Issue 3839 - Adapt for Prefs event changes

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 42 matching lines @@
   var convertFilter = convertObject.bind(null, ["text"]);
 
   var changeListeners = null;
   var messageTypes = {
     "app": "app.listen",
     "filter": "filters.listen",
     "pref": "prefs.listen",
     "subscription": "subscriptions.listen"
   };
 
-  function sendMessage(type, action, args, page)
+  function sendMessage(type, action, args)
   {
-    var pages = page ? [page] : changeListeners.keys();
+    var pages = changeListeners.keys();

[Sebastian Noack, 2016/03/19 19:17:29]

This is unrelated, but since page is never specified, I used the chance to get
rid of the dead code here.

     for (var i = 0; i < pages.length; i++)
     {
       var filters = changeListeners.get(pages[i]);
-      if (filters[type] && filters[type].indexOf(action) >= 0)
+      var actions = filters[type];
+      if (actions && !(actions instanceof Array && actions.indexOf(action) == -1))

[Sebastian Noack, 2016/03/19 19:17:29]

filters.pref is an object now, not an array anymore. And filtering is done by
Prefs.on, so it can/must be skipped here.

       {
         pages[i].sendMessage({
           type:  messageTypes[type],
           action: action,
           args: args
         });
       }
     }
   }
 
@@ skipping 23 matching lines @@
       if (arg instanceof Subscription)
         return convertSubscription(arg);
       else if (arg instanceof Filter)
         return convertFilter(arg);
       else
         return arg;
     });
     sendMessage(type, action, args);
   }
 
-  function onPrefChange(name)
-  {
-    sendMessage("pref", name, [Prefs[name]]);
-  }
-
   global.ext.onMessage.addListener(function(message, sender, callback)
   {
     var listenerFilters = null;
     if (/\.listen$/.test(message.type))
     {
       if (!changeListeners)
       {
         changeListeners = new global.ext.PageMap();
         FilterNotifier.addListener(onFilterChange);
-        Prefs.onChanged.addListener(onPrefChange);
       }
 
       listenerFilters = changeListeners.get(sender.page);
       if (!listenerFilters)
       {
         listenerFilters = Object.create(null);
         changeListeners.set(sender.page, listenerFilters);
       }
     }
 
@@ skipping 162 matching lines @@
 
         if (!subscription)
           FilterStorage.removeFilter(filter);
         else
           FilterStorage.removeFilter(filter, subscription, message.index);
         break;
       case "prefs.get":
         callback(Prefs[message.key]);
         break;
       case "prefs.listen":
+        for (var preference in listenerFilters.pref)
+          Prefs.off(preference, listenerFilters.pref[preference]);
+
         if (message.filter)
-          listenerFilters.pref = message.filter;
+        {
+          listenerFilters.pref = Object.create(null);
+          message.filter.forEach(function(preference)
+          {
+            function callback()
+            {
+              sendMessage("prefs", preference, [Prefs[preference]]);
+            }
+
+            listenerFilters.pref[preference] = callback;
+            Prefs.on(preference, callback);
+          });
+        }
         else
           delete listenerFilters.pref;
         break;
       case "prefs.toggle":
         if (message.key == "notifications_ignoredcategories")
           NotificationStorage.toggleIgnoreCategory("*");
         else
           Prefs[message.key] = !Prefs[message.key];
         break;
       case "subscriptions.add":
@@ skipping 75 matching lines @@
           if (subscription instanceof DownloadableSubscription)
             Synchronizer.execute(subscription, true);
         }
         break;
       case "subscriptions.isDownloading":
         callback(Synchronizer.isExecuting(message.url));
         break;
     }
   });
 })(this);