Fennec 128.0.0

Signed-off-by: Tavi <[email protected]>

Author: SkewedZeppelin

fenix-liberate.patch

@@ -1,6 +1,6 @@
-diff -r cfd3e02d8411 mobile/android/fenix/app/build.gradle
---- a/mobile/android/fenix/app/build.gradle	Thu Jun 06 18:17:11 2024 +0000
-+++ b/mobile/android/fenix/app/build.gradle	Thu Jun 13 09:01:09 2024 +0300
+diff -r 14b32d530926 mobile/android/fenix/app/build.gradle
+--- a/mobile/android/fenix/app/build.gradle	Thu Jul 04 12:11:31 2024 +0000
++++ b/mobile/android/fenix/app/build.gradle	Tue Jul 09 12:12:48 2024 -0400
 @@ -643,7 +643,6 @@
 
      implementation project(':lib-crash')
@@ -9,7 +9,7 @@ diff -r cfd3e02d8411 mobile/android/fenix/app/build.gradle
      implementation project(':lib-state')
      implementation project(':lib-dataprotect')
      testImplementation project(':support-test-fakes')
-@@ -686,15 +685,8 @@
+@@ -687,15 +686,8 @@
      implementation FenixDependencies.protobuf_javalite
      implementation ComponentsDependencies.google_material
 
@@ -19,8 +19,8 @@ diff -r cfd3e02d8411 mobile/android/fenix/app/build.gradle
      implementation FenixDependencies.google_ads_id // Required for the Google Advertising ID
 
 -    // Required for in-app reviews
--    implementation FenixDependencies.google_play_review
--    implementation FenixDependencies.google_play_review_ktx
+-    implementation ComponentsDependencies.play_review
+-    implementation ComponentsDependencies.play_review_ktx
 -
      implementation FenixDependencies.androidx_profileinstaller
 
@@ -928,27 +928,25 @@ diff -r cfd3e02d8411 mobile/android/fenix/app/src/main/res/xml/site_permissions_
          app:allowDividerBelow="true"/>
 
      <androidx.preference.Preference
-diff -r cfd3e02d8411 mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
---- a/mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt	Thu Jun 06 18:17:11 2024 +0000
-+++ b/mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt	Thu Jun 13 09:01:09 2024 +0300
-@@ -25,16 +25,9 @@
-     const val androidx_transition = "1.5.0"
+diff -r 14b32d530926 mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt
+--- a/mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt	Thu Jul 04 12:11:31 2024 +0000
++++ b/mobile/android/fenix/plugins/fenixdependencies/src/main/java/FenixDependenciesPlugin.kt	Tue Jul 09 12:12:48 2024 -0400
+@@ -26,14 +26,9 @@
+     const val androidx_viewpager2 = "1.1.0"
      const val google_accompanist = "0.32.0"
 
 -    const val adjust = "4.38.2"
 -    const val installreferrer = "2.2"
 -
      const val junit = "5.10.2"
-     const val mockk = "1.13.10"
+     const val mockk = "1.13.11"
 
 -    const val google_ads_id_version = "16.0.0"
--
--    const val google_play_review_version = "2.0.1"
 -
      // keep in sync with the versions used in AS.
      const val protobuf = "3.21.10"
      const val protobuf_plugin = "0.9.4"
-@@ -58,9 +51,6 @@
+@@ -58,9 +53,6 @@
      const val protobuf_javalite = "com.google.protobuf:protobuf-javalite:${FenixVersions.protobuf}"
      const val protobuf_compiler = "com.google.protobuf:protoc:${FenixVersions.protobuf}"
 
@@ -958,15 +956,11 @@ diff -r cfd3e02d8411 mobile/android/fenix/plugins/fenixdependencies/src/main/jav
      const val mockk = "io.mockk:mockk:${FenixVersions.mockk}"
      const val mockk_android = "io.mockk:mockk-android:${FenixVersions.mockk}"
      const val falcon = "com.jraska:falcon:${FenixVersions.falcon}"
-@@ -83,11 +73,7 @@
+@@ -83,7 +75,7 @@
      // Test services is unused
      // --- END AndroidX test dependencies --- //
 
 -    const val google_ads_id = "com.google.android.gms:play-services-ads-identifier:${FenixVersions.google_ads_id_version}"
--
--    // Required for in-app reviews
--    const val google_play_review = "com.google.android.play:review:${FenixVersions.google_play_review_version}"
--    const val google_play_review_ktx = "com.google.android.play:review-ktx:${FenixVersions.google_play_review_version}"
 +    const val google_ads_id = "org.microg.gms:play-services-ads-identifier:0.3.2.240913"
 
      const val junitApi = "org.junit.jupiter:junit-jupiter-api:${FenixVersions.junit}"

gecko-liberate.patch

@@ -5,76 +5,76 @@ diff -r d80eefe94738 mobile/android/geckoview/build.gradle
      implementation "androidx.annotation:annotation:1.6.0"
      implementation "androidx.legacy:legacy-support-v4:1.0.0"
 
