Issue 2720 - [Adblocking settings] Add the other filter lists category

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 76 matching lines @@
     request.send();
     return request.responseText;
   },
   isSubscriptionListed: function(url)
   {
     return url in FilterStorage.knownSubscriptions;
   },
   addSubscription: function(url, title)
   {
     let subscription = Subscription.fromURL(url);
-    subscription.title = title;
+    if (title)
+      subscription.title = title;
     FilterStorage.addSubscription(subscription);
     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});
+    }
+    return subscriptions;
+  },
   isLocal: function(url)
   {
     let uriObject = Services.io.newURI(url, null, null);
     return !uriObject.schemeIs("http") && !uriObject.schemeIs("https");
   },
   isPageWhitelisted: function(url)
   {
     return AdblockPlusApi.isLocal(url) || !!getWhitelistingFilter(url);
   },
   whitelistSite: function(url, whitelisted)
@@ skipping 43 matching lines @@
           return {"success": true, "value": this.acceptableAdsEnabled};
         case "setAcceptableAdsEnabled":
           if ("enable" in data)
           {
             this.acceptableAdsEnabled = !!data["enable"];
             return {"success": true};
           }
           break;
         case "getSubscriptionsXml":
           return {"success": true, "value": this.subscriptionsXml};
+        case "getActiveSubscriptions":
+          return {"success": true, "value": this.getActiveSubscriptions()};
         case "isSubscriptionListed":
           if ("url" in data)
           {
             return {"success": true,
                 "value": this.isSubscriptionListed(data["url"])};
           }
           break;
         case "addSubscription":
-          if ("url" in data && "title" in data)
+          if ("url" in data)
           {
             this.addSubscription(data["url"], data["title"]);
             return {"success": true};
           }
           break;
         case "removeSubscription":
           if ("url" in data)
           {
             this.removeSubscription(data["url"]);
             return {"success": true};
@@ skipping 14 matching lines @@
           {
             this.whitelistSite(data["url"], data["whitelisted"]);
             return {"success": true};
           }
           break;
       }
       return {"success": false, "error": "malformed request"};
     }).bind(this), "AdblockPlus:Api");
   }
 };