From fcfd61829a1edd8519e3965f201f575d70a84239 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Wed, 25 Apr 2018 01:31:25 +0200
Subject: Honor browser.safebrowsing.UI.enabled

This resolves #266
---
 browser/components/preferences/in-content/security.js  | 12 ++++++++++++
 browser/components/preferences/in-content/security.xul |  8 ++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'browser/components')

diff --git a/browser/components/preferences/in-content/security.js b/browser/components/preferences/in-content/security.js
index a8ad28c7e..0d7af39a3 100644
--- a/browser/components/preferences/in-content/security.js
+++ b/browser/components/preferences/in-content/security.js
@@ -168,12 +168,24 @@ var gSecurityPane = {
     let safeBrowsingPhishingPref = document.getElementById("browser.safebrowsing.phishing.enabled");
     let safeBrowsingMalwarePref = document.getElementById("browser.safebrowsing.malware.enabled");
 
+    let safeBrowsingUIPref = document.getElementById("browser.safebrowsing.UI.enabled");
+    let safeBrowsingUISep = document.getElementById("safeBrowsingUISep");
+    let safeBrowsingUIGroup = document.getElementById("safeBrowsingUIGroup");
+
     let blockDownloadsPref = document.getElementById("browser.safebrowsing.downloads.enabled");
     let malwareTable = document.getElementById("urlclassifier.malwareTable");
 
     let blockUnwantedPref = document.getElementById("browser.safebrowsing.downloads.remote.block_potentially_unwanted");
     let blockUncommonPref = document.getElementById("browser.safebrowsing.downloads.remote.block_uncommon");
 
+    if (safeBrowsingUIPref.value == false) {
+      safeBrowsingUISep.setAttribute("hidden", "true");
+      safeBrowsingUIGroup.setAttribute("hidden", "true");
+    } else {
+      safeBrowsingUISep.removeAttribute("hidden");
+      safeBrowsingUIGroup.removeAttribute("hidden");
+    }
+      
     enableSafeBrowsing.addEventListener("command", function() {
       safeBrowsingPhishingPref.value = enableSafeBrowsing.checked;
       safeBrowsingMalwarePref.value = enableSafeBrowsing.checked;
diff --git a/browser/components/preferences/in-content/security.xul b/browser/components/preferences/in-content/security.xul
index b7bdb9361..5dc8ad5e9 100644
--- a/browser/components/preferences/in-content/security.xul
+++ b/browser/components/preferences/in-content/security.xul
@@ -28,6 +28,10 @@
               name="browser.safebrowsing.phishing.enabled"
               type="bool"/>
 
+  <preference id="browser.safebrowsing.UI.enabled"
+              name="browser.safebrowsing.UI.enabled"
+              type="bool"/>
+
   <preference id="browser.safebrowsing.downloads.enabled"
               name="browser.safebrowsing.downloads.enabled"
               type="bool"/>
@@ -73,8 +77,8 @@
             accesskey="&addonExceptions.accesskey;"/>
   </hbox>
 
-  <separator class="thin"/>
-  <vbox align="start">
+  <separator id="safeBrowsingUISep" class="thin"/>
+  <vbox id="safeBrowsingUIGroup" align="start">
     <checkbox id="enableSafeBrowsing"
               label="&enableSafeBrowsing.label;"
               accesskey="&enableSafeBrowsing.accesskey;" />
-- 
cgit v1.2.3