Issue 4023 - Use localforage (IndexedDB) instead of localStorage

lib/adblockplus.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 347 matching lines @@
   }
 
   function loadFile(file)
   {
     return new Promise(function(resolve, reject)
     {
       var key = fileToKey(file);
       ext.storage.get([key], function(items)
       {
         var entry = items[key];
-        if (!entry)
-        {
-          try

[Sebastian Noack, 2016/10/05 21:27:32]

I think this try-catch block should be removed now. It seems to have been there
originally to handle if JSON.parse() fails. But if there is an error now it is
passed to the callback rather than being thrown synchronously, right?

[Oleksandr, 2016/10/05 21:49:13]

Done.

-          {
-            entry = JSON.parse(window.localStorage.getItem(key));
-          }
-          catch (err)
-          {}
-        }
         if (entry)
         {
           resolve(entry);
         }
         else
         {
-          reject(new Error("File doesn't exist"));
+          try
+          {
+            entry = localforage.getItem(key, function(err, value) 
+            {
+              if (err || !value)
+                reject(new Error("File doesn't exist"));                
+              else
+                resolve(value);
+            });
+          }
+          catch (err)
+          {}
         }
       });
     }.bind(this));
   }
   function saveFile(file, data, callback)
   {
-    var entry = {};
     var key = fileToKey(file);
-
-    if (typeof browser == "undefined")
-    {
-      entry[key] = {
-        lastModified: Date.now(),
-        content: data
-      };
-      ext.storage.set(entry, callback);
-    }
-    else
-    {
-      var processedData = LZString.compressToUTF16(JSON.stringify(data));
-      ext.storage.remove(key);
-      entry[key] = {
-        lastModified: Date.now(),
-        content: processedData,
-        compressed: true
-      };
-      window.localStorage.setItem(key, JSON.stringify(entry[key]));
-      setTimeout(callback, 0);
-    }
-    callback();
+    ext.storage.remove(key);
+    localforage.setItem(key, 
+                        { lastModified: Date.now(), content: data }, 
+                        callback
+                        );
   }
   exports.IO = {
     resolveFilePath: function(path)
     {
       return new FakeFile(path);
     },
     readFromFile: function(file, listener, callback)
     {
       function onLoaded(entry)
       {
         if ("content" in entry)
         {
-          if (entry["compressed"])
-          {
-            entry.content = JSON.parse(LZString.decompressFromUTF16(entry.content));
-          }
           for (var _loopIndex15 = 0; _loopIndex15 < entry.content.length; ++_loopIndex15)
           {
             var line = entry.content[_loopIndex15];
             listener.process(line);
           }
         }
         callback(null);
       }
       loadFile(file).then(onLoaded, callback);
     },
@@ skipping 6136 matching lines @@
     search.push("notificationDownloadCount=" + encodeURIComponent(downlCount));
     chrome.runtime.setUninstallURL(Utils.getDocLink("uninstalled") + "&" + search.join("&"));
   }
   if ("setUninstallURL" in chrome.runtime)
   {
     Prefs.untilLoaded.then(setUninstallURL);
     Prefs.on("notificationdata", setUninstallURL);
   }
   return exports;
 })();