Issue 424 - Anti-adblock filterlist disabled on extension update (Firefox)

lib/ui.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 777 matching lines @@
       {
         subscription.title = "Allow non-intrusive advertising";
         FilterStorage.addSubscription(subscription);
         if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
           Synchronizer.execute(subscription);
       }
       else
         addAcceptable = false;
     }
 
-    // Add "anti-adblock messages" subscription
-    let subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl);
-    if (subscription)
+    // Add "anti-adblock messages" subscription for new users and users updating from old ABP versions
+    if (Services.vc.compare(prevVersion, "2.5") < 0)
     {
-      subscription.disabled = true;
-      FilterStorage.addSubscription(subscription);
-      if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
-        Synchronizer.execute(subscription);
+      let subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl);
+      if (subscription)

[Wladimir Palant, 2014/05/05 15:20:54]

This should be:

if (subscription && !(subscription.url in FilterStorage.knownSubscriptions))

This will make sure we will never override the settings for a subscription that
is always there.

+      {
+        subscription.disabled = true;
+        FilterStorage.addSubscription(subscription);
+        if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
+          Synchronizer.execute(subscription);
+      }
     }
 
     if (!addSubscription && !addAcceptable)
       return;
 
     function notifyUser()
     {
       let {addTab} = require("appSupport");
       if (addTab)
       {
@@ skipping 1101 matching lines @@
   ["abp-command-contribute", "command", UI.openContributePage.bind(UI)],
   ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)]
 ];
 
 onShutdown.add(function()
 {
   for (let window in UI.applicationWindows)
     if (UI.isBottombarOpen(window))
       UI.toggleBottombar(window);
 });