Merge pull request #160 from toasted-nutbread/mobile

Add support for mobile Firefox

2 files changed, 9 insertions, 5 deletions

diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js
index a81cbef8..bd652f3b 100644
--- a/ext/fg/js/frontend.js
+++ b/ext/fg/js/frontend.js
@@ -256,7 +256,7 @@ class Frontend {
     }
 
     onError(error) {
-        window.alert(`Error: ${error.toString ? error.toString() : error}`);
+        console.log(error);
     }
 
     popupTimerSet(callback) {
diff --git a/ext/fg/js/util.js b/ext/fg/js/util.js
index 5eff4018..954b3988 100644
--- a/ext/fg/js/util.js
+++ b/ext/fg/js/util.js
@@ -26,11 +26,15 @@ function utilAsync(func) {
 function utilInvoke(action, params={}) {
     return new Promise((resolve, reject) => {
         try {
-            chrome.runtime.sendMessage({action, params}, ({result, error}) => {
-                if (error) {
-                    reject(error);
+            chrome.runtime.sendMessage({action, params}, (response) => {
+                if (response !== null && typeof response === 'object') {
+                    if (response.error) {
+                        reject(response.error);
+                    } else {
+                        resolve(response.result);
+                    }
                 } else {
-                    resolve(result);
+                    reject(`Unexpected response of type ${typeof response}`);
                 }
             });
         } catch (e) {