issue #331 - Remove localStorage to FileSystem migration code

background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 41 matching lines @@
 var canUseChromeNotifications = require("info").platform == "chromium"
   && "notifications" in chrome
   && (navigator.platform.indexOf("Linux") == -1 || parseInt(require("info").applicationVersion) > 34);
 
 var seenDataCorruption = false;
 var filterlistsReinitialized = false;
 require("filterNotifier").FilterNotifier.addListener(function(action)
 {
   if (action == "load")
   {
-    var importingOldData = importOldData();
-
     var addonVersion = require("info").addonVersion;
     var prevVersion = ext.storage.currentVersion;
 
     // 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;
-      if (!importingOldData)
-        addSubscription(prevVersion);
+      addSubscription(prevVersion);
     }
 
     if (canUseChromeNotifications)
       initChromeNotifications();
     initAntiAdblockNotification();
   }
 
   // update browser actions when whitelisting might have changed,
   // due to loading filters or saving filter changes
   if (action == "load" || action == "save")
@@ skipping 56 matching lines @@
 
 function refreshIconAndContextMenuForAllPages()
 {
   ext.pages.query({}, function(pages)
   {
     pages.forEach(refreshIconAndContextMenu);
   });
 }
 
 /**
- * Old versions for Opera stored patterns.ini in the localStorage object, this
- * will import it into FilterStorage properly.
- * @return {Boolean} true if data import is in progress
- */
-function importOldData()
-{
-  if ("patterns.ini" in localStorage)
-  {
-    FilterStorage.loadFromDisk(localStorage["patterns.ini"]);

[Wladimir Palant, 2014/08/14 14:16:13]

There is a hack in lib/filesystem/io.js, function readFromFile() - it allows
reading from a "file object" that is actually a string. This hack exists for the
purpose of importing data from localStorage, it can be removed as well now.

[saroyanm, 2014/08/14 16:09:54]

Thanks Wladimir, My bad, I should check current revision first:
https://hg.adblockplus.org/adblockpluschrome/rev/f5f784607bfd

-
-    var remove = [];
-    for (var key in localStorage)
-      if (key.indexOf("patterns.ini") == 0 || key.indexOf("patterns-backup") == 0)
-        remove.push(key);
-    for (var i = 0; i < remove.length; i++)
-      delete localStorage[remove[i]];
-
-    return true;
-  }
-  else
-    return false;
-}
-
-/**
  * This function is called on an extension update. It will add the default
  * filter subscription if necessary.
  */
 function addSubscription(prevVersion)
 {
   // Make sure to remove "Recommended filters", no longer necessary
   var toRemove = "https://easylist-downloads.adblockplus.org/chrome_supplement.txt";
   if (toRemove in FilterStorage.knownSubscriptions)
     FilterStorage.removeSubscription(FilterStorage.knownSubscriptions[toRemove]);
 
@@ skipping 417 matching lines @@
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);