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.

1 files changed, 236 insertions, 0 deletions

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 @@
+         <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.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 @@
+             <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">
+@@ -219,47 +201,6 @@
+             <button id="open-about-logins-button" class="primary" data-l10n-id="protection-report-view-logins-button"></button>
+           </div>
+         </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 class="has-logins hidden">
+-              <span class="number-of-logins block">
+-                <!-- Display number of stored logins here. -->
+-              </span>
+-              <span class="passwords-stored-text">
+-                <img class="icon-small" src= "chrome://browser/skin/login.svg"/>
+-                <span id="lockwise-passwords-stored">
+-                  <!-- Display message for stored logins here. -->
+-                  <a target="_blank" id="lockwise-how-it-works" data-l10n-name="lockwise-how-it-works" href=""></a>
+-                </span>
+-              </span>
+-              <span class="number-of-synced-devices block">
+-                <!-- Display number of synced devices here. -->
+-              </span>
+-              <span class="synced-devices-text">
+-                <img class="icon-small" src="chrome://browser/skin/sync.svg"/>
+-                <span>
+-                  <!-- Display message for status of synced devices here. -->
+-                </span>
+-                <a id="turn-on-sync" tabindex="0" class="hidden" href="" data-l10n-id="turn-on-sync"></a>
+-                <a id="manage-devices" target="_blank" class="hidden" href="" data-l10n-id="manage-connected-devices"></a>
+-              </span>
+-            </div>
+-          </div>
+-        </div>
+       </section>
+       <!-- Markup for Proxy card -->
+       <section class="card card-no-hover proxy-card hidden">
+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/browser/locales/en-US/browser/protections.ftl b/browser/locales/en-US/browser/protections.ftl
+index dc51592c0a..19e269bdd8 100644
+--- a/browser/locales/en-US/browser/protections.ftl
++++ b/browser/locales/en-US/browser/protections.ftl
+@@ -68,19 +68,12 @@ protections-close-button2 =
+   .aria-label = Close
+   .title = Close
+
+-mobile-app-title = Block ad trackers across more devices
+-mobile-app-card-content = Use the mobile browser with built-in protection against ad tracking.
+-mobile-app-links = { -brand-product-name } Browser for <a data-l10n-name="android-mobile-inline-link">Android</a> and <a data-l10n-name="ios-mobile-inline-link">iOS</a>
+-
+ lockwise-title = Never forget a password again
+ lockwise-title-logged-in = { -lockwise-brand-name }
+ lockwise-header-content = { -lockwise-brand-name } securely stores your passwords in your browser.
+ lockwise-header-content-logged-in = Securely store and sync your passwords to all your devices.
+ protection-report-view-logins-button = View Logins
+   .title = Go to Saved Logins
+-lockwise-mobile-app-title = Take your passwords everywhere
+-lockwise-no-logins-card-content = Use passwords saved in { -brand-short-name } on any device.
+-lockwise-app-links = { -lockwise-brand-name } for <a data-l10n-name="lockwise-android-inline-link">Android</a> and <a data-l10n-name="lockwise-ios-inline-link">iOS</a>
+
+ # This string is displayed after a large numeral that indicates the total number
+ # of email addresses being monitored. Don’t add $count to