From 6419d0cf138d6fe5ea6fa8166a065692571c1253 Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Fri, 10 Jan 2020 15:21:30 +0100 Subject: [PATCH] Open "migration FAQ" when selecting "What's new" in a Fennec build. --- app/src/main/java/org/mozilla/fenix/Config.kt | 19 ++++++++++++++++++- .../org/mozilla/fenix/home/HomeFragment.kt | 5 +---- .../mozilla/fenix/settings/SupportUtils.kt | 10 +++++++++- 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/Config.kt b/app/src/main/java/org/mozilla/fenix/Config.kt index f8bc1720a..56f526a41 100644 --- a/app/src/main/java/org/mozilla/fenix/Config.kt +++ b/app/src/main/java/org/mozilla/fenix/Config.kt @@ -5,7 +5,15 @@ package org.mozilla.fenix enum class ReleaseChannel { - FenixDebug, FenixNightly, FenixBeta, FenixProduction, FennecProduction, FennecBeta, FennecNightly; + FenixDebug, + + FenixNightly, + FenixBeta, + FenixProduction, + + FennecProduction, + FennecBeta, + FennecNightly; val isReleased: Boolean get() = when (this) { @@ -39,6 +47,9 @@ enum class ReleaseChannel { FenixDebug -> true else -> false } + + val isFennec: Boolean + get() = this in fennecChannels } object Config { @@ -62,3 +73,9 @@ object Config { } } } + +private val fennecChannels: List = listOf( + ReleaseChannel.FennecNightly, + ReleaseChannel.FennecBeta, + ReleaseChannel.FennecProduction +) 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 5d30f6b6d..5a5007ad9 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -536,10 +536,7 @@ class HomeFragment : Fragment() { WhatsNew.userViewedWhatsNew(context) context.metrics.track(Event.WhatsNewTapped(Event.WhatsNewTapped.Source.HOME)) (activity as HomeActivity).openToBrowserAndLoad( - searchTermOrURL = SupportUtils.getSumoURLForTopic( - context, - SupportUtils.SumoTopic.WHATS_NEW - ), + searchTermOrURL = SupportUtils.getWhatsNewUrl(context), newTab = true, from = 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 5053d8f17..2257e4b03 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt @@ -10,6 +10,7 @@ import androidx.browser.customtabs.CustomTabsIntent import androidx.core.net.toUri import mozilla.components.support.ktx.android.content.appVersionName import org.mozilla.fenix.BuildConfig +import org.mozilla.fenix.Config import org.mozilla.fenix.IntentReceiverActivity import org.mozilla.fenix.R import org.mozilla.fenix.ext.getColorFromAttr @@ -32,7 +33,8 @@ object SupportUtils { SEND_TABS("send-tab-preview"), SET_AS_DEFAULT_BROWSER("set-firefox-preview-default"), SEARCH_SUGGESTION("how-search-firefox-preview"), - CUSTOM_SEARCH_ENGINES("custom-search-engines") + CUSTOM_SEARCH_ENGINES("custom-search-engines"), + UPGRADE_FAQ("firefox-preview-upgrade-faqs") } /** @@ -64,6 +66,12 @@ object SupportUtils { fun getPrivacyNoticeUrl(locale: Locale = Locale.getDefault()) = "https://www.mozilla.org/${getLanguageTag(locale)}/privacy/firefox/" + fun getWhatsNewUrl(context: Context) = if (Config.channel.isFennec) { + getGenericSumoURLForTopic(SumoTopic.UPGRADE_FAQ) + } else { + getSumoURLForTopic(context, SumoTopic.WHATS_NEW) + } + fun createCustomTabIntent(context: Context, url: String): Intent = CustomTabsIntent.Builder() .setInstantAppsEnabled(false) .setToolbarColor(context.getColorFromAttr(R.attr.foundation))