Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1388574 - Use the correct pref to gate the Application Reputation lists. r=hchang

Browse Source 
MozReview-Commit-ID: 1ZuxnbgsOMX

--HG--
extra : rebase_source : 4984101882f1cfc16d07df78752c1a5aa18fadb4
This commit is contained in:
Francois Marier 2017-08-23 13:40:50 -07:00
parent 719c2b26b8
commit a014fe4f74
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
toolkit/components/url-classifier/SafeBrowsing.jsm
View File

@ -134,6 +134,7 @@ this.SafeBrowsing = {
initialized: false,
phishingEnabled: false,
malwareEnabled: false,
downloadsEnabled: false,
passwordsEnabled: false,
trackingEnabled: false,
blockedEnabled: false,
@ -213,6 +214,7 @@ this.SafeBrowsing = {
this.phishingEnabled = Services.prefs.getBoolPref("browser.safebrowsing.phishing.enabled");
this.malwareEnabled = Services.prefs.getBoolPref("browser.safebrowsing.malware.enabled");
this.downloadsEnabled = Services.prefs.getBoolPref("browser.safebrowsing.downloads.enabled");
this.passwordsEnabled = Services.prefs.getBoolPref("browser.safebrowsing.passwords.enabled");
this.trackingEnabled = Services.prefs.getBoolPref("privacy.trackingprotection.enabled") || Services.prefs.getBoolPref("privacy.trackingprotection.pbmode.enabled");
this.blockedEnabled = Services.prefs.getBoolPref("browser.safebrowsing.blockedURIs.enabled");
@ -327,11 +329,14 @@ this.SafeBrowsing = {
},
controlUpdateChecking() {
log("phishingEnabled:", this.phishingEnabled, "malwareEnabled:",
this.malwareEnabled, "passwordsEnabled:", this.passwordsEnabled,
log("phishingEnabled:", this.phishingEnabled,
"malwareEnabled:", this.malwareEnabled,
"downloadsEnabled:", this.downloadsEnabled,
"passwordsEnabled:", this.passwordsEnabled,
"trackingEnabled:", this.trackingEnabled,
"blockedEnabled:", this.blockedEnabled, "trackingAnnotations",
this.trackingAnnotations, "flashBlockEnabled", this.flashBlockEnabled,
"blockedEnabled:", this.blockedEnabled,
"trackingAnnotations", this.trackingAnnotations,
"flashBlockEnabled", this.flashBlockEnabled,
"flashInfobarListEnabled:", this.flashInfobarListEnabled);
let listManager = Cc["@mozilla.org/url-classifier/listmanager;1"].
@ -352,14 +357,14 @@ this.SafeBrowsing = {
}
}
for (let i = 0; i < this.downloadBlockLists.length; ++i) {
if (this.malwareEnabled) {
if (this.downloadsEnabled) {
listManager.enableUpdate(this.downloadBlockLists[i]);
} else {
listManager.disableUpdate(this.downloadBlockLists[i]);
}
}
for (let i = 0; i < this.downloadAllowLists.length; ++i) {
if (this.malwareEnabled) {
if (this.downloadsEnabled) {
listManager.enableUpdate(this.downloadAllowLists[i]);
} else {
listManager.disableUpdate(this.downloadAllowLists[i]);