diff --git a/Makefile b/Makefile index dd1fae4..a60df75 100644 --- a/Makefile +++ b/Makefile @@ -37,11 +37,11 @@ clean: rc clean-artifacts ## EVEN RELEASES are AMO RELEASES ## ODD RELEASES are SELFHOSTED RELEASES -MOZ_VERSION=0.84 -VERSION=0.83 +MOZ_VERSION=0.86 +VERSION=0.85 ## INCREMENT THIS EVERY TIME YOU DO A RELEASE -LAST_VERSION=0.81 +LAST_VERSION=0.83 YELLOW=F7E59A ORANGE=FFC56D diff --git a/bookmarks.js b/bookmarks.js index 1752242..0e2586b 100644 --- a/bookmarks.js +++ b/bookmarks.js @@ -2,6 +2,7 @@ var gettingInfo = browser.runtime.getPlatformInfo(); gettingInfo.then((got) => { if (got.os != 'android') { function bookmarks(bookmarkToolbar) { + console.log('(bookmarks)', bookmarkToolbar); console.log('Setting up bookmark toolbar', bookmarkToolbar); function bookHome(bookmarkItems) { if (!bookmarkItems.length) { diff --git a/debian/changelog b/debian/changelog index 684714b..ba95f96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +i2psetproxy.js (0.83-1) UNRELEASED; urgency=low + + * Fix a bug which was causing i2psnark to fail to isolate. + + -- idk Sat, 10 NOV 2020 1:33:50 -0400 + + i2psetproxy.js (0.83-1) UNRELEASED; urgency=low * Add a tab for I2P-Native Dispatch diff --git a/handler.js b/handler.js index f3d7723..b1a073e 100644 --- a/handler.js +++ b/handler.js @@ -1,7 +1,9 @@ function routerHost(url) { + console.log('(urlcheck) HANDLER URL CHECK'); let hostname = ''; let path = ''; function pathcheck(str) { + console.log('(urlcheck) HANDLER PATH CHECK', str); if (str != undefined) { let final = str.split('/')[0]; if (final === 'i2ptunnelmgr' || final === 'i2ptunnel') { @@ -11,7 +13,8 @@ function routerHost(url) { final === 'i2psnark' || final === 'torrents' || final.startsWith('transmission') || - final.startsWith('tracker') + final.startsWith('tracker') || + str.includes(':7662') ) { console.log('(urlcheck) Torrent application path', final); return 'i2psnark'; diff --git a/host.js b/host.js index d6ce780..844ae60 100644 --- a/host.js +++ b/host.js @@ -60,6 +60,7 @@ function i2pHost(url) { } function routerHost(url) { + console.log('(urlcheck) HOST URL CHECK'); let hostname = ''; let path = ''; function pathcheck(str) { @@ -72,7 +73,8 @@ function routerHost(url) { final === 'i2psnark' || final === 'torrents' || final.startsWith('transmission') || - final.startsWith('tracker') + final.startsWith('tracker') || + str.includes(':7662') ) { console.log('(urlcheck) Torrent application path', final); return 'i2psnark'; @@ -111,15 +113,6 @@ function routerHost(url) { if (hostname === control_host + ':' + control_port) { return pathcheck(path); } - if (hostname === control_host + ':' + '7662') { - return pathcheck(path); - } - if (hostname === 'localhost' + ':' + '7662') { - return pathcheck(path); - } - if (hostname === '127.0.0.1' + ':' + '7662') { - return pathcheck(path); - } if (hostname === 'localhost' + ':' + control_port) { return pathcheck(path); } diff --git a/i2ppb@eyedeekay.github.io.xpi.torrent b/i2ppb@eyedeekay.github.io.xpi.torrent index 8c1df68..bd69139 100644 Binary files a/i2ppb@eyedeekay.github.io.xpi.torrent and b/i2ppb@eyedeekay.github.io.xpi.torrent differ diff --git a/index.html b/index.html index f558d1f..95a0cca 100644 --- a/index.html +++ b/index.html @@ -38,7 +38,7 @@