Issue 2567 - Simplified stats data structure, fixed regression resetting ad counter

lib/prefs.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 86 matching lines @@
  * @see https://adblockplus.org/en/preferences#notificationdata
  * @type {object}
  */
 defaults.notificationdata = {};
 /**
  * @see https://adblockplus.org/en/preferences#notificationurl
  * @type {string}
  */
 defaults.notificationurl = "https://notification.adblockplus.org/notification.json";
 /**
- * The total number of ads blocked on all pages.
+ * The total number of requests blocked by the extension.
  *
- * @type {object}
- * @property {number} [blocked]
+ * @type {number}
  */
-defaults.stats_total = {};
+defaults.blocked_total = 0;
 /**
  * Whether to show a badge in the toolbar icon indicating the number of blocked ads.
  *
  * @type {boolean}
  */
 defaults.show_statsinicon = true;
 /**
  * Whether to show the number of blocked ads in the popup.
  *
  * @type {boolean}
@@ skipping 116 matching lines @@
     });
 
     Prefs.onLoaded._dispatch();
   };
 
   // Migrate preferences for users updating from old versions.
   // TODO: Remove the migration code after a few releases.
   ext.storage.migratePrefs({
     map: function(key, value)
     {
-      if (key in defaults)
+      if (key in defaults || key == "stats_total")
       {
         if (key != "currentVersion")
         {
           try
           {
             value = JSON.parse(value);
           }
           catch (e)
           {
             return null;
           }
         }
 
+        if (key == "stats_total")
+        {
+          key = "blocked_total";
+          value = value.blocked;
+        }
+
         return {key: prefToKey(key), value: value};
       }
 
       return null;
     },
 
     done: function()
     {
       ext.storage.get(prefs.map(prefToKey), function(items)
       {
@@ skipping 24 matching lines @@
     });
   }
   else
   {
     managedLoaded = true;
     checkLoaded();
   }
 }
 
 init();