From 38e693f92c5cb37f213b52858c100185b6729f57 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Mon, 26 Aug 2024 09:07:23 -0500
Subject: [PATCH] Simplify manual unlock check (#3824)

---
 .../ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt
index bb8a84999..30a254677 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockViewModel.kt
@@ -61,22 +61,20 @@ class VaultUnlockViewModel @Inject constructor(
         )
         val vaultUnlockType = activeAccount.vaultUnlockType
         val hasNoMasterPassword = !activeAccount.hasMasterPassword
-        val hideInput = hasNoMasterPassword && vaultUnlockType == VaultUnlockType.MASTER_PASSWORD
-        val isBiometricsEnabled = activeAccount.isBiometricsEnabled
-        if (hasNoMasterPassword && vaultUnlockType != VaultUnlockType.PIN && !isBiometricsEnabled) {
+        if (!activeAccount.hasManualUnlockMechanism) {
             // There is no valid way to unlock this app.
             authRepository.logout()
         }
         VaultUnlockState(
             accountSummaries = accountSummaries,
             avatarColorString = activeAccountSummary.avatarColorHex,
-            hideInput = hideInput,
+            hideInput = hasNoMasterPassword && vaultUnlockType == VaultUnlockType.MASTER_PASSWORD,
             initials = activeAccountSummary.initials,
             email = activeAccountSummary.email,
             dialog = null,
             environmentUrl = environmentRepo.environment.label,
             input = "",
-            isBiometricEnabled = isBiometricsEnabled,
+            isBiometricEnabled = activeAccount.isBiometricsEnabled,
             isBiometricsValid = isBiometricsValid,
             showAccountMenu = VaultUnlockArgs(savedStateHandle).unlockType == UnlockType.STANDARD,
             showBiometricInvalidatedMessage = false,