From 5540230e3d4c0d0a29af294a963427ae9560253f Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Fri, 14 Jun 2019 13:29:10 -0700 Subject: [PATCH] For #1116 - Changes help link (#3491) --- .../main/java/org/mozilla/fenix/browser/BrowserFragment.kt | 7 +------ app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt | 5 +---- .../java/org/mozilla/fenix/settings/SettingsFragment.kt | 2 +- .../main/java/org/mozilla/fenix/settings/SupportUtils.kt | 5 +++-- 4 files changed, 6 insertions(+), 13 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 c9b0fc2054..634a82474f 100644 --- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt @@ -752,12 +752,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope { } } ToolbarMenu.Item.Help -> { - requireComponents.useCases.tabsUseCases.addTab.invoke( - SupportUtils.getSumoURLForTopic( - requireContext(), - SupportUtils.SumoTopic.HELP - ) - ) + requireComponents.useCases.tabsUseCases.addTab.invoke(SupportUtils.HELP_URL) } 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 index 9c541c945b..b04b0bae7a 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -537,10 +537,7 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver { HomeMenu.Item.Help -> { invokePendingDeleteJobs() (activity as HomeActivity).openToBrowserAndLoad( - searchTermOrURL = SupportUtils.getSumoURLForTopic( - context!!, - SupportUtils.SumoTopic.HELP - ), + searchTermOrURL = SupportUtils.HELP_URL, 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 index d3d646eabf..3bc45194c4 100644 --- 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.getSumoURLForTopic(context!!, SupportUtils.SumoTopic.HELP), + searchTermOrURL = SupportUtils.HELP_URL, 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 index 4d4bbd1553..3d98e9413b 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt @@ -18,15 +18,16 @@ 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("firefox-android-help"), PRIVATE_BROWSING_MYTHS("common-myths-about-private-browsing"), YOUR_RIGHTS("your-rights") }