--    implementation "com.google.android.gms:play-services-fido:20.0.1"
+-    implementation "com.google.android.gms:play-services-fido:21.1.0"
 +    implementation "org.microg.gms:play-services-fido:0.3.2.240913"
      implementation "org.yaml:snakeyaml:2.2"
 
      implementation "androidx.lifecycle:lifecycle-common:2.6.1"
-diff -r d80eefe94738 mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebAuthnTokenManager.java
---- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebAuthnTokenManager.java	Tue Nov 28 21:01:37 2023 +0000
-+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebAuthnTokenManager.java	Fri Dec 15 11:32:38 2023 +0300
-@@ -260,27 +260,15 @@
+diff -r 14b32d530926 mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebAuthnTokenManager.java
+--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebAuthnTokenManager.java	Thu Jul 04 12:11:31 2024 +0000
++++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/WebAuthnTokenManager.java	Tue Jul 09 11:44:11 2024 -0400
+@@ -193,27 +193,14 @@
 
-     final Task<PendingIntent> intentTask;
+       final Task<PendingIntent> intentTask;
 
--    if (BuildConfig.MOZILLA_OFFICIAL) {
--      // Certain Fenix builds and signing keys are whitelisted for Web Authentication.
--      // See https://wiki.mozilla.org/Security/Web_Authentication
--      //
--      // Third party apps will need to get whitelisted themselves.
--      final Fido2PrivilegedApiClient fidoClient =
--          Fido.getFido2PrivilegedApiClient(GeckoAppShell.getApplicationContext());
-+    // The privileged FIDO2 API normally is restricted to apps with package
-+    // names and signatures that Google knows to be a browser. microG does not
-+    // have such a list, instead it asks the user to confirm that the app doing
-+    // the request is indeed a browser app (only for the first request from
-+    // that app).
-+    final Fido2PrivilegedApiClient fidoClient =
-+        Fido.getFido2PrivilegedApiClient(GeckoAppShell.getApplicationContext());
- 
--      intentTask = fidoClient.getRegisterPendingIntent(browserOptions);
--    } else {
--      // For non-official builds, websites have to opt-in to permit the
--      // particular version of Gecko to perform WebAuthn operations on
--      // them. See https://developers.google.com/digital-asset-links
--      // for the general form, and Step 1 of
--      // https://developers.google.com/identity/fido/android/native-apps
--      // for details about doing this correctly for the FIDO2 API.
--      final Fido2ApiClient fidoClient =
--          Fido.getFido2ApiClient(GeckoAppShell.getApplicationContext());
+-      if (BuildConfig.MOZILLA_OFFICIAL) {
+-        // Certain Fenix builds and signing keys are whitelisted for Web Authentication.
+-        // See https://wiki.mozilla.org/Security/Web_Authentication
+-        //
+-        // Third party apps will need to get whitelisted themselves.
+-        final Fido2PrivilegedApiClient fidoClient =
+-            Fido.getFido2PrivilegedApiClient(GeckoAppShell.getApplicationContext());
 -
--      intentTask = fidoClient.getRegisterPendingIntent(requestOptions);
--    }
-+    intentTask = fidoClient.getRegisterPendingIntent(browserOptions);
- 
-     final GeckoResult<MakeCredentialResponse> result = new GeckoResult<>();
+-        intentTask = fidoClient.getRegisterPendingIntent(browserOptions);
+-      } else {
+-        // For non-official builds, websites have to opt-in to permit the
+-        // particular version of Gecko to perform WebAuthn operations on
+-        // them. See https://developers.google.com/digital-asset-links
+-        // for the general form, and Step 1 of
+-        // https://developers.google.com/identity/fido/android/native-apps
+-        // for details about doing this correctly for the FIDO2 API.
+-        final Fido2ApiClient fidoClient =
+-            Fido.getFido2ApiClient(GeckoAppShell.getApplicationContext());
+-
+-        intentTask = fidoClient.getRegisterPendingIntent(requestOptions);
+-      }
++      // The privileged FIDO2 API normally is restricted to apps with package
++      // names and signatures that Google knows to be a browser. microG does not
++      // have such a list, instead it asks the user to confirm that the app doing
++      // the request is indeed a browser app (only for the first request from
++      // that app).
++      final Fido2PrivilegedApiClient fidoClient =
++          Fido.getFido2PrivilegedApiClient(GeckoAppShell.getApplicationContext());
++      intentTask = fidoClient.getRegisterPendingIntent(browserOptions);
 
