From 403900b9335ac916e3506facd34130c808bc9f1f Mon Sep 17 00:00:00 2001 From: grizzlyuser Date: Wed, 3 Jun 2020 23:14:40 +0300 Subject: libre/iceweasel: Remove references to Lockwise on nonfree app stores While Firefox Lockwise itself is libre-licensed (apps, website, etc), the references to Android and iOS versions lead to Google Play and Apple app stores, all of which execute some JavaScript that is not clearly licensed, so can be considered nonfree. These references can be found on about:logins page as items in "..." menu, and on about:protections page in promo cards. Removed them for now. Could also change the URLs to open the Lockwise website, but although libre licensed, it still has large links to nonfree app stores and Firefox on the front page, so that wouldn't be a huge improvement. --- libre/iceweasel/libre.patch | 236 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 236 insertions(+) (limited to 'libre') diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch index 136a33a46..f4085b4a6 100644 --- a/libre/iceweasel/libre.patch +++ b/libre/iceweasel/libre.patch @@ -395,3 +395,239 @@ index 4c4ea76..e0f2880 100644 -# The default set of protocol handlers for ircs: -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 8d055e583f..00837e77a3 100644 +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -1599,10 +1599,6 @@ pref("browser.contentblocking.report.monitor.how_it_works.url", "https://monitor + pref("browser.contentblocking.report.monitor.sign_in_url", "https://monitor.firefox.com/oauth/init?entrypoint=protection_report_monitor&utm_source=about-protections&email="); + pref("browser.contentblocking.report.manage_devices.url", "https://accounts.firefox.com/settings/clients"); + 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"); + + // 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"); +@@ -1733,11 +1729,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 }, +@@ -783,8 +781,6 @@ const listeners = { + "AboutLogins:OpenFAQ": ["AboutLoginsParent"], + "AboutLogins:GetHelp": ["AboutLoginsParent"], + "AboutLogins:OpenPreferences": ["AboutLoginsParent"], +- "AboutLogins:OpenMobileAndroid": ["AboutLoginsParent"], +- "AboutLogins:OpenMobileIos": ["AboutLoginsParent"], + "AboutLogins:OpenSite": ["AboutLoginsParent"], + "AboutLogins:SortChanged": ["AboutLoginsParent"], + "AboutLogins:Subscribe": ["AboutLoginsParent"], +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 @@ + + + +- +- +- + + + +diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html +index 5f2087bbe4..ca93a4fcda 100644 +--- a/browser/components/protections/content/protections.html ++++ b/browser/components/protections/content/protections.html +@@ -114,24 +114,6 @@ +
+ + +- + + + + +