Issue 3890 - Fix "Downloading..." indication for subscriptions on the options page

messageResponder.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 46 matching lines @@
   }
 
   function convertObject(keys, obj)
   {
     var result = {};
     for (var i = 0; i < keys.length; i++)
       result[keys[i]] = obj[keys[i]];
     return result;
   }
 
-  var convertSubscription = convertObject.bind(null, ["disabled",
-    "downloadStatus", "homepage", "lastDownload", "title", "url"]);
+  function convertSubscription(subscription)
+  {
+    var obj = convertObject(["disabled", "downloadStatus", "homepage",
+                             "lastDownload", "title", "url"], subscription);
+    obj.isDownloading = Synchronizer.isExecuting(subscription);

[Thomas Greiner, 2016/04/06 14:19:43]

`Synchronizer.isExecuting()` is expecting a URL but you're passing in an object
so that shouldn't work from what I see.

[Sebastian Noack, 2016/04/06 17:22:22]

Well spotted. Done.

+    return obj;
+  }
+
   var convertFilter = convertObject.bind(null, ["text"]);
 
   var changeListeners = new global.ext.PageMap();
   var listenedPreferences = Object.create(null);
   var listenedFilterChanges = Object.create(null);
   var messageTypes = {
     "app": "app.respond",
     "filter": "filters.respond",
     "pref": "prefs.respond",
     "subscription": "subscriptions.respond"
@@ skipping 310 matching lines @@
       case "subscriptions.update":
         var subscriptions = message.url ? [Subscription.fromURL(message.url)] :
                             FilterStorage.subscriptions;
         for (var i = 0; i < subscriptions.length; i++)
         {
           var subscription = subscriptions[i];
           if (subscription instanceof DownloadableSubscription)
             Synchronizer.execute(subscription, true);
         }
         break;
-      case "subscriptions.isDownloading":
-        callback(Synchronizer.isExecuting(message.url));
-        break;
     }
   });
 })(this);