From ddd484387df450c2bfd43b3b0795f42109d7cc93 Mon Sep 17 00:00:00 2001 From: Emily Kager Date: Thu, 14 Nov 2019 16:12:52 -0800 Subject: [PATCH] No issue: Check destination before popping logins fragments --- .../org/mozilla/fenix/logins/SavedLoginSiteInfoFragment.kt | 4 +++- .../main/java/org/mozilla/fenix/logins/SavedLoginsFragment.kt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/logins/SavedLoginSiteInfoFragment.kt b/app/src/main/java/org/mozilla/fenix/logins/SavedLoginSiteInfoFragment.kt index 34e5b5b63..8344106ba 100644 --- a/app/src/main/java/org/mozilla/fenix/logins/SavedLoginSiteInfoFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/logins/SavedLoginSiteInfoFragment.kt @@ -28,7 +28,9 @@ class SavedLoginSiteInfoFragment : Fragment(R.layout.fragment_saved_login_site_i override fun onPause() { // If we pause this fragment, we want to pop users back to reauth - findNavController().popBackStack(R.id.loginsFragment, false) + if (findNavController().currentDestination?.id != R.id.savedLoginsFragment) { + findNavController().popBackStack(R.id.loginsFragment, false) + } super.onPause() } diff --git a/app/src/main/java/org/mozilla/fenix/logins/SavedLoginsFragment.kt b/app/src/main/java/org/mozilla/fenix/logins/SavedLoginsFragment.kt index 737df5753..caac2effc 100644 --- a/app/src/main/java/org/mozilla/fenix/logins/SavedLoginsFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/logins/SavedLoginsFragment.kt @@ -66,7 +66,9 @@ class SavedLoginsFragment : Fragment() { override fun onPause() { // If we pause this fragment, we want to pop users back to reauth - findNavController().popBackStack(R.id.loginsFragment, false) + if (findNavController().currentDestination?.id != R.id.savedLoginSiteInfoFragment) { + findNavController().popBackStack(R.id.loginsFragment, false) + } super.onPause() }