Unverified Commit 80ecb57c authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Merge remote-tracking branch 'acatgl/40123+1' into tor-browser-84.0.0b2-10.5-1

parents 6c98973b 238126dc

app/build.gradle

+9 −0
Original line number Diff line number Diff line
@@ -17,7 +17,16 @@ import org.gradle.internal.logging.text.StyledTextOutputFactory 


import static org.gradle.api.tasks.testing.TestResult.ResultType



def obtainTestBuildType() {

    def result = "debug";

    if (project.hasProperty("testBuildType")) {

        result = project.getProperties().get("testBuildType")

    }

    result

}



android {

    testBuildType obtainTestBuildType()

    compileSdkVersion Config.compileSdkVersion

    defaultConfig {

        applicationId "org.torproject"

app/proguard-rules.pro

+4 −1
Original line number Diff line number Diff line
@@ -120,3 +120,6 @@ 
# Keep Android Lifecycle methods

# https://bugzilla.mozilla.org/show_bug.cgi?id=1596302

-keep class androidx.lifecycle.** { *; }



# Workaround for 'already has mapping' r8 issue (https://issuetracker.google.com/issues/140851070)

-keep class com.google.android.gms.common.internal.BaseGmsClient { *; }
 
 No newline at end of file

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

+2 −2
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ private fun assertVersionNumber() { 
}



private fun assertProductCompany() {

    onView(withId(R.id.tor_about_content))

        .check(matches(withText(containsString("Firefox Preview is produced by the Tor Project."))))

    onView(withId(R.id.about_content))

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

}



private fun assertCurrentTimestamp() {