github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-05-13 15:21:11 -05:00
Code Issues 1.1k Packages Projects Releases 124 Wiki Activity

Simplify and rename the hasManualUnlockMechanism helper (#1322)

Browse Source
This commit is contained in:
David Perez
2024-04-30 15:51:14 -05:00
committed by GitHub
parent 0d398a4b5f
commit 3be55288dc
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/x8bit/bitwarden/data/auth/repository/model/UserState.kt
View File

@@ -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
}
}
/**

2
app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/rootnav/RootNavViewModel.kt
View File

@@ -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