Issue 7054 - Update the adblockpluscore dependency to 5cb695da5a40, adblockplusui to f86abf2efdfd

lib/firefoxDataCleanup.js

 /*

[Sebastian Noack, 2018/12/08 00:52:26]

FWIW, this file can be removed now. I don't think that we need to still support
the migration path from the legacy Gecko extension to Adblock Plus 3.5. If we do
so before landing this dependency update, we don't need to instruct the testers
to redundantly retest this logic.

[Jon Sonesen, 2018/12/09 15:52:09]

Acknowledged. So I should delete?

[Manish Jethani, 2018/12/10 07:48:27]

If we delete it, normally it would be a separate Trac ticket and patch, and then
we would rebase this patch on top of it.

What do you think, Sebastian?

[Sebastian Noack, 2018/12/11 13:04:04]

Yes, a seperate change would make sense. (Mind that I said "before landing" this
change.) Not sure if we need an issue for that though.

  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
 const {Filter, ActiveFilter} = require("../adblockpluscore/lib/filterClasses");
 const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier");
-const {FilterStorage} = require("../adblockpluscore/lib/filterStorage");
+const {filterStorage} = require("../adblockpluscore/lib/filterStorage");
 const {Prefs} = require("./prefs");
 const {SpecialSubscription} =
   require("../adblockpluscore/lib/subscriptionClasses");
 
 Promise.all([filterNotifier.once("load"), Prefs.untilLoaded]).then(() =>
 {
   if (Prefs.data_cleanup_done)
     return;
 
-  if (FilterStorage.firstRun)
+  if (filterStorage.firstRun)
   {
     Prefs.data_cleanup_done = true;
     return;
   }
 
   let haveHitCounts = [];
 
   for (let key in Filter.knownFilters)
   {
     let filter = Filter.knownFilters[key];
     if (!(filter instanceof ActiveFilter))
       continue;
 
     if (filter.disabled)
     {
       // Enable or replace disabled filters
       filter.disabled = false;
 
       for (let subscription of filter.subscriptions())
       {
         if (subscription instanceof SpecialSubscription)
         {
           while (true)
           {
-            let position = subscription.filters.indexOf(filter);
+            let position = subscription.searchFilter(filter);
             if (position < 0)
               break;
 
             let newFilter = Filter.fromText("! " + filter.text);
-            FilterStorage.removeFilter(filter, subscription, position);
-            FilterStorage.addFilter(newFilter, subscription, position);
+            filterStorage.removeFilter(filter, subscription, position);
+            filterStorage.addFilter(newFilter, subscription, position);
           }
         }
       }
     }
 
     if (filter.hitCount || filter.lastHit)
       haveHitCounts.push(filter);
   }
 
   // Reset hit statistics on any filters having them
-  FilterStorage.resetHitCounts(haveHitCounts);
+  filterStorage.resetHitCounts(haveHitCounts);
 
   // Remove any existing automatic backups
   let backups = [];
   for (let i = 1; i < 100; i++)
     backups.push(`file:patterns-backup${i}.ini`);
   browser.storage.local.remove(backups, () =>
   {
     Prefs.data_cleanup_done = true;
   });
 });