mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-11-24 18:36:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

Simplify manual unlock check (#3824)

Browse source
This commit is contained in:
David Perez 2024-08-26 09:07:23 -05:00 committed by GitHub
parent 9dbb40f33b
commit 38e693f92c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt
View file

@ -61,22 +61,20 @@ class VaultUnlockViewModel @Inject constructor(
) )
val vaultUnlockType = activeAccount.vaultUnlockType val vaultUnlockType = activeAccount.vaultUnlockType
val hasNoMasterPassword = !activeAccount.hasMasterPassword val hasNoMasterPassword = !activeAccount.hasMasterPassword
val hideInput = hasNoMasterPassword && vaultUnlockType == VaultUnlockType.MASTER_PASSWORD if (!activeAccount.hasManualUnlockMechanism) {
val isBiometricsEnabled = activeAccount.isBiometricsEnabled
if (hasNoMasterPassword && vaultUnlockType != VaultUnlockType.PIN && !isBiometricsEnabled) {
// There is no valid way to unlock this app. // There is no valid way to unlock this app.
authRepository.logout() authRepository.logout()
} }
VaultUnlockState( VaultUnlockState(
accountSummaries = accountSummaries, accountSummaries = accountSummaries,
avatarColorString = activeAccountSummary.avatarColorHex, avatarColorString = activeAccountSummary.avatarColorHex,
hideInput = hideInput, hideInput = hasNoMasterPassword && vaultUnlockType == VaultUnlockType.MASTER_PASSWORD,
initials = activeAccountSummary.initials, initials = activeAccountSummary.initials,
email = activeAccountSummary.email, email = activeAccountSummary.email,
dialog = null, dialog = null,
environmentUrl = environmentRepo.environment.label, environmentUrl = environmentRepo.environment.label,
input = "", input = "",
isBiometricEnabled = isBiometricsEnabled, isBiometricEnabled = activeAccount.isBiometricsEnabled,
isBiometricsValid = isBiometricsValid, isBiometricsValid = isBiometricsValid,
showAccountMenu = VaultUnlockArgs(savedStateHandle).unlockType == UnlockType.STANDARD, showAccountMenu = VaultUnlockArgs(savedStateHandle).unlockType == UnlockType.STANDARD,
showBiometricInvalidatedMessage = false, showBiometricInvalidatedMessage = false,