From 7a6b8f7fca6e89f545012b4ff2625f5b38596c51 Mon Sep 17 00:00:00 2001 From: Evgenii Kozlov Date: Wed, 18 Dec 2024 13:35:52 +0100 Subject: [PATCH] DROID-3194 Navigation | Fix | Should not crash after converting an object to collection and returning to home screen (#1938) --- .../main/java/com/anytypeio/anytype/navigation/Navigator.kt | 4 +++- .../anytypeio/anytype/presentation/editor/EditorViewModel.kt | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt b/app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt index 0c67246dc6..2c1838900c 100644 --- a/app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt +++ b/app/src/main/java/com/anytypeio/anytype/navigation/Navigator.kt @@ -192,7 +192,9 @@ class Navigator : AppNavigation { view = view ), navOptions { - popUpTo(R.id.main_navigation) { inclusive = true } + popUpTo(R.id.homeScreen) { + inclusive = false + } } ) } else { diff --git a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt index 5c572ed4be..89a5828efc 100644 --- a/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt +++ b/presentation/src/main/java/com/anytypeio/anytype/presentation/editor/EditorViewModel.kt @@ -4536,7 +4536,7 @@ class EditorViewModel( Timber.e(it, "Error while closing object") navigate( EventWrapper( - AppNavigation.Command.OpenSetOrCollection( + OpenSetOrCollection( target = target, space = space.id, isPopUpToDashboard @@ -4547,7 +4547,7 @@ class EditorViewModel( onSuccess = { navigate( EventWrapper( - AppNavigation.Command.OpenSetOrCollection( + OpenSetOrCollection( target = target, space = space.id, isPopUpToDashboard