refactor: Handle authCheck onSuccess before back nav

Author: ovitrif

app/src/main/java/to/bitkit/ui/ContentView.kt

@@ -478,10 +478,9 @@ private fun NavGraphBuilder.generalSettings(navController: NavHostController) {
 }
 
 private fun NavGraphBuilder.securitySettings(navController: NavHostController) {
-    composableWithDefaultTransitions<Routes.SecuritySettings> { backStackEntry ->
+    composableWithDefaultTransitions<Routes.SecuritySettings> {
         SecuritySettingsScreen(
             navController = navController,
-            savedStateHandle = backStackEntry.savedStateHandle,
         )
     }
 }

app/src/main/java/to/bitkit/ui/components/AuthCheckScreen.kt

@@ -1,6 +1,8 @@
 package to.bitkit.ui.components
 
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import to.bitkit.ui.Routes
 import to.bitkit.ui.appViewModel
@@ -12,27 +14,36 @@ fun AuthCheckScreen(
 ) {
     val app = appViewModel ?: return
 
+    val isPinOnLaunchEnabled by app.isPinOnLaunchEnabled.collectAsStateWithLifecycle()
+    val isBiometricEnabled by app.isBiometricEnabled.collectAsStateWithLifecycle()
+
     AuthCheckView(
         showLogoOnPin = route.showLogoOnPin,
         appViewModel = app,
         requireBiometrics = route.requireBiometrics,
         requirePin = route.requirePin,
         onSuccess = {
-            navController.previousBackStackEntry
-                ?.savedStateHandle
-                ?.set(AuthCheckAction.KEY, route.onSuccessActionId)
+            when (route.onSuccessActionId) {
+                AuthCheckAction.TOGGLE_BIOMETRICS -> {
+                    app.setIsBiometricEnabled(!isBiometricEnabled)
+                }
+
+                AuthCheckAction.TOGGLE_PIN_ON_LAUNCH -> {
+                    app.setIsPinOnLaunchEnabled(!isPinOnLaunchEnabled)
+                }
+
+                AuthCheckAction.DISABLE_PIN -> {
+                    app.removePin()
+                }
+            }
 
             navController.popBackStack()
         },
     )
 }
 
 object AuthCheckAction {
-    const val KEY = "auth_check_action_key"
-
-    object Id {
-        const val TOGGLE_PIN_ON_LAUNCH = "toggle_pin_on_launch"
-        const val TOGGLE_BIOMETRICS = "toggle_biometrics"
-        const val DISABLE_PIN = "disable_pin"
-    }
+    const val TOGGLE_PIN_ON_LAUNCH = "toggle_pin_on_launch"
+    const val TOGGLE_BIOMETRICS = "toggle_biometrics"
+    const val DISABLE_PIN = "disable_pin"
 }

app/src/main/java/to/bitkit/ui/settings/SecuritySettingsScreen.kt

@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -14,10 +13,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
-import kotlinx.coroutines.flow.filterNotNull
 import to.bitkit.R
 import to.bitkit.ui.appViewModel
 import to.bitkit.ui.components.AuthCheckAction
@@ -38,7 +35,6 @@ import to.bitkit.ui.utils.rememberBiometricAuthSupported
 @Composable
 fun SecuritySettingsScreen(
     navController: NavController,
-    savedStateHandle: SavedStateHandle,
 ) {
     val app = appViewModel ?: return
 
@@ -47,27 +43,6 @@ fun SecuritySettingsScreen(
     val isPinOnLaunchEnabled by app.isPinOnLaunchEnabled.collectAsStateWithLifecycle()
     val isBiometricEnabled by app.isBiometricEnabled.collectAsStateWithLifecycle()
 
-    LaunchedEffect(savedStateHandle) {
-        savedStateHandle.getStateFlow<String?>(AuthCheckAction.KEY, null)
-            .filterNotNull()
-            .collect { actionId ->
-                when (actionId) {
-                    AuthCheckAction.Id.TOGGLE_BIOMETRICS -> {
-                        app.setIsBiometricEnabled(!isBiometricEnabled)
-                    }
-
-                    AuthCheckAction.Id.TOGGLE_PIN_ON_LAUNCH -> {
-                        app.setIsPinOnLaunchEnabled(!isPinOnLaunchEnabled)
-                    }
-
-                    AuthCheckAction.Id.DISABLE_PIN -> {
-                        app.removePin()
-                    }
-                }
-                savedStateHandle.remove<String>(AuthCheckAction.KEY)
-            }
-    }
-
     PinNavigationSheet(
         showSheet = showPinSheet,
         showLaterButton = false,
@@ -87,13 +62,13 @@ fun SecuritySettingsScreen(
             },
             onPinOnLaunchClick = {
                 navController.navigateToAuthCheck(
-                    onSuccessActionId = AuthCheckAction.Id.TOGGLE_PIN_ON_LAUNCH,
+                    onSuccessActionId = AuthCheckAction.TOGGLE_PIN_ON_LAUNCH,
                 )
             },
             onUseBiometricsClick = {
                 navController.navigateToAuthCheck(
                     requireBiometrics = true,
-                    onSuccessActionId = AuthCheckAction.Id.TOGGLE_BIOMETRICS,
+                    onSuccessActionId = AuthCheckAction.TOGGLE_BIOMETRICS,
                 )
             },
             onBackClick = { navController.popBackStack() },

app/src/main/java/to/bitkit/ui/settings/pin/DisablePinScreen.kt

@@ -38,7 +38,7 @@ fun DisablePinScreen(
         onDisableClick = {
             navController.navigateToAuthCheck(
                 requirePin = true,
-                onSuccessActionId = AuthCheckAction.Id.DISABLE_PIN,
+                onSuccessActionId = AuthCheckAction.DISABLE_PIN,
                 navOptions = navOptions { popUpTo(Routes.SecuritySettings) },
             )
         },