Issue 2419 - Show newly downloaded notifications immediately

lib/notification.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
@@ skipping 12 matching lines @@
 
 let {Prefs} = require("prefs");
 let {Downloader, Downloadable, MILLIS_IN_MINUTE, MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader");
 let {Utils} = require("utils");
 let {Matcher} = require("matcher");
 let {Filter} = require("filterClasses");
 
 let INITIAL_DELAY = 12 * MILLIS_IN_MINUTE;
 let CHECK_INTERVAL = 1 * MILLIS_IN_HOUR;
 let EXPIRATION_INTERVAL = 1 * MILLIS_IN_DAY;
-let STARTUP_SHOW_DELAY = 3 * MILLIS_IN_MINUTE;
 let TYPE = {
   information: 0,
   question: 1,
   critical: 2
 };
 
 let showListeners = [];
 let questionListeners = {};
 
 function getNumericalSeverity(notification)
@@ skipping 36 matching lines @@
   /**
    * Called on module startup.
    */
   init: function()
   {
     downloader = new Downloader(this._getDownloadables.bind(this), INITIAL_DELAY, CHECK_INTERVAL);
     downloader.onExpirationChange = this._onExpirationChange.bind(this);
     downloader.onDownloadSuccess = this._onDownloadSuccess.bind(this);
     downloader.onDownloadError = this._onDownloadError.bind(this);
     onShutdown.add(() => downloader.cancel());
-
-    notificationTimer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);

[Felix Dahlke, 2015/06/08 20:06:23]

While we had IIRC discussed that it makes sense to show notifications _both_
three minutes after startup and when new ones are downloaded, with a reduced
INITIAL_DELAY (we agreed on one minute), IMO it doesn't. We would show emergency
notifications both one and three minutes after startup. If we would only show
them after download, we would show them at most once a day, no matter how often
the user restarts the browser. Seems preferable to showing them twice in short
succession.

I suppose the main downside of this is that users won't see emergency
notifications if our notification infrastructure is not reachable anymore. Seems
fine to me however - if they can't reach that for some reason, it's unlikely
they can do whatever we ask them to do in the notification.

-    notificationTimer.initWithCallback(Notification.showNext.bind(this),
-                                       STARTUP_SHOW_DELAY,
-                                       Ci.nsITimer.TYPE_ONE_SHOT);
-    onShutdown.add(() => notificationTimer.cancel());
   },
 
   /**
    * Yields a Downloadable instances for the notifications download.
    */
   _getDownloadables: function*()
   {
     let downloadable = new Downloadable(Prefs.notificationurl);
     if (typeof Prefs.notificationdata.lastError === "number")
       downloadable.lastError = Prefs.notificationdata.lastError;
@@ skipping 39 matching lines @@
       Cu.reportError(e);
       errorCallback("synchronize_invalid_data");
       return;
     }
 
     Prefs.notificationdata.lastError = 0;
     Prefs.notificationdata.downloadStatus = "synchronize_ok";
     [Prefs.notificationdata.softExpiration, Prefs.notificationdata.hardExpiration] = downloader.processExpirationInterval(EXPIRATION_INTERVAL);
     Prefs.notificationdata.downloadCount = downloadable.downloadCount;
     saveNotificationData();
+
+    Notification.showNext();
   },
 
   _onDownloadError: function(downloadable, downloadURL, error, channelStatus, responseStatus, redirectCallback)
   {
     Prefs.notificationdata.lastError = Date.now();
     Prefs.notificationdata.downloadStatus = error;
     saveNotificationData();
   },
 
   /**
@@ skipping 232 matching lines @@
       Prefs.notifications_showui = true;
     }
     else if (index != -1 && forceValue !== true)
       categories.splice(index, 1);
 
     // HACK: JSON values aren't saved unless they are assigned a different object.
     Prefs.notifications_ignoredcategories = JSON.parse(JSON.stringify(categories));
   }
 };
 Notification.init();