This is never getting Chrome compatibility back. The Chrome, Chromium, Brave, edgium(<--Worst browser ever, and I'm including IE, the second-worst browser ever) is going to have to be a completely different codebase basically forever

Code cleanup

Makefile

@@ -37,11 +37,11 @@ clean: rc clean-artifacts
 ## EVEN RELEASES are AMO RELEASES
 ## ODD RELEASES are SELFHOSTED RELEASES
 
-MOZ_VERSION=0.108
-VERSION=0.107
+MOZ_VERSION=0.112
+VERSION=0.111
 
 ## INCREMENT THIS EVERY TIME YOU DO A RELEASE
-LAST_VERSION=0.105
+LAST_VERSION=0.109
 
 YELLOW=F7E59A
 ORANGE=FFC56D
@@ -168,7 +168,7 @@ moz-sign: version clean-artifacts
 	@echo "Using the 'sign' target to instantly sign an extension for self-distribution"
 	@echo "requires a JWT API Key and Secret from addons.mozilla.org to be made available"
 	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
-	$(HOME)/node_modules/web-ext/bin/web-ext sign --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET)
+	$(HOME)/web-ext/bin/web-ext sign --channel unlisted --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET) --timeout 900000 #--api-url-prefix http://localhost:3000/api/v4
 	make copyss
 	sleep 5
 
@@ -182,7 +182,7 @@ moz-submit: moz-version
 	@echo "to the Makefile under the variables WEB_EXT_API_KEY and WEB_EXT_API_SECRET."
 	mv manifest.json .manifest.json
 	grep -v update_url .manifest.json > manifest.json
-	$(HOME)/node_modules/web-ext/bin/web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET); true
+	$(HOME)/web-ext/bin/web-ext sign --channel listed --config-discovery false --api-key $(WEB_EXT_API_KEY) --api-secret $(WEB_EXT_API_SECRET) --timeout 900000 --verbose #--api-url-prefix http://localhost:3000/api/v4
 	sleep 5
 	mv .manifest.json manifest.json
 
@@ -328,7 +328,7 @@ upload-updatemanifest:
 	gothub upload -R -u eyedeekay -r I2P-in-Private-Browsing-Mode-Firefox -t docs -n "updateManifest.json" -f updateManifest.json
 
 webext:
-	$(HOME)/node_modules/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u "about:devtools-toolbox?type=extension&id=i2ppb%40eyedeekay.github.io"
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u "about:devtools-toolbox?type=extension&id=i2ppb%40eyedeekay.github.io"
 
 snark-mirror:
 	http_proxy=http://127.0.0.1:4444 wget -c -O ../i2psnark-rpc.su3 http://stats.i2p/i2p/plugins/i2psnark-rpc.su3
@@ -345,7 +345,7 @@ wire:
 	cp -v "../i2ppb-$(VERSION)@eyedeekay.github.io.xpi" "$(HOME)/i2p/MuWireDownloads/"
 
 ndtest:
-	$(HOME)/node_modules/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging \
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging \
 		-u http://127.0.0.1:7657/home \
 		-u http://127.0.0.1:7657/i2ptunnel \
 		-u http://127.0.0.1:7657/i2psnark \
@@ -359,7 +359,7 @@ ndtest:
 		-u https://ramble.pw/f/i2p \
 
 lht-test:
-	$(HOME)/node_modules/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging \
+	$(HOME)/web-ext/bin/web-ext run --firefox /usr/bin/firefox -u about:debugging \
 		-u http://localhost:7657/home \
 		-u http://localhost:7657/i2ptunnel \
 		-u http://localhost:7657/i2psnark \

_locales/en/messages.json

