From fc8fc2b33d77620373593724a9d0b41e9cb20f17 Mon Sep 17 00:00:00 2001
From: mihai-adrian <mihai.carare.dev@gmail.com>
Date: Fri, 30 Aug 2019 10:45:58 +0300
Subject: [PATCH] Fixes #4997: Changed navigation to ShareFragment

Added global navigation action to share fragment in navigation graph
Changed share action to use global navigation to ShareFragment
---
 .../fenix/components/toolbar/BrowserToolbarController.kt     | 5 +++--
 app/src/main/res/navigation/nav_graph.xml                    | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
index 62299b19e..18856c317 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt
@@ -16,6 +16,7 @@ import kotlinx.coroutines.ObsoleteCoroutinesApi
 import kotlinx.coroutines.launch
 import mozilla.components.browser.session.Session
 import mozilla.components.concept.engine.EngineView
+import org.mozilla.fenix.NavGraphDirections
 import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.BrowserFragment
 import org.mozilla.fenix.browser.BrowserFragmentDirections
@@ -96,8 +97,8 @@ class DefaultBrowserToolbarController(
             ToolbarMenu.Item.Share -> {
                 val currentUrl = currentSession?.url
                 currentUrl?.apply {
-                    val directions = BrowserFragmentDirections.actionBrowserFragmentToShareFragment(this)
-                    navController.nav(R.id.browserFragment, directions)
+                    val directions = NavGraphDirections.actionGlobalShareFragment(this)
+                    navController.navigate(directions)
                 }
             }
             ToolbarMenu.Item.NewTab -> {
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index bfd262cdd..73f246fe8 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -513,4 +513,6 @@
     <dialog
         android:id="@+id/signOutFragment"
         android:name="org.mozilla.fenix.settings.SignOutFragment" />
+    <action android:id="@+id/action_global_shareFragment"
+            app:destination="@id/shareFragment"/>
 </navigation>