Issue 417 - Reinitializing removed filter lists (Core/Firefox)

lib/filterListener.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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
@@ skipping 102 matching lines @@
     else if (match && match[1] == "subscription")
       onSubscriptionChange(match[2], item, newValue, oldValue);
     else
       onGenericChange(action, item);
   });
 
   if ("nsIStyleSheetService" in Ci)
     ElemHide.init();
   else
     flushElemHide = function() {};    // No global stylesheet in Chrome & Co.
-  FilterStorage.loadFromDisk();
+  FilterStorage.loadFromDisk(null, function()
+  {
+    // All attempts to restore filter settings have failed
+    // so we need to reinitialize them
+    if (addSubscription)
+    {
+      addSubscription(null);
+      filterlistsReinitialized = true;
+    }
+    else
+    {
+      let {UI} = require("ui");
+      UI.addSubscription(UI.currentWindow, null);
+      UI.filterlistsReinitialized = true;
+    }
+  });

[Wladimir Palant, 2014/05/26 15:08:46]

This is really the wrong place to do it. We are already running first-run
actions in Firefox from the UI module, whenever the version number changes -
that's where we already check whether filters and subscriptions got lost. If
anything, you might override the version number check for the
FilterStorage.subscriptions.length == 0 scenario.

[Thomas Greiner, 2014/05/26 17:45:38]

Done.

 
   TimeLine.log("done initializing data structures");
 
   Services.obs.addObserver(HistoryPurgeObserver, "browser:purge-session-history", true);
   onShutdown.add(function()
   {
     Services.obs.removeObserver(HistoryPurgeObserver, "browser:purge-session-history");
   });
   TimeLine.log("done adding observers");
 
@@ skipping 134 matching lines @@
     defaultMatcher.clear();
     ElemHide.clear();
     for (let subscription of FilterStorage.subscriptions)
       if (!subscription.disabled)
         subscription.filters.forEach(addFilter);
     flushElemHide();
   }
   else if (action == "save")
     isDirty = 0;
 }