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

background.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 202 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
-  var subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl);
-  if (subscription)
+  // Add "anti-adblock messages" subscription for new users and users updating from old ABP versions
+  if (!prevVersion || parseFloat(prevVersion) < 1.8)

[Wladimir Palant, 2014/05/05 15:23:15]

Please use Services.vc.compare() here as well.

   {
-    subscription.disabled = true;
-    FilterStorage.addSubscription(subscription);
-    if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
-      Synchronizer.execute(subscription);
+    var subscription = Subscription.fromURL(Prefs.subscriptions_antiadblockurl);
+    if (subscription)

[Wladimir Palant, 2014/05/05 15:23:15]

As with the other review, this should be:

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

+    {
+      subscription.disabled = true;
+      FilterStorage.addSubscription(subscription);
+      if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
+        Synchronizer.execute(subscription);
+    }
   }
 
   if (!addSubscription && !addAcceptable)
     return;
 
   function notifyUser()
   {
     ext.pages.open(ext.getURL("firstRun.html"));
   }
 
@@ skipping 354 matching lines @@
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);