From fcda84dce73ad73be411b968d6bc5bc9c6b496bf Mon Sep 17 00:00:00 2001
From: ekager <emilykager@gmail.com>
Date: Mon, 18 Mar 2019 19:52:17 -0700
Subject: [PATCH] Closes #1030 - Fixes navigation, white screen after back
 button

---
 app/src/main/java/org/mozilla/fenix/HomeActivity.kt | 6 +-----
 app/src/main/res/navigation/nav_graph.xml           | 6 ++++--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index fba5ce7b2..873b4acbb 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -124,11 +124,7 @@ open class HomeActivity : AppCompatActivity() {
         val host = supportFragmentManager.findFragmentById(R.id.container) as NavHostFragment
 
         val directions = when (from) {
-            BrowserDirection.FromGlobal -> {
-                NavGraphDirections.actionGlobalBrowser(sessionId).apply {
-                    host.navController.popBackStack()
-                }
-            }
+            BrowserDirection.FromGlobal -> NavGraphDirections.actionGlobalBrowser(sessionId)
             BrowserDirection.FromHome -> HomeFragmentDirections.actionHomeFragmentToBrowserFragment(sessionId)
             BrowserDirection.FromSearch -> SearchFragmentDirections.actionSearchFragmentToBrowserFragment(sessionId)
             BrowserDirection.FromSettings ->
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index 1234878cb..6418f0922 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -7,7 +7,9 @@
 
     <action
         android:id="@+id/action_global_browser"
-        app:destination="@id/browserFragment" />
+        app:destination="@id/browserFragment"
+        app:popUpTo="@id/nav_graph"
+        app:popUpToInclusive="true" />
 
     <fragment
         android:id="@+id/homeFragment"
@@ -47,7 +49,7 @@
         <action
             android:id="@+id/action_browserFragment_to_homeFragment"
             app:destination="@id/homeFragment"
-            app:popUpTo="@+id/homeFragment"
+            app:popUpTo="@+id/nav_graph"
             app:popUpToInclusive="true" />
         <action
             android:id="@+id/action_browserFragment_to_searchFragment"