Revert "Call callback function after storage.set"

This reverts commit ced3ac5.
avast · Oct 11, 2020 · 5496f14 · 5496f14
1 parent 546296d
commit 5496f14
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/src/Framework/Sources/JavaScript/Background/background.js b/src/Framework/Sources/JavaScript/Background/background.js
@@ -61,7 +61,8 @@ function manageRequest(payload) {
     }
 
     if (payload.eventName === 'storage.set') {
-        chrome.storage[payload.message.area].set(payload.message.items, sendResponse);
+        chrome.storage[payload.message.area].set(payload.message.items);
+        sendResponse();
     }
 
     if (payload.eventName === 'storage.remove') {

diff --git a/src/Framework/Sources/JavaScript/Background/chrome/storage.js b/src/Framework/Sources/JavaScript/Background/chrome/storage.js
@@ -68,7 +68,7 @@ function storage(storageArea) {
             }
             callbackFunc(result);
         },
-        set(items, callbackFunc) {
+        set(items) {
             const changes = {};
             for (const key of Object.keys(items)) {
                 const oldValue = localStorage.getItem(key);
@@ -100,7 +100,6 @@ function storage(storageArea) {
                     });
                 });
             });
-            callbackFunc && callbackFunc();
         },
         remove,
         /**

diff --git a/src/Framework/Sources/JavaScript/Content/chrome/storage.js b/src/Framework/Sources/JavaScript/Content/chrome/storage.js
@@ -25,16 +25,22 @@ function storage(storageArea) {
             );
         },
         set(items,callback) {
+            if (callback) {
+                chrome.storage.onChanged.addListener(notify);
+            }
             background.dispatchRequest(
                 {
                     eventName: 'storage.set',
                     message: {
                         area: storageArea,
                         items
                     }
-                },
-                () => callback()
+                }
             );
+            function notify() {
+                callback();
+                chrome.storage.onChanged.removeListener(notify);
+            }
         },
         remove(keys, callback) {
             background.dispatchRequest(

diff --git a/src/Framework/Sources/JavaScript/Popup/chrome/storage.js b/src/Framework/Sources/JavaScript/Popup/chrome/storage.js
@@ -24,7 +24,7 @@ function storage(storageArea) {
                 (resp) => callback(resp)
             );
         },
-        set(items, callback) {
+        set(items) {
             window.topee.dispatchRequest(
                 0,
                 {
@@ -33,8 +33,8 @@ function storage(storageArea) {
                         area: storageArea,
                         items
                     }
-                },
-                () => callback()
+                }
+                // (resp) => callback(resp)
             );
         },
         remove(keys, callback) {