diff --git a/app/src/main/java/com/kunzisoft/keepass/biometric/DeviceUnlockFragment.kt b/app/src/main/java/com/kunzisoft/keepass/biometric/DeviceUnlockFragment.kt index 7dd3e9509..5814623f3 100644 --- a/app/src/main/java/com/kunzisoft/keepass/biometric/DeviceUnlockFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/biometric/DeviceUnlockFragment.kt @@ -133,10 +133,12 @@ class DeviceUnlockFragment: Fragment() { viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) { mDeviceUnlockViewModel.uiState.collect { uiState -> // Change mode - toggleDeviceCredentialMode(uiState.deviceUnlockMode) + toggleDeviceCredentialMode( + uiState.newDeviceUnlockMode, + uiState.deviceUnlockModeChange + ) // Prompt manageDeviceCredentialPrompt( - uiState.cryptoPrompt, uiState.cryptoPromptState ) // Advanced menu @@ -162,36 +164,32 @@ class DeviceUnlockFragment: Fragment() { mBiometricPrompt?.cancelAuthentication() } - private var currentCredentialMode = DeviceUnlockMode.BIOMETRIC_UNAVAILABLE - private fun toggleDeviceCredentialMode(deviceUnlockMode: DeviceUnlockMode) { - if (currentCredentialMode == deviceUnlockMode) { - return - } - currentCredentialMode = deviceUnlockMode - try { - when (deviceUnlockMode) { - DeviceUnlockMode.BIOMETRIC_UNAVAILABLE -> setNotAvailableMode() - DeviceUnlockMode.BIOMETRIC_SECURITY_UPDATE_REQUIRED -> setSecurityUpdateRequiredMode() - DeviceUnlockMode.DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED -> setNotConfiguredMode() - DeviceUnlockMode.KEY_MANAGER_UNAVAILABLE -> setKeyManagerNotAvailableMode() - DeviceUnlockMode.WAIT_CREDENTIAL -> setWaitCredentialMode() - DeviceUnlockMode.STORE_CREDENTIAL -> setStoreCredentialMode() - DeviceUnlockMode.EXTRACT_CREDENTIAL -> setExtractCredentialMode() + private fun toggleDeviceCredentialMode(deviceUnlockMode: DeviceUnlockMode, modeChanged: Boolean) { + if (modeChanged) { + try { + when (deviceUnlockMode) { + DeviceUnlockMode.BIOMETRIC_UNAVAILABLE -> setNotAvailableMode() + DeviceUnlockMode.BIOMETRIC_SECURITY_UPDATE_REQUIRED -> setSecurityUpdateRequiredMode() + DeviceUnlockMode.DEVICE_CREDENTIAL_OR_BIOMETRIC_NOT_CONFIGURED -> setNotConfiguredMode() + DeviceUnlockMode.KEY_MANAGER_UNAVAILABLE -> setKeyManagerNotAvailableMode() + DeviceUnlockMode.WAIT_CREDENTIAL -> setWaitCredentialMode() + DeviceUnlockMode.STORE_CREDENTIAL -> setStoreCredentialMode() + DeviceUnlockMode.EXTRACT_CREDENTIAL -> setExtractCredentialMode() + } + } catch (e: Exception) { + mDeviceUnlockViewModel.setException(e) } - } catch (e: Exception) { - mDeviceUnlockViewModel.setException(e) } } private fun manageDeviceCredentialPrompt( - cryptoPrompt: DeviceUnlockCryptoPrompt?, state: DeviceUnlockPromptMode ) { - cryptoPrompt?.let { + mDeviceUnlockViewModel.cryptoPrompt?.let { prompt -> when (state) { DeviceUnlockPromptMode.IDLE -> {} DeviceUnlockPromptMode.SHOW -> { - openPrompt(cryptoPrompt) + openPrompt(prompt) mDeviceUnlockViewModel.promptShown() } DeviceUnlockPromptMode.CLOSE -> { diff --git a/app/src/main/java/com/kunzisoft/keepass/viewmodels/DeviceUnlockViewModel.kt b/app/src/main/java/com/kunzisoft/keepass/viewmodels/DeviceUnlockViewModel.kt index a86efd511..a428e13a1 100644 --- a/app/src/main/java/com/kunzisoft/keepass/viewmodels/DeviceUnlockViewModel.kt +++ b/app/src/main/java/com/kunzisoft/keepass/viewmodels/DeviceUnlockViewModel.kt @@ -34,6 +34,9 @@ class DeviceUnlockViewModel(application: Application): AndroidViewModel(applicat private var deviceUnlockManager: DeviceUnlockManager? = null private var databaseUri: Uri? = null + private var deviceUnlockMode = DeviceUnlockMode.BIOMETRIC_UNAVAILABLE + var cryptoPrompt: DeviceUnlockCryptoPrompt? = null + // TODO Retrieve credential storage from app database var credentialDatabaseStorage: CredentialStorage = CredentialStorage.DEFAULT @@ -91,7 +94,7 @@ class DeviceUnlockViewModel(application: Application): AndroidViewModel(applicat } private fun isModeChanging(newMode: DeviceUnlockMode): Boolean { - return _uiState.value.deviceUnlockMode != newMode + return deviceUnlockMode != newMode } @RequiresApi(Build.VERSION_CODES.M) @@ -165,7 +168,7 @@ class DeviceUnlockViewModel(application: Application): AndroidViewModel(applicat fun onAuthenticationSucceeded( activityResult: ActivityResult ) { - uiState.value.cryptoPrompt?.let { prompt -> + cryptoPrompt?.let { prompt -> when (prompt.type) { DeviceUnlockCryptoPromptType.CREDENTIAL_ENCRYPTION -> retrieveCredentialForEncryption( prompt.cipher) @@ -179,7 +182,7 @@ class DeviceUnlockViewModel(application: Application): AndroidViewModel(applicat fun onAuthenticationSucceeded( result: BiometricPrompt.AuthenticationResult ) { - uiState.value.cryptoPrompt?.type?.let { type -> + cryptoPrompt?.type?.let { type -> when (type) { DeviceUnlockCryptoPromptType.CREDENTIAL_ENCRYPTION -> retrieveCredentialForEncryption(result.cryptoObject?.cipher) @@ -299,9 +302,9 @@ class DeviceUnlockViewModel(application: Application): AndroidViewModel(applicat cryptoPrompt: DeviceUnlockCryptoPrompt, autoOpen: Boolean = false ) { + this@DeviceUnlockViewModel.cryptoPrompt = cryptoPrompt _uiState.update { currentState -> currentState.copy( - cryptoPrompt = cryptoPrompt, cryptoPromptState = if ( autoOpen && PreferencesUtil.isAdvancedUnlockPromptAutoOpenEnable(getApplication())) @@ -374,10 +377,13 @@ class DeviceUnlockViewModel(application: Application): AndroidViewModel(applicat @RequiresApi(Build.VERSION_CODES.M) private fun changeMode(deviceUnlockMode: DeviceUnlockMode) { + val modeChanged = this.deviceUnlockMode == deviceUnlockMode + this.deviceUnlockMode = deviceUnlockMode cipherDatabaseAction.containsCipherDatabase(databaseUri) { containsCipher -> _uiState.update { currentState -> currentState.copy( - deviceUnlockMode = deviceUnlockMode, + newDeviceUnlockMode = deviceUnlockMode, + deviceUnlockModeChange = modeChanged, allowAdvancedUnlockMenu = containsCipher && deviceUnlockMode != DeviceUnlockMode.BIOMETRIC_UNAVAILABLE && deviceUnlockMode != DeviceUnlockMode.KEY_MANAGER_UNAVAILABLE @@ -409,9 +415,9 @@ class DeviceUnlockViewModel(application: Application): AndroidViewModel(applicat } fun biometricPromptClosed() { + cryptoPrompt = null _uiState.update { currentState -> currentState.copy( - cryptoPrompt = null, cryptoPromptState = DeviceUnlockPromptMode.IDLE ) } @@ -437,12 +443,12 @@ enum class DeviceUnlockPromptMode { } data class DeviceUnlockState( - val deviceUnlockMode: DeviceUnlockMode = DeviceUnlockMode.BIOMETRIC_UNAVAILABLE, + val newDeviceUnlockMode: DeviceUnlockMode = DeviceUnlockMode.BIOMETRIC_UNAVAILABLE, + val deviceUnlockModeChange: Boolean = true, val allowAdvancedUnlockMenu: Boolean = false, val credentialRequiredCipher: Cipher? = null, val cipherEncryptDatabase: CipherEncryptDatabase? = null, val cipherDecryptDatabase: CipherDecryptDatabase? = null, - val cryptoPrompt: DeviceUnlockCryptoPrompt? = null, val cryptoPromptState: DeviceUnlockPromptMode = DeviceUnlockPromptMode.IDLE, val autoOpenPrompt: Boolean = false, val exception: Exception? = null