From 06a888f5ef3d13cb13e1b740bc541e4c9155d6e0 Mon Sep 17 00:00:00 2001 From: jackyzy823 Date: Wed, 3 Apr 2024 12:08:21 +0200 Subject: [PATCH] Bug 1886083 - Don't call onHomePressed when notification permission prompt is shown. r=#android-reviewers Differential Revision: https://phabricator.services.mozilla.com/D205793 --- app/src/main/java/org/mozilla/fenix/HomeActivity.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index e5a79aea1..348a24a25 100644 --- 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 + } } }