From a4172aafaeaafb3c55d55bc589b338d410428b85 Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Wed, 4 Sep 2019 16:40:41 -0700
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/5025 - Do not remove custom
 tab session with config removed

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

diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabActivity.kt b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabActivity.kt
index efa48a53f..b2dd5a8e4 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabActivity.kt
@@ -52,7 +52,10 @@ open class CustomTabActivity : HomeActivity() {
             // then there's no way to get back to it other than relaunching it.
             val sessionId = getIntentSessionId(SafeIntent(intent))
             components.core.sessionManager.runWithSession(sessionId) { session ->
-                remove(session)
+                // If the custom tag config has been removed we are opening this in normal browsing
+                if (session.customTabConfig != null) {
+                    remove(session)
+                }
                 true
             }
         }