Updated extensions bundle

4 files changed, 20 insertions, 11 deletions

diff --git a/data/extensions/tortm-browser-button@jeremybenthum/lib/chrome/chrome.js b/data/extensions/tortm-browser-button@jeremybenthum/lib/chrome/chrome.js
index 14491f7..ebb58e9 100644
--- a/data/extensions/tortm-browser-button@jeremybenthum/lib/chrome/chrome.js
+++ b/data/extensions/tortm-browser-button@jeremybenthum/lib/chrome/chrome.js
@@ -3,9 +3,13 @@ var app = {};
 app.button = {set icon (o) {chrome.browserAction.setIcon(o)}};

 app.version = function () {return chrome.runtime.getManifest().version};

 app.homepage = function () {return chrome.runtime.getManifest().homepage_url};

-app.tab = {"open": function (url) {chrome.tabs.create({"url": url, "active": true})}};

 if (chrome.runtime.setUninstallURL) chrome.runtime.setUninstallURL(app.homepage() + "?v=" + app.version() + "&type=uninstall", function () {});

 

+app.tab = {

+  "reload": function (url) {chrome.tabs.reload(function () {})},

+  "open": function (url) {chrome.tabs.create({"url": url, "active": true})}

+};

+

 app.storage = (function () {

   var objs = {};

   window.setTimeout(function () {

@@ -21,8 +25,8 @@ app.storage = (function () {
     "read": function (id) {return objs[id]},

     "write": function (id, data) {

       var tmp = {};

-      objs[id] = data;

       tmp[id] = data;

+      objs[id] = data;

       chrome.storage.local.set(tmp, function () {});

     }

   }

diff --git a/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js b/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js
index 6fed205..51171b6 100644
--- a/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js
+++ b/data/extensions/tortm-browser-button@jeremybenthum/lib/common.js
@@ -16,15 +16,19 @@ var popupsend = function () {
 };

 

 var setproxy = function (callback) {

-  if (tor.id === "OFF") chrome.proxy.settings.set({"scope": "regular", "value": {"mode": "system"}}, callback);

+  if (tor.id === "OFF") chrome.proxy.settings.set({"scope": "regular", "value": {"proxyType":"system", "mode": "system"}}, callback);

   else chrome.proxy.settings.set({

     "scope": "regular",

     "value":  {

-      "mode": "fixed_servers",

-      "rules": {

-        "bypassList": tor.bypassList,

-        "singleProxy": {"scheme": "socks5", "host": "127.0.0.1", "port": 9050}

-      }

+      "proxyDNS":true,

+      "autoConfigUrl":"",

+      "socksVersion":5,

+      "passthrough":"",

+      "proxyType":"manual",

+      "ftp":"",

+      "ssl":"",

+      "http":"",

+      "socks":"127.0.0.1:9050"

     }

   }, callback);

 };

@@ -79,6 +83,7 @@ var tor = {
 };

 

 app.popup.receive("popup-data", function (e) {

+  if (e.name === "reload") app.tab.reload();

   if (e.name === "support") app.tab.open(app.homepage());

   if (e.name === "check") app.tab.open(config.addon.check);

   if (e.name === "install") app.tab.open(config.addon.github);

diff --git a/data/extensions/tortm-browser-button@jeremybenthum/lib/config.js b/data/extensions/tortm-browser-button@jeremybenthum/lib/config.js
index 37aeaf5..721a1cf 100644
--- a/data/extensions/tortm-browser-button@jeremybenthum/lib/config.js
+++ b/data/extensions/tortm-browser-button@jeremybenthum/lib/config.js
@@ -32,8 +32,8 @@ config.notifications = (function () {
   return {

     "id": '',

     "create": function (message) {

-      var iconUrl = /Firefox/.test(navigator.userAgent) ? "data/icons/ON/64.png" : chrome.runtime.getURL("data/icons/ON/64.png");

-      var o = {"message": message, "type": "basic", "title": "Tor Browser Button", "iconUrl": iconUrl};

+      var iconUrl = /Firefox/.test(navigator.userAgent) ? "data/icons/64.png" : chrome.runtime.getURL("data/icons/64.png");

+      var o = {"message": message, "type": "basic", "title": "Onion Browser Button", "iconUrl": iconUrl};

       if (config.notifications.id) {

         if (chrome.notifications.update) {

           return chrome.notifications.update(config.notifications.id, o, function () {});

diff --git a/data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js b/data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js
index a8e3748..525bb5b 100644
--- a/data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js
+++ b/data/extensions/tortm-browser-button@jeremybenthum/lib/proxy.js
@@ -5,7 +5,7 @@ if (/Firefox/.test(navigator.userAgent)) {
       const mode = value.mode;

       const settings = {

         "autoLogin": value.noPrompt,

-        "proxyDNS": value.remoteDNS,

+        "proxyDNS": true,

         "autoConfigUrl": mode === 'pac_script' ? value.pacScript.url : '',

         "socksVersion": mode === 'fixed_servers' && value.rules.singleProxy.scheme === 'socks5' ? 5 : 4,

         "passthrough": mode === 'fixed_servers' && value.rules.bypassList && value.rules.bypassList.length ? value.rules.bypassList.join(', ') : '',