From e2198f19adc91faba22d238972e6e71046e34dfb Mon Sep 17 00:00:00 2001 From: Sawyer Blatz Date: Tue, 23 Apr 2019 14:26:56 -0700 Subject: [PATCH] Fixes #1868: Corrects private browsing myths link (#1930) --- app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt | 2 +- .../main/java/org/mozilla/fenix/settings/SupportUtils.kt | 9 ++++++++- 2 files changed, 9 insertions(+), 2 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 01b48e71e..53471ff5d 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -212,7 +212,7 @@ class HomeFragment : Fragment(), CoroutineScope { } is TabAction.PrivateBrowsingLearnMore -> { requireComponents.useCases.tabsUseCases.addPrivateTab - .invoke(SupportUtils.getSumoURLForTopic(context!!, SupportUtils.SumoTopic.PRIVATE_BROWSING_MYTHS)) + .invoke(SupportUtils.getGenericSumoURLForTopic(SupportUtils.SumoTopic.PRIVATE_BROWSING_MYTHS)) (activity as HomeActivity).openToBrowser( requireComponents.core.sessionManager.selectedSession?.id, BrowserDirection.FromHome 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 7b2622c5d..7036badfa 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt @@ -20,7 +20,7 @@ object SupportUtils { internal val topicStr: String ) { HELP("firefox-android-help"), - PRIVATE_BROWSING_MYTHS("private-browsing-myths") + PRIVATE_BROWSING_MYTHS("common-myths-about-private-browsing") } fun getSumoURLForTopic(context: Context, topic: SumoTopic): String { @@ -31,6 +31,13 @@ object SupportUtils { return "https://support.mozilla.org/1/mobile/$appVersion/$osTarget/$langTag/$escapedTopic" } + // Used when the app version and os are not part of the URL + fun getGenericSumoURLForTopic(topic: SumoTopic): String { + val escapedTopic = getEncodedTopicUTF8(topic.topicStr) + val langTag = getLanguageTag(Locale.getDefault()) + return "https://support.mozilla.org/$langTag/kb/$escapedTopic" + } + private fun getEncodedTopicUTF8(topic: String): String { try { return URLEncoder.encode(topic, "UTF-8")