For #17635: Check if id corresponds to a custom tab before removing it.

3 years ago · 278ed658b6
parent 87d6f32374
commit 278ed658b6
1 changed files with 2 additions and 1 deletions
--- a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserActivity.kt
@ -102,7 +102,8 @@ open class ExternalAppBrowserActivity : HomeActivity() {
            // exists then remove it now to free all its resources. Once this activity is finished
            // then there's no way to get back to it other than relaunching it.
            val tabId = getExternalTabId()
-            if (tabId != null) {
+            val customTab = tabId?.let { components.core.store.state.findCustomTab(it) }
+            if (tabId != null && customTab != null) {
                components.useCases.customTabsUseCases.remove(tabId)
            }
        }