Some fixes in navigation logic

LibrePass · Jun 8, 2024 · 82a2c8a · 82a2c8a
1 parent 9d0da94
commit 82a2c8a
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 29 deletions.
diff --git a/app/src/main/java/dev/medzik/librepass/android/MainActivity.kt b/app/src/main/java/dev/medzik/librepass/android/MainActivity.kt
@@ -75,10 +75,8 @@ class MainActivity : FragmentActivity() {
 
         val expired = vault.handleExpiration(this)
         if (expired) {
-            navController.navigate(
-                Unlock
-            ) {
-                popUpToDestination(navController)
+            navController.navigate(Unlock) {
+                popUpToDestination(Unlock)
             }
         }
     }

diff --git a/app/src/main/java/dev/medzik/librepass/android/ui/screens/auth/Login.kt b/app/src/main/java/dev/medzik/librepass/android/ui/screens/auth/Login.kt
@@ -30,7 +30,7 @@ import dev.medzik.android.utils.runOnUiThread
 import dev.medzik.android.utils.showToast
 import dev.medzik.librepass.android.R
 import dev.medzik.librepass.android.common.haveNetworkConnection
-import dev.medzik.librepass.android.common.popUpToDestination
+import dev.medzik.librepass.android.common.popUpToStartDestination
 import dev.medzik.librepass.android.database.Credentials
 import dev.medzik.librepass.android.ui.LibrePassViewModel
 import dev.medzik.librepass.android.ui.components.auth.ChoiceServer
@@ -105,10 +105,8 @@ fun LoginScreen(
                 )
 
                 runOnUiThread {
-                    navController.navigate(
-                        Vault
-                    ) {
-                        popUpToDestination(navController)
+                    navController.navigate(Vault) {
+                        popUpToStartDestination(navController)
                     }
                 }
             } catch (e: Exception) {

diff --git a/app/src/main/java/dev/medzik/librepass/android/ui/screens/auth/Register.kt b/app/src/main/java/dev/medzik/librepass/android/ui/screens/auth/Register.kt
@@ -30,7 +30,7 @@ import dev.medzik.android.utils.runOnUiThread
 import dev.medzik.android.utils.showToast
 import dev.medzik.librepass.android.R
 import dev.medzik.librepass.android.common.haveNetworkConnection
-import dev.medzik.librepass.android.common.popUpToDestination
+import dev.medzik.librepass.android.common.popUpToStartDestination
 import dev.medzik.librepass.android.ui.components.auth.ChoiceServer
 import dev.medzik.librepass.android.utils.showErrorToast
 import dev.medzik.librepass.client.Server
@@ -75,10 +75,8 @@ fun RegisterScreen(navController: NavController) {
                 runOnUiThread {
                     context.showToast(R.string.Toast_PleaseVerifyYourEmail)
 
-                    navController.navigate(
-                        Login
-                    ) {
-                        popUpToDestination(navController)
+                    navController.navigate(Login) {
+                        popUpToStartDestination(navController)
                     }
                 }
             } catch (e: Exception) {

diff --git a/app/src/main/java/dev/medzik/librepass/android/ui/screens/auth/Unlock.kt b/app/src/main/java/dev/medzik/librepass/android/ui/screens/auth/Unlock.kt
@@ -102,10 +102,8 @@ fun UnlockScreen(
                 // run only if loading is true (if no error occurred)
                 if (loading) {
                     runOnUiThread {
-                        navController.navigate(
-                            Vault
-                        ) {
-                            popUpToDestination(navController)
+                        navController.navigate(Vault) {
+                            popUpToDestination(Vault)
                         }
                     }
                 }
@@ -129,10 +127,8 @@ fun UnlockScreen(
                 onAuthenticationSucceeded = { cipher ->
                     viewModel.vault.aesKey = KeyStore.decrypt(cipher, credentials.biometricAesKey!!)
 
-                    navController.navigate(
-                        Vault
-                    ) {
-                        popUpToDestination(navController)
+                    navController.navigate(Vault) {
+                        popUpToDestination(Vault)
                     }
                 },
                 onAuthenticationFailed = { }

diff --git a/app/src/main/java/dev/medzik/librepass/android/ui/screens/settings/account/Utils.kt b/app/src/main/java/dev/medzik/librepass/android/ui/screens/settings/account/Utils.kt
@@ -2,11 +2,11 @@ package dev.medzik.librepass.android.ui.screens.settings.account
 
 import androidx.navigation.NavController
 import dev.medzik.android.utils.runOnUiThread
+import dev.medzik.librepass.android.common.popUpToDestination
 import dev.medzik.librepass.android.ui.LibrePassViewModel
 import dev.medzik.librepass.android.ui.screens.Welcome
-import dev.medzik.librepass.android.common.popUpToDestination
 import kotlinx.coroutines.runBlocking
-import java.util.*
+import java.util.UUID
 
 fun navigateToWelcomeAndLogout(
     viewModel: LibrePassViewModel,
@@ -19,10 +19,8 @@ fun navigateToWelcomeAndLogout(
     }
 
     runOnUiThread {
-        navController.navigate(
-            Welcome
-        ) {
-            popUpToDestination(navController)
+        navController.navigate(Welcome) {
+            popUpToDestination(Welcome)
         }
     }
 }
diff --git a/common/src/main/java/dev/medzik/librepass/android/common/Navigation.kt b/common/src/main/java/dev/medzik/librepass/android/common/Navigation.kt
@@ -4,9 +4,16 @@ import androidx.navigation.NavController
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavOptionsBuilder
 
-fun NavOptionsBuilder.popUpToDestination(navController: NavController) {
+fun NavOptionsBuilder.popUpToStartDestination(navController: NavController) {
     popUpTo(navController.graph.findStartDestination().id) {
         saveState = false
         inclusive = true
     }
 }
+
+inline fun <reified T : Any> NavOptionsBuilder.popUpToDestination(destination: T) {
+    popUpTo(destination) {
+        saveState = false
+        inclusive = true
+    }
+}