-@@ -464,19 +452,12 @@
-             .build();
+       intentTask.addOnSuccessListener(
+           pendingIntent -> {
+@@ -411,19 +398,12 @@
+               .build();
 
-     final Task<PendingIntent> intentTask;
--    // See the makeCredential method for documentation about this
--    // conditional.
--    if (BuildConfig.MOZILLA_OFFICIAL) {
--      final Fido2PrivilegedApiClient fidoClient =
--          Fido.getFido2PrivilegedApiClient(GeckoAppShell.getApplicationContext());
-+    // See the makeCredential method for documentation about the FIDO2 API and
-+    // microG.
-+    final Fido2PrivilegedApiClient fidoClient =
-+        Fido.getFido2PrivilegedApiClient(GeckoAppShell.getApplicationContext());
+       final Task<PendingIntent> intentTask;
+-      // See the makeCredential method for documentation about this
+-      // conditional.
+-      if (BuildConfig.MOZILLA_OFFICIAL) {
+-        final Fido2PrivilegedApiClient fidoClient =
+-            Fido.getFido2PrivilegedApiClient(GeckoAppShell.getApplicationContext());
++      // See the makeCredential method for documentation about the FIDO2 API and
++      // microG.
++      final Fido2PrivilegedApiClient fidoClient =
++          Fido.getFido2PrivilegedApiClient(GeckoAppShell.getApplicationContext());
 
--      intentTask = fidoClient.getSignPendingIntent(browserOptions);
--    } else {
--      final Fido2ApiClient fidoClient =
--          Fido.getFido2ApiClient(GeckoAppShell.getApplicationContext());
+-        intentTask = fidoClient.getSignPendingIntent(browserOptions);
+-      } else {
+-        final Fido2ApiClient fidoClient =
+-            Fido.getFido2ApiClient(GeckoAppShell.getApplicationContext());
 -
--      intentTask = fidoClient.getSignPendingIntent(requestOptions);
--    }
-+    intentTask = fidoClient.getSignPendingIntent(browserOptions);
+-        intentTask = fidoClient.getSignPendingIntent(requestOptions);
+-      }
++      intentTask = fidoClient.getSignPendingIntent(browserOptions);
 
-     final GeckoResult<GetAssertionResponse> result = new GeckoResult<>();
-     intentTask.addOnSuccessListener(
-@@ -573,15 +554,9 @@
+       intentTask.addOnSuccessListener(
+           pendingIntent -> {
+@@ -557,15 +537,9 @@
    @WrapForJNI(calledFrom = "gecko")
    private static GeckoResult<Boolean> webAuthnIsUserVerifyingPlatformAuthenticatorAvailable() {
      final Task<Boolean> task;

paths.sh

@@ -18,7 +18,8 @@
 #
 
 readonly patches=$(dirname "$(realpath "$0")")
-readonly android_components_as=$(realpath ../srclib/FirefoxAndroidAS/android-components)
+readonly android_components_as_top=$(realpath ../srclib/MozFennecAS)
+readonly android_components_as=$(realpath ../srclib/MozFennecAS/mobile/android/android-components)
 readonly android_components=$(realpath ../srclib/MozFennec/mobile/android/android-components)
 readonly application_services=$(realpath ../srclib/MozAppServices)
 readonly glean_as=$(realpath ../srclib/MozGleanAS)

prebuild.sh

@@ -156,6 +156,10 @@ popd
 #
 # Android Components
 #
+pushd "$android_components_as_top"
+# Remove Mozilla repositories substitution and explicitly add the required ones
+patch -p1 --no-backup-if-mismatch --quiet < "$patches/gecko-localize_maven.patch"
+popd
 
 pushd "$android_components_as"
 acver=$(git name-rev --tags --name-only "$(git rev-parse HEAD)")
@@ -164,6 +168,8 @@ sed -e "s/VERSION/$acver/" "$patches/a-c-buildconfig.yml" > .buildconfig.yml
 # We don't need Gecko while building A-C for A-S
 rm -fR components/browser/engine-gecko*
 localize_maven
+sed -i -e '/firebase_messaging/d' plugins/dependencies/src/main/java/DependenciesPlugin.kt
+sed -i -e '/play_services_base/d' plugins/dependencies/src/main/java/DependenciesPlugin.kt
 popd
 
 pushd "$android_components"
@@ -185,14 +191,17 @@ sed -i \
 # Hack to prevent too long string from breaking build
 sed -i '/val statusCmd/,+3d' plugins/config/src/main/java/ConfigPlugin.kt
 sed -i '/\/\/ Append "+"/a \        val statusSuffix = "+"' plugins/config/src/main/java/ConfigPlugin.kt
+sed -i -e '/firebase_messaging/d' plugins/dependencies/src/main/java/DependenciesPlugin.kt
+sed -i -e '/play_services_base/d' plugins/dependencies/src/main/java/DependenciesPlugin.kt
+sed -i -e '/play_review/d' plugins/dependencies/src/main/java/DependenciesPlugin.kt
 popd
 
 #
 # Application Services
 #
 
 pushd "$application_services"
-sed -i -e 's/60.0.0/60.0.1/'  gradle/libs.versions.toml
+sed -i -e 's/60.1.0/60.1.1/'  gradle/libs.versions.toml
 echo "rust.targets=linux-x86-64,$rusttarget" >> local.properties
 sed -i -e '/content {/,/}/d' build.gradle
 sed -i -e '/NDK ez-install/,/^$/d' libs/verify-android-ci-environment.sh