Skip to content

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

Add additional loading message feedback during passkey verification (#1440)

Leendert de Borstb3350473103d
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/OriginVerifier.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/OriginVerifier.kt
index 7f89a3d2f..ef0174575 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/OriginVerifier.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/credentialprovider/OriginVerifier.kt
@@ -1005,7 +1005,7 @@ class OriginVerifier {
if (connection.responseCode != HttpURLConnection.HTTP_OK) {
Log.w(TAG, "Asset links not found for $rpId: ${connection.responseCode}")
return AssetLinksResult.Failure(
- "Cannot verify app authorization: $rpId does not provide asset links",
+ "App is not authorized to access passkeys for $rpId",
)
}
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 127e02a3f..4b45eb5e4 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
@@ -114,6 +114,19 @@ class PasskeyAuthenticationActivity : FragmentActivity() {
}
}
+ /**
+ * Update the loading message displayed to the user.
+ */
+ private fun updateLoadingMessage(messageResId: Int) {
+ runOnUiThread {
+ try {
+ findViewById<TextView>(R.id.loadingMessage)?.text = getString(messageResId)
+ } catch (e: Exception) {
+ Log.w(TAG, "Could not update loading message", e)
+ }
+ }
+ }
+
/**
* Process the passkey authentication request and generate assertion.
* Called after authentication (biometric or PIN) succeeds and vault is unlocked.
@@ -128,6 +141,9 @@ class PasskeyAuthenticationActivity : FragmentActivity() {
lifecycleScope.launch {
try {
+ // Show retrieving status to user
+ updateLoadingMessage(R.string.passkey_retrieving)
+
// Extract passkey ID from intent
val passkeyIdString = intent.getStringExtra(
AliasVaultCredentialProviderService.EXTRA_PASSKEY_ID,
@@ -141,7 +157,7 @@ class PasskeyAuthenticationActivity : FragmentActivity() {
val passkeyId = UUID.fromString(passkeyIdString.uppercase())
- // Get database connection from vault (should be unlocked at this point)
+ // Get database connection from vault
val db = vaultStore.database
if (db == null) {
Log.e(TAG, "Database not available - vault may not be unlocked")
@@ -169,7 +185,10 @@ class PasskeyAuthenticationActivity : FragmentActivity() {
.filterIsInstance<androidx.credentials.GetPublicKeyCredentialOption>()
.firstOrNull()?.clientDataHash
- // Verify origin of the calling app (may involve network call for asset links)
+ // Show verifying status to user
+ updateLoadingMessage(R.string.passkey_verifying)
+
+ // Verify origin of the calling app
val originVerifier = OriginVerifier()
val callingAppInfo = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
providerRequest.callingAppInfo
@@ -177,7 +196,7 @@ class PasskeyAuthenticationActivity : FragmentActivity() {
null
}
- // Run origin verification on IO thread (asset links fetch requires network)
+ // Run origin verification on IO thread
val originResult = withContext(Dispatchers.IO) {
originVerifier.verifyOrigin(
callingAppInfo = callingAppInfo,
@@ -201,6 +220,9 @@ class PasskeyAuthenticationActivity : FragmentActivity() {
}
}
+ // Show authenticating status to user
+ updateLoadingMessage(R.string.passkey_authenticating)
+
// Determine clientDataHash and clientDataJson based on what caller provided
val clientDataHash: ByteArray
val clientDataJson: String?
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 4547507dd..f351a43e7 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
@@ -134,12 +134,28 @@ class PasskeyRegistrationActivity : FragmentActivity() {
}
}
+ /**
+ * Update the loading message displayed to the user.
+ */
+ private fun updateLoadingMessage(messageResId: Int) {
+ runOnUiThread {
+ try {
+ findViewById<TextView>(R.id.loadingMessage)?.text = getString(messageResId)
+ } catch (e: Exception) {
+ Log.w(TAG, "Could not update loading message", e)
+ }
+ }
+ }
+
/**
* Verify origin on background thread and start unlock flow if successful.
*/
private fun verifyOriginAndStartUnlock(callingAppInfo: CallingAppInfo?, savedInstanceState: Bundle?) {
lifecycleScope.launch {
try {
+ // Show verifying status to user (network call may happen)
+ updateLoadingMessage(R.string.passkey_verifying)
+
// Run origin verification on IO thread (asset links fetch requires network)
val originVerifier = OriginVerifier()
val originResult = withContext(Dispatchers.IO) {
diff --git a/apps/mobile-app/android/app/src/main/res/values/strings.xml b/apps/mobile-app/android/app/src/main/res/values/strings.xml
index 2b214b425..c4b42a274 100644
--- a/apps/mobile-app/android/app/src/main/res/values/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values/strings.xml
@@ -49,6 +49,9 @@
<string name="passkey_replace_explanation">This will replace the existing passkey with a new one. Please be aware that your old passkey will be overwritten and no longer accessible. If you wish to create a separate passkey instead, go back to the previous screen.</string>
<string name="passkey_replacing">Replacing passkey…</string>
<string name="passkey_checking_connection">Checking connection…</string>
+ <string name="passkey_retrieving">Retrieving passkey…</string>
+ <string name="passkey_verifying">Verifying…</string>
+ <string name="passkey_authenticating">Authenticating…</string>
<!-- Vault sync error messages -->
<string name="connection_error_title">Connection Error</string>