blallo
/
fenix
1
0
Fork 0
Code Releases Activity

For #1116 - Uses alias link for help

master
Jeff Boek 2019-06-14 15:00:09 -07:00
parent 5540230e3d
commit 7ebdfcc87b
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
View File

@ -752,7 +752,12 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
} }
} }
ToolbarMenu.Item.Help -> { 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 -> { ToolbarMenu.Item.NewTab -> {
val directions = BrowserFragmentDirections val directions = BrowserFragmentDirections

5
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View File

@ -537,7 +537,10 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
HomeMenu.Item.Help -> { HomeMenu.Item.Help -> {
invokePendingDeleteJobs() invokePendingDeleteJobs()
(activity as HomeActivity).openToBrowserAndLoad( (activity as HomeActivity).openToBrowserAndLoad(
searchTermOrURL = SupportUtils.HELP_URL, searchTermOrURL = SupportUtils.getSumoURLForTopic(
context!!,
SupportUtils.SumoTopic.HELP
),
newTab = true, newTab = true,
from = BrowserDirection.FromHome from = BrowserDirection.FromHome
) )

2
app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
View File

@ -162,7 +162,7 @@ class SettingsFragment : PreferenceFragmentCompat(), AccountObserver {
} }
resources.getString(pref_key_help) -> { resources.getString(pref_key_help) -> {
(activity as HomeActivity).openToBrowserAndLoad( (activity as HomeActivity).openToBrowserAndLoad(
searchTermOrURL = SupportUtils.HELP_URL, searchTermOrURL = SupportUtils.getSumoURLForTopic(context!!, SupportUtils.SumoTopic.HELP),
newTab = true, newTab = true,
from = BrowserDirection.FromSettings from = BrowserDirection.FromSettings
) )

5
app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
View File

@ -18,16 +18,15 @@ import java.util.Locale
object SupportUtils { object SupportUtils {
const val RATE_APP_URL = "market://details?id=" + BuildConfig.APPLICATION_ID 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}" const val FENIX_PLAY_STORE_URL = "https://play.google.com/store/apps/details?id=${BuildConfig.APPLICATION_ID}"
val PRIVACY_NOTICE_URL: String val PRIVACY_NOTICE_URL: String
get() = "https://www.mozilla.org/${getLanguageTag(Locale.getDefault())}/privacy/firefox/" 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( enum class SumoTopic(
internal val topicStr: String internal val topicStr: String
) { ) {
HELP("faq-android"),
PRIVATE_BROWSING_MYTHS("common-myths-about-private-browsing"), PRIVATE_BROWSING_MYTHS("common-myths-about-private-browsing"),
YOUR_RIGHTS("your-rights") YOUR_RIGHTS("your-rights")
} }