Issue 2871 - Honor the disabled flag for subscriptions

adblockplus/Api.jsm

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 75 matching lines @@
                  false);
     request.send();
     return request.responseText;
   },
   isSubscriptionListed: function(url)
   {
     return url in FilterStorage.knownSubscriptions;
   },
   addSubscription: function(url, title)
   {
-    let subscription = Subscription.fromURL(url);
+    let subscriptionToAdd = Subscription.fromURL(url);
     if (title)
-      subscription.title = title;
-    FilterStorage.addSubscription(subscription);
-    if (!subscription.lastDownload)
+      subscriptionToAdd.title = title;
+    FilterStorage.addSubscription(subscriptionToAdd);
+    let subscription = FilterStorage.knownSubscriptions[url];
+    if (subscription)
     {
-      Synchronizer.execute(subscription);
+      subscription.disabled = false;
+      if (!subscription.lastDownload)
+      {
+        Synchronizer.execute(subscription);
+      }
     }
   },
   removeSubscription: function(url)
   {
     FilterStorage.removeSubscription(
       FilterStorage.knownSubscriptions[url]);
   },
   getActiveSubscriptions: function()
   {
     let subscriptions = [];
     for (let i = 0; i < FilterStorage.subscriptions.length; i++)
     {
       let subscription = FilterStorage.subscriptions[i];
-      subscriptions.push({"title": subscription.title, "url": subscription.url});
+      if (!subscription.disabled)
+        subscriptions.push({"title": subscription.title, "url": subscription.url});
     }
     return subscriptions;
   },
   isLocal: function(url)
   {
     let uriObject = Services.io.newURI(url, null, null);
     return !uriObject.schemeIs("http") && !uriObject.schemeIs("https");
   },
   isPageWhitelisted: function(url)
   {
@@ skipping 91 matching lines @@
           {
             this.whitelistSite(data["url"], data["whitelisted"]);
             return {"success": true};
           }
           break;
       }
       return {"success": false, "error": "malformed request"};
     }).bind(this), "AdblockPlus:Api");
   }
 };