fix(biometric): ensure nextStep is called after biometric setup and allow disable without unlock

Author: JamGmilk

app/src/main/java/jamgmilk/fuwagit/ui/screen/onboarding/OnboardingViewModel.kt

@@ -89,25 +89,23 @@ class OnboardingViewModel @Inject constructor(
         _uiState.update { it.copy(enableBiometric = enable) }
     }
 
-    fun enableBiometricIfNeeded(
+    private suspend fun enableBiometricIfNeeded(
         activity: FragmentActivity,
         title: String,
         subtitle: String,
         negativeButtonText: String
     ) {
         if (!_uiState.value.enableBiometric) return
 
-        viewModelScope.launch {
-            credentialFacade.enableBiometric(
-                activity = activity,
-                title = title,
-                subtitle = subtitle,
-                negativeButtonText = negativeButtonText
-            ).onSuccess {
-                _uiState.update { it.copy(isBiometricSetupComplete = true) }
-            }.onError { e ->
-                _uiState.update { it.copy(biometricSetupError = e.message) }
-            }
+        credentialFacade.enableBiometric(
+            activity = activity,
+            title = title,
+            subtitle = subtitle,
+            negativeButtonText = negativeButtonText
+        ).onSuccess {
+            _uiState.update { it.copy(isBiometricSetupComplete = true) }
+        }.onError { e ->
+            _uiState.update { it.copy(biometricSetupError = e.message) }
         }
     }
 
@@ -147,9 +145,8 @@ class OnboardingViewModel @Inject constructor(
                     _uiState.update { it.copy(isSettingPassword = false) }
                     if (state.enableBiometric) {
                         enableBiometricIfNeeded(activity, biometricTitle, biometricSubtitle, biometricNegativeButtonText)
-                    } else {
-                        nextStep()
                     }
+                    nextStep()
                 }
                 .onError { e ->
                     _uiState.update { it.copy(isSettingPassword = false, passwordError = e.message) }

app/src/main/java/jamgmilk/fuwagit/ui/screen/settings/SettingsScreen.kt

@@ -279,13 +279,8 @@ fun SettingsScreen(
                         }
                     }
                 } else {
-                    if (!credentialsUiState.isDecryptionUnlocked && credentialsUiState.isBiometricEnabled) {
-                        if (BuildConfig.DEBUG) Log.d(TAG, "Already enabled but locked, showing unlock dialog to unlock vault")
-                        credentialsViewModel.showUnlockDialog()
-                    } else {
-                        if (BuildConfig.DEBUG) Log.d(TAG, "Disabling biometric")
-                        credentialsViewModel.disableBiometric()
-                    }
+                    if (BuildConfig.DEBUG) Log.d(TAG, "Disabling biometric")
+                    credentialsViewModel.disableBiometric()
                 }
             },
             autoLockTimeout = settingsUiState.autoLockTimeout,