Issue 2040 - Replaced localStorage with chrome.storage.local

background.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 51 matching lines @@
 var canUseChromeNotifications = require("info").platform == "chromium"
   && "notifications" in chrome
   && (navigator.platform.indexOf("Linux") == -1 || parseInt(require("info").applicationVersion, 10) > 34);
 
 var seenDataCorruption = false;
 var filterlistsReinitialized = false;
 require("filterNotifier").FilterNotifier.addListener(function(action)
 {
   if (action == "load")
   {
-    var addonVersion = require("info").addonVersion;
-    var prevVersion = ext.storage.currentVersion;
+    ext.storage.get(["currentVersion"], function(items)
+    {
+      var addonVersion = require("info").addonVersion;
+      var prevVersion = items.currentVersion;
 
-    // There are no filters stored so we need to reinitialize all filterlists
-    if (!FilterStorage.firstRun && FilterStorage.subscriptions.length === 0)
-    {
-      filterlistsReinitialized = true;
-      prevVersion = null;
-    }
+      // There are no filters stored so we need to reinitialize all filterlists
+      if (!FilterStorage.firstRun && FilterStorage.subscriptions.length === 0)
+      {
+        filterlistsReinitialized = true;
+        prevVersion = null;
+      }
 
-    if (prevVersion != addonVersion || FilterStorage.firstRun)
-    {
-      seenDataCorruption = prevVersion && FilterStorage.firstRun;
-      ext.storage.currentVersion = addonVersion;
-      addSubscription(prevVersion);
-    }
+      if (prevVersion != addonVersion || FilterStorage.firstRun)
+      {
+        seenDataCorruption = prevVersion && FilterStorage.firstRun;
+        ext.storage.set("currentVersion", addonVersion);
+        addSubscription(prevVersion);
+      }
+
+      // The "Hide placeholders" option has been removed from the UI in 1.8.8.1285
+      // So we reset the option for users updating from older versions.
+      if (prevVersion && Services.vc.compare(prevVersion, "1.8.8.1285") < 0)
+        Prefs.hidePlaceholders = true;
+    });
 
     if (canUseChromeNotifications)
       initChromeNotifications();
     initAntiAdblockNotification();
-
-    // The "Hide placeholders" option has been removed from the UI in 1.8.8.1285
-    // So we reset the option for users updating from older versions.
-    if (prevVersion && Services.vc.compare(prevVersion, "1.8.8.1285") < 0)
-      Prefs.hidePlaceholders = true;
   }
 
   // update browser actions when whitelisting might have changed,
   // due to loading filters or saving filter changes
   if (action == "load" || action == "save")
     refreshIconAndContextMenuForAllPages();
 });
 
 // Special-case domains for which we cannot use style-based hiding rules.
 // See http://crbug.com/68705.
 var noStyleRulesHosts = ["mail.google.com", "mail.yahoo.com", "www.google.com"];
 
 var htmlPages = new ext.PageMap();
-
-function removeDeprecatedOptions()
-{
-  var deprecatedOptions = ["specialCaseYouTube", "experimental", "disableInlineTextAds"];
-  deprecatedOptions.forEach(function(option)
-  {
-    if (option in ext.storage)
-      delete ext.storage[option];
-  });
-}
-
-// Remove deprecated options before we do anything else.
-removeDeprecatedOptions();
-
 var activeNotification = null;
 
 var contextMenuItem = {
   title: ext.i18n.getMessage("block_element"),
   contexts: ["image", "video", "audio"],
   onclick: function(page)
   {
     page.sendMessage({type: "clickhide-new-filter"});
   }
 };
@@ skipping 412 matching lines @@
       });
       break;
     case "add-sitekey":
       processKey(msg.token, sender.page, sender.frame);
       break;
     case "report-html-page":
       htmlPages.set(sender.page, null);
       refreshIconAndContextMenu(sender.page);
       break;
     case "compose-filters":
-      sendResponse(composeFilters({
-        tagName: msg.tagName,
-        id: msg.id,
-        src: msg.src,
-        style: msg.style,
-        classes: msg.classes,
-        urls: msg.urls,
-        type: msg.mediatype,
-        baseURL: msg.baseURL,
-        page: sender.page,
-        frame: sender.frame
-      }));
+      sendResponse(composeFilters(
+        msg.tagName, msg.id, msg.src, msg.style,
+        msg.classes, msg.urls, new URL(msg.baseURL)
+      ));
       break;
     case "forward":
       if (sender.page)
       {
         if (msg.expectsResponse)
         {
           sender.page.sendMessage(msg.payload, sendResponse);
           return true;
         }
 
         sender.page.sendMessage(msg.payload);
       }
       break;
   }
 });
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
 });
 
 setTimeout(function()
 {
   var notificationToShow = NotificationStorage.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);