From b739be712a64cfe7add18bd2c8118771683695b7 Mon Sep 17 00:00:00 2001
From: David Perez <david@livefront.com>
Date: Tue, 30 Apr 2024 15:51:14 -0500
Subject: [PATCH] Simplify and rename the hasManualUnlockMechanism helper
 (#1322)

---
 .../bitwarden/data/auth/repository/model/UserState.kt | 11 ++++++-----
 .../ui/platform/feature/rootnav/RootNavViewModel.kt   |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/UserState.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/UserState.kt
index da595f8e8..2275c291e 100644
--- a/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/UserState.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/UserState.kt
@@ -72,12 +72,13 @@ data class UserState(
         val hasMasterPassword: Boolean get() = trustedDevice?.hasMasterPassword != false
 
         /**
-         * Indicates that the user does or does not have a means to unlock the vault.
+         * Indicates that the user does or does not have a means to manually unlock the vault.
          */
-        val hasUnlockMechanism: Boolean
-            get() = hasMasterPassword ||
-                isBiometricsEnabled ||
-                vaultUnlockType == VaultUnlockType.PIN
+        val hasManualUnlockMechanism: Boolean
+            get() = when (vaultUnlockType) {
+                VaultUnlockType.MASTER_PASSWORD -> hasMasterPassword || isBiometricsEnabled
+                VaultUnlockType.PIN -> true
+            }
     }
 
     /**
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt
index 97bbd5f66..d9bc612cb 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt
@@ -62,7 +62,7 @@ class RootNavViewModel @Inject constructor(
         val updatedRootNavState = when {
             userState?.activeAccount?.trustedDevice?.isDeviceTrusted == false &&
                 !userState.activeAccount.isVaultUnlocked &&
-                !userState.activeAccount.hasUnlockMechanism -> RootNavState.TrustedDevice
+                !userState.activeAccount.hasManualUnlockMechanism -> RootNavState.TrustedDevice
 
             userState?.activeAccount?.needsMasterPassword == true -> RootNavState.SetPassword