1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
|
From f3f1223d1a9bee16672c6b7ec07dc5816a5ea084 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyuser@protonmail.com>
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 a9f8e6318f..81e40f6db4 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -4884,7 +4884,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 fab5c7b41b..9805ea69c9 100644
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -3720,7 +3720,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 bff69763d7833a187d663a443cca20f5bdd83acf Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyuser@protonmail.com>
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 | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 6bbc26eb86..8ea3186824 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1877,7 +1877,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);
// Avoid advertising in certain regions. Comma separated string of two letter ISO 3166-1 country codes.
// We're currently blocking all of Ukraine (ua), but would prefer to block just Crimea (ua-43). Currently, the Mozilla Location Service APIs used by Region.jsm only exposes the country, not the subdivision.
@@ -1887,12 +1887,12 @@ pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,t
pref("browser.vpn_promo.enabled", true);
// Enable the vpn card by default.
-pref("browser.contentblocking.report.vpn.enabled", true);
+pref("browser.contentblocking.report.vpn.enabled", false);
// Only show vpn card to certain regions. Comma separated string of two letter ISO 3166-1 country codes.
pref("browser.contentblocking.report.vpn_regions", "us,ca,nz,sg,my,gb,de,fr");
// 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");
@@ -1903,12 +1903,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
|
