[tor-commits] [snowflake/master] Move missingFeature to initToggle in webext

[arlo at torproject.org]

commit 19bc6d88584fc8cd67e5545e8d5f659a0782aa23
Author: Arlo Breault <arlolra at gmail.com>
Date:   Wed Sep 25 21:33:57 2019 -0400

    Move missingFeature to initToggle in webext
---
 proxy/init-webext.js  | 91 ++++++++++++++++++++++++---------------------------
 proxy/webext/embed.js |  2 +-
 2 files changed, 44 insertions(+), 49 deletions(-)

diff --git a/proxy/init-webext.js b/proxy/init-webext.js
index fc0a841..b45f2df 100644
--- a/proxy/init-webext.js
+++ b/proxy/init-webext.js
@@ -18,46 +18,52 @@ class WebExtUI extends UI {
 
   initStats() {
     this.stats = [0];
-    return setInterval((() => {
+    setInterval((() => {
       this.stats.unshift(0);
       this.stats.splice(24);
-      return this.postActive();
+      this.postActive();
     }), 60 * 60 * 1000);
   }
 
   initToggle() {
+    if (!Util.hasWebRTC()) {
+      this.missingFeature = 'popupWebRTCOff';
+      this.setEnabled(false);
+      return;
+    }
     chrome.storage.local.get("snowflake-enabled", (result) => {
+      let enabled = this.enabled;
       if (result['snowflake-enabled'] !== void 0) {
-        this.enabled = result['snowflake-enabled'];
+        enabled = result['snowflake-enabled'];
       } else {
         log("Toggle state not yet saved");
       }
-      this.setEnabled(this.enabled);
+      this.setEnabled(enabled);
     });
   }
 
   postActive() {
-    var ref;
-    return (ref = this.port) != null ? ref.postMessage({
+    this.setIcon();
+    if (!this.port) { return; }
+    this.port.postMessage({
       active: this.active,
       total: this.stats.reduce((function(t, c) {
         return t + c;
       }), 0),
-      enabled: this.enabled
-    }) : void 0;
+      enabled: this.enabled,
+      missingFeature: this.missingFeature,
+    });
   }
 
   onConnect(port) {
     this.port = port;
     port.onDisconnect.addListener(this.onDisconnect);
     port.onMessage.addListener(this.onMessage);
-    return this.postActive();
+    this.postActive();
   }
 
   onMessage(m) {
-    this.enabled = m.enabled;
-    this.setEnabled(this.enabled);
-    this.postActive();
+    this.setEnabled(m.enabled);
     chrome.storage.local.set({
       "snowflake-enabled": this.enabled
     }, function() {
@@ -75,30 +81,34 @@ class WebExtUI extends UI {
       this.stats[0] += 1;
     }
     this.postActive();
-    if (this.active) {
-      return chrome.browserAction.setIcon({
-        path: {
-          48: "assets/toolbar-running-48.png",
-          96: "assets/toolbar-running-96.png"
-        }
-      });
-    } else {
-      return chrome.browserAction.setIcon({
-        path: {
-          48: "assets/toolbar-on-48.png",
-          96: "assets/toolbar-on-96.png"
-        }
-      });
-    }
   }
 
   setEnabled(enabled) {
+    this.enabled = enabled;
+    this.postActive();
     update();
-    return chrome.browserAction.setIcon({
-      path: {
-        48: "assets/toolbar-" + (enabled ? "on" : "off") + "-48.png",
-        96: "assets/toolbar-" + (enabled ? "on" : "off") + "-96.png"
-      }
+  }
+
+  setIcon() {
+    let path = null;
+    if (!this.enabled) {
+      path = {
+        48: "assets/toolbar-off-48.png",
+        96: "assets/toolbar-off-96.png"
+      };
+    } else if (this.active) {
+      path = {
+        48: "assets/toolbar-running-48.png",
+        96: "assets/toolbar-running-96.png"
+      };
+    } else {
+      path = {
+        48: "assets/toolbar-on-48.png",
+        96: "assets/toolbar-on-96.png"
+      };
+    }
+    chrome.browserAction.setIcon({
+      path: path,
     });
   }
 
@@ -139,28 +149,13 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific
     }
   };
 
-  if (!Util.hasWebRTC()) {
-    chrome.runtime.onConnect.addListener(function(port) {
-      return port.postMessage({
-        missingFeature: true
-      });
-    });
-    chrome.browserAction.setIcon({
-      path: {
-        48: "assets/toolbar-off-48.png",
-        96: "assets/toolbar-off-96.png"
-      }
-    });
-    return;
-  }
-
   init = function() {
     config = new Config;
     ui = new WebExtUI();
     broker = new Broker(config.brokerUrl);
     snowflake = new Snowflake(config, ui, broker);
     log('== snowflake proxy ==');
-    return ui.initToggle();
+    ui.initToggle();
   };
 
   update = function() {
diff --git a/proxy/webext/embed.js b/proxy/webext/embed.js
index 7e0dac9..85a3465 100644
--- a/proxy/webext/embed.js
+++ b/proxy/webext/embed.js
@@ -19,7 +19,7 @@ port.onMessage.addListener((m) => {
     popup.setEnabled(false);
     popup.setActive(false);
     popup.setStatusText(chrome.i18n.getMessage('popupStatusOff'));
-    popup.setStatusDesc(chrome.i18n.getMessage('popupWebRTCOff'), true);
+    popup.setStatusDesc(chrome.i18n.getMessage(missingFeature), true);
     popup.hideButton();
     return;
   }