diff --git a/patches/fenix-overlay/app/src/main/res/values/ironfox_strings.xml b/patches/fenix-overlay/app/src/main/res/values/ironfox_strings.xml index a57e5872..fef16a0d 100644 --- a/patches/fenix-overlay/app/src/main/res/values/ironfox_strings.xml +++ b/patches/fenix-overlay/app/src/main/res/values/ironfox_strings.xml @@ -71,8 +71,6 @@ Secure your browsing with DNS-over-HTTPS for enhanced privacy and security. - IronFox will use your system’s DNS resolver. - IronFox will use secure DNS by default, but fallback to your system’s DNS resolver if secure DNS is unavailable. diff --git a/patches/gecko-disable-telemetry.patch b/patches/gecko-disable-telemetry.patch index 9e569e07..dcdd248e 100644 --- a/patches/gecko-disable-telemetry.patch +++ b/patches/gecko-disable-telemetry.patch @@ -40,7 +40,7 @@ index 0e2a6efdc9..c931fb3c74 100644 imply_option("MOZ_APP_UA_NAME", "Firefox") diff --git a/toolkit/components/glean/src/init/mod.rs b/toolkit/components/glean/src/init/mod.rs -index 42c16ebb87..6c796a950f 100644 +index 42c16ebb87..4f27d1ed09 100644 --- a/toolkit/components/glean/src/init/mod.rs +++ b/toolkit/components/glean/src/init/mod.rs @@ -72,7 +72,7 @@ pub extern "C" fn fog_init( @@ -61,12 +61,16 @@ index 42c16ebb87..6c796a950f 100644 } }; -@@ -190,9 +190,9 @@ fn build_configuration( +@@ -186,13 +186,13 @@ fn build_configuration( + delay_ping_lifetime_io: true, + server_endpoint: Some(server), + uploader: None, +- use_core_mps: true, ++ use_core_mps: false, trim_data_to_registered_pings: true, log_level: None, rate_limit, -- enable_event_timestamps: true, -+ enable_event_timestamps: false, + enable_event_timestamps: true, experimentation_id: None, - enable_internal_pings: true, + enable_internal_pings: false, @@ -119,31 +123,6 @@ index cf0a7bd372..4f19716815 100644 isPrereleaseChannel || isReleaseCandidateOnBeta || Services.prefs.getBoolPref(this.Preferences.OverridePreRelease, false); -diff --git a/toolkit/components/telemetry/app/TelemetryReportingPolicy.sys.mjs b/toolkit/components/telemetry/app/TelemetryReportingPolicy.sys.mjs -index 1e45187924..b45af61339 100644 ---- a/toolkit/components/telemetry/app/TelemetryReportingPolicy.sys.mjs -+++ b/toolkit/components/telemetry/app/TelemetryReportingPolicy.sys.mjs -@@ -280,9 +280,9 @@ var TelemetryReportingPolicyImpl = { - */ - get dataSubmissionEnabled() { - // Default is true because we are opt-out. -- return Services.prefs.getBoolPref( -+ return false && Services.prefs.getBoolPref( - TelemetryUtils.Preferences.DataSubmissionEnabled, -- true -+ false - ); - }, - -@@ -716,7 +716,7 @@ var TelemetryReportingPolicyImpl = { - return this._ensureUserIsNotifiedPromise.then(() => { - // The user has been notified and interacted with the modal. - // Glean can now init on shutdown if necessary. -- Services.prefs.setBoolPref("telemetry.fog.init_on_shutdown", true); -+ Services.prefs.setBoolPref("telemetry.fog.init_on_shutdown", false); - }); - }, - diff --git a/toolkit/components/telemetry/app/UsageReporting.sys.mjs b/toolkit/components/telemetry/app/UsageReporting.sys.mjs index 4a3e1de32d..baeff11b29 100644 --- a/toolkit/components/telemetry/app/UsageReporting.sys.mjs diff --git a/patches/ironfox-onboarding.patch b/patches/ironfox-onboarding.patch index d7c3c2f5..2bd3b4f7 100644 --- a/patches/ironfox-onboarding.patch +++ b/patches/ironfox-onboarding.patch @@ -377,8 +377,8 @@ index 0000000000..5d75386d0d + val captionText = when (contentState) { + IfPreferenceDohContentState.ModeSelection -> stringResource( + when (dohSettingsState.selectedProtectionLevel) { -+ ProtectionLevel.Default -> R.string.onboarding_if_preference_doh_default_protection_summary -+ ProtectionLevel.Increased -> R.string.onboarding_if_preference_doh_increased_protection_summary ++ ProtectionLevel.Default -> R.string.preference_doh_default_protection_summary ++ ProtectionLevel.Increased -> R.string.preference_doh_increased_protection_summary + ProtectionLevel.Max -> R.string.preference_doh_max_protection_summary + ProtectionLevel.Off -> R.string.onboarding_if_preference_doh_off_summary + }, diff --git a/scripts/patches.yaml b/scripts/patches.yaml index e3aa466f..3b0da9b0 100644 --- a/scripts/patches.yaml +++ b/scripts/patches.yaml @@ -373,9 +373,9 @@ patches: - file: "disable-shipped-domains.patch" name: "Disable Shipped Domains" - description: "Disables pre-shipped domain list." - reason: "To address security concerns from outdated domain lists." - effect: "Prevents potential security issues and removes annoying domain suggestions." + description: "Disables Firefox's built-in list of domains used to autocomplete URLs." + reason: "To quote a Mozilla employee (https://bugzilla.mozilla.org/show_bug.cgi?id=1842106#c0): Android’s current list of 400+ domain names for address bar suggestions was created way back in December 2015… This list hasn’t been updated since 2015 and now includes expired and squatted domains that might serve ads or malware. Instead of updating the lists of top domains, we should remove it. This would avoid the risk from future bad domains. The default suggestions are out of date and not necessarily relevant for every locale." + effect: "Prevents suggesting squatted domains to users that serve ads and malware, and reduces annoyances/unwanted behavior." category: "Security" - file: "harden-pdfjs.patch" diff --git a/scripts/prebuild.sh b/scripts/prebuild.sh index c008fc12..bbc30b64 100755 --- a/scripts/prebuild.sh +++ b/scripts/prebuild.sh @@ -154,9 +154,28 @@ sed -i \ -e 's/Notifications help you stay safer with Firefox/Enable notifications/' \ -e 's/Securely send tabs between your devices and discover other privacy features in Firefox./IronFox can remind you when private tabs are open and show you the progress of file downloads./' \ -e 's/Agree and continue/Continue/' \ + -e 's/Address bar - Firefox Suggest/Address bar/' \ -e 's/Firefox Daylight/IronFox/; s/Firefox Fenix/IronFox/; s/Mozilla Firefox/IronFox/; s/Firefox/IronFox/g' \ - -e 's/Fast and secure web browsing/The private and secure Firefox-based web browser for Android/' \ -e '/about_content/s/Mozilla/IronFox OSS/' \ + -e 's/IronFox Suggest/Firefox Suggest/' \ + -e 's/Learn more about Firefox Suggest/Learn more about search suggestions/' \ + -e 's/Suggestions from %1$s/Suggestions from Mozilla/' \ + -e 's/Notifications for tabs received from other IronFox devices/Notifications for tabs received from other devices/' \ + -e 's/To send a tab, sign in to IronFox/To send a tab, sign in to a Firefox-based web browser/' \ + -e 's/On your computer open IronFox and/On your computer, open a Firefox-based web browser, and/' \ + -e 's/Fast and secure web browsing/The private, secure, user first web browser for Android./' \ + -e 's/Sync is on/Firefox Sync is on/' \ + -e 's/No account?/No Firefox account?/' \ + -e 's/to sync IronFox/to sync your browsing data/' \ + -e 's/%s will stop syncing with your account/%s will stop syncing with your Firefox account/' \ + -e 's/%1$s decides when to use secure DNS to protect your privacy/IronFox will use your system’s DNS resolver/' \ + -e 's/Use your default DNS resolver if there is a problem with the secure DNS provider/Use your default DNS resolver/' \ + -e 's/You control when to use secure DNS and choose your provider/IronFox will use secure DNS with your chosen provider by default, but might fallback to your system’s DNS resolver if secure DNS is unavailable/' \ + -e '/preference_doh_off_summary/s/Use your default DNS resolver/Never use secure DNS, even if supported by your system’s DNS resolver/' \ + -e 's/Learn more about sync/Learn more about Firefox Sync/' \ + -e 's/search?client=firefox&q=%s/search?q=%s/' \ + -e 's/You don’t have any tabs open in IronFox on your other devices/You don’t have any tabs open on your other devices/' \ + -e 's/Google Search/%s search/' \ app/src/*/res/values*/*strings.xml # Fenix uses reflection to create a instance of profile based on the text of