From 3d69f247d403f3b317c8f348b0d040392d8f704b Mon Sep 17 00:00:00 2001
From: fxbrit <ft.compiled@simplelogin.co>
Date: Sat, 22 May 2021 13:19:16 +0200
Subject: [PATCH] re-organize SB sections

---
 docs/Changelog.md | 29 +----------------------------
 librewolf.cfg     | 22 ++++++++++++----------
 2 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index e692ad4..16b7605 100755
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -677,40 +677,13 @@ defaultPref("devtools.performance.recording.ui-base-url", "http://localhost:5555
 defaultPref("devtools.devices.url", "");
 defaultPref("devtools.remote.adb.extensionURL", ""); // [FF64+]
 defaultPref("devtools.remote.adb.extensionID", ""); // default adb@mozilla.org [FF64+]
-defaultPref("browser.safebrowsing.id", "");
 defaultPref("browser.safebrowsing.blockedURIs.enabled", false);
-defaultPref("browser.safebrowsing.provider.google4.pver", "");
-defaultPref("browser.safebrowsing.provider.google4.advisoryName", "");
-defaultPref("browser.safebrowsing.provider.google4.advisoryURL", "");
-defaultPref("browser.safebrowsing.provider.google4.dataSharing.enabled", false);
-defaultPref("browser.safebrowsing.provider.google4.dataSharingURL", "");
-defaultPref("browser.safebrowsing.provider.google4.gethashURL", "");
-defaultPref("browser.safebrowsing.provider.google4.lists", "");
-defaultPref("browser.safebrowsing.provider.google4.reportMalwareMistakeURL", "");
-defaultPref("browser.safebrowsing.provider.google4.reportPhishMistakeURL", "");
-defaultPref("browser.safebrowsing.provider.google4.reportURL", "");
+defaultPref("browser.safebrowsing.provider.google4.gethashURL", "")
 defaultPref("browser.safebrowsing.provider.google4.updateURL", "");
-defaultPref("browser.safebrowsing.provider.google4.lastupdatetime", "");
-defaultPref("browser.safebrowsing.provider.google4.nextupdatetime", "");
-defaultPref("browser.safebrowsing.provider.google.advisoryName", "");
-defaultPref("browser.safebrowsing.provider.google.advisoryURL", "");
 defaultPref("browser.safebrowsing.provider.google.gethashURL", "");
-defaultPref("browser.safebrowsing.provider.google.lastupdatetime", "");
-defaultPref("browser.safebrowsing.provider.google.lists", "");
-defaultPref("browser.safebrowsing.provider.google.nextupdatetime", "");
-defaultPref("browser.safebrowsing.provider.google.pver", "");
-defaultPref("browser.safebrowsing.provider.google.reportMalwareMistakeURL", "");
-defaultPref("browser.safebrowsing.provider.google.reportPhishMistakeURL", "");
-defaultPref("browser.safebrowsing.provider.google.reportURL", "");
 defaultPref("browser.safebrowsing.provider.google.updateURL", "");
-defaultPref("browser.safebrowsing.provider.mozilla.pver", "");
-defaultPref("browser.safebrowsing.provider.mozilla.lists", "");
-defaultPref("browser.safebrowsing.provider.mozilla.lists.base", "");
-defaultPref("browser.safebrowsing.provider.mozilla.lists.content", "");
 defaultPref("browser.safebrowsing.provider.mozilla.updateURL", "");
 defaultPref("browser.safebrowsing.provider.mozilla.gethashURL", "");
-defaultPref("browser.safebrowsing.provider.mozilla.lastupdatetime", "");
-defaultPref("browser.safebrowsing.provider.mozilla.nextupdatetime", "");
 defaultPref("browser.safebrowsing.reportPhishURL", "");
 defaultPref("browser.safebrowsing.malware.enabled", false);
 defaultPref("browser.safebrowsing.passwords.enabled", false);
diff --git a/librewolf.cfg b/librewolf.cfg
index bf3cfbe..7822d04 100755
--- a/librewolf.cfg
+++ b/librewolf.cfg
@@ -393,26 +393,28 @@ lockPref("security.csp.enable", true);
 // # SAFE BROWSING
 // -------------------------------------------------------
 
+// re-enabling
 defaultPref("browser.safebrowsing.malware.enabled", false);
-defaultPref("browser.safebrowsing.passwords.enabled", false);
 defaultPref("browser.safebrowsing.phishing.enabled", false);
+defaultPref("browser.safebrowsing.blockedURIs.enabled", false);
+defaultPref("browser.safebrowsing.provider.google4.gethashURL", "");
+defaultPref("browser.safebrowsing.provider.google4.updateURL", "");
+defaultPref("browser.safebrowsing.provider.google.gethashURL", "");
+defaultPref("browser.safebrowsing.provider.google.updateURL", "");
 
-// downloads and unwanted software
+// downloads
 lockPref("browser.safebrowsing.downloads.enabled", false);
+
+// remote downloads, unwanted software, data sharing
+lockPref("browser.safebrowsing.passwords.enabled", false);
 lockPref("browser.safebrowsing.downloads.remote.enabled", false);
 lockPref("browser.safebrowsing.downloads.remote.block_dangerous", false);
 lockPref("browser.safebrowsing.downloads.remote.block_dangerous_host", false);
 lockPref("browser.safebrowsing.downloads.remote.block_potentially_unwanted", false);
 lockPref("browser.safebrowsing.downloads.remote.block_uncommon", false);
 lockPref("browser.safebrowsing.downloads.remote.url", "");
-
-defaultPref("browser.safebrowsing.blockedURIs.enabled", false);
-defaultPref("browser.safebrowsing.provider.google4.dataSharing.enabled", false);
-defaultPref("browser.safebrowsing.provider.google4.dataSharingURL", "");
-defaultPref("browser.safebrowsing.provider.google4.gethashURL", "");
-defaultPref("browser.safebrowsing.provider.google4.updateURL", "");
-defaultPref("browser.safebrowsing.provider.google.gethashURL", "");
-defaultPref("browser.safebrowsing.provider.google.updateURL", "");
+lockPref("browser.safebrowsing.provider.google4.dataSharing.enabled", false);
+lockPref("browser.safebrowsing.provider.google4.dataSharingURL", "");
 
 // commented all below as they do no harm and make enabling SB painful
 // could potentially at some point