Skip to content
Snippets Groups Projects
Commit 9b5de5cf authored by clairehurst's avatar clairehurst Committed by morgan
Browse files

Bug 42195: [android] Fix "Whats new URL"

parent 48bd69cd
No related branches found
No related tags found
2 merge requests!1202Bug_43099: 2024 YEC Strings,!1136Bug 43085: Rebased alpha onto 128.2.0esr
......@@ -130,7 +130,7 @@ class MenuNavigationMiddleware(
)
is MenuAction.Navigate.ReleaseNotes -> openToBrowser(
BrowserNavigationParams(url = SupportUtils.WHATS_NEW_URL),
BrowserNavigationParams(url = SupportUtils.getTorWhatsNewUrl()),
)
is MenuAction.Navigate.Tools -> navHostController.navigate(route = TOOLS_MENU_ROUTE)
......
......@@ -196,7 +196,7 @@ class HomeMenuView(
Events.whatsNewTapped.record(NoExtras())
homeActivity.openToBrowserAndLoad(
searchTermOrURL = SupportUtils.WHATS_NEW_URL,
searchTermOrURL = SupportUtils.getTorWhatsNewUrl(),
newTab = true,
from = BrowserDirection.FromHome,
)
......
......@@ -38,7 +38,7 @@ object SupportUtils {
const val MEITUAN_URL = "https://tb.j5k6.com/6ZSOp"
const val GOOGLE_US_URL = "https://www.google.com/webhp?client=firefox-b-1-m&channel=ts"
const val GOOGLE_XX_URL = "https://www.google.com/webhp?client=firefox-b-m&channel=ts"
const val WHATS_NEW_URL = "https://www.torproject.org/releases/"
// const val WHATS_NEW_URL = "https://www.torproject.org/releases/"
const val DONATE_URL = "https://donate.torproject.org/"
const val TB_MANUAL_URL = "https://tb-manual.torproject.org/mobile-tor"
......@@ -109,6 +109,21 @@ object SupportUtils {
return TB_MANUAL_URL
}
fun getTorWhatsNewUrl(): String {
val fullVersionName: String = BuildConfig.VERSION_NAME // e.g. "115.2.1-beta (13.5a5)"
if (!fullVersionName.contains('(') || !fullVersionName.contains(')')) {
return "https://blog.torproject.org/"
}
val versionNumber: String = fullVersionName.substring(
fullVersionName.indexOf('(') + 1,
fullVersionName.indexOf(')'),
) // e.g. "13.5a5"
val alpha: String = if (versionNumber.contains('a')) "alpha-" else ""
val versionNumberNoDecimals: String =
versionNumber.split('.').joinToString("") // e.g. "135a5"
return "https://blog.torproject.org/new-${alpha}release-tor-browser-${versionNumberNoDecimals}/" // e.g. "https://blog.torproject.org/new-alpha-release-tor-browser-135a5/
}
fun getMozillaPageUrl(page: MozillaPage, locale: Locale = Locale.getDefault()): String {
val path = page.path
val langTag = getLanguageTag(locale)
......
......@@ -134,7 +134,7 @@ class AboutFragment : Fragment(), AboutPageListener {
AboutPageItem(
AboutItem.ExternalLink(
WHATS_NEW,
SupportUtils.WHATS_NEW_URL,
SupportUtils.getTorWhatsNewUrl(),
),
// Note: Fenix only has release notes for 'Release' versions, NOT 'Beta' & 'Nightly'.
getString(R.string.about_whats_new, getString(R.string.firefox)),
......
......@@ -216,7 +216,7 @@ class HomeMenuViewTest {
WhatsNew.userViewedWhatsNew(testContext)
homeActivity.openToBrowserAndLoad(
searchTermOrURL = SupportUtils.WHATS_NEW_URL,
searchTermOrURL = SupportUtils.getTorWhatsNewUrl(),
newTab = true,
from = BrowserDirection.FromHome,
)
......
......@@ -25,10 +25,10 @@ class SupportUtilsTest {
"https://support.mozilla.org/1/mobile/20/Android/fr/tracking-protection-firefox-android",
SupportUtils.getSumoURLForTopic(mockContext("2 0"), SupportUtils.SumoTopic.TRACKING_PROTECTION, Locale("fr")),
)
assertEquals(
"https://www.mozilla.org/firefox/android/notes",
SupportUtils.WHATS_NEW_URL,
)
// assertEquals(
// "https://www.mozilla.org/firefox/android/notes",
// SupportUtils.WHATS_NEW_URL,
// )
}
@Test
......@@ -63,7 +63,7 @@ class SupportUtilsTest {
)
assertEquals(
"https://www.torproject.org/releases/",
SupportUtils.WHATS_NEW_URL
SupportUtils.getTorWhatsNewUrl()
)
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment