Merge remote-tracking branch 'origin/fenix/125.3.0' into iceraven

fork-maintainers · May 1, 2024 · 6472b0e · 6472b0e
2 parents 9c50d29 + 06a888f
commit 6472b0e
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -833,9 +833,13 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
     }
 
     final override fun onUserLeaveHint() {
-        supportFragmentManager.primaryNavigationFragment?.childFragmentManager?.fragments?.forEach {
-            if (it is UserInteractionHandler && it.onHomePressed()) {
-                return
+        // The notification permission prompt will trigger onUserLeaveHint too.
+        // We shouldn't treat this situation as user leaving.
+        if (!components.notificationsDelegate.isRequestingPermission) {
+            supportFragmentManager.primaryNavigationFragment?.childFragmentManager?.fragments?.forEach {
+                if (it is UserInteractionHandler && it.onHomePressed()) {
+                    return
+                }
             }
         }