From 2df5fa2e52e5e46cc533504edf0a6988a5be6f11 Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Thu, 28 Feb 2019 16:25:16 -0800
Subject: [PATCH] Closes #613 - Do not close activity for normal tabs on back
 press

---
 .../org/mozilla/fenix/browser/BrowserFragment.kt    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index 13db308a9..22d8fe785 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -200,13 +200,14 @@ class BrowserFragment : Fragment(), BackHandler {
             }
     }
 
-    @SuppressWarnings("ReturnCount")
     override fun onBackPressed(): Boolean {
-        if (findInPageIntegration.onBackPressed()) return true
-        if (sessionFeature.onBackPressed()) return true
-        if (customTabsToolbarFeature.onBackPressed()) return true
-
-        return false
+        return when {
+            findInPageIntegration.onBackPressed() -> true
+            sessionFeature.onBackPressed() -> true
+            requireComponents.core.sessionManager.selectedSession?.isCustomTabSession()
+                    ?: false && customTabsToolbarFeature.onBackPressed() -> true
+            else -> false
+        }
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {