Verified Commit b9bb3eb5 authored by clairehurst's avatar clairehurst 🌱 Committed by Pier Angelo Vendrame
Browse files

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

parent 5468b399

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/middleware/MenuNavigationMiddleware.kt

+1 −1
Original line number Diff line number Diff line
@@ -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)

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/home/HomeMenuView.kt

+1 −1
Original line number Diff line number Diff line
@@ -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,

                )

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt

+12 −1
Original line number Diff line number Diff line
@@ -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,17 @@ object SupportUtils { 
        return TB_MANUAL_URL

    }



    fun getTorWhatsNewUrl(): String {

        val versionNumber = BuildConfig.VERSION_NAME.substringBefore(' ') // e.g. "13.5a5"

        if (versionNumber.isEmpty()) {

            return "https://blog.torproject.org/"

        }

        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)

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/about/AboutFragment.kt

+1 −1
Original line number Diff line number Diff line
@@ -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)),

mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/HomeMenuViewTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ class HomeMenuViewTest { 
            WhatsNew.userViewedWhatsNew(testContext)



            homeActivity.openToBrowserAndLoad(

                searchTermOrURL = SupportUtils.WHATS_NEW_URL,

                searchTermOrURL = SupportUtils.getTorWhatsNewUrl(),

                newTab = true,

                from = BrowserDirection.FromHome,

            )