Verified Commit 4742d1db authored by Matthew Finkel's avatar Matthew Finkel Committed by Pier Angelo Vendrame
Browse files

[android] Rename as Tor Browser 

Bug 40020: Change applicationId

Bug 40020: Change app name

Bug 40020: Change deeplink scheme

Bug 40020: Change App icons

Bug 40073: Use correct branding on About page

Bug 40088: Use Tor Browser logo in migration screen
parent d8110083

mobile/android/fenix/app/build.gradle

+11 −12
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ android { 
    }



    defaultConfig {

        applicationId "org.mozilla"

        applicationId "org.torproject"

        minSdkVersion config.minSdkVersion

        compileSdk config.compileSdkVersion

        targetSdkVersion config.targetSdkVersion
@@ -70,8 +70,7 @@ android { 
                "}"

        // This should be the base URL used to call the AMO API.

        buildConfigField "String", "AMO_SERVER_URL", "\"https://services.addons.mozilla.org\""



        def deepLinkSchemeValue = "fenix-dev"

        def deepLinkSchemeValue = "torbrowser-dev"

        buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""



        // This allows overriding the target activity for MozillaOnline builds, which happens
@@ -121,14 +120,14 @@ android { 
        debug {

            shrinkResources false

            minifyEnabled false

            applicationIdSuffix ".fenix.debug"

            applicationIdSuffix ".torbrowser_debug"

            resValue "bool", "IS_DEBUG", "true"

            pseudoLocalesEnabled true

        }

        nightly releaseTemplate >> {

            applicationIdSuffix ".fenix"

            applicationIdSuffix ".torbrowser_nightly"

            buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"

            def deepLinkSchemeValue = "fenix-nightly"

            def deepLinkSchemeValue = "torbrowser-nightly"

            buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""

            manifestPlaceholders.putAll([

                    "deepLinkScheme": deepLinkSchemeValue
@@ -136,8 +135,8 @@ android { 
        }

        beta releaseTemplate >> {

            buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"

            applicationIdSuffix ".firefox_beta"

            def deepLinkSchemeValue = "fenix-beta"

            applicationIdSuffix ".torbrowser_alpha"

            def deepLinkSchemeValue = "torbrowser-alpha"

            buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""

            manifestPlaceholders.putAll([

                    // This release type is meant to replace Firefox (Beta channel) and therefore needs to inherit
@@ -147,14 +146,14 @@ android { 
                    // fatal consequences. For example see:

                    //  - https://issuetracker.google.com/issues/36924841

                    //  - https://issuetracker.google.com/issues/36905922

                    "sharedUserId": "org.mozilla.firefox.sharedID",

                    "sharedUserId": "org.torproject.torbrowser_alpha.sharedID",

                    "deepLinkScheme": deepLinkSchemeValue,

            ])

        }

        release releaseTemplate >> {

            buildConfigField "boolean", "USE_RELEASE_VERSIONING", "true"

            applicationIdSuffix ".firefox"

            def deepLinkSchemeValue = "fenix"

            applicationIdSuffix ".torbrowser"

            def deepLinkSchemeValue = "torbrowser"

            buildConfigField "String", "DEEP_LINK_SCHEME", "\"$deepLinkSchemeValue\""

            manifestPlaceholders.putAll([

                    // This release type is meant to replace Firefox (Release channel) and therefore needs to inherit
@@ -164,7 +163,7 @@ android { 
                    // fatal consequences. For example see:

                    //  - https://issuetracker.google.com/issues/36924841

                    //  - https://issuetracker.google.com/issues/36905922

                    "sharedUserId": "org.mozilla.firefox.sharedID",

                    "sharedUserId": "org.torproject.torbrowser.sharedID",

                    "deepLinkScheme": deepLinkSchemeValue,

            ])

        }

mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuAboutRobot.kt

+3 −3
Original line number Diff line number Diff line
@@ -76,10 +76,10 @@ class SettingsSubMenuAboutRobot { 
    }



    fun verifyProductCompany() {

        Log.i(TAG, "verifyProductCompany: Trying to verify that the about section contains the company that produced the app info: ${"$appName is produced by Mozilla."}")

        Log.i(TAG, "verifyProductCompany: Trying to verify that the about section contains the company that produced the app info: ${"$appName is produced by the Tor Project, a U.S.-based 501(c)(3) nonprofit."}")

        onView(withId(R.id.about_content))

            .check(matches(withText(containsString("$appName is produced by Mozilla."))))

        Log.i(TAG, "verifyProductCompany: Verified that the about section contains the company that produced the app info: \"$appName is produced by Mozilla.\"")

            .check(matches(withText(containsString("$appName is produced by the Tor Project, a U.S.-based 501(c)(3) nonprofit."))))

        Log.i(TAG, "verifyProductCompany: Verified that the about section contains the company that produced the app info: \"$appName is produced by the Tor Project, a U.S.-based 501(c)(3) nonprofit.\"")

    }



    fun verifyCurrentTimestamp() {

mobile/android/fenix/app/src/beta/res/drawable-hdpi/fenix_search_widget.png

0 → 100644
+14.1 KiB
Loading image diff...

mobile/android/fenix/app/src/beta/res/drawable-hdpi/fenix_search_widget.webp

deleted100644 → 0
−21.4 KiB
Loading image diff...

mobile/android/fenix/app/src/beta/res/drawable/animated_splash_screen.xml

deleted100644 → 0
+0 −566

File deleted.

Preview size limit exceeded, changes collapsed.