summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/iceweasel/libre.patch290
1 files changed, 79 insertions, 211 deletions
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index c4e9a443e..124ff00f2 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -291,229 +291,97 @@ index 4c4ea76..e0f2880 100644
-gecko.handlerService.schemes.ircs.0.name=Mibbit
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index cd9bc92969..e35c951e67 100644
+index 2588a53cf2..e818b254d2 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
-@@ -1639,10 +1639,6 @@ pref("browser.contentblocking.report.monitor.home_page_url", "https://monitor.fi
+@@ -1726,15 +1726,15 @@ 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);
+
+ // 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");
+ // Comma separated string of mozilla vpn supported platforms.
+ pref("browser.contentblocking.report.vpn_platforms", "win");
+-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");
+@@ -1745,12 +1745,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.lockwise.mobile-ios.url", "https://apps.apple.com/app/id1314000270");
--pref("browser.contentblocking.report.lockwise.mobile-android.url", "https://play.google.com/store/apps/details?id=mozilla.lockbox&referrer=utm_source%3Dprotection_report%26utm_content%3Dmobile_promotion");
-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");
-@@ -1774,11 +1770,6 @@ pref("signon.management.page.os-auth.enabled", false);
- pref("signon.management.page.breach-alerts.enabled", true);
- pref("signon.management.page.vulnerable-passwords.enabled", true);
- pref("signon.management.page.sort", "name");
--// The utm_creative value is appended within the code (specific to the location on
--// where it is clicked). Be sure that if these two prefs are updated, that
--// the utm_creative param be last.
--pref("signon.management.page.mobileAndroidURL", "https://app.adjust.com/6tteyjo?redirect=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dmozilla.lockbox&utm_campaign=Desktop&utm_adgroup=InProduct&utm_creative=");
--pref("signon.management.page.mobileAppleURL", "https://app.adjust.com/6tteyjo?redirect=https%3A%2F%2Fitunes.apple.com%2Fapp%2Fid1314000270%3Fmt%3D8&utm_campaign=Desktop&utm_adgroup=InProduct&utm_creative=");
- pref("signon.management.page.breachAlertUrl",
- "https://monitor.firefox.com/breach-details/");
- pref("signon.management.page.hideMobileFooter", false);
-diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
-index 5bc3a4b6c2..afc8d388e2 100644
---- a/browser/components/BrowserGlue.jsm
-+++ b/browser/components/BrowserGlue.jsm
-@@ -85,8 +85,6 @@ let ACTORS = {
- AboutLoginsImport: { wantUntrusted: true },
- AboutLoginsInit: { wantUntrusted: true },
- AboutLoginsGetHelp: { wantUntrusted: true },
-- AboutLoginsOpenMobileAndroid: { wantUntrusted: true },
-- AboutLoginsOpenMobileIos: { wantUntrusted: true },
- AboutLoginsOpenPreferences: { wantUntrusted: true },
- AboutLoginsOpenSite: { wantUntrusted: true },
- AboutLoginsRecordTelemetryEvent: { wantUntrusted: true },
-diff --git a/browser/components/aboutlogins/AboutLoginsChild.jsm b/browser/components/aboutlogins/AboutLoginsChild.jsm
-index a4cd976dd5..c24b42eed0 100644
---- a/browser/components/aboutlogins/AboutLoginsChild.jsm
-+++ b/browser/components/aboutlogins/AboutLoginsChild.jsm
-@@ -120,18 +120,6 @@ class AboutLoginsChild extends JSWindowActorChild {
- this.sendAsyncMessage("AboutLogins:Import");
- break;
- }
-- case "AboutLoginsOpenMobileAndroid": {
-- this.sendAsyncMessage("AboutLogins:OpenMobileAndroid", {
-- source: event.detail,
-- });
-- break;
-- }
-- case "AboutLoginsOpenMobileIos": {
-- this.sendAsyncMessage("AboutLogins:OpenMobileIos", {
-- source: event.detail,
-- });
-- break;
-- }
- case "AboutLoginsOpenPreferences": {
- this.sendAsyncMessage("AboutLogins:OpenPreferences");
- break;
-diff --git a/browser/components/aboutlogins/AboutLoginsParent.jsm b/browser/components/aboutlogins/AboutLoginsParent.jsm
-index 81141c342a..724369962b 100644
---- a/browser/components/aboutlogins/AboutLoginsParent.jsm
-+++ b/browser/components/aboutlogins/AboutLoginsParent.jsm
-@@ -286,31 +286,6 @@ class AboutLoginsParent extends JSWindowActorParent {
- });
- break;
- }
-- case "AboutLogins:OpenMobileAndroid": {
-- const MOBILE_ANDROID_URL_PREF =
-- "signon.management.page.mobileAndroidURL";
-- const linkTrackingSource = message.data.source;
-- let MOBILE_ANDROID_URL = Services.prefs.getStringPref(
-- MOBILE_ANDROID_URL_PREF
-- );
-- // Append the `utm_creative` query parameter value:
-- MOBILE_ANDROID_URL += linkTrackingSource;
-- ownerGlobal.openWebLinkIn(MOBILE_ANDROID_URL, "tab", {
-- relatedToCurrent: true,
-- });
-- break;
-- }
-- case "AboutLogins:OpenMobileIos": {
-- const MOBILE_IOS_URL_PREF = "signon.management.page.mobileAppleURL";
-- const linkTrackingSource = message.data.source;
-- let MOBILE_IOS_URL = Services.prefs.getStringPref(MOBILE_IOS_URL_PREF);
-- // Append the `utm_creative` query parameter value:
-- MOBILE_IOS_URL += linkTrackingSource;
-- ownerGlobal.openWebLinkIn(MOBILE_IOS_URL, "tab", {
-- relatedToCurrent: true,
-- });
-- break;
-- }
- case "AboutLogins:OpenPreferences": {
- ownerGlobal.openPreferences("privacy-logins");
- break;
-diff --git a/browser/components/aboutlogins/content/aboutLogins.html b/browser/components/aboutlogins/content/aboutLogins.html
-index 33c380a898..fdc1ccb38c 100644
---- a/browser/components/aboutlogins/content/aboutLogins.html
-+++ b/browser/components/aboutlogins/content/aboutLogins.html
-@@ -274,9 +274,6 @@
- <button role="menuitem" class="menuitem-button menuitem-preferences ghost-button" data-event-name="AboutLoginsOpenPreferences" data-l10n-id="menu-menuitem-preferences"></button>
- <hr role="separator" class="menuitem-separator"></hr>
- <button role="menuitem" class="menuitem-button menuitem-help ghost-button" data-event-name="AboutLoginsGetHelp" data-l10n-id="about-logins-menu-menuitem-help"></button>
-- <hr role="separator" class="menuitem-separator"></hr>
-- <button role="menuitem" class="menuitem-button menuitem-mobile menuitem-mobile-android ghost-button" data-event-name="AboutLoginsOpenMobileAndroid" data-l10n-id="menu-menuitem-android-app"></button>
-- <button role="menuitem" class="menuitem-button menuitem-mobile menuitem-mobile-ios ghost-button" data-event-name="AboutLoginsOpenMobileIos" data-l10n-id="menu-menuitem-iphone-app"></button>
- </ul>
- </template>
+diff --git a/browser/components/protections/content/protections.ftl b/browser/components/protections/content/protections.ftl
+index 5ac8a7b08c..fec81698e3 100644
+--- a/browser/components/protections/content/protections.ftl
++++ b/browser/components/protections/content/protections.ftl
+@@ -18,7 +18,7 @@ get-vpn-link = Get { -mozilla-vpn-brand-name }
+
+ vpn-title-subscribed = VPN: Subscribed
+ # Note This text is not being translated, and the <br> will need to be removed if or when it does get translated
+-vpn-header-content-subscribed = Using the { -mozilla-vpn-brand-name } encrypts all your traffic and hides your location — on up to 5 devices. Get the most from your subscription — add it from <br> the <a data-l10n-name="vpn-google-playstore-link">Google Play Store</a> or <a data-l10n-name="vpn-app-store-link">Apple App Store</a>.
++vpn-header-content-subscribed = Using the { -mozilla-vpn-brand-name } encrypts all your traffic and hides your location — on up to 5 devices.
+ vpn-banner-header = Protection that extends beyond the browser
+ # Note This text is not being translated, and the <br> will need to be removed if or when it does get translated
diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html
-index e7aac37ed6..164a07988d 100644
+index e33c814f62..5698f2b3e9 100644
--- a/browser/components/protections/content/protections.html
+++ b/browser/components/protections/content/protections.html
-@@ -115,24 +115,6 @@
- <div id="graph-total-summary"></div>
- </div>
- </div>
-- <div id="mobile-hanger" class="card-body hidden">
-- <div class="body-wrapper">
-- <button class="exit-icon" data-l10n-id="protections-close-button2"></button>
-- <div id="etp-mobile-content">
-- <img class="mobile-app-icon" src="chrome://browser/content/logos/etp-mobile.svg"/>
-- <span>
-- <h2 class="card-title" data-l10n-id="mobile-app-title"></h2>
-- <p class="content">
-- <span data-l10n-id="mobile-app-card-content"></span>
-- <span target="_blank" id="mobile-app-links" data-l10n-id="mobile-app-links">
-- <a target="_blank" id="android-mobile-inline-link" data-l10n-name="android-mobile-inline-link" href=""></a>
-- <a target="_blank" id="ios-mobile-inline-link" data-l10n-name="ios-mobile-inline-link" href=""></a>
-- </span>
-- </p>
-- </span>
-- </div>
-- </div>
-- </div>
- </div>
- <!-- Markup for Monitor card. -->
- <section class="card card-no-hover monitor-card hidden">
-@@ -256,20 +238,6 @@
- </div>
- <div class="card-body hidden">
- <div id="lockwise-body-content" class="body-wrapper">
-- <div class="no-logins hidden">
-- <button class="exit-icon" data-l10n-id="protections-close-button2"></button>
-- <img class="mobile-app-icon" src="chrome://browser/content/logos/lockwise-mobile.svg"/>
-- <span>
-- <h2 class="card-title" data-l10n-id="lockwise-mobile-app-title"></h2>
-- <p class="content">
-- <span data-l10n-id="lockwise-no-logins-card-content"></span>
-- <span target="_blank" id="lockwise-app-links" data-l10n-id="lockwise-app-links" href="">
-- <a id="lockwise-android-inline-link" target="_blank" data-l10n-name="lockwise-android-inline-link"></a>
-- <a id="lockwise-ios-inline-link" target="_blank" data-l10n-name="lockwise-ios-inline-link"></a>
-- </span>
-- </p>
-- </span>
-- </div>
- </div>
- </div>
- </section>
-diff --git a/browser/locales/en-US/browser/aboutLogins.ftl b/browser/locales/en-US/browser/aboutLogins.ftl
-index 03feeef059..f9580d0f8f 100644
---- a/browser/locales/en-US/browser/aboutLogins.ftl
-+++ b/browser/locales/en-US/browser/aboutLogins.ftl
-@@ -35,8 +35,6 @@ menu-menuitem-preferences =
- *[other] Preferences
- }
- about-logins-menu-menuitem-help = Help
--menu-menuitem-android-app = { -lockwise-brand-short-name } for Android
--menu-menuitem-iphone-app = { -lockwise-brand-short-name } for iPhone and iPad
-
- ## Login List
-
-diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js
-index 5cd41b3e36..ba6b2bc4d8 100644
---- a/devtools/client/definitions.js
-+++ b/devtools/client/definitions.js
-@@ -73,11 +73,6 @@ loader.lazyGetter(
- "ApplicationPanel",
- () => require("devtools/client/application/panel").ApplicationPanel
- );
--loader.lazyGetter(
-- this,
-- "WhatsNewPanel",
-- () => require("devtools/client/whats-new/panel").WhatsNewPanel
--);
-
- // Other dependencies
- loader.lazyRequireGetter(
-@@ -529,7 +524,6 @@ var defaultTools = [
- Tools.dom,
- Tools.accessibility,
- Tools.application,
-- Tools.whatsnew,
- ];
-
- exports.defaultTools = defaultTools;
-diff --git a/devtools/client/jar.mn b/devtools/client/jar.mn
-index af42ded2ae..86cf0a650f 100644
---- a/devtools/client/jar.mn
-+++ b/devtools/client/jar.mn
-@@ -367,10 +367,6 @@ devtools.jar:
- content/application/src/components/service-workers/Worker.css (application/src/components/service-workers/Worker.css)
- content/application/src/components/ui/UIButton.css (application/src/components/ui/UIButton.css)
-
-- # WhatsNew panel
-- content/whats-new/index.html (whats-new/index.html)
-- content/whats-new/src/whats-new.css (whats-new/src/whats-new.css)
--
- # about:profiling
- skin/aboutprofiling.css (themes/aboutprofiling.css)
- content/performance-new/aboutprofiling/initializer.js (performance-new/aboutprofiling/initializer.js)
-diff --git a/devtools/client/moz.build b/devtools/client/moz.build
-index 0dd219c13c..b589c7ac4d 100644
---- a/devtools/client/moz.build
-+++ b/devtools/client/moz.build
-@@ -28,7 +28,6 @@ DIRS += [
- 'styleeditor',
- 'themes',
- 'webconsole',
-- 'whats-new',
- ]
+@@ -303,8 +303,6 @@
+ </div>
+ <p class="content" data-l10n-id="vpn-header-content"></p>
+ <p class="content subscribed" data-l10n-id="vpn-header-content-subscribed">
+- <a target="_blank" id="vpn-google-playstore-link" data-l10n-name="vpn-google-playstore-link"></a>
+- <a target="_blank" id="vpn-app-store-link" data-l10n-name="vpn-app-store-link"></a>
+ </p>
+ </div>
+ <a target="_blank" id="get-vpn-link" data-l10n-id="get-vpn-link"></a>
+diff --git a/browser/components/protections/content/vpn-card.js b/browser/components/protections/content/vpn-card.js
+index 2417f1a641..698c48ccc3 100644
+--- a/browser/components/protections/content/vpn-card.js
++++ b/browser/components/protections/content/vpn-card.js
+@@ -23,22 +23,6 @@ export default class VPNCard {
+ vpnLink.addEventListener("click", () => {
+ this.doc.sendTelemetryEvent("click", "vpn_card_link");
+ });
+- let androidVPNAppLink = document.getElementById(
+- "vpn-google-playstore-link"
+- );
+- androidVPNAppLink.href = RPMGetStringPref(
+- "browser.contentblocking.report.vpn-android.url"
+- );
+- androidVPNAppLink.addEventListener("click", () => {
+- document.sendTelemetryEvent("click", "vpn_app_link_android");
+- });
+- let iosVPNAppLink = document.getElementById("vpn-app-store-link");
+- iosVPNAppLink.href = RPMGetStringPref(
+- "browser.contentblocking.report.vpn-ios.url"
+- );
+- iosVPNAppLink.addEventListener("click", () => {
+- document.sendTelemetryEvent("click", "vpn_app_link_ios");
+- });
- JAR_MANIFESTS += ['jar.mn']
+ const vpnBanner = this.doc.querySelector(".vpn-banner");
+ const exitIcon = vpnBanner.querySelector(".exit-icon");