@@ -20,7 +20,7 @@
     "description": "Description of the extension."
   },
   "extensionVersion": {
-    "message": "0.107",
+    "message": "0.108",
     "description": "Version of the extension."
   },
   "proxyFailedStatus": {

_locales/es/messages.json

@@ -20,7 +20,7 @@
     "description": "Descripción de la extensión."
   },
   "extensionVersion": {
-    "message": "0,107",
+    "message": "0.108",
     "description": "Versión de la extensión."
   },
   "proxyFailedStatus": {

background.js

@@ -1,23 +1,23 @@
-var titlepref = chrome.i18n.getMessage("titlePreface");
-var titleprefpriv = chrome.i18n.getMessage("titlePrefacePrivate");
-var webpref = chrome.i18n.getMessage("webPreface");
-var webprefpriv = chrome.i18n.getMessage("webPrefacePrivate");
-var routerpref = chrome.i18n.getMessage("routerPreface");
-var routerprefpriv = chrome.i18n.getMessage("routerPrefacePrivate");
-var mailpref = chrome.i18n.getMessage("mailPreface");
-var mailprefpriv = chrome.i18n.getMessage("mailPrefacePrivate");
-var torrentpref = chrome.i18n.getMessage("torrentPreface");
-var torrentprefpriv = chrome.i18n.getMessage("torrentPrefacePrivate");
-var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
-var tunnelprefpriv = chrome.i18n.getMessage("i2ptunnelPrefacePrivate");
-var ircpref = chrome.i18n.getMessage("ircPreface");
-var ircprefpriv = chrome.i18n.getMessage("ircPrefacePrivate");
-var extensionpref = chrome.i18n.getMessage("extensionPreface");
-var muwirepref = chrome.i18n.getMessage("muwirePreface");
-var muwireprefpriv = chrome.i18n.getMessage("muwirePrefacePrivate");
-var botepref = chrome.i18n.getMessage("botePreface");
-var blogpref = chrome.i18n.getMessage("blogPreface");
-var blogprefpriv = chrome.i18n.getMessage("blogPrefacePrivate");
+var titlepref = browser.i18n.getMessage("titlePreface");
+var titleprefpriv = browser.i18n.getMessage("titlePrefacePrivate");
+var webpref = browser.i18n.getMessage("webPreface");
+var webprefpriv = browser.i18n.getMessage("webPrefacePrivate");
+var routerpref = browser.i18n.getMessage("routerPreface");
+var routerprefpriv = browser.i18n.getMessage("routerPrefacePrivate");
+var mailpref = browser.i18n.getMessage("mailPreface");
+var mailprefpriv = browser.i18n.getMessage("mailPrefacePrivate");
+var torrentpref = browser.i18n.getMessage("torrentPreface");
+var torrentprefpriv = browser.i18n.getMessage("torrentPrefacePrivate");
+var tunnelpref = browser.i18n.getMessage("i2ptunnelPreface");
+var tunnelprefpriv = browser.i18n.getMessage("i2ptunnelPrefacePrivate");
+var ircpref = browser.i18n.getMessage("ircPreface");
+var ircprefpriv = browser.i18n.getMessage("ircPrefacePrivate");
+var extensionpref = browser.i18n.getMessage("extensionPreface");
+var muwirepref = browser.i18n.getMessage("muwirePreface");
+var muwireprefpriv = browser.i18n.getMessage("muwirePrefacePrivate");
+var botepref = browser.i18n.getMessage("botePreface");
+var blogpref = browser.i18n.getMessage("blogPreface");
+var blogprefpriv = browser.i18n.getMessage("blogPrefacePrivate");
 
 function onError(err) {
   console.log("(background)", err);

bookmarks.js

@@ -191,7 +191,7 @@ function bookmarksSetup() {
 
       function toolDir(bookmarkToolbar) {
         let defaultSettings = {};
-        chrome.storage.local.set(defaultSettings);
+        browser.storage.local.set(defaultSettings);
         console.log("(bookmarks) created");
         var ibbt = browser.bookmarks.search("I2P Toolbar");
         function setupDir(ibbt) {

cert.js

@@ -9,7 +9,7 @@ function blankContent(id) {
 
 function contentUpdateById(id, message) {
   let infoTitle = document.getElementById(id);
-  let messageContent = chrome.i18n.getMessage(message);
+  let messageContent = browser.i18n.getMessage(message);
   if (infoTitle === null) {
     console.log("content error", id, messageContent);
     return;

content.js

@@ -1,6 +1,6 @@
 function contentUpdateById(id, message) {
   let infoTitle = document.getElementById(id);
-  let messageContent = chrome.i18n.getMessage(message);
+  let messageContent = browser.i18n.getMessage(message);
   if (infoTitle === null) {
     console.log("content error", id, messageContent);
     return;

context.js

@@ -1,5 +1,5 @@
 //var windowIds = []
-var titlepref = chrome.i18n.getMessage("titlePreface");
+var titlepref = browser.i18n.getMessage("titlePreface");
 
 function onError(error) {
   console.log(`Error : ${error}`);

debian/changelog

@@ -1,9 +1,23 @@
+i2psetproxy.js (0.111-1) UNRELEASED; urgency=low
+
+  * simplify background theme issue fix
+
+ -- idk <hankhill19580@gmail.com> Wed, 07 Jul 2021 23:27:27 -0400
+
+i2psetproxy.js (0.109-1) UNRELEASED; urgency=low
+
+  * connection interrupted mid release, retry failed validation. Bump and retry
+
+ -- idk <hankhill19580@gmail.com> Wed, 07 Jul 2021 22:00:25 -0400
+
+connection interrupted mid release, retry failed validation. Bump and retry
+
 i2psetproxy.js (0.107-1) UNRELEASED; urgency=low
 
   * Small code fixes
   * Fix for interference with non-I2P containers
 
- -- idk <hankhill19580@gmail.com> Wed, 26 May 2021 12:56:56 -0400
+ -- idk <hankhill19580@gmail.com> Wed, 07 Jul 2021 22:00:25 -0400
 
 i2psetproxy.js (0.105-1) UNRELEASED; urgency=low
 

manifest.json

@@ -27,7 +27,7 @@
   ],
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
-  "version": "0.107",
+  "version": "0.112",
   "description": "__MSG_extensionDescription__",
   "homepage_url": "https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox",
   "icons": {

privacy.js

@@ -1,4 +1,4 @@
-var titlepref = chrome.i18n.getMessage("titlePreface");
+var titlepref = browser.i18n.getMessage("titlePreface");
 
 function onSet(result) {
   if (result) {
@@ -241,7 +241,7 @@ function AssurePeerConnection() {
     browser.privacy.network.peerConnectionEnabled.set({
       value: true,
     });
-    chrome.privacy.network.webRTCIPHandlingPolicy.set({
+    browser.privacy.network.webRTCIPHandlingPolicy.set({
       value: "disable_non_proxied_udp",
     });
   }
@@ -255,7 +255,7 @@ function UnsetPeerConnection() {
     browser.privacy.network.peerConnectionEnabled.set({
       value: true,
     });
-    chrome.privacy.network.webRTCIPHandlingPolicy.set({
+    browser.privacy.network.webRTCIPHandlingPolicy.set({
       value: "default",
     });
   }

proxy.js

@@ -1,24 +1,24 @@
-var titlepref = chrome.i18n.getMessage("titlePreface");
-var webpref = chrome.i18n.getMessage("webPreface");
-var routerpref = chrome.i18n.getMessage("routerPreface");
-var mailpref = chrome.i18n.getMessage("mailPreface");
-var torrentpref = chrome.i18n.getMessage("torrentPreface");
-var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
-var ircpref = chrome.i18n.getMessage("ircPreface");
-var extensionpref = chrome.i18n.getMessage("extensionPreface");
-var muwirepref = chrome.i18n.getMessage("muwirePreface");
-var botepref = chrome.i18n.getMessage("botePreface");
-var blogpref = chrome.i18n.getMessage("blogPreface");
-var blogprefpriv = chrome.i18n.getMessage("blogPrefacePrivate");
+var titlepref = browser.i18n.getMessage("titlePreface");
+var webpref = browser.i18n.getMessage("webPreface");
+var routerpref = browser.i18n.getMessage("routerPreface");
+var mailpref = browser.i18n.getMessage("mailPreface");
+var torrentpref = browser.i18n.getMessage("torrentPreface");
+var tunnelpref = browser.i18n.getMessage("i2ptunnelPreface");
+var ircpref = browser.i18n.getMessage("ircPreface");
+var extensionpref = browser.i18n.getMessage("extensionPreface");
+var muwirepref = browser.i18n.getMessage("muwirePreface");
+var botepref = browser.i18n.getMessage("botePreface");
+var blogpref = browser.i18n.getMessage("blogPreface");
+var blogprefpriv = browser.i18n.getMessage("blogPrefacePrivate");
 
 browser.privacy.network.peerConnectionEnabled.set({
   value: true,
 });
 
-chrome.privacy.network.networkPredictionEnabled.set({
+browser.privacy.network.networkPredictionEnabled.set({
   value: false,
 });
-chrome.privacy.network.webRTCIPHandlingPolicy.set({
+browser.privacy.network.webRTCIPHandlingPolicy.set({
   value: "disable_non_proxied_udp",
 });
 console.log("Disabled unproxied UDP.");
@@ -303,9 +303,8 @@ function SetupSettings() {
     console.log("Initialising Control Host", storedSettings.control_host);
     setupProxy();
   }
-  var gettingControlHostStoredSettings = browser.storage.local.get(
-    "control_host"
-  );
+  var gettingControlHostStoredSettings =
+    browser.storage.local.get("control_host");
   gettingControlHostStoredSettings.then(
     checkControlHostStoredSettings,
     onSetupError
@@ -320,9 +319,8 @@ function SetupSettings() {
     console.log("Initialising Control Port", storedSettings.control_port);
     setupProxy();
   }
-  var gettingControlPortStoredSettings = browser.storage.local.get(
-    "control_port"
-  );
+  var gettingControlPortStoredSettings =
+    browser.storage.local.get("control_port");
   gettingControlPortStoredSettings.then(
     checkControlPortStoredSettings,
     onSetupError
@@ -340,9 +338,8 @@ function SetupSettings() {
     );
     setupProxy();
   }
-  var gettingHistoryStoredSettings = browser.storage.local.get(
-    "disable_history"
-  );
+  var gettingHistoryStoredSettings =
+    browser.storage.local.get("disable_history");
   gettingHistoryStoredSettings.then(checkHistoryStoredSettings, onSetupError);
 }
 
@@ -397,7 +394,7 @@ function update() {
 
 function updateFromStorage() {
   console.log("updating settings from storage");
-  chrome.storage.local.get(function () {
+  browser.storage.local.get(function () {
     SetupSettings();
     update();
     setupProxy();
@@ -412,7 +409,7 @@ setupProxy();
 var gettingListenerInfo = browser.runtime.getPlatformInfo();
 gettingListenerInfo.then((got) => {
   browser.windows.onCreated.addListener(() => {
-    chrome.storage.local.get(function () {
+    browser.storage.local.get(function () {
       setupProxy();
     });
   });

scrub.js

@@ -1,15 +1,15 @@
-var titlepref = chrome.i18n.getMessage("titlePreface");
-var webpref = chrome.i18n.getMessage("webPreface");
-var routerpref = chrome.i18n.getMessage("routerPreface");
-var mailpref = chrome.i18n.getMessage("mailPreface");
-var torrentpref = chrome.i18n.getMessage("torrentPreface");
-var tunnelpref = chrome.i18n.getMessage("i2ptunnelPreface");
-var ircpref = chrome.i18n.getMessage("ircPreface");
-var extensionpref = chrome.i18n.getMessage("extensionPreface");
-var muwirepref = chrome.i18n.getMessage("muwirePreface");
-var botepref = chrome.i18n.getMessage("botePreface");
-var blogpref = chrome.i18n.getMessage("blogPreface");
-var blogprefpriv = chrome.i18n.getMessage("blogPrefacePrivate");
+var titlepref = browser.i18n.getMessage("titlePreface");
+var webpref = browser.i18n.getMessage("webPreface");
+var routerpref = browser.i18n.getMessage("routerPreface");
+var mailpref = browser.i18n.getMessage("mailPreface");
+var torrentpref = browser.i18n.getMessage("torrentPreface");
+var tunnelpref = browser.i18n.getMessage("i2ptunnelPreface");
+var ircpref = browser.i18n.getMessage("ircPreface");
+var extensionpref = browser.i18n.getMessage("extensionPreface");
+var muwirepref = browser.i18n.getMessage("muwirePreface");
+var botepref = browser.i18n.getMessage("botePreface");
+var blogpref = browser.i18n.getMessage("blogPreface");
+var blogprefpriv = browser.i18n.getMessage("blogPrefacePrivate");
 
 var contextScrub = async function (requestDetails) {
   function onHeaderError() {
@@ -442,7 +442,7 @@ var coolheadersSetup = function (e) {
             var tab = browser.tabs.get(e.tabId);
             tab.then(altSrc);
             function altSrc(tab) {
-              console.log("(scrub) X-I2P-LOCATION");
+              console.log("(scrub) X-I2P-LOCATION", header.value);
               let url = new URL(header.value);
               browser.pageAction.setPopup({
                 tabId: e.tabId,
@@ -541,16 +541,16 @@ var coolheadersSetup = function (e) {
 
 function getTabURL(tab) {
   if (tab.url.startsWith("https")) {
-    browser.pageAction.setPopup({
-      tabId: tab.id,
-      popup: "security.html",
-    });
-    browser.pageAction.setIcon({
-      path: "icons/infotoopies.png",
-      tabId: tab.id,
-    });
-    console.log(tab.url);
     if (tab.url.includes(".i2p")) {
+      browser.pageAction.setPopup({
+        tabId: tab.id,
+        popup: "security.html",
+      });
+      browser.pageAction.setIcon({
+        path: "icons/infotoopies.png",
+        tabId: tab.id,
+      });
+      console.log(tab.url);
       //console.log("(background) tabinfo", tabInfo[0].id)
       try {
         browser.tabs