Skip to content

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

Show normal error with help suggestion if enabling PIN fails in Android app (#2510)

Leendert de Borst3971cbc1e98a
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinViewModel.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinViewModel.kt
index a0cfc7c1d..05bd183c0 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinViewModel.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/pinunlock/PinViewModel.kt
@@ -1,6 +1,7 @@
package net.aliasvault.app.pinunlock
import android.content.Context
+import android.security.keystore.UserNotAuthenticatedException
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
import net.aliasvault.app.R
@@ -82,10 +83,7 @@ class PinViewModel(
}
}
} catch (e: Exception) {
- PinResult.Error(
- e.message ?: context.getString(R.string.unknown_error),
- shouldClear = true,
- )
+ PinResult.Error(errorMessage(e) ?: context.getString(R.string.unknown_error), shouldClear = true)
}
}
@@ -140,15 +138,22 @@ class PinViewModel(
vaultStore.setupPin(pin, setupAccountKey)
PinResult.Success(null)
} catch (e: Exception) {
- PinResult.Error(
- e.message ?: "Failed to setup PIN",
- shouldClear = false,
- )
+ PinResult.Error(errorMessage(e) ?: "Failed to setup PIN", shouldClear = false)
}
}
}
}
+ /**
+ * The message to show for a PIN error, with a readable one when the Android Keystore refuses its key on a device it sees as locked.
+ */
+ private fun errorMessage(e: Exception): String? {
+ if (generateSequence<Throwable>(e) { it.cause }.any { it is UserNotAuthenticatedException }) {
+ return context.getString(R.string.pin_device_not_unlocked)
+ }
+ return e.message
+ }
+
/**
* Check if PIN entry should auto-submit based on configuration.
*/
diff --git a/apps/mobile-app/android/app/src/main/res/values-da/strings.xml b/apps/mobile-app/android/app/src/main/res/values-da/strings.xml
index f2e83548f..0aad57564 100644
--- a/apps/mobile-app/android/app/src/main/res/values-da/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-da/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">Bekræft PIN-kode</string>
<string name="pin_confirm_description">Indtast din PIN-kode igen for at bekræfte</string>
<string name="pin_mismatch">PIN-koderne stemmer ikke overens. Prøv venligst igen.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Lås boks op</string>
<string name="password_unlock_subtitle">Indtast din hovedadgangskode</string>
<string name="password_unlock_password_hint">Adgangskode</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-de/strings.xml b/apps/mobile-app/android/app/src/main/res/values-de/strings.xml
index d090bc576..332f0abda 100644
--- a/apps/mobile-app/android/app/src/main/res/values-de/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-de/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">PIN bestätigen</string>
<string name="pin_confirm_description">Zur Bestätigung PIN erneut eingeben</string>
<string name="pin_mismatch">PINs stimmen nicht überein. Bitte versuche es erneut.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Tresor entsperren</string>
<string name="password_unlock_subtitle">Gib Dein Master-Passwort ein</string>
<string name="password_unlock_password_hint">Passwort</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-es/strings.xml b/apps/mobile-app/android/app/src/main/res/values-es/strings.xml
index ae3c83e03..7b489c28c 100644
--- a/apps/mobile-app/android/app/src/main/res/values-es/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-es/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">Confirmar PIN</string>
<string name="pin_confirm_description">Vuelva a introducir tu PIN para confirmar</string>
<string name="pin_mismatch">Los PIN no coinciden. Por favor, inténtalo de nuevo.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Desbloquear bóveda</string>
<string name="password_unlock_subtitle">Ingrese tu contraseña maestra</string>
<string name="password_unlock_password_hint">Contraseña</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-fi/strings.xml b/apps/mobile-app/android/app/src/main/res/values-fi/strings.xml
index b0a1a0c1d..c40c6a2c6 100644
--- a/apps/mobile-app/android/app/src/main/res/values-fi/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-fi/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">Vahvista PIN</string>
<string name="pin_confirm_description">Syötä PIN-koodi uudelleen vahvistaaksesi</string>
<string name="pin_mismatch">PIN-koodit eivät täsmää. Yritä uudelleen.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Avaa holvin lukitus</string>
<string name="password_unlock_subtitle">Syötä pääsalasanasi</string>
<string name="password_unlock_password_hint">Salasana</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-fr/strings.xml b/apps/mobile-app/android/app/src/main/res/values-fr/strings.xml
index 8f8ae0b70..29fe4e311 100644
--- a/apps/mobile-app/android/app/src/main/res/values-fr/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-fr/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">Confirmer le code PIN</string>
<string name="pin_confirm_description">Entrez à nouveau votre code PIN pour confirmer</string>
<string name="pin_mismatch">Les codes PIN ne correspondent pas. Veuillez réessayer.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Déverrouiller le coffre-fort</string>
<string name="password_unlock_subtitle">Entrez votre mot de passe principal</string>
<string name="password_unlock_password_hint">Mot de passe</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-ga/strings.xml b/apps/mobile-app/android/app/src/main/res/values-ga/strings.xml
index 51b9547ea..c84bcbd76 100644
--- a/apps/mobile-app/android/app/src/main/res/values-ga/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-ga/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">Deimhnigh PIN</string>
<string name="pin_confirm_description">Ath-iontráil do PIN le deimhniú</string>
<string name="pin_mismatch">Ní hionann na PINanna. Déan iarracht arís.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Díghlasáil an Cruinneachán</string>
<string name="password_unlock_subtitle">Cuir isteach do phríomhfhocal faire</string>
<string name="password_unlock_password_hint">Pasfhocal</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-he/strings.xml b/apps/mobile-app/android/app/src/main/res/values-he/strings.xml
index f185c7d63..4b81c986c 100644
--- a/apps/mobile-app/android/app/src/main/res/values-he/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-he/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">אישור קוד אישי</string>
<string name="pin_confirm_description">נא למלא את הקוד האישי שלך מחדש לאישור</string>
<string name="pin_mismatch">הקודים האישיים לא תואמים. נא לנסות שוב.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">שחרור נעילת כספת</string>
<string name="password_unlock_subtitle">נא למלא את סיסמת העל שלך</string>
<string name="password_unlock_password_hint">סיסמה</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-hu/strings.xml b/apps/mobile-app/android/app/src/main/res/values-hu/strings.xml
index 3f7c432aa..e5fe3a399 100644
--- a/apps/mobile-app/android/app/src/main/res/values-hu/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-hu/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">PIN kód megerősítése</string>
<string name="pin_confirm_description">Adja meg újra PIN kódját a megerősítéshez</string>
<string name="pin_mismatch">A PIN kódok nem egyeznek. Kérem, próbálja meg újra.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Széf feloldása</string>
<string name="password_unlock_subtitle">Adja meg mester jelszavát</string>
<string name="password_unlock_password_hint">Jelszó</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-id/strings.xml b/apps/mobile-app/android/app/src/main/res/values-id/strings.xml
index 9d7bc55de..ee952d620 100644
--- a/apps/mobile-app/android/app/src/main/res/values-id/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-id/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">Konfirmasi PIN</string>
<string name="pin_confirm_description">Masukkan kembali PIN untuk mengonfirmasi</string>
<string name="pin_mismatch">PIN tidak cocok. Mohon coba lagi.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Buka Brankas</string>
<string name="password_unlock_subtitle">Masukkan kata sandi utama Anda</string>
<string name="password_unlock_password_hint">Kata sandi</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-it/strings.xml b/apps/mobile-app/android/app/src/main/res/values-it/strings.xml
index 415f677a4..72f9dd602 100644
--- a/apps/mobile-app/android/app/src/main/res/values-it/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-it/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">Conferma PIN</string>
<string name="pin_confirm_description">Reinserisci il tuo PIN per confermare.</string>
<string name="pin_mismatch">I PIN non corrispondono. Riprova.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Sblocca Cassaforte</string>
<string name="password_unlock_subtitle">Inserisci la tua password principale</string>
<string name="password_unlock_password_hint">Password</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-ko/strings.xml b/apps/mobile-app/android/app/src/main/res/values-ko/strings.xml
index ebbb4e4de..7e938f690 100644
--- a/apps/mobile-app/android/app/src/main/res/values-ko/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-ko/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">PIN 확인</string>
<string name="pin_confirm_description">확인을 위해 PIN을 다시 입력하세요</string>
<string name="pin_mismatch">PIN이 일치하지 않습니다. 다시 시도하세요.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">보관함 잠금 해제</string>
<string name="password_unlock_subtitle">마스터 비밀번호 입력</string>
<string name="password_unlock_password_hint">비밀번호</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-nl/strings.xml b/apps/mobile-app/android/app/src/main/res/values-nl/strings.xml
index d51aad6b7..497d812b9 100644
--- a/apps/mobile-app/android/app/src/main/res/values-nl/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-nl/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">Bevestig pincode</string>
<string name="pin_confirm_description">Voer je pincode opnieuw in om te bevestigen</string>
<string name="pin_mismatch">Pincodes komen niet overeen. Probeer het opnieuw.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Vault ontgrendelen</string>
<string name="password_unlock_subtitle">Voer je hoofdwachtwoord in</string>
<string name="password_unlock_password_hint">Wachtwoord</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-pl/strings.xml b/apps/mobile-app/android/app/src/main/res/values-pl/strings.xml
index df211eed7..ac7f13002 100644
--- a/apps/mobile-app/android/app/src/main/res/values-pl/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-pl/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">Potwierdź kod PIN</string>
<string name="pin_confirm_description">Wprowadź ponownie swój kod PIN, aby potwierdzić</string>
<string name="pin_mismatch">Kody PIN nie pasują. Spróbuj jeszcze raz.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Odblokuj sejf</string>
<string name="password_unlock_subtitle">Wprowadź swoje hasło główne</string>
<string name="password_unlock_password_hint">Hasło</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-pt/strings.xml b/apps/mobile-app/android/app/src/main/res/values-pt/strings.xml
index 4a95962b0..5e8e80bb8 100644
--- a/apps/mobile-app/android/app/src/main/res/values-pt/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-pt/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">Confirmar PIN</string>
<string name="pin_confirm_description">Digite seu PIN novamente para confirmar</string>
<string name="pin_mismatch">PINs não correspondem. Por favor, tente novamente.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Desbloquear cofre</string>
<string name="password_unlock_subtitle">Digite sua senha mestre</string>
<string name="password_unlock_password_hint">Senha</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-ro/strings.xml b/apps/mobile-app/android/app/src/main/res/values-ro/strings.xml
index beed22ab8..8d42b188c 100644
--- a/apps/mobile-app/android/app/src/main/res/values-ro/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-ro/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">Confirmă PIN</string>
<string name="pin_confirm_description">Reintrodu PIN-ul pentru confirmare</string>
<string name="pin_mismatch">Codurile PIN nu coincid. Încearcă din nou.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Deblochează seiful</string>
<string name="password_unlock_subtitle">Introdu parola principală</string>
<string name="password_unlock_password_hint">Parolă</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-ru/strings.xml b/apps/mobile-app/android/app/src/main/res/values-ru/strings.xml
index d52557859..17f51e001 100644
--- a/apps/mobile-app/android/app/src/main/res/values-ru/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-ru/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">Подтвердите ПИН-код</string>
<string name="pin_confirm_description">Введите PIN-код еще раз для подтверждения</string>
<string name="pin_mismatch">PIN-коды не совпадают. Повторите попытку.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Разблокировать хранилище</string>
<string name="password_unlock_subtitle">Введите свой мастер-пароль</string>
<string name="password_unlock_password_hint">Пароль</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-sv/strings.xml b/apps/mobile-app/android/app/src/main/res/values-sv/strings.xml
index edb3089a6..0a9701598 100644
--- a/apps/mobile-app/android/app/src/main/res/values-sv/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-sv/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">Bekräfta PIN-kod</string>
<string name="pin_confirm_description">Ange din PIN-kod igen för att bekräfta</string>
<string name="pin_mismatch">PIN-koderna matchar inte. Var god försök igen.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Lås upp valv</string>
<string name="password_unlock_subtitle">Ange ditt huvudlösenord</string>
<string name="password_unlock_password_hint">Lösenord</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-uk/strings.xml b/apps/mobile-app/android/app/src/main/res/values-uk/strings.xml
index c12c432e5..f8c4b4305 100644
--- a/apps/mobile-app/android/app/src/main/res/values-uk/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-uk/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">Підтвердити ПІН-код</string>
<string name="pin_confirm_description">Введіть PIN-код ще раз для підтвердження</string>
<string name="pin_mismatch">PIN-коди не збігаються. Спробуйте ще раз.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Розблокувати Vault</string>
<string name="password_unlock_subtitle">Введіть ваш головний пароль</string>
<string name="password_unlock_password_hint">Пароль</string>
diff --git a/apps/mobile-app/android/app/src/main/res/values-zh/strings.xml b/apps/mobile-app/android/app/src/main/res/values-zh/strings.xml
index 94feb3a3a..a7fb2b60a 100644
--- a/apps/mobile-app/android/app/src/main/res/values-zh/strings.xml
+++ b/apps/mobile-app/android/app/src/main/res/values-zh/strings.xml
@@ -79,6 +79,7 @@
<string name="pin_confirm_title">确认 PIN</string>
<string name="pin_confirm_description">重新输入您的 PIN 以确认</string>
<string name="pin_mismatch">PIN 不匹配,请重试。</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">解锁密码库</string>
<string name="password_unlock_subtitle">输入您的主密码</string>
<string name="password_unlock_password_hint">密码</string>
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 fed75ea51..e0915373c 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
@@ -82,6 +82,7 @@
<string name="pin_confirm_title">Confirm PIN</string>
<string name="pin_confirm_description">Re-enter your PIN to confirm</string>
<string name="pin_mismatch">PINs do not match. Please try again.</string>
+ <string name="pin_device_not_unlocked">Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.</string>
<string name="password_unlock_title">Unlock Vault</string>
<string name="password_unlock_subtitle">Enter your master password</string>
<string name="password_unlock_password_hint">Password</string>
diff --git a/core/i18n/exports/mobile-native.json b/core/i18n/exports/mobile-native.json
index 8e49720ae..eb298543f 100644
--- a/core/i18n/exports/mobile-native.json
+++ b/core/i18n/exports/mobile-native.json
@@ -227,6 +227,7 @@
"pin_confirm_title": "settings.unlockMethod.confirmPin",
"pin_confirm_description": "native.pinConfirmSubtitle",
"pin_mismatch": "native.pinMismatch",
+ "pin_device_not_unlocked": "native.pinDeviceNotUnlocked",
"password_unlock_title": "auth.unlockVault",
"password_unlock_subtitle": "auth.setup.passwordStep.masterPasswordPlaceholder",
"password_unlock_password_hint": "common.password",
diff --git a/core/i18n/locales/en.json b/core/i18n/locales/en.json
index 4950ffc73..6bede1704 100644
--- a/core/i18n/locales/en.json
+++ b/core/i18n/locales/en.json
@@ -1025,6 +1025,7 @@
"passwordCopied": "Password copied",
"passwordUnlockError": "Failed to verify password",
"pinConfirmSubtitle": "Re-enter your PIN to confirm",
+ "pinDeviceNotUnlocked": "Your device did not confirm it is unlocked. Lock your device, unlock it with your device PIN, pattern or password and try again.",
"pinIncorrectAttemptsRemaining": "Incorrect PIN. {{count}} attempts remaining",
"pinLockedMaxAttempts": "PIN locked after too many failed attempts",
"pinMismatch": "PINs do not match. Please try again.",