Issue 3880 - Improve behavior of Safari content blocker option

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 53 matching lines @@
     return result;
   }
 
   var convertSubscription = convertObject.bind(null, ["disabled",
     "downloadStatus", "homepage", "lastDownload", "title", "url"]);
   var convertFilter = convertObject.bind(null, ["text"]);
 
   var changeListeners = new global.ext.PageMap();
   var listenedPreferences = Object.create(null);
   var listenedFilterChanges = Object.create(null);
+  var safariRestartRequired = null;
   var messageTypes = {
     "app": "app.respond",
     "filter": "filters.respond",
     "pref": "prefs.respond",
     "subscription": "subscriptions.respond"
   };
 
   function sendMessage(type, action)
   {
     var pages = changeListeners.keys();
@@ skipping 98 matching lines @@
             safariContentBlocker: "safari" in global
                 && "extension" in global.safari
                 && "setContentBlocker" in global.safari.extension
           });
         }
         else
           callback(info[message.what]);
         break;
       case "app.listen":
         getListenerFilters(sender.page).app = message.filter;
+        if (message.filter.indexOf("safariRestartRequired") != -1)
+        {
+          if (safariRestartRequired == null)
+          {
+            safariRestartRequired = false;
+            Prefs.on("safari_contentblocker", function()
+            {
+              safariRestartRequired = !Prefs.safari_contentblocker;
+              sendMessage("app", "safariRestartRequired", safariRestartRequired);
+            });
+          }
+
+          sender.page.sendMessage({
+            type: messageTypes.app,
+            action: "safariRestartRequired",
+            args: [safariRestartRequired]
+          });
+        }
         break;
       case "app.open":
         if (message.what == "options")
           ext.showOptions();
         break;
       case "filters.add":
         var result = require("filterValidation").parseFilter(message.text);
         var errors = [];
         if (result.error)
           errors.push(result.error.toString());
@@ skipping 193 matching lines @@
           if (subscription instanceof DownloadableSubscription)
             Synchronizer.execute(subscription, true);
         }
         break;
       case "subscriptions.isDownloading":
         callback(Synchronizer.isExecuting(message.url));
         break;
     }
   });
 })(this);