fix: enabling app lock manually displays the dialog turn off

wireapp · Nov 22, 2023 · b9cc0ff · b9cc0ff
1 parent 3afc4af
commit b9cc0ff
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/SettingsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/SettingsScreen.kt
@@ -54,6 +54,8 @@ fun SettingsScreen(
     viewModel: SettingsViewModel = hiltViewModel()
 ) {
     val lazyListState: LazyListState = rememberLazyListState()
+    val turnAppLockOffDialogState = rememberVisibilityState<Unit>()
+
     val context = LocalContext.current
     SettingsScreenContent(
         lazyListState = lazyListState,
@@ -69,10 +71,11 @@ fun SettingsScreen(
         onAppLockSwitchChanged = remember {
             { isChecked ->
                 if (isChecked) homeStateHolder.navigator.navigate(NavigationCommand(SetLockCodeScreenDestination, BackStackMode.NONE))
-                else viewModel.disableAppLock()
+                else turnAppLockOffDialogState.show(Unit)
             }
         }
     )
+    TurnAppLockOffDialog(dialogState = turnAppLockOffDialogState, turnOff = viewModel::disableAppLock)
 }
 
 @Composable
@@ -84,7 +87,6 @@ fun SettingsScreenContent(
 ) {
     val context = LocalContext.current
     val featureVisibilityFlags = LocalFeatureVisibilityFlags.current
-    val turnAppLockOffDialogState = rememberVisibilityState<Unit>()
 
     with(featureVisibilityFlags) {
         LazyColumn(
@@ -121,10 +123,9 @@ fun SettingsScreenContent(
                                 appLogger.d("AppLockConfig isAppLockEnabled: ${settingsState.isAppLockEnabled}")
                                 SwitchState.Enabled(
                                     value = settingsState.isAppLockEnabled,
-                                    isOnOffVisible = true
-                                ) {
-                                    turnAppLockOffDialogState.show(Unit)
-                                }
+                                    isOnOffVisible = true,
+                                    onCheckedChange = onAppLockSwitchChanged
+                                )
                             }
 
                             false -> {
@@ -159,7 +160,6 @@ fun SettingsScreenContent(
         }
     }
 
-    TurnAppLockOffDialog(dialogState = turnAppLockOffDialogState) { onAppLockSwitchChanged(false) }
 }
 
 private fun LazyListScope.folderWithElements(