Issue 2757 - Fix timing issue resetting notification data while loading preferences

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 180 matching lines @@
       let maxVersionKey = parameter + "MaxVersion";
       return !((parameter in target && target[parameter] != name) ||
                (minVersionKey in target && Services.vc.compare(version, target[minVersionKey]) < 0) ||
                (maxVersionKey in target && Services.vc.compare(version, target[maxVersionKey]) > 0));
     }
 
     let remoteData = [];
     if (typeof Prefs.notificationdata.data == "object" && Prefs.notificationdata.data.notifications instanceof Array)
       remoteData = Prefs.notificationdata.data.notifications;
 
-    if (!(Prefs.notificationdata.shown instanceof Array))
-    {
-      Prefs.notificationdata.shown = [];
-      saveNotificationData();
-    }
-
     let notifications = localData.concat(remoteData);
     if (notifications.length === 0)
       return null;
 
     let {addonName, addonVersion, application, applicationVersion, platform, platformVersion} = require("info");
     let notificationToShow = null;
     for (let notification of notifications)
     {
       if (typeof notification.type === "undefined" || notification.type !== "critical")
       {
-        if (Prefs.notificationdata.shown.indexOf(notification.id) !== -1
-            || Prefs.notifications_ignoredcategories.indexOf("*") !== -1)
+        let shown = Prefs.notificationdata.shown;
+        if (shown instanceof Array && shown.indexOf(notification.id) != -1)
+          continue;
+        if (Prefs.notifications_ignoredcategories.indexOf("*") != -1)
           continue;
       }
 
       if (typeof url === "string" || notification.urlFilters instanceof Array)
       {
         if (typeof url === "string" && notification.urlFilters instanceof Array)
         {
           let matcher = new Matcher();
           for (let urlFilter of notification.urlFilters)
             matcher.add(Filter.fromText(urlFilter));
@@ skipping 41 matching lines @@
       for (let showListener of showListeners)
         showListener(notification);
   },
 
   /**
    * Marks a notification as shown.
    * @param {String} id ID of the notification to be marked as shown
    */
   markAsShown: function(id)
   {
-    if (Prefs.notificationdata.shown.indexOf(id) > -1)
+    var data = Prefs.notificationdata;
+
+    if (!(data.shown instanceof Array))
+      data.shown = [];
+    if (data.shown.indexOf(id) != -1)
       return;
 
-    Prefs.notificationdata.shown.push(id);
+    data.shown.push(id);
     saveNotificationData();
   },
 
   /**
    * Localizes the texts of the supplied notification.
    * @param {Object} notification notification to translate
    * @param {String} locale the target locale (optional, defaults to the
    *                        application locale)
    * @return {Object} the translated texts
    */
@@ skipping 90 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();