From 534d88f6295f9737e010e3952b698224aba0f2ba Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Mon, 22 Apr 2019 11:32:28 -0700
Subject: [PATCH] Closes #1894 - Fixes Help Page Navigation

---
 .../org/mozilla/fenix/home/HomeFragment.kt    | 21 +++++++++++++-----
 .../fenix/settings/SettingsFragment.kt        | 22 +++++++++----------
 2 files changed, 25 insertions(+), 18 deletions(-)

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 c97350cfb..01b48e71e 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -234,13 +234,22 @@ class HomeFragment : Fragment(), CoroutineScope {
 
     private fun setupHomeMenu() {
         homeMenu = HomeMenu(requireContext()) {
-            val directions = when (it) {
-                HomeMenu.Item.Settings -> HomeFragmentDirections.actionHomeFragmentToSettingsFragment()
-                HomeMenu.Item.Library -> HomeFragmentDirections.actionHomeFragmentToLibraryFragment()
-                HomeMenu.Item.Help -> return@HomeMenu // Not implemented yetN
+            when (it) {
+                HomeMenu.Item.Settings -> Navigation.findNavController(homeLayout).navigate(
+                    HomeFragmentDirections.actionHomeFragmentToSettingsFragment()
+                )
+                HomeMenu.Item.Library -> Navigation.findNavController(homeLayout).navigate(
+                    HomeFragmentDirections.actionHomeFragmentToLibraryFragment()
+                )
+                HomeMenu.Item.Help -> {
+                    (activity as HomeActivity).openToBrowserAndLoad(
+                        SupportUtils.getSumoURLForTopic(
+                            context!!,
+                            SupportUtils.SumoTopic.HELP
+                        ), from = BrowserDirection.FromHome
+                    )
+                }
             }
-
-            Navigation.findNavController(homeLayout).navigate(directions)
         }
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index b8ca282d8..ff7a71d3d 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -128,16 +128,21 @@ class SettingsFragment : PreferenceFragmentCompat(), CoroutineScope, AccountObse
                 navigateToDataChoices()
             }
             resources.getString(pref_key_help) -> {
-                requireComponents.useCases.tabsUseCases.addTab
-                    .invoke(SupportUtils.getSumoURLForTopic(context!!, SupportUtils.SumoTopic.HELP))
-                navigateToSettingsArticle()
+                (activity as HomeActivity).openToBrowserAndLoad(
+                    SupportUtils.getSumoURLForTopic(
+                        context!!,
+                        SupportUtils.SumoTopic.HELP
+                    ), from = BrowserDirection.FromSettings
+                )
             }
             resources.getString(pref_key_rate) -> {
                 startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(SupportUtils.RATE_APP_URL)))
             }
             resources.getString(pref_key_feedback) -> {
-                requireComponents.useCases.tabsUseCases.addTab.invoke(SupportUtils.FEEDBACK_URL)
-                navigateToSettingsArticle()
+                (activity as HomeActivity).openToBrowserAndLoad(
+                    SupportUtils.FEEDBACK_URL,
+                    from = BrowserDirection.FromSettings
+                )
             }
             resources.getString(pref_key_about) -> {
                 navigateToAbout()
@@ -259,13 +264,6 @@ class SettingsFragment : PreferenceFragmentCompat(), CoroutineScope, AccountObse
         Navigation.findNavController(view!!).navigate(directions)
     }
 
-    private fun navigateToSettingsArticle() {
-        val newSession = requireComponents.core.sessionManager.selectedSession?.id
-        view?.let {
-            (activity as HomeActivity).openToBrowser(newSession, BrowserDirection.FromSettings)
-        }
-    }
-
     private fun navigateToAbout() {
         val directions = SettingsFragmentDirections.actionSettingsFragmentToAboutFragment()
         Navigation.findNavController(view!!).navigate(directions)