From 2f5cafeae451379e5c98296f256d7a6e8d2f253c Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Tue, 17 Oct 2023 13:12:19 -0700
Subject: [PATCH] Bug 1858997 - Ensures we remove the Popup when destroying the
 fragment

(cherry picked from commit 081a2219515fe5947f39d28fee1d4aa2e64c243e)
---
 .../java/org/mozilla/fenix/home/HomeFragment.kt  | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

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<List<TabCollection>> {
         return Observer<List<TabCollection>> {
             requireComponents.core.tabCollectionStorage.cachedTabCollections = it