Issue 2642 - Moved notifications code to separate module

lib/notificationHelper.js

 /*
  * 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
  * 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/>.
  */
 
+/** @module notificationHelper */
+
 let {startIconAnimation, stopIconAnimation} = require("icon");
 let {Utils} = require("utils");
 let {Notification: NotificationStorage} = require("notification");
+let {stringifyURL} = require("url");
+let {initAntiAdblockNotification} = require("antiadblockInit");
 
 let activeNotification = null;
 
 // Chrome on Linux does not fully support chrome.notifications until version 35
 // https://code.google.com/p/chromium/issues/detail?id=291485
 let canUseChromeNotifications = (function()
 {
   let info = require("info");
   if (info.platform == "chromium" && "notifications" in chrome)
   {
@@ skipping 87 matching lines @@
 
   chrome.notifications.onButtonClicked.addListener(function(notificationId, buttonIndex)
   {
     notificationButtonClick(buttonIndex);
     clearActiveNotification(notificationId);
   });
   chrome.notifications.onClicked.addListener(clearActiveNotification);
   chrome.notifications.onClosed.addListener(notificationClosed);
 }
 
-function showNotification(notification)
-{
-  if (activeNotification && activeNotification.id == notification.id)
+/**
+ * Initializes the notification system.
+ */
+exports.initNotifications = function()
+{
+  if (canUseChromeNotifications)
+    initChromeNotifications();
+  initAntiAdblockNotification();
+};
+
+let showNextNotification =
+/**
+ * Shows the next notification from the queue if any.
+ *
+ * @param {URL} [url] URL to match notifications to
+ */
+exports.showNextNotification = function(url)
+{
+  let notification = NotificationStorage.getNextToShow(url && stringifyURL(url));
+  if (!notification || activeNotification && activeNotification.id == notification.id)
     return;
 
   activeNotification = notification;
   if (activeNotification.type == "critical" || activeNotification.type == "question")
   {
     let texts = NotificationStorage.getLocalizedTexts(notification);
     let title = texts.title || "";
     let message = texts.message ? texts.message.replace(/<\/?(a|strong)>/g, "") : "";
     let iconUrl = ext.getURL("icons/detailed/abp-128.png");
     let hasLinks = activeNotification.links && activeNotification.links.length > 0;
@@ skipping 55 matching lines @@
         message += "\n\n" + ext.i18n.getMessage("notification_with_buttons");
 
       let approved = confirm(message);
       if (activeNotification.type == "question")
         notificationButtonClick(approved ? 0 : 1);
       else if (approved)
         openNotificationLinks();
     }
   }
   prepareNotificationIconAndPopup();
-}
-
-setTimeout(function()
-{
-  let notificationToShow = NotificationStorage.getNextToShow();
-  if (notificationToShow)
-    showNotification(notificationToShow);
-}, 3 * 60 * 1000);
+};
+
+setTimeout(showNextNotification, 3 * 60 * 1000);