Issue 3851 - Implement subscribe link handling via process scripts

lib/ui.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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 let {Utils} = require("utils");
+let {port} = require("messaging");
 let {Prefs} = require("prefs");
 let {Policy} = require("contentPolicy");
 let {FilterStorage} = require("filterStorage");
 let {FilterNotifier} = require("filterNotifier");
 let {RequestNotifier} = require("requestNotifier");
 let {Filter} = require("filterClasses");
 let {Subscription, SpecialSubscription, DownloadableSubscription} = require("subscriptionClasses");
 let {Synchronizer} = require("synchronizer");
 let {KeySelector} = require("keySelector");
 let {Notification} = require("notification");
@@ skipping 408 matching lines @@
         return;
 
       this._showNotification(window, button, notification);
     });
 
     // Add "anti-adblock messages" notification
     initAntiAdblockNotification();
 
     // Frame script URL has to be randomized due to caching
     // (see https://bugzilla.mozilla.org/show_bug.cgi?id=1051238)
     let frameScript = "chrome://adblockplus/content/subscribeLinkHandler.js?" + Math.random();

[Erik, 2016/04/06 03:11:41]

should this line not be removed too?

[Wladimir Palant, 2016/04/18 15:38:40]

Done.

 
     // Initialize subscribe link handling
-    let callback = this.subscribeLinkClicked.bind(this);
-    let messageManager = Cc["@mozilla.org/globalmessagemanager;1"]
-                           .getService(Ci.nsIMessageListenerManager);
-    messageManager.loadFrameScript(frameScript, true);
-    messageManager.addMessageListener("AdblockPlus:SubscribeLink", callback);
-    onShutdown.add(() => {
-      messageManager.broadcastAsyncMessage("AdblockPlus:Shutdown", frameScript);
-      messageManager.removeDelayedFrameScript(frameScript);
-      messageManager.removeMessageListener("AdblockPlus:SubscribeLink", callback);
-    });
+    port.on("subscribeLinkClick", data => this.subscribeLinkClicked(data));
 
     // Execute first-run actions if a window is open already, otherwise it
     // will happen in applyToWindow() when a window is opened.
     this.firstRunActions(this.currentWindow);
   },
 
   addToolbarButton: function()
   {
     let {WindowObserver} = require("windowObserver");
     new WindowObserver(this);
@@ skipping 451 matching lines @@
           notifyUser();
         }
       }, false);
       request.send();
     }
     else
       notifyUser();
   },
 
   /**
-   * Called whenever subscribeLinkHandler.js intercepts clicks on abp: links
+   * Called whenever child/subscribeLinks module intercepts clicks on abp: links
    * as well as links to subscribe.adblockplus.org.
    */
-  subscribeLinkClicked: function(message)
+  subscribeLinkClicked: function({title, url,
+      mainSubscriptionTitle, mainSubscriptionURL})
   {
-    let {title, url, mainSubscriptionTitle, mainSubscriptionURL} = message.data;
     if (!url)
       return;
 
     // Default title to the URL
     if (!title)
       title = url;
 
     // Main subscription needs both title and URL
     if (mainSubscriptionTitle && !mainSubscriptionURL)
       mainSubscriptionTitle = null;
@@ skipping 954 matching lines @@
   ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)],
   ["abp-command-toggleshownotifications", "command", Notification.toggleIgnoreCategory.bind(Notification, "*", null)]
 ];
 
 onShutdown.add(function()
 {
   for (let window of UI.applicationWindows)
     if (UI.isBottombarOpen(window))
       UI.toggleBottombar(window);
 });