From e213396af554e033e4ecc7d1de72465ffcff5997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Malte=20J=C3=BCrgens?= <maltejur@dismail.de>
Date: Wed, 9 Mar 2022 11:34:01 +0000
Subject: [PATCH] Add `privacy-preferences.patch`

---
 assets/patches.txt                           |  2 +-
 patches/ui-patches/hide-safe-browsing.patch  | 21 -------
 patches/ui-patches/privacy-preferences.patch | 62 ++++++++++++++++++++
 3 files changed, 63 insertions(+), 22 deletions(-)
 delete mode 100644 patches/ui-patches/hide-safe-browsing.patch
 create mode 100644 patches/ui-patches/privacy-preferences.patch

diff --git a/assets/patches.txt b/assets/patches.txt
index 247f25c..689a8ce 100644
--- a/assets/patches.txt
+++ b/assets/patches.txt
@@ -11,8 +11,8 @@ patches/sed-patches/allow-searchengines-non-esr.patch
 patches/sed-patches/disable-pocket.patch
 patches/sed-patches/remove-internal-plugin-certs.patch
 patches/sed-patches/stop-undesired-requests.patch
-patches/ui-patches/hide-safe-browsing.patch
 patches/ui-patches/pref-naming.patch
+patches/ui-patches/privacy-preferences.patch
 patches/ui-patches/remove-branding-urlbar.patch
 patches/ui-patches/remove-cfrprefs.patch
 patches/ui-patches/remove-organization-policy-banner.patch
diff --git a/patches/ui-patches/hide-safe-browsing.patch b/patches/ui-patches/hide-safe-browsing.patch
deleted file mode 100644
index 721111b..0000000
--- a/patches/ui-patches/hide-safe-browsing.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a//browser/components/preferences/privacy.inc.xhtml
-+++ b//browser/components/preferences/privacy.inc.xhtml
-@@ -1008,15 +1008,15 @@
- 
- <!-- addons, forgery (phishing) UI Security -->
- <groupbox id="browsingProtectionGroup" data-category="panePrivacy" hidden="true">
--  <label><html:h2 data-l10n-id="security-browsing-protection"/></label>
--  <hbox align = "center">
-+  <label><html:h2 data-l10n-id="security-browsing-protection" hidden="true"/></label>
-+  <hbox align = "center" hidden="true">
-     <checkbox id="enableSafeBrowsing"
-               data-l10n-id="security-enable-safe-browsing"
-               class="tail-with-learn-more"/>
-     <label id="enableSafeBrowsingLearnMore"
-            class="learnMore" is="text-link" data-l10n-id="security-enable-safe-browsing-link"/>
-   </hbox>
--  <vbox class="indent">
-+  <vbox class="indent" hidden="true">
-     <checkbox id="blockDownloads"
-               data-l10n-id="security-block-downloads"/>
-     <checkbox id="blockUncommonUnwanted"
diff --git a/patches/ui-patches/privacy-preferences.patch b/patches/ui-patches/privacy-preferences.patch
new file mode 100644
index 0000000..ab6899a
--- /dev/null
+++ b/patches/ui-patches/privacy-preferences.patch
@@ -0,0 +1,62 @@
+--- a/browser/components/preferences/privacy.inc.xhtml
++++ b/browser/components/preferences/privacy.inc.xhtml
+@@ -54,7 +54,7 @@
+         </description>
+       </vbox>
+     </hbox>
+-    <vbox id="contentBlockingCategories">
++    <vbox id="contentBlockingCategories" hidden="true">
+       <radiogroup id="contentBlockingCategoryRadio"
+                   preference="browser.contentblocking.category"
+                   aria-labelledby="trackingProtectionMenuDesc">
+@@ -535,7 +535,7 @@
+ <!-- History -->
+ <groupbox id="historyGroup" data-category="panePrivacy" hidden="true">
+   <label><html:h2 data-l10n-id="history-header"/></label>
+-  <hbox align="center">
++  <hbox align="center" hidden="true">
+     <label id="historyModeLabel"
+            control="historyMode"
+            data-l10n-id="history-remember-label"/>
+@@ -585,8 +585,9 @@
+         <vbox>
+           <checkbox id="privateBrowsingAutoStart"
+                     data-l10n-id="history-private-browsing-permanent"
+-                    preference="browser.privatebrowsing.autostart"/>
+-          <vbox class="indent">
++                    preference="browser.privatebrowsing.autostart"
++                    hidden="true" />
++          <vbox>
+             <checkbox id="rememberHistory"
+                       data-l10n-id="history-remember-browser-option"
+                       preference="places.history.enabled"/>
+@@ -1015,15 +1016,15 @@
+ 
+ <!-- addons, forgery (phishing) UI Security -->
+ <groupbox id="browsingProtectionGroup" data-category="panePrivacy" hidden="true">
+-  <label><html:h2 data-l10n-id="security-browsing-protection"/></label>
+-  <hbox align = "center">
++  <label><html:h2 data-l10n-id="security-browsing-protection" hidden="true"/></label>
++  <hbox align = "center" hidden="true">
+     <checkbox id="enableSafeBrowsing"
+               data-l10n-id="security-enable-safe-browsing"
+               class="tail-with-learn-more"/>
+     <label id="enableSafeBrowsingLearnMore"
+            class="learnMore" is="text-link" data-l10n-id="security-enable-safe-browsing-link"/>
+   </hbox>
+-  <vbox class="indent">
++  <vbox class="indent" hidden="true">
+     <checkbox id="blockDownloads"
+               data-l10n-id="security-block-downloads"/>
+     <checkbox id="blockUncommonUnwanted"
+--- a/browser/locales/en-US/browser/preferences/preferences.ftl
++++ b/browser/locales/en-US/browser/preferences/preferences.ftl
+@@ -1107,7 +1107,7 @@ addressbar-suggestions-settings = Change preferences for search engine suggestio
+ 
+ content-blocking-enhanced-tracking-protection = Enhanced Tracking Protection
+ 
+-content-blocking-section-top-level-description = Trackers follow you around online to collect information about your browsing habits and interests. { -brand-short-name } blocks many of these trackers and other malicious scripts.
++content-blocking-section-top-level-description = LibreWolf supports - and it enables by default - Enhanced Tracking Protection in Strict mode. This is one of the most important settings in the browser, as it provides state partitioning, strict blocking lists and other neat privacy features. We do not recommend changing to other modes.
+ 
+ content-blocking-learn-more = Learn more
+