From 9e5c823ac27e085db76c88bfbd8f3ec07ab69bf8 Mon Sep 17 00:00:00 2001
From: Emily Kager <emilykager@gmail.com>
Date: Wed, 6 Mar 2019 11:48:00 -0800
Subject: [PATCH] [fenix] Revert "Closes
 https://github.com/mozilla-mobile/fenix/issues/811 - Clear stack after
 switching to private browsing"
 (https://github.com/mozilla-mobile/fenix/pull/876)

This reverts commit 62b743ee072a8b72375ac3e64085f1f7a993d6ad.
---
 .../java/org/mozilla/fenix/browser/BrowserFragment.kt     | 8 ++------
 app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt  | 4 ----
 2 files changed, 2 insertions(+), 10 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 f5989e2594..f5bfe90026 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -16,7 +16,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
-import androidx.navigation.NavOptions
 import androidx.navigation.Navigation
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.component_search.*
@@ -271,13 +270,10 @@ class BrowserFragment : Fragment(), BackHandler {
             ToolbarMenu.Item.Share -> requireComponents.core.sessionManager
                 .selectedSession?.url?.apply { requireContext().share(this) }
             ToolbarMenu.Item.NewPrivateTab -> {
-                val navBuilder = NavOptions.Builder()
-                val navOptions = navBuilder.setPopUpTo(R.id.homeFragment, false).build()
                 val directions = BrowserFragmentDirections
                     .actionBrowserFragmentToSearchFragment(null)
-                Navigation.findNavController(view!!).navigate(directions, navOptions)
-                (activity as HomeActivity).browsingModeManager.mode =
-                    BrowsingModeManager.Mode.Private
+                Navigation.findNavController(view!!).navigate(directions)
+                (activity as HomeActivity).browsingModeManager.mode = BrowsingModeManager.Mode.Private
             }
             ToolbarMenu.Item.FindInPage -> FindInPageIntegration.launch?.invoke()
             ToolbarMenu.Item.ReportIssue -> requireComponents.core.sessionManager
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 171ab6de0d..455920b314 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -83,7 +83,6 @@ class HomeFragment : Fragment() {
         return view
     }
 
-    @SuppressWarnings("ComplexMethod")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -164,9 +163,6 @@ class HomeFragment : Fragment() {
                 BrowsingModeManager.Mode.Normal -> BrowsingModeManager.Mode.Private
                 BrowsingModeManager.Mode.Private -> BrowsingModeManager.Mode.Normal
             }
-            Navigation.findNavController(it).apply {
-                popBackStack(R.id.nav_graph, false)
-            }
         }
     }