diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index 8d7161e57..95e924b84 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -735,6 +735,11 @@ class HomeFragment : Fragment() { lastAppliedWallpaperName = Wallpaper.defaultName } + override fun onStop() { + dismissRecommendPrivateBrowsingShortcut() + super.onStop() + } + override fun onStart() { super.onStart() @@ -863,7 +868,7 @@ class HomeFragment : Fragment() { PrivateBrowsingShortcutCfr.cancel.record() context.settings().showedPrivateModeContextualFeatureRecommender = true context.settings().lastCfrShownTimeInMillis = System.currentTimeMillis() - recommendPrivateBrowsingCFR?.dismiss() + dismissRecommendPrivateBrowsingShortcut() }, text = { FirefoxTheme { @@ -887,7 +892,7 @@ class HomeFragment : Fragment() { PrivateShortcutCreateManager.createPrivateShortcut(context) context.settings().showedPrivateModeContextualFeatureRecommender = true context.settings().lastCfrShownTimeInMillis = System.currentTimeMillis() - recommendPrivateBrowsingCFR?.dismiss() + dismissRecommendPrivateBrowsingShortcut() }, colors = ButtonDefaults.buttonColors(backgroundColor = PhotonColors.LightGrey30), shape = RoundedCornerShape(8.dp), @@ -912,7 +917,7 @@ class HomeFragment : Fragment() { PrivateBrowsingShortcutCfr.cancel.record() context.settings().showedPrivateModeContextualFeatureRecommender = true context.settings().lastCfrShownTimeInMillis = System.currentTimeMillis() - recommendPrivateBrowsingCFR?.dismiss() + dismissRecommendPrivateBrowsingShortcut() }, modifier = Modifier .heightIn(36.dp) @@ -938,6 +943,11 @@ class HomeFragment : Fragment() { } } + private fun dismissRecommendPrivateBrowsingShortcut() { + recommendPrivateBrowsingCFR?.dismiss() + recommendPrivateBrowsingCFR = null + } + private fun subscribeToTabCollections(): Observer> { return Observer> { requireComponents.core.tabCollectionStorage.cachedTabCollections = it