Skip to content

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

Update KeyStoreProvider activity setter flow (#1845)

Leendert de Borst356c782053df
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/MainActivity.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/MainActivity.kt
index cd199b510..85ac87b1e 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/MainActivity.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/MainActivity.kt
@@ -139,7 +139,7 @@ class MainActivity : ReactActivity() {
}
val vaultStore = net.aliasvault.app.vaultstore.VaultStore.getInstance(
- net.aliasvault.app.vaultstore.keystoreprovider.AndroidKeystoreProvider(this) { null },
+ net.aliasvault.app.vaultstore.keystoreprovider.AndroidKeystoreProvider(this),
net.aliasvault.app.vaultstore.storageprovider.AndroidStorageProvider(this),
)
@@ -262,7 +262,7 @@ class MainActivity : ReactActivity() {
}
val vaultStore = net.aliasvault.app.vaultstore.VaultStore.getInstance(
- net.aliasvault.app.vaultstore.keystoreprovider.AndroidKeystoreProvider(this) { null },
+ net.aliasvault.app.vaultstore.keystoreprovider.AndroidKeystoreProvider(this),
net.aliasvault.app.vaultstore.storageprovider.AndroidStorageProvider(this),
)
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 332474db0..68fc58fae 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
@@ -243,18 +243,12 @@ class AutofillService : AutofillService() {
}
}
- // If we get here, either there was no instance or the vault wasn't unlocked.
- // Use FillResponse-level authentication so that after the user unlocks
- // through AutofillUnlockActivity, the OS automatically restores the
- // calling app and shows the (now-populated) autofill picker.
Log.d(TAG, "Vault is locked, requiring authentication before fill")
callback(buildLockedFillResponse(fieldFinder, appInfo))
}
/**
- * Build a [FillResponse] whose only entry is a "Vault locked" row that, when
- * tapped, launches [AutofillUnlockActivity] to unlock the vault and resume
- * the autofill flow in the calling app.
+ * Build a [FillResponse] whose only entry is a "Vault locked" row.
*/
private fun buildLockedFillResponse(fieldFinder: FieldFinder, appInfo: String?): FillResponse {
val autofillIds = fieldFinder.autofillableFields.map { it.first }.toTypedArray()
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 67a820c97..0db3eca5f 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
@@ -71,16 +71,14 @@ class AutofillUnlockActivity : FragmentActivity() {
appInfo = intent.getStringExtra(EXTRA_APP_INFO)
vaultStore = VaultStore.getExistingInstance() ?: run {
- val keystoreProvider = AndroidKeystoreProvider(applicationContext) { this }
+ val keystoreProvider = AndroidKeystoreProvider(applicationContext)
val storageProvider = AndroidStorageProvider(applicationContext)
VaultStore.getInstance(keystoreProvider, storageProvider)
}
setContentView(R.layout.activity_loading)
- // Vault may have been unlocked in another flow between the
- // FillResponse being built and the user tapping the row. Skip the
- // unlock prompt entirely in that case.
+ // Skip the unlock prompt if the vault is already unlocked.
if (vaultStore.isVaultUnlocked()) {
onVaultUnlocked()
return
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/AliasVaultCredentialProviderService.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/AliasVaultCredentialProviderService.kt
index 8cc3aeeda..7366b71c8 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/AliasVaultCredentialProviderService.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/AliasVaultCredentialProviderService.kt
@@ -190,9 +190,9 @@ class AliasVaultCredentialProviderService : CredentialProviderService() {
): BeginCreateCredentialResponse? {
// Get or initialize VaultStore instance (needed for subsequent passkey registration)
VaultStore.getExistingInstance() ?: run {
- // Need a FragmentActivity reference for biometrics, but this is a service
- // We'll create a minimal VaultStore instance here
- val keystoreProvider = AndroidKeystoreProvider(applicationContext) { null }
+ // Services can't show biometric prompts; the calling activity must
+ // register itself via setKeystoreActivityGetter if it needs one.
+ val keystoreProvider = AndroidKeystoreProvider(applicationContext)
val storageProvider = AndroidStorageProvider(applicationContext)
VaultStore.getInstance(keystoreProvider, storageProvider)
}
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 a376214c7..1068ff076 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
@@ -64,9 +64,8 @@ class PasskeyAuthenticationActivity : FragmentActivity() {
return
}
- // Get or initialize VaultStore instance
vaultStore = VaultStore.getExistingInstance() ?: run {
- val keystoreProvider = AndroidKeystoreProvider(applicationContext) { this }
+ val keystoreProvider = AndroidKeystoreProvider(applicationContext)
val storageProvider = AndroidStorageProvider(applicationContext)
VaultStore.getInstance(keystoreProvider, storageProvider)
}
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeyRegistrationActivity.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeyRegistrationActivity.kt
index f2c811870..03d9ea21f 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeyRegistrationActivity.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/PasskeyRegistrationActivity.kt
@@ -49,9 +49,8 @@ class PasskeyRegistrationActivity : FragmentActivity() {
super.onCreate(savedInstanceState)
try {
- // Get or initialize VaultStore instance
vaultStore = VaultStore.getExistingInstance() ?: run {
- val keystoreProvider = AndroidKeystoreProvider(applicationContext) { this }
+ val keystoreProvider = AndroidKeystoreProvider(applicationContext)
val storageProvider = AndroidStorageProvider(applicationContext)
VaultStore.getInstance(keystoreProvider, storageProvider)
}
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/UnlockCoordinator.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/UnlockCoordinator.kt
index ed4eeca39..e8974fef4 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/UnlockCoordinator.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/UnlockCoordinator.kt
@@ -98,7 +98,7 @@ class UnlockCoordinator(
* Can be called directly to retry biometric unlock.
*/
fun attemptBiometricUnlock() {
- val keystoreProvider = AndroidKeystoreProvider(activity.applicationContext) { activity }
+ val keystoreProvider = AndroidKeystoreProvider(activity.applicationContext)
keystoreProvider.retrieveKeyExternal(
activity,
object : KeystoreOperationCallback {
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt
index 1e46bbd1f..09e3f7613 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt
@@ -107,9 +107,12 @@ class NativeVaultManager(reactContext: ReactApplicationContext) :
}
private val vaultStore = VaultStore.getInstance(
- AndroidKeystoreProvider(reactContext) { getFragmentActivity() },
+ AndroidKeystoreProvider(reactContext),
AndroidStorageProvider(reactContext),
- )
+ ).also { store ->
+ // Point the singleton's keystore provider at React's current activity.
+ store.setKeystoreActivityGetter { getFragmentActivity() }
+ }
private val webApiService = WebApiService(reactContext)
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/passwordunlock/PasswordUnlockActivity.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/passwordunlock/PasswordUnlockActivity.kt
index f53a2d44e..4d2197c96 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/passwordunlock/PasswordUnlockActivity.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/passwordunlock/PasswordUnlockActivity.kt
@@ -105,7 +105,7 @@ class PasswordUnlockActivity : AppCompatActivity() {
// Initialize VaultStore
vaultStore = VaultStore.getInstance(
- AndroidKeystoreProvider(this) { null },
+ AndroidKeystoreProvider(this),
AndroidStorageProvider(this),
)
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinUnlockActivity.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinUnlockActivity.kt
index 585c33561..8de638b95 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinUnlockActivity.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinUnlockActivity.kt
@@ -113,7 +113,7 @@ class PinUnlockActivity : AppCompatActivity() {
// Initialize VaultStore and ViewModel
vaultStore = VaultStore.getInstance(
- net.aliasvault.app.vaultstore.keystoreprovider.AndroidKeystoreProvider(this) { null },
+ net.aliasvault.app.vaultstore.keystoreprovider.AndroidKeystoreProvider(this),
net.aliasvault.app.vaultstore.storageprovider.AndroidStorageProvider(this),
)
viewModel = PinViewModel(this, vaultStore)
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultStore.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultStore.kt
index 9952ac6d6..9659fb00d 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultStore.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/VaultStore.kt
@@ -114,6 +114,12 @@ class VaultStore(
// endregion
+ /** Point the keystore provider at the caller's foreground activity for biometric prompts. */
+ fun setKeystoreActivityGetter(getter: () -> android.app.Activity?) {
+ (keystoreProvider as? net.aliasvault.app.vaultstore.keystoreprovider.AndroidKeystoreProvider)
+ ?.setActivityGetter(getter)
+ }
+
// region Crypto Methods
/**
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/keystoreprovider/AndroidKeystoreProvider.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/keystoreprovider/AndroidKeystoreProvider.kt
index fe5118496..50114b263 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/keystoreprovider/AndroidKeystoreProvider.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/vaultstore/keystoreprovider/AndroidKeystoreProvider.kt
@@ -26,12 +26,23 @@ import javax.crypto.SecretKey
import javax.crypto.spec.GCMParameterSpec
/**
- * Android implementation of the keystore provider that uses Android's Keystore and Biometric APIs.
+ * Android implementation of the keystore provider using Android's Keystore
+ * and Biometric APIs. Whichever component holds the foreground UI registers
+ * itself via [setActivityGetter] so biometric prompts attach correctly;
+ * callers with an activity on hand should prefer [retrieveKeyExternal].
*/
class AndroidKeystoreProvider(
private val context: Context,
- private val getCurrentActivity: () -> Activity?,
) : KeystoreProvider {
+
+ @Volatile
+ private var getCurrentActivity: () -> Activity? = { null }
+
+ /** Register the source of the foreground activity for biometric prompts. */
+ fun setActivityGetter(getter: () -> Activity?) {
+ getCurrentActivity = getter
+ }
+
companion object {
/**
* The tag for logging.