From 2db40c620bb5400886795931246bb50fddfbbcfa Mon Sep 17 00:00:00 2001 From: celenity Date: Wed, 10 Sep 2025 20:06:22 -0400 Subject: [PATCH] fix: Use patches for certain changes (instead of `sed`/the `prebuild` script) Signed-off-by: celenity --- patches/fenix-disable-telemetry.patch | 17 ----------------- scripts/prebuild.sh | 6 ------ 2 files changed, 23 deletions(-) diff --git a/patches/fenix-disable-telemetry.patch b/patches/fenix-disable-telemetry.patch index 1e6c9e6..ba2055b 100644 --- a/patches/fenix-disable-telemetry.patch +++ b/patches/fenix-disable-telemetry.patch @@ -1,20 +1,3 @@ -diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt -index 4d5067becf..bd5029ab74 100644 ---- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt -+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt -@@ -269,10 +269,10 @@ class Components(private val context: Context) { - controller = nimbus.messaging, - settings = settings, - ), -- MetricsMiddleware( -+/* MetricsMiddleware( - metrics = analytics.metrics, - nimbusEventStore = nimbus.events, -- ), -+ ),*/ - CrashReportingAppMiddleware( - CrashMiddleware( - cache = SettingsCrashReportCache(settings), diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt index 5cc1da059f7d..e40d569c88c6 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt diff --git a/scripts/prebuild.sh b/scripts/prebuild.sh index ca0a344..ef74e84 100755 --- a/scripts/prebuild.sh +++ b/scripts/prebuild.sh @@ -278,12 +278,6 @@ rm -vrf app/src/main/java/org/mozilla/fenix/components/metrics/fonts rm -vrf app/src/main/java/org/mozilla/fenix/settings/datachoices rm -vrf app/src/main/java/org/mozilla/fenix/startupCrash -$SED -i -e 's|val push by lazyMonitored { Push(context, analytics.crashReporter) }|val push by lazyMonitored { Push(context) }|' app/src/main/java/org/mozilla/fenix/components/Components.kt -$SED -i -e 's|import com.google.android.play.core.review|// import com.google.android.play.core.review|' app/src/main/java/org/mozilla/fenix/components/Components.kt - -$SED -i -e 's|import org.mozilla.fenix.ext.recordEventInNimbus|// import org.mozilla.fenix.ext.recordEventInNimbus|' app/src/main/java/org/mozilla/fenix/share/SaveToPDFMiddleware.kt -$SED -i -e 's|context.recordEventInNimbus|// context.recordEventInNimbus|' app/src/main/java/org/mozilla/fenix/share/SaveToPDFMiddleware.kt - # Let it be IronFox "${IRONFOX_SED}" -i \ -e 's/Address bar - Firefox Suggest/Address bar/' \