Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Copy TOTP to clipboard after passkey authentication in Android (#2305)

Leendert de Borst9a423caaaf94
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/AutofillFillActivity.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/AutofillFillActivity.kt
index d82c1398b..31db23c0f 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/AutofillFillActivity.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/AutofillFillActivity.kt
@@ -1,14 +1,9 @@
package net.aliasvault.app.autofill
import android.app.Activity
-import android.content.ClipData
-import android.content.ClipDescription
-import android.content.ClipboardManager
-import android.content.Context
import android.content.Intent
import android.os.Build
import android.os.Bundle
-import android.os.PersistableBundle
import android.service.autofill.Dataset
import android.util.Log
import android.view.autofill.AutofillId
@@ -17,7 +12,7 @@ import android.widget.RemoteViews
import net.aliasvault.app.R
import net.aliasvault.app.autofill.models.FieldType
import net.aliasvault.app.autofill.utils.AutofillFieldMapper
-import net.aliasvault.app.utils.TotpGenerator
+import net.aliasvault.app.utils.TotpClipboard
import net.aliasvault.app.vaultstore.VaultStore
/**
@@ -80,7 +75,7 @@ class AutofillFillActivity : Activity() {
}
if (copyTotp) {
- tryCopyTotpToClipboard(store, itemId)
+ TotpClipboard.copyCodeForItem(this, store, itemId)
}
val fields = pairFields(autofillIds, fieldTypeOrdinals)
@@ -122,25 +117,4 @@ class AutofillFillActivity : Activity() {
id to (types.getOrNull(fieldTypeOrdinals[i]) ?: FieldType.UNKNOWN)
}
}
-
- private fun tryCopyTotpToClipboard(store: VaultStore, itemId: String) {
- val secret = store.getTotpSecretForItem(itemId) ?: return
- val code = TotpGenerator.generateCode(secret) ?: return
- if (code.isEmpty()) return
-
- try {
- val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
- val clip = ClipData.newPlainText("AliasVault", code)
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
- val extras = PersistableBundle().apply {
- putBoolean(ClipDescription.EXTRA_IS_SENSITIVE, true)
- }
- clip.description.extras = extras
- }
- clipboard.setPrimaryClip(clip)
- Log.d(TAG, "TOTP code copied to clipboard during autofill")
- } catch (e: Exception) {
- Log.e(TAG, "Failed to copy TOTP code to clipboard", e)
- }
- }
}
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/AutofillService.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/AutofillService.kt
index f54071985..2277ea840 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/AutofillService.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/AutofillService.kt
@@ -30,6 +30,7 @@ import net.aliasvault.app.autofill.utils.AutofillDatasetBuilder
import net.aliasvault.app.autofill.utils.FieldFinder
import net.aliasvault.app.autofill.utils.InlinePresentationHelper
import net.aliasvault.app.autofill.utils.RustItemMatcher
+import net.aliasvault.app.utils.TotpClipboard
import net.aliasvault.app.vaultstore.VaultStore
import net.aliasvault.app.vaultstore.interfaces.ItemOperationCallback
import net.aliasvault.app.vaultstore.models.Item
@@ -181,7 +182,7 @@ class AutofillService : AutofillService() {
// Add debug dataset if enabled in settings
val sharedPreferences = getSharedPreferences("AliasVaultPrefs", android.content.Context.MODE_PRIVATE)
val showSearchText = sharedPreferences.getBoolean("autofill_show_search_text", false)
- val copyTotpOnFill = sharedPreferences.getBoolean("autofill_copy_totp_on_fill", true)
+ val copyTotpOnFill = TotpClipboard.isCopyOnFillEnabled(this@AutofillService)
if (showSearchText) {
responseBuilder.addDataset(createSearchDebugDataset(fieldFinder, appInfo ?: "unknown", inlinePool))
}
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/AutofillUnlockActivity.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/AutofillUnlockActivity.kt
index f9b742803..5ca3f11e5 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/AutofillUnlockActivity.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/autofill/AutofillUnlockActivity.kt
@@ -19,6 +19,7 @@ import net.aliasvault.app.autofill.utils.AutofillDatasetBuilder
import net.aliasvault.app.autofill.utils.RustItemMatcher
import net.aliasvault.app.credentialprovider.UnlockCoordinator
import net.aliasvault.app.utils.ErrorScreenView
+import net.aliasvault.app.utils.TotpClipboard
import net.aliasvault.app.vaultstore.VaultStore
import net.aliasvault.app.vaultstore.keystoreprovider.AndroidKeystoreProvider
import net.aliasvault.app.vaultstore.storageprovider.AndroidStorageProvider
@@ -149,8 +150,7 @@ class AutofillUnlockActivity : FragmentActivity() {
"Post-unlock items: app matches=${filteredByApp.size}, with data=${matchingItems.size}",
)
- val copyTotpOnFill = getSharedPreferences("AliasVaultPrefs", MODE_PRIVATE)
- .getBoolean("autofill_copy_totp_on_fill", true)
+ val copyTotpOnFill = TotpClipboard.isCopyOnFillEnabled(this)
val responseBuilder = FillResponse.Builder()
if (matchingItems.isEmpty()) {
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeyAuthenticationActivity.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeyAuthenticationActivity.kt
index 7f26d0550..3c6a277b5 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeyAuthenticationActivity.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeyAuthenticationActivity.kt
@@ -16,6 +16,7 @@ import kotlinx.coroutines.withContext
import net.aliasvault.app.R
import net.aliasvault.app.utils.ErrorScreenView
import net.aliasvault.app.utils.Helpers
+import net.aliasvault.app.utils.TotpClipboard
import net.aliasvault.app.vaultstore.VaultStore
import net.aliasvault.app.vaultstore.keystoreprovider.AndroidKeystoreProvider
import net.aliasvault.app.vaultstore.passkey.PasskeyAuthenticator
@@ -261,6 +262,16 @@ class PasskeyAuthenticationActivity : FragmentActivity() {
clientDataJson = clientDataJson,
)
+ // If the item behind this passkey also has a TOTP code and the user has the
+ // copy-on-fill setting enabled (default), write the current code to the clipboard.
+ if (TotpClipboard.isCopyOnFillEnabled(this@PasskeyAuthenticationActivity)) {
+ TotpClipboard.copyCodeForItem(
+ context = this@PasskeyAuthenticationActivity,
+ store = vaultStore,
+ itemId = passkey.parentItemId.toString(),
+ )
+ }
+
val resultIntent = Intent()
try {
PendingIntentHandler.setGetCredentialResponse(resultIntent, response)
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/utils/TotpClipboard.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/utils/TotpClipboard.kt
new file mode 100644
index 000000000..2e3687dba
--- /dev/null
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/utils/TotpClipboard.kt
@@ -0,0 +1,61 @@
+package net.aliasvault.app.utils
+
+import android.content.ClipData
+import android.content.ClipDescription
+import android.content.ClipboardManager
+import android.content.Context
+import android.os.Build
+import android.os.PersistableBundle
+import android.util.Log
+import net.aliasvault.app.vaultstore.VaultStore
+
+/**
+ * Puts an item's current TOTP code on the clipboard while autofilling, so the user can paste it
+ * into the 2FA field after the fill completes.
+ */
+object TotpClipboard {
+ private const val TAG = "TotpClipboard"
+
+ /** Shared preferences file holding the app's autofill settings. */
+ private const val PREFS_NAME = "AliasVaultPrefs"
+
+ /** Preference key for the copy-TOTP-on-fill setting. */
+ private const val PREF_COPY_TOTP_ON_FILL = "autofill_copy_totp_on_fill"
+
+ /**
+ * Whether the user wants the item's TOTP code copied to the clipboard on autofill.
+ * Defaults to true when the setting has never been written.
+ */
+ fun isCopyOnFillEnabled(context: Context): Boolean {
+ return context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
+ .getBoolean(PREF_COPY_TOTP_ON_FILL, true)
+ }
+
+ /**
+ * Copy the current TOTP code of the passed item to the clipboard.
+ *
+ * @param context The context used for the clipboard service.
+ * @param store The unlocked vault store to read the TOTP secret from.
+ * @param itemId The ID of the item being filled.
+ */
+ fun copyCodeForItem(context: Context, store: VaultStore, itemId: String) {
+ val secret = store.getTotpSecretForItem(itemId) ?: return
+ val code = TotpGenerator.generateCode(secret) ?: return
+ if (code.isEmpty()) return
+
+ try {
+ val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+ val clip = ClipData.newPlainText("AliasVault", code)
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+ val extras = PersistableBundle().apply {
+ putBoolean(ClipDescription.EXTRA_IS_SENSITIVE, true)
+ }
+ clip.description.extras = extras
+ }
+ clipboard.setPrimaryClip(clip)
+ Log.d(TAG, "TOTP code copied to clipboard during autofill")
+ } catch (e: Exception) {
+ Log.e(TAG, "Failed to copy TOTP code to clipboard", e)
+ }
+ }
+}