Use FileSystem API to store data in Opera

background.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 23 matching lines @@
 var Synchronizer = require("synchronizer").Synchronizer;
 var Utils = require("utils").Utils;
 var Notification = require("notification").Notification;
 
 // Some types cannot be distinguished
 RegExpFilter.typeMap.OBJECT_SUBREQUEST = RegExpFilter.typeMap.OBJECT;
 RegExpFilter.typeMap.MEDIA = RegExpFilter.typeMap.FONT = RegExpFilter.typeMap.OTHER;
 
 var isFirstRun = false;
 var seenDataCorruption = false;
+var importingOldData = false;
 require("filterNotifier").FilterNotifier.addListener(function(action)
 {
   if (action == "load")
   {
     importOldData();
 
     var addonVersion = require("info").addonVersion;
-    var prevVersion = localStorage["currentVersion"];
-    if (seenDataCorruption || prevVersion != addonVersion)
+    var prevVersion = localStorage.currentVersion;
+    if (prevVersion != addonVersion)
     {
       isFirstRun = !prevVersion;
-      localStorage["currentVersion"] = addonVersion;
-      addSubscription(prevVersion);
+      localStorage.currentVersion = addonVersion;
+      if (!importingOldData)

[Thomas Greiner, 2013/11/26 13:40:13]

You're only using this variable for this check here so you don't need
importingOldData to be a global variable. By making it the return value of
importOldData you could make it a local variable.

[Wladimir Palant, 2013/11/27 15:46:21]

Done.

+        addSubscription(prevVersion);
     }
   }
 });
 
 // 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"];
 
 function removeDeprecatedOptions()
 {
@@ skipping 80 matching lines @@
 }
 
 /**
  * Old versions for Opera stored patterns.ini in the localStorage object, this
  * will import it into FilterStorage properly.
  */
 function importOldData()
 {
   if ("patterns.ini" in localStorage)
   {
+    importingOldData = true;
     FilterStorage.loadFromDisk(localStorage["patterns.ini"]);
-    seenDataCorruption = false;
 
     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]];
   }
 }
 
 /**
  * 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]);
 
   // Add "acceptable ads" subscription for new users
-  var addAcceptable = !prevVersion || seenDataCorruption;
+  var addAcceptable = !prevVersion;
   if (addAcceptable)
   {
     addAcceptable = !FilterStorage.subscriptions.some(function(subscription)
     {
       return subscription.url == Prefs.subscriptions_exceptionsurl;
     });
   }
 
   // Don't add subscription if the user has a subscription already
   var addSubscription = !FilterStorage.subscriptions.some(function(subscription)
@@ skipping 264 matching lines @@
   tab.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(tab);
 });
 
 setTimeout(function()
 {
   var notificationToShow = Notification.getNextToShow();
   if (notificationToShow)
     showNotification(notificationToShow);
 }, 3 * 60 * 1000);