From e1f3611fdd907672d3f1c2368aa4654bd9a83d12 Mon Sep 17 00:00:00 2001 From: ValentinTimisica Date: Thu, 7 Nov 2019 12:42:23 +0200 Subject: [PATCH] Fixes #6408: Pop stack to homeFragment when opening bookmarks from homeFragment When bookmark fragment is opened from homeFragment, libraryFragment does not exists so the popBackStack(R.id.libraryFragment, true) would have failed. So the solution for this was to pop back stack to homeFragment when the bookmarks/history fragments are opened from homeFragment. --- .../java/org/mozilla/fenix/library/LibraryPageFragment.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/mozilla/fenix/library/LibraryPageFragment.kt b/app/src/main/java/org/mozilla/fenix/library/LibraryPageFragment.kt index 6b5f505f7..092259688 100644 --- a/app/src/main/java/org/mozilla/fenix/library/LibraryPageFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/LibraryPageFragment.kt @@ -16,7 +16,9 @@ abstract class LibraryPageFragment : Fragment() { abstract val selectedItems: Set protected fun close() { - findNavController().popBackStack(R.id.libraryFragment, true) + if (!findNavController().popBackStack(R.id.libraryFragment, true)) { + findNavController().popBackStack(R.id.homeFragment, false) + } } protected fun openItemsInNewTab(private: Boolean = false, toUrl: (T) -> String?) {