Merge branch 'v0.9.5.3'

* v0.9.5.3: Fixed issue with enrolling users in Acceptable Ads.
uBlock-LLC · Feb 23, 2019 · b295c0c · b295c0c
2 parents dd0767b + c5308f1
commit b295c0c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/assets/ublock/filter-lists.json b/assets/ublock/filter-lists.json
@@ -44,6 +44,12 @@
         "group": "ads",
         "homeURL": "https://easylist-downloads.adblockplus.org/easylist.txt"
         },
+    "easylist-downloads.adblockplus.org/exceptionrules.txt": {
+        "off": true,
+        "title": "Acceptable Ads",
+        "group": "ads",
+        "homeURL": "https://easylist-downloads.adblockplus.org/exceptionrules.txt"
+        },
     "abp-filters-anti-cv/english.txt": {
         "title": "ABP Anti-Circumvention Filter List",
         "group": "ads",
@@ -86,6 +92,7 @@
         "homeURL": "https://easylist-downloads.adblockplus.org/easylistitaly.txt"
         },
     "easylist-downloads.adblockplus.org/easyprivacy.txt": {
+        "off": true,
         "title": "EasyPrivacy",
         "group": "privacy",
         "homeURL": "https://easylist-downloads.adblockplus.org/easyprivacy.txt"
@@ -169,6 +176,7 @@
         "homeURL": ""
         },
     "mirror1.malwaredomains.com/files/justdomains": {
+        "off": true,
         "title": "Malware domains",
         "group": "malware",
         "homeURL": "https://mirror1.malwaredomains.com/files/justdomains"
@@ -294,6 +302,7 @@
         "homeURL": ""
         },
     "www.malwaredomainlist.com/hostslist/hosts.txt": {
+        "off": true,
         "title": "Malware Domain List",
         "group": "malware",
         "homeURL": "http://www.malwaredomainlist.com/hostslist/hosts.txt"

diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "uBlock",
-    "version": "0.9.5.13",
+    "version": "0.9.5.14",
 
     "default_locale": "en",
     "description": "__MSG_extShortDesc__",

diff --git a/src/js/background.js b/src/js/background.js
@@ -91,8 +91,8 @@ return {
 
     // read-only
     systemSettings: {
-        compiledMagic: 'eopszukpnabe',
-        selfieMagic: 'menhiasrxabe'
+        compiledMagic: 'eopszukpsabe',
+        selfieMagic: 'menhiasrsabe'
     },
     restoreBackupSettings: {
         lastRestoreFile: '',
@@ -147,7 +147,8 @@ return {
 
     // so that I don't have to care for last comma
     dummy: 0,
-    turnOffAA: true
+    turnOffAA: true,
+    versionUpdateTo13: false
 };
 
 /******************************************************************************/

diff --git a/src/js/start.js b/src/js/start.js
@@ -206,7 +206,7 @@ var onInstalled = function() {
     var onVersionRead = function(store) {
 
         var lastVersion = store.extensionLastVersion || '0.0.0.0';
-    
+
         var firstInstall = lastVersion === '0.0.0.0';
 
         var onDataReceived = function(data) {
@@ -220,6 +220,9 @@ var onInstalled = function() {
         }
 
         if(!firstInstall) {
+            if(lastVersion == "0.9.5.12" || (lastVersion == "0.9.5.13" && vAPI.browserInfo.flavor == "Firefox")) {
+                µb.versionUpdateTo13 = true;
+            }
             return;    
         } else {
             µb.turnOffAA = false;

diff --git a/src/js/storage.js b/src/js/storage.js
@@ -192,7 +192,7 @@
 µBlock.getAvailableLists = function(callback) {
     var availableLists = {};
     var relocationMap = {};
-
+    var locationOfAA = 'assets/thirdparties/easylist-downloads.adblockplus.org/exceptionrules.txt';
     var fixLocation = function(location) {
         // https://github.com/uBlockAdmin/uBlock/issues/418
         // We now support built-in external filter lists
@@ -206,6 +206,9 @@
     var onSelectedListsLoaded = function(store) {
         var µb = µBlock;
         var lists = store.remoteBlacklists;
+        if(lists.hasOwnProperty(locationOfAA) && µb.versionUpdateTo13) {
+            delete lists[locationOfAA];
+        } 
         var locations = Object.keys(lists);
         var location, availableEntry, storedEntry;
         var off;
@@ -273,7 +276,6 @@
             }
             availableLists[location] = entry;
         }
-        let locationOfAA = 'assets/thirdparties/easylist-downloads.adblockplus.org/exceptionrules.txt';
         if(availableLists.hasOwnProperty(locationOfAA) !== false) {
             availableLists[locationOfAA].off = µb.turnOffAA;
         }