Issue 4580 - Removed ext.storage

lib/prefs.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 243 matching lines @@
   return key.substr(keyPrefix.length);
 }
 
 function prefToKey(pref)
 {
   return keyPrefix + pref;
 }
 
 function savePref(pref)
 {
-  ext.storage.set(prefToKey(pref), overrides[pref]);
+  browser.storage.local.set({[prefToKey(pref)]: overrides[pref]});
 }
 
 let customSave = new Map();
 if (require("../buildtools/info").platform == "gecko")
 {
   // Saving one storage value causes all others to be saved as well on Gecko.
   // Make sure that updating ad counter doesn't cause the filters data to be
   // saved frequently as a side-effect.
   const MIN_UPDATE_INTERVAL = 60 * 1000;
   let lastUpdate = -MIN_UPDATE_INTERVAL;
@@ skipping 28 matching lines @@
     set(value)
     {
       let defaultValue = defaults[pref];
 
       if (typeof value != typeof defaultValue)
         throw new Error("Attempt to change preference type");
 
       if (value == defaultValue)
       {
         delete overrides[pref];
-        ext.storage.remove(prefToKey(pref));
+        browser.storage.local.remove(prefToKey(pref));
       }
       else
       {
         overrides[pref] = value;
         (customSave.get(pref) || savePref)(pref);
       }
     },
     enumerable: true
   });
 }
 
 function init()
 {
   let prefs = Object.keys(defaults);
   prefs.forEach(addPreference);
 
-  let localLoaded = new Promise(resolve =>
-  {
-    ext.storage.get(prefs.map(prefToKey), items =>
+  let localLoaded = browser.storage.local.get(prefs.map(prefToKey)).then(
+    items =>
     {
       for (let key in items)
         overrides[keyToPref(key)] = items[key];
+    },
+    (error) =>

[kzar, 2018/04/24 20:38:56]

Nit: Superfluous parenthesis, also could we just pass in console.error directly?

[Sebastian Noack, 2018/04/24 21:12:55]

Acknowledged.
That is not garuanteed to work, and at least in older Chrome versions it didn't
work. That is because its an implementation detail of the JavaScript environment
whether the console methods depend on the console object (i.e. rely on the
correct value of "this") or not.

FWIW, I only added the error callback here to not change the behavior yet, i.e.
make sure that the Prefs.untilLoaded promise is never rejected. This callback is
removed with the next patch anyway.

[kzar, 2018/04/25 10:33:39]

Ah right, well it's not a big deal then.

+    {
+      console.error(error);
+    }
+  );
 
-      resolve();
-    });
-  });
-
-  let managedLoaded = new Promise(resolve =>
+  let managedLoaded;
+  if ("managed" in browser.storage)
   {
-    if ("managed" in browser.storage)
-    {
-      browser.storage.managed.get(null, items =>
+    managedLoaded = browser.storage.managed.get(null).then(
+      items =>
       {
-        // Opera doesn't support browser.storage.managed, but instead simply
-        // removing the API, Opera sets browser.runtime.lastError when using it.
-        // So we have to retrieve that error, to prevent it from showing up
-        // in the console.
-        browser.runtime.lastError;
-
         for (let key in items)
           defaults[key] = items[key];
+      },
 
-        resolve();
-      });
-    }
-    else
-    {
-      resolve();
-    }
-  });
+      // Opera doesn't support browser.storage.managed, but instead of simply
+      // removing the API, it gives an asynchronous error which we ignore here.
+      () => {}
+    );
+  }
+  else
+  {
+    managedLoaded = Promise.resolve();
+  }
 
   function onLoaded()
   {
-    ext.storage.onChanged.addListener(changes =>
+    browser.storage.onChanged.addListener(changes =>
     {
       for (let key in changes)
       {
         let pref = keyToPref(key);
         if (pref && pref in defaults)
         {
           let change = changes[key];
           if ("newValue" in change && change.newValue != defaults[pref])
             overrides[pref] = change.newValue;
           else
             delete overrides[pref];
 
           eventEmitter.emit(pref);
         }
       }
     });
   }
 
   Prefs.untilLoaded = Promise.all([localLoaded, managedLoaded]).then(onLoaded);
 }
 
 init();