DROID-4115 App | Tech | Navigation stabilisation fixes

app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt

@@ -1,5 +1,6 @@
 package com.anytypeio.anytype.navigation
 
+import androidx.annotation.IdRes
 import androidx.core.os.bundleOf
 import androidx.navigation.NavController
 import androidx.navigation.navOptions
@@ -35,6 +36,15 @@ class Navigator : AppNavigation {
 
     private var navController: NavController? = null
 
+    private fun NavController.safePopBackStack(@IdRes destinationId: Int, inclusive: Boolean): Boolean {
+        return try {
+            popBackStack(destinationId, inclusive)
+        } catch (e: IllegalArgumentException) {
+            Timber.w(e, "popBackStack failed - destination not in back stack: id=$destinationId")
+            false
+        }
+    }
+
     override fun openSpaceSettings() {
         try {
             navController?.navigate(R.id.action_open_space_settings)
@@ -153,22 +163,23 @@ class Navigator : AppNavigation {
     }
 
     override fun exitToDesktop(space: Id) {
-        val popped = navController?.popBackStack(R
-            .id.homeScreen,
-            false
-        )
-        if (popped == false) {
-            navController?.navigate(
-                R.id.homeScreen,
-                WidgetsScreenFragment.args(space = space)
-            )
+        navController?.let { controller ->
+            val popped = controller.safePopBackStack(R.id.homeScreen, inclusive = false)
+            if (!popped) {
+                controller.navigate(
+                    R.id.homeScreen,
+                    WidgetsScreenFragment.args(space = space)
+                )
+            }
         }
     }
 
     override fun exitToVault() {
-        val popped = navController?.popBackStack(R.id.vaultScreen, true)
-        if (popped == false) {
-            navController?.navigate(R.id.vaultScreen)
+        navController?.let { controller ->
+            val popped = controller.safePopBackStack(R.id.vaultScreen, inclusive = true)
+            if (!popped) {
+                controller.navigate(R.id.vaultScreen)
+            }
         }
     }
 

app/src/main/java/com/anytypeio/anytype/ui/history/VersionHistoryFragment.kt

@@ -46,6 +46,7 @@ import com.google.accompanist.navigation.material.bottomSheet
 import com.google.accompanist.navigation.material.rememberBottomSheetNavigator
 import java.util.LinkedList
 import javax.inject.Inject
+import timber.log.Timber
 
 class VersionHistoryFragment : BaseBottomSheetComposeFragment() {
 
@@ -150,7 +151,14 @@ class VersionHistoryFragment : BaseBottomSheetComposeFragment() {
     }
 
     private fun exitToObjectMenu() {
-        findNavController().popBackStack(R.id.objectMenuScreen, true)
+        // Avoid IllegalArgumentException when the object menu isn't in the back stack
+        val controller = findNavController()
+        try {
+            controller.popBackStack(R.id.objectMenuScreen, true)
+        } catch (e: IllegalArgumentException) {
+            Timber.w(e, "objectMenuScreen not in back stack, doing regular popBackStack")
+            controller.popBackStack()
+        }
     }
 
     private fun navigateToRelationMultiSelect(navigation: Command.RelationMultiSelect) {

app/src/main/java/com/anytypeio/anytype/ui/main/MainActivity.kt

@@ -452,7 +452,7 @@ class MainActivity : AppCompatActivity(R.layout.activity_main), AppNavigation.Pr
             is OpenObjectNavigation.OpenType -> {
                 runCatching {
                     findNavController(R.id.fragment).navigate(
-                        resId = R.id.objectTypeScreen,
+                        resId = R.id.objectTypeNavigation,
                         args = ObjectTypeFragment.args(
                             objectId = dest.target,
                             space = dest.space