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

lib/ui.js

Index: lib/ui.js
===================================================================
--- a/lib/ui.js
+++ b/lib/ui.js
@@ -795,14 +795,17 @@
         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)