Fixed #267 - Missing integration changes for filterState

Author: hfiguiere

lib/csp.js

@@ -75,7 +75,7 @@ browser.webRequest.onHeadersReceived.addListener(details =>
         url: details.url, type: "CSP", docDomain: hostname,
         specificOnly
       }, cspMatch);
-      filterNotifier.emit("filter.hitCount", cspMatch, 0, 0, [details.tabId]);
+      recordBlockedRequest(cspMatch, [details.tabId]);
 
       details.responseHeaders.push({
         name: "Content-Security-Policy",

lib/filterConfiguration.js

@@ -33,6 +33,7 @@ const {Subscription, DownloadableSubscription,
 const {showOptions} = require("./options");
 const {recommendations} = require("../adblockpluscore/lib/recommendations");
 const {allowlistedDomainRegexp} = require("./allowlisting");
+const {filterState} = require("../adblockpluscore/lib/filterState");
 
 function convertObject(keys, obj)
 {
@@ -326,7 +327,7 @@ port.on("filters.importRaw", (message, sender) =>
   for (let filter of filters)
   {
     if (isActiveFilter(filter))
-      filter.disabled = false;
+      filterState.setEnabled(filter.text, true);
 
     filterStorage.addFilter(filter);
     addedFilters.add(filter.text);
@@ -396,8 +397,7 @@ port.on("filters.replace", (message, sender) =>
  */
 port.on("filters.toggle", (message, sender) =>
 {
-  let filter = Filter.fromText(message.text);
-  filter.disabled = message.disabled;
+  filterState.setEnabled(message.text, !message.disabled);
 });
 
 /**
@@ -485,7 +485,7 @@ port.on("subscriptions.get", (message, sender) =>
     {
       subscription.disabledFilters =
         Array.from(s.filterText(), Filter.fromText)
-        .filter(f => isActiveFilter(f) && f.disabled)
+        .filter(f => isActiveFilter(f) && !filterState.isEnabled(f.text))
         .map(f => f.text);
     }
     subscriptions.push(subscription);
@@ -578,7 +578,7 @@ function filtersAdd(text)
   if (filter)
   {
     if (isActiveFilter(filter))
-      filter.disabled = false;
+      filterState.setEnabled(text, true);
     filterStorage.addFilter(filter);
   }