From b410d2259c469d5f3c30bbbdddaeeb1956c58297 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Apr 2021 13:09:05 +0300 Subject: [PATCH 1/2] geolocation: Disable API and remove Google API URLs The idea for Iceweasel is to reference only services which can be self-hosted using 100% free software stack. At the moment, upstream uses Google Geolocation API by default for release builds. There's also a special configuration for Nightly and early Beta builds to use Mozilla Location Services. Since I couldn't find the source code of Google Geolocation API, let's assume it's nonfree. So removed the URLs. Mozilla Location Services need further evaluation. But as we don't ship Nightly or Beta builds and strive to stick as close to upstream as possible while keeping the SW stack 100% free, release builds don't have any valid geolocation provider, so let's disable geolocation API by default for now. --- modules/libpref/init/StaticPrefList.yaml | 2 +- modules/libpref/init/all.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml index 153d7504d2..79928ac755 100644 --- a/modules/libpref/init/StaticPrefList.yaml +++ b/modules/libpref/init/StaticPrefList.yaml @@ -5067,7 +5067,7 @@ # Is support for Navigator.geolocation enabled? - name: geo.enabled type: bool - value: true + value: false mirror: always # Time, in milliseconds, to wait for the location provider to spin up. diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 651d38c0e2..0c5f36c5b6 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -3726,7 +3726,7 @@ pref("network.psl.onUpdate_notify", false); // All the Geolocation preferences are here. // #ifndef EARLY_BETA_OR_EARLIER - pref("geo.provider.network.url", "https://www.googleapis.com/geolocation/v1/geolocate?key=%GOOGLE_LOCATION_SERVICE_API_KEY%"); + pref("geo.provider.network.url", ""); #else // Use MLS on Nightly and early Beta. pref("geo.provider.network.url", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); -- 2.35.1 From f687c43eb8adc710c54d9dd2ee2ea8d57b8088e3 Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Sun, 4 Apr 2021 13:49:05 +0300 Subject: [PATCH 2/2] Disable banners and remove URLs for mobile apps on about:protections page --- browser/app/profile/firefox.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index af9c349671..0ecb9726bd 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -1883,7 +1883,7 @@ pref("browser.contentblocking.report.monitor.enabled", true); pref("browser.contentblocking.report.proxy.enabled", false); // Disable the mobile promotion by default. -pref("browser.contentblocking.report.show_mobile_app", true); +pref("browser.contentblocking.report.show_mobile_app", false); // Locales in which Send to Device emails are supported // The most recent list of supported locales can be found at https://github.com/mozilla/bedrock/blob/6a08c876f65924651554decc57b849c00874b4e7/bedrock/settings/base.py#L963 @@ -1902,7 +1902,7 @@ pref("browser.contentblocking.report.vpn_regions", "at,be,ca,ch,de,fr,ie,it,my,n // Comma separated string of mozilla vpn supported platforms. pref("browser.contentblocking.report.vpn_platforms", "win,mac,linux"); -pref("browser.contentblocking.report.hide_vpn_banner", false); +pref("browser.contentblocking.report.hide_vpn_banner", true); pref("browser.contentblocking.report.vpn_sub_id", "sub_HrfCZF7VPHzZkA"); pref("browser.contentblocking.report.monitor.url", "https://monitor.firefox.com/?entrypoint=protection_report_monitor&utm_source=about-protections"); @@ -1913,12 +1913,12 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi pref("browser.contentblocking.report.manage_devices.url", "https://accounts.firefox.com/settings/clients"); pref("browser.contentblocking.report.endpoint_url", "https://monitor.firefox.com/user/breach-stats?includeResolved=true"); pref("browser.contentblocking.report.proxy_extension.url", "https://fpn.firefox.com/browser?utm_source=firefox-desktop&utm_medium=referral&utm_campaign=about-protections&utm_content=about-protections"); -pref("browser.contentblocking.report.mobile-ios.url", "https://apps.apple.com/app/firefox-private-safe-browser/id989804926"); -pref("browser.contentblocking.report.mobile-android.url", "https://play.google.com/store/apps/details?id=org.mozilla.firefox&referrer=utm_source%3Dprotection_report%26utm_content%3Dmobile_promotion"); -pref("browser.contentblocking.report.vpn.url", "https://vpn.mozilla.org/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=about-protections-card"); -pref("browser.contentblocking.report.vpn-promo.url", "https://vpn.mozilla.org/?utm_source=firefox-browser&utm_medium=firefox-browser&utm_campaign=about-protections-top-promo"); -pref("browser.contentblocking.report.vpn-android.url", "https://play.google.com/store/apps/details?id=org.mozilla.firefox.vpn&referrer=utm_source%3Dfirefox-browser%26utm_medium%3Dfirefox-browser%26utm_campaign%3Dabout-protections-mobile-vpn%26anid%3D--"); -pref("browser.contentblocking.report.vpn-ios.url", "https://apps.apple.com/us/app/firefox-private-network-vpn/id1489407738"); +pref("browser.contentblocking.report.mobile-ios.url", ""); +pref("browser.contentblocking.report.mobile-android.url", ""); +pref("browser.contentblocking.report.vpn.url", ""); +pref("browser.contentblocking.report.vpn-promo.url", ""); +pref("browser.contentblocking.report.vpn-android.url", ""); +pref("browser.contentblocking.report.vpn-ios.url", ""); // Protection Report's SUMO urls pref("browser.contentblocking.report.lockwise.how_it_works.url", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/password-manager-report"); -- 2.35.1