For #1116 - Uses alias link for help

mozilla-mobile · Jun 14, 2019 · 7ebdfcc · 7ebdfcc
1 parent 5540230
commit 7ebdfcc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 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
@@ -752,7 +752,12 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
                 }
             }
             ToolbarMenu.Item.Help -> {
-                requireComponents.useCases.tabsUseCases.addTab.invoke(SupportUtils.HELP_URL)
+                requireComponents.useCases.tabsUseCases.addTab.invoke(
+                    SupportUtils.getSumoURLForTopic(
+                        requireContext(),
+                        SupportUtils.SumoTopic.HELP
+                    )
+                )
             }
             ToolbarMenu.Item.NewTab -> {
                 val directions = BrowserFragmentDirections

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -537,7 +537,10 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
                 HomeMenu.Item.Help -> {
                     invokePendingDeleteJobs()
                     (activity as HomeActivity).openToBrowserAndLoad(
-                        searchTermOrURL = SupportUtils.HELP_URL,
+                        searchTermOrURL = SupportUtils.getSumoURLForTopic(
+                            context!!,
+                            SupportUtils.SumoTopic.HELP
+                        ),
                         newTab = true,
                         from = BrowserDirection.FromHome
                     )

diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -162,7 +162,7 @@ class SettingsFragment : PreferenceFragmentCompat(), AccountObserver {
             }
             resources.getString(pref_key_help) -> {
                 (activity as HomeActivity).openToBrowserAndLoad(
-                    searchTermOrURL = SupportUtils.HELP_URL,
+                    searchTermOrURL = SupportUtils.getSumoURLForTopic(context!!, SupportUtils.SumoTopic.HELP),
                     newTab = true,
                     from = BrowserDirection.FromSettings
                 )

diff --git a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
@@ -18,16 +18,15 @@ import java.util.Locale
 
 object SupportUtils {
     const val RATE_APP_URL = "market://details?id=" + BuildConfig.APPLICATION_ID
+    const val MOZILLA_MANIFESTO_URL = "https://www.mozilla.org/en-GB/about/manifesto/"
     const val FENIX_PLAY_STORE_URL = "https://play.google.com/store/apps/details?id=${BuildConfig.APPLICATION_ID}"
     val PRIVACY_NOTICE_URL: String
         get() = "https://www.mozilla.org/${getLanguageTag(Locale.getDefault())}/privacy/firefox/"
 
-    val HELP_URL: String
-        get() = "https://support.mozilla.org/${getLanguageTag(Locale.getDefault())}/products/firefox-preview"
-
     enum class SumoTopic(
         internal val topicStr: String
     ) {
+        HELP("faq-android"),
         PRIVATE_BROWSING_MYTHS("common-myths-about-private-browsing"),
         YOUR_RIGHTS("your-rights")
     }