No issue: Check destination before popping logins fragments

5 years ago · ddd484387d
parent fdd7400ccc
commit ddd484387d
2 changed files with 6 additions and 2 deletions
--- 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()
    }

--- 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()
    }