From d46369696f1d43385f335936f50abb31176845ef Mon Sep 17 00:00:00 2001
From: ekager <ekager@mozilla.com>
Date: Mon, 18 May 2020 15:02:50 -0700
Subject: [PATCH] For #10718 - Finish activity after removing external session

---
 .../org/mozilla/fenix/browser/BaseBrowserFragment.kt     | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

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 8c5ac8dee..7a92205f8 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -131,9 +131,6 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
 
     private var browserInitialized: Boolean = false
     private var initUIJob: Job? = null
-
-    // We need this so we don't accidentally remove all external sessions on back press
-    private var sessionRemoved = false
     private var enteredPip = false
 
     private val sharedViewModel: SharedViewModel by activityViewModels()
@@ -587,8 +584,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
 
     @CallSuper
     override fun onBackPressed(): Boolean {
-        return sessionRemoved ||
-                findInPageIntegration.onBackPressed() ||
+        return findInPageIntegration.onBackPressed() ||
                 fullScreenFeature.onBackPressed() ||
                 sessionFeature.onBackPressed() ||
                 removeSessionIfNeeded()
@@ -647,8 +643,7 @@ abstract class BaseBrowserFragment : Fragment(), UserInteractionHandler, Session
             val sessionManager = requireComponents.core.sessionManager
             if (session.source == Session.Source.ACTION_VIEW) {
                 sessionManager.remove(session)
-                sessionRemoved = true
-                activity?.onBackPressed()
+                activity?.finish()
             } else {
                 val isLastSession =
                     sessionManager.sessionsOfType(private = session.private).count() == 1