From dd2615b5541d59659daa6dce3ece2e19a85f4e35 Mon Sep 17 00:00:00 2001
From: ekager <emilykager@gmail.com>
Date: Wed, 9 Dec 2020 15:42:39 -0800
Subject: [PATCH] For #16442 - Check if fragment is still attached before
 updating site permissions rules (#16954)

---
 .../java/org/mozilla/fenix/browser/BaseBrowserFragment.kt    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index db909b32b..a7c90081f 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -86,6 +86,7 @@ import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.IntentReceiverActivity
 import org.mozilla.fenix.NavGraphDirections
 import org.mozilla.fenix.OnBackLongPressedListener
+import org.mozilla.fenix.addons.runIfFragmentIsAttached
 import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.browser.readermode.DefaultReaderModeController
@@ -636,7 +637,9 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler,
             context.settings().setSitePermissionSettingListener(viewLifecycleOwner) {
                 // If the user connects to WIFI while on the BrowserFragment, this will update the
                 // SitePermissionsRules (specifically autoplay) accordingly
-                assignSitePermissionsRules()
+                runIfFragmentIsAttached {
+                    assignSitePermissionsRules()
+                }
             }
             assignSitePermissionsRules()