Fix changes

.dockerignore

@@ -1 +1,4 @@
-.git
+/.git
+/plugin
+/i2pbrowser
+/i2p.plugins.firefox

.github/workflows/ant.yml

@@ -0,0 +1,240 @@
+# Mostly copied from i2p.i2p, by way of: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-ant
+# zlatinb did it originally, now I maintain it(idk)
+
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: dependencies
+        run: sudo apt install gettext golang-go git ant
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name : Generate override.properties
+        run: |
+          rm -f override.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+      - name: install crx3
+        run: go install github.com/mediabuyerbot/go-crx3/crx3@latest
+      - name: install dzip
+        run: go install github.com/delicb/dzip@latest
+      - name: install amo-version
+        run: go install github.com/eyedeekay/amo-version@a4f4119eac453a14d6b6184b656320eb72b5da3c
+      - name: install manifest-json-version
+        run: go install github.com/eyedeekay/manifest-json-version@latest
+      - run: git clone https://github.com/i2p/i2p.i2p ../i2p.i2p
+      - run: cd ../i2p.i2p && ant builddep
+      - name: build with Ant
+        run: |
+          export PATH=$PATH:$(go env GOPATH)/bin
+          ant distclean jpackage debian
+      - name: Upload Firefox Profile Strict
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p.firefox.base.profile.zip
+          path: ./src/i2p.firefox.base.profile.zip
+      - name: Upload Firefox Profile Usability
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p.firefox.usability.profile.zip
+          path: ./src/i2p.firefox.usability.profile.zip
+      - name: Upload Chromium Profile Strict
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p.chromium.base.profile.zip
+          path: ./src/i2p.chromium.base.profile.zip
+      - name: Upload Chromium Profile Usability
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p.chromium.usability.profile.zip
+          path: ./src/i2p.chromium.usability.profile.zip
+      - name: Upload i2pfirefox.jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2pfirefox.jar
+          path: ./src/build/i2pfirefox.jar
+      - name: Upload i2pfirefox-plugin.jar
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2pfirefox-plugin.jar
+          path: ./src/build/i2pfirefox-plugin.jar
+      - name: Upload i2pbrowser.tar.gz
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2pbrowser.tar.gz
+          path: ./i2pbrowser.tar.gz
+      - name: Upload i2pbrowser.deb
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2pbrowser_amd64.deb
+          path: ./i2pbrowser_1.0.0_amd64.deb
+      - name: build plugin with Ant
+        run: |
+          export PATH=$PATH:$(go env GOPATH)/bin
+          ant distclean pluginzip
+      - name: Upload i2pfirefox.zip (unsigned plugin)
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2pfirefox.zip
+          path: ./plugin.zip
+
+
+  buildrpm:
+    runs-on: ubuntu-latest
+    container: fedora
+
+    steps:
+      - name: dependencies
+        run: sudo yum install -y gettext golang-go git ant jq wget curl gpg xz ca-certificates rpm-build
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - run: echo [Adoptium] >> /etc/yum.repos.d/adoptium.repo 
+      - run: echo name=Adoptium >> /etc/yum.repos.d/adoptium.repo
+      - run: . /etc/os-release; echo baseurl=https://packages.adoptium.net/artifactory/rpm/fedora/$VERSION_ID/x86_64/ >> /etc/yum.repos.d/adoptium.repo
+      - run: echo enabled=1 >> /etc/yum.repos.d/adoptium.repo
+      - run: echo gpgcheck=1 >> /etc/yum.repos.d/adoptium.repo
+      - run: echo gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public >> /etc/yum.repos.d/adoptium.repo
+      - run: dnf clean all && rm -r /var/cache/dnf  && dnf upgrade -y && dnf update -y
+      - run: dnf install -y temurin-21-jdk
+      - name: Generate override.properties
+        run: |
+          rm -f override.properties
+          echo "build.built-by=GitHub Actions" >> override.properties
+          echo "noExe=true" >> override.properties
+      - name: install crx3
+        run: go install github.com/mediabuyerbot/go-crx3/crx3@latest
+      - name: install dzip
+        run: go install github.com/delicb/dzip@latest
+      - name: install amo-version
+        run: go install github.com/eyedeekay/amo-version@a4f4119eac453a14d6b6184b656320eb72b5da3c
+      - name: install manifest-json-version
+        run: go install github.com/eyedeekay/manifest-json-version@latest
+      - run: git clone https://github.com/i2p/i2p.i2p ../i2p.i2p
+      - run: cd ../i2p.i2p && ant builddep
+      - name: build with Ant
+        run: |
+          export PATH=$PATH:$(go env GOPATH)/bin
+          ant distclean jpackage fedora
+          find . -name '*.rpm'
+      - name: Upload i2pbrowser.rpm
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2pbrowser.x86_64.rpm
+          path: ./i2pbrowser-1.0.0-1.x86_64.rpm
+
+
+  buildwin:
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+      - name : Generate override.properties
+        run: |
+          bash -c 'rm -f override.properties'
+          bash -c 'echo "build.built-by=GitHub Actions" >> override.properties'
+          bash -c 'echo "noExe=true" >> override.properties'
+      - name: install crx3
+        run: go install github.com/mediabuyerbot/go-crx3/crx3@latest
+      - name: install dzip
+        run: go install github.com/delicb/dzip@latest
+      - name: install amo-version
+        run: go install github.com/eyedeekay/amo-version@a4f4119eac453a14d6b6184b656320eb72b5da3c
+      - name: install manifest-json-version
+        run: go install github.com/eyedeekay/manifest-json-version@latest
+      - run: git clone https://github.com/i2p/i2p.i2p ../i2p.i2p
+      - run: cd ../i2p.i2p && ant builddep
+      - name: build exe with Ant
+        run: |
+          ant windows
+          bash -c 'ls *.exe'
+      - name: Upload Firefox Profile EXE Installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2pbrowser-1.0.0.exe
+          path: ./i2pbrowser-1.0.0.exe
+      - name: build msi with Ant
+        run: |
+          ant windows-msi
+          bash -c 'ls *.msi'
+      - name: Upload Firefox Profile MSI Installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2pbrowser-1.0.0.msi
+          path: ./i2pbrowser-1.0.0.msi
+      - name: build portable zip with Ant
+        run: |
+          ant windows-portable
+          bash -c 'ls *.zip'
+      - name: Upload Firefox Profile Portable Zip
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2pbrowser-portable.zip
+          path: ./i2pbrowser-portable.zip
+
+  buildmac:
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.21'
+      - name : Generate override.properties
+        run: |
+          bash -c 'rm -f override.properties'
+          bash -c 'echo "build.built-by=GitHub Actions" >> override.properties'
+          bash -c 'echo "noExe=true" >> override.properties'
+      - name: install crx3
+        run: go install github.com/mediabuyerbot/go-crx3/crx3@latest
+      - name: install dzip
+        run: go install github.com/delicb/dzip@latest
+      - name: install amo-version
+        run: go install github.com/eyedeekay/amo-version@a4f4119eac453a14d6b6184b656320eb72b5da3c
+      - name: install manifest-json-version
+        run: go install github.com/eyedeekay/manifest-json-version@latest
+      - run: git clone https://github.com/i2p/i2p.i2p ../i2p.i2p
+      - run: cd ../i2p.i2p && ant builddep
+      - name: build dmg with Ant
+        run: |
+          ant macos
+          bash -c 'ls *.dmg'
+      - name: Upload Firefox Profile DMG Installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2pbrowser-1.0.0.dmg
+          path: ./i2pbrowser-1.0.0.dmg
+      - name: build pkg with Ant
+        run: |
+          ant macos-pkg
+          bash -c 'ls *.pkg'
+      - name: Upload Firefox Profile PKG Installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2pbrowser-1.0.0.pkg
+          path: ./i2pbrowser-1.0.0.pkg

.github/workflows/release.yml

@@ -0,0 +1,78 @@
+name: Release
+
+#on: [push]
+
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - '*.*.*' # Release 1.2.3
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            CHANGES.md
+          sparse-checkout-cone-mode: false
+      - name: sleep 15 minutes
+        run: |
+          echo "sleeping 15 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 14 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 13 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 12 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 11 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 10 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 9 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 8 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 7 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 6 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 5 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 4 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 3 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 2 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 1 minutes to wait for artifacts"
+          sleep 1m
+      - name: Download artifacts
+        id: download-artifact
+        uses: dawidd6/action-download-artifact@v3
+        with:
+          skip_unpack: false
+          workflow: ant.yml
+          if_no_artifact_found: fail
+      # remove .zip file extension
+      - run: for f in *.zip; do mv "$f" "${f%.zip}"; done
+      - run: echo "" | tee -a CHANGES.md
+      - run: echo "## Checksums" | tee -a CHANGES.md
+      - run: echo "" | tee -a CHANGES.md
+      - run: echo '```' | tee -a CHANGES.md
+      - run: sha256sum * | tee -a CHANGES.md
+      - run: echo '```' | tee -a CHANGES.md
+      - run: echo "" | tee -a CHANGES.md
+      - run: echo '```' | tee -a CHANGES.md
+      - run: file * | tee -a CHANGES.md
+      - run: echo '```' | tee -a CHANGES.md
+      - run: echo "" | tee -a CHANGES.md
+      - name: Upload artifacts
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "*"
+          bodyFile: "CHANGES.md"

.gitignore

@@ -7,6 +7,10 @@ log
 /i2p.firefox.base.profile/
 /i2p.chromium.usability.profile/
 /i2p.firefox.usability.profile/
+/src/i2p.chromium.base.profile/
+/src/i2p.firefox.base.profile/
+/src/i2p.chromium.usability.profile/
+/src/i2p.firefox.usability.profile/
 i2p.chromium.profile
 i2p.firefox.profile
 src/build
@@ -25,4 +29,11 @@ arkenfoxnum
 /*.tar.xz
 /i2p.firefox.profile.*
 /src/*.zip
-/src/*profile/extensions/*.xpi
+/src/*profile/extensions/*.xpi
+i2p.plugins.firefox/
+/icon.png
+/systray.running
+/.cache
+/.mozilla
+/i2p.plugins.firefox.torrent.zip
+/plugin

CHANGES.html

@@ -8,379 +8,496 @@
     <meta name="keywords" content="main" />
     <link rel="stylesheet" type="text/css" href="style.css" />
     <link rel="stylesheet" type="text/css" href="showhider.css" />
+    <link rel="stylesheet" type="text/css" href="darklight.css" />
   </head>
   <body>
-    <div id="navbar">
-      <a href="#shownav">
-        Show navigation
-      </a>
-      <div id="shownav">
-        <div id="hidenav">
-          <ul>
-            <li>
-              <a href="..">
-                Up one level ^
-              </a>
-            </li>
-            <li>
-              <a href="index.html">
-                index
-              </a>
-            </li>
-            <li>
-              <a href="CHANGES.html">
-                CHANGES
-              </a>
-            </li>
-            <li>
-              <a href="LICENSE.html">
-                LICENSE
-              </a>
-            </li>
-            <li>
-              <a href="LINUX.html">
-                LINUX
-              </a>
-            </li>
-            <li>
-              <a href="OSX.html">
-                OSX
-              </a>
-            </li>
-            <li>
-              <a href="VERSION.html">
-                VERSION
-              </a>
-            </li>
-            <li>
-              <a href="WINDOWS.html">
-                WINDOWS
-              </a>
-            </li>
-            <li>
-              <a href="index.html">
-                index.html
-              </a>
-            </li>
-          </ul>
-          <br>
-          <a href="#hidenav">
-            Hide Navigation
-          </a>
+    <input type="checkbox" id="checkboxDarkLight">
+    <div class="container">
+      <div id="navbar">
+        <a href="#shownav">
+          Show navigation
+        </a>
+        <div id="shownav">
+          <div id="hidenav">
+            <ul>
+              <li>
+                <a href="..">
+                  Up one level ^
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index
+                </a>
+              </li>
+              <li>
+                <a href="CHANGES.html">
+                  CHANGES
+                </a>
+              </li>
+              <li>
+                <a href="LICENSE.html">
+                  LICENSE
+                </a>
+              </li>
+              <li>
+                <a href="VERSION.html">
+                  VERSION
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index.html
+                </a>
+              </li>
+              <li>
+                <a href="docs/BUILD.html">
+                  docs/BUILD
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PBrowser.html">
+                  docs/I2PBrowser
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PBrowserPlugin.html">
+                  docs/I2PBrowserPlugin.html
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PChromium.html">
+                  docs/I2PChromium
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PChromiumProfileBuilder.html">
+                  docs/I2PChromiumProfileBuilder
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PChromiumProfileChecker.html">
+                  docs/I2PChromiumProfileChecker
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PChromiumProfileUnpacker.html">
+                  docs/I2PChromiumProfileUnpacker
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PCommonBrowser.html">
+                  docs/I2PCommonBrowser
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PFirefox.html">
+                  docs/I2PFirefox
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PFirefoxProfileBuilder.html">
+                  docs/I2PFirefoxProfileBuilder
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PFirefoxProfileChecker.html">
+                  docs/I2PFirefoxProfileChecker
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PFirefoxProfileUnpacker.html">
+                  docs/I2PFirefoxProfileUnpacker
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PGenericUnsafeBrowser.html">
+                  docs/I2PGenericUnsafeBrowser
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PLibreWolf.html">
+                  docs/I2PLibreWolf.html
+                </a>
+              </li>
+              <li>
+                <a href="docs/LINUX.html">
+                  docs/LINUX
+                </a>
+              </li>
+              <li>
+                <a href="docs/OSX.html">
+                  docs/OSX
+                </a>
+              </li>
+              <li>
+                <a href="docs/WINDOWS.html">
+                  docs/WINDOWS
+                </a>
+              </li>
+            </ul>
+            <br>
+            <a href="#hidenav">
+              Hide Navigation
+            </a>
+          </div>
         </div>
       </div>
-    </div>
-    <a id="returnhome" href="/">
-      /
-    </a>
-    <h2>
-      Tue, November 22
-    </h2>
-    <ul>
-      <li>
-        Fix some minor issues from buildsystem refactor that surfaced during release
-      </li>
-      <li>
-        update to version 1.0.5
-      </li>
-    </ul>
-    <h2>
-      Sat, October 22
-    </h2>
-    <ul>
-      <li>
-        Add systray for launching browsers from our own GUI
-      </li>
-      <li>
-        Add
-        <code>
-          browser.config
-        </code>
-        file for customizing configuration
-      </li>
-    </ul>
-    <h2>
-      Thu, October 20
-    </h2>
-    <ul>
-      <li>
-        Complete the PWA/App mode
-      </li>
-    </ul>
-    <h2>
-      Sat, October 1
-    </h2>
-    <ul>
-      <li>
-        Work around anti-automation measures on OSX by writing final command out to shell script and running that
-      </li>
-      <li>
-        Deterministically generate .zip files
-      </li>
-      <li>
-        Add Tor Browser support to OSX
-      </li>
-      <li>
-        Improve Tor Browser support on Linux
-      </li>
-    </ul>
-    <h2>
-      Sun, September 25
-    </h2>
-    <ul>
-      <li>
-        Become version 1.0.0
-      </li>
-    </ul>
-    <h2>
-      Wed, September 15
-    </h2>
-    <ul>
-      <li>
-        Add ant targets which auto-update the user.js
-      </li>
-    </ul>
-    <h2>
-      Wed, September 14
-    </h2>
-    <ul>
-      <li>
-        Add ant targets which fetch Firefox addons from addons.mozilla.org
-      </li>
-    </ul>
-    <h2>
-      Sun, September 11
-    </h2>
-    <ul>
-      <li>
-        Make the logging a little more sensible
-      </li>
-    </ul>
-    <h2>
-      Tue, September 6
-    </h2>
-    <ul>
-      <li>
-        Wait up to 5 seconds for the initializing headless Firefox instance to die on Windows
-      </li>
-      <li>
-        Add option to disable proxy pre-check by setting timeout to zero or less
-      </li>
-    </ul>
-    <h2>
-      Tue, September 6
-    </h2>
-    <ul>
-      <li>
-        Run headlessly on first-run on Windows.
-      </li>
-      <li>
-        Add support for building an .exe package.
-      </li>
-      <li>
-        Add support for building an .zip Windows portable package.
-      </li>
-      <li>
-        Add support for building an .rpm package.
-      </li>
-      <li>
-        Destroy headless process if it goes too long.
-      </li>
-    </ul>
-    <h2>
-      Mon, September 5
-    </h2>
-    <ul>
-      <li>
-        Fix several issues with running on Windows 11
-      </li>
-      <li>
-        Make tunnel nicknames different to avoid double shared tunnels
-      </li>
-      <li>
-        Add support for building a .deb package.
-      </li>
-      <li>
-        Add support for building an .msi package.
-      </li>
-    </ul>
-    <h2>
-      Fri, September 2
-    </h2>
-    <ul>
-      <li>
-        Disable HTTPS only mode in favor of HTTPS-first mode to remove the interstitial on I2P sites.
-      </li>
-      <li>
-        Clearnet sites still choose HTTPS first and will silently deny downgrades but will not warn HTTP-only users.
-      </li>
-    </ul>
-    <h2>
-      Thu, September 1
-    </h2>
-    <ul>
-      <li>
-        Add a jpackage target. Add descriptions to release items.
-      </li>
-    </ul>
-    <h2>
-      Wed, August 31
-    </h2>
-    <ul>
-      <li>
-        Add unpacked extensions for Chromium profiles
-      </li>
-      <li>
-        Add Chromium flags from Ungoogled-Chromium documentation
-      </li>
-      <li>
-        Add Usability/Strict mode switching for Chromium
-      </li>
-    </ul>
-    <h2>
-      Tue, August 30
-    </h2>
-    <ul>
-      <li>
-        Add Usability/Strict mode switching for Firefox
-      </li>
-      <li>
-        Factor out common functions to own class
-      </li>
-    </ul>
-    <h2>
-      Sun, August 28
-    </h2>
-    <ul>
-      <li>
-        Adds support for generically configuring a browser with environment variables.
-      </li>
-      <li>
-        Bugfix for MSEdgium support
-      </li>
-      <li>
-        Add detachable version of launchers
-      </li>
-    </ul>
-    <h2>
-      Sat, August 27
-    </h2>
-    <ul>
-      <li>
-        Added support for passing a URL as a parameter to the cli&rsquo;s
-      </li>
-      <li>
-        revised test.sh
-      </li>
-    </ul>
-    <h2>
-      Mon, August 22
-    </h2>
-    <ul>
-      <li>
-        Completes support for auto-selecting
-        <em>
-          either
-        </em>
-        a Firefox or Chrome instance, automatically
-      </li>
-    </ul>
-    <h2>
-      Sat, August 21
-    </h2>
-    <ul>
-      <li>
-        Adds support for passing the -private flag to start Firefox with &ndash;private-window and Chromium &ndash;incognito
-      </li>
-    </ul>
-    <h2>
-      Fri, August 20
-    </h2>
-    <ul>
-      <li>
-        Chromium is now a first-class citizen
-      </li>
-    </ul>
-    <h2>
-      Fri, August 19
-    </h2>
-    <ul>
-      <li>
-        Adds the ability to pass &ndash;private-window to Firefoxes and &ndash;incognito to Chromiums
-      </li>
-      <li>
-        Switch Tor Browser to the top of the order on Windows to match i2p.firefox behavior
-      </li>
-    </ul>
-    <h2>
-      Mon, August 8
-    </h2>
-    <ul>
-      <li>
-        Add Chromium support. You heard me. Chromium support.
-      </li>
-      <li>
-        Update launcher script so it self-discovers the location of the script and uses that to find the bundled jar.
-      </li>
-    </ul>
-    <h2>
-      Sun, August 7
-    </h2>
-    <ul>
-      <li>
-        Wrote the Javadoc
-      </li>
-      <li>
-        Embedded the Firefox profile in the Jar so it always unpacks correctly
-      </li>
-      <li>
-        re-added Tor Browser support on Windows
-      </li>
-      <li>
-        Fix false positives in validation routine
-      </li>
-      <li>
-        Make constructors public
-      </li>
-      <li>
-        Wait on processbuilder to close
-      </li>
-    </ul>
-    <h2>
-      Saturday, August 6
-    </h2>
-    <ul>
-      <li>
-        Implemented firefox detection
-      </li>
-      <li>
-        Implemented directory setup
-      </li>
-      <li>
-        Implemented processBuilder generator
-      </li>
-    </ul>
-    <div id="sourcecode">
-      <span id="sourcehead">
-        <strong>
-          Get the source code:
-        </strong>
-      </span>
+      <a id="returnhome" href="/">
+        /
+      </a>
+      <h2>
+        Thu, March 7
+      </h2>
       <ul>
         <li>
-          <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
-            Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
-          </a>
+          re-implement Plugin functions with Destop GUI API.
+        </li>
+        <li>
+          Fix several NPE&rsquo;s
+        </li>
+        <li>
+          Delete redundant code
+        </li>
+        <li>
+          CI/CD improvements, packaging improvements
         </li>
       </ul>
-    </div>
-    <div>
-      <a href="#show">
-        Show license
-      </a>
-      <div id="show">
-        <div id="hide">
-          <pre><code>   Copyright 2022 idk (hankhill19580@gmail.com)
+      <h2>
+        Tue, January 17
+      </h2>
+      <ul>
+        <li>
+          Remove HTTPS everywhere from all profiles
+        </li>
+        <li>
+          Generate a Tor Browser install to go inside Linux jpackage portables
+        </li>
+      </ul>
+      <h2>
+        Sat, December 31
+      </h2>
+      <ul>
+        <li>
+          Add environment variables which customize behavior of Tor Browser
+        </li>
+      </ul>
+      <h2>
+        Sun, December 18
+      </h2>
+      <ul>
+        <li>
+          Enable use as a Java I2P Console Plugin
+        </li>
+      </ul>
+      <h2>
+        Tue, November 22
+      </h2>
+      <ul>
+        <li>
+          Fix some minor issues from buildsystem refactor that surfaced during release
+        </li>
+        <li>
+          update to version 1.0.5
+        </li>
+      </ul>
+      <h2>
+        Sat, October 22
+      </h2>
+      <ul>
+        <li>
+          Add systray for launching browsers from our own GUI
+        </li>
+        <li>
+          Add
+          <code>
+            browser.config
+          </code>
+          file for customizing configuration
+        </li>
+      </ul>
+      <h2>
+        Thu, October 20
+      </h2>
+      <ul>
+        <li>
+          Complete the PWA/App mode
+        </li>
+      </ul>
+      <h2>
+        Sat, October 1
+      </h2>
+      <ul>
+        <li>
+          Work around anti-automation measures on OSX by writing final command out to shell script and running that
+        </li>
+        <li>
+          Deterministically generate .zip files
+        </li>
+        <li>
+          Add Tor Browser support to OSX
+        </li>
+        <li>
+          Improve Tor Browser support on Linux
+        </li>
+      </ul>
+      <h2>
+        Sun, September 25
+      </h2>
+      <ul>
+        <li>
+          Become version 1.0.0
+        </li>
+      </ul>
+      <h2>
+        Wed, September 15
+      </h2>
+      <ul>
+        <li>
+          Add ant targets which auto-update the user.js
+        </li>
+      </ul>
+      <h2>
+        Wed, September 14
+      </h2>
+      <ul>
+        <li>
+          Add ant targets which fetch Firefox addons from addons.mozilla.org
+        </li>
+      </ul>
+      <h2>
+        Sun, September 11
+      </h2>
+      <ul>
+        <li>
+          Make the logging a little more sensible
+        </li>
+      </ul>
+      <h2>
+        Tue, September 6
+      </h2>
+      <ul>
+        <li>
+          Wait up to 5 seconds for the initializing headless Firefox instance to die on Windows
+        </li>
+        <li>
+          Add option to disable proxy pre-check by setting timeout to zero or less
+        </li>
+      </ul>
+      <h2>
+        Tue, September 6
+      </h2>
+      <ul>
+        <li>
+          Run headlessly on first-run on Windows.
+        </li>
+        <li>
+          Add support for building an .exe package.
+        </li>
+        <li>
+          Add support for building an .zip Windows portable package.
+        </li>
+        <li>
+          Add support for building an .rpm package.
+        </li>
+        <li>
+          Destroy headless process if it goes too long.
+        </li>
+      </ul>
+      <h2>
+        Mon, September 5
+      </h2>
+      <ul>
+        <li>
+          Fix several issues with running on Windows 11
+        </li>
+        <li>
+          Make tunnel nicknames different to avoid double shared tunnels
+        </li>
+        <li>
+          Add support for building a .deb package.
+        </li>
+        <li>
+          Add support for building an .msi package.
+        </li>
+      </ul>
+      <h2>
+        Fri, September 2
+      </h2>
+      <ul>
+        <li>
+          Disable HTTPS only mode in favor of HTTPS-first mode to remove the interstitial on I2P sites.
+        </li>
+        <li>
+          Clearnet sites still choose HTTPS first and will silently deny downgrades but will not warn HTTP-only users.
+        </li>
+      </ul>
+      <h2>
+        Thu, September 1
+      </h2>
+      <ul>
+        <li>
+          Add a jpackage target. Add descriptions to release items.
+        </li>
+      </ul>
+      <h2>
+        Wed, August 31
+      </h2>
+      <ul>
+        <li>
+          Add unpacked extensions for Chromium profiles
+        </li>
+        <li>
+          Add Chromium flags from Ungoogled-Chromium documentation
+        </li>
+        <li>
+          Add Usability/Strict mode switching for Chromium
+        </li>
+      </ul>
+      <h2>
+        Tue, August 30
+      </h2>
+      <ul>
+        <li>
+          Add Usability/Strict mode switching for Firefox
+        </li>
+        <li>
+          Factor out common functions to own class
+        </li>
+      </ul>
+      <h2>
+        Sun, August 28
+      </h2>
+      <ul>
+        <li>
+          Adds support for generically configuring a browser with environment variables.
+        </li>
+        <li>
+          Bugfix for MSEdgium support
+        </li>
+        <li>
+          Add detachable version of launchers
+        </li>
+      </ul>
+      <h2>
+        Sat, August 27
+      </h2>
+      <ul>
+        <li>
+          Added support for passing a URL as a parameter to the cli&rsquo;s
+        </li>
+        <li>
+          revised test.sh
+        </li>
+      </ul>
+      <h2>
+        Mon, August 22
+      </h2>
+      <ul>
+        <li>
+          Completes support for auto-selecting
+          <em>
+            either
+          </em>
+          a Firefox or Chrome instance, automatically
+        </li>
+      </ul>
+      <h2>
+        Sat, August 21
+      </h2>
+      <ul>
+        <li>
+          Adds support for passing the -private flag to start Firefox with &ndash;private-window and Chromium &ndash;incognito
+        </li>
+      </ul>
+      <h2>
+        Fri, August 20
+      </h2>
+      <ul>
+        <li>
+          Chromium is now a first-class citizen
+        </li>
+      </ul>
+      <h2>
+        Fri, August 19
+      </h2>
+      <ul>
+        <li>
+          Adds the ability to pass &ndash;private-window to Firefoxes and &ndash;incognito to Chromiums
+        </li>
+        <li>
+          Switch Tor Browser to the top of the order on Windows to match i2p.firefox behavior
+        </li>
+      </ul>
+      <h2>
+        Mon, August 8
+      </h2>
+      <ul>
+        <li>
+          Add Chromium support. You heard me. Chromium support.
+        </li>
+        <li>
+          Update launcher script so it self-discovers the location of the script and uses that to find the bundled jar.
+        </li>
+      </ul>
+      <h2>
+        Sun, August 7
+      </h2>
+      <ul>
+        <li>
+          Wrote the Javadoc
+        </li>
+        <li>
+          Embedded the Firefox profile in the Jar so it always unpacks correctly
+        </li>
+        <li>
+          re-added Tor Browser support on Windows
+        </li>
+        <li>
+          Fix false positives in validation routine
+        </li>
+        <li>
+          Make constructors public
+        </li>
+        <li>
+          Wait on processbuilder to close
+        </li>
+      </ul>
+      <h2>
+        Saturday, August 6
+      </h2>
+      <ul>
+        <li>
+          Implemented firefox detection
+        </li>
+        <li>
+          Implemented directory setup
+        </li>
+        <li>
+          Implemented processBuilder generator
+        </li>
+      </ul>
+      <div id="sourcecode">
+        <span id="sourcehead">
+          <strong>
+            Get the source code:
+          </strong>
+        </span>
+        <ul>
+          <li>
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+            </a>
+          </li>
+        </ul>
+      </div>
+      <div>
+        <a href="#show">
+          Show license
+        </a>
+        <div id="show">
+          <div id="hide">
+            <pre><code>   Copyright 2022 idk (hankhill19580@gmail.com)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -1223,9 +1340,10 @@ consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
 </code></pre>
-          <a href="#hide">
-            Hide license
-          </a>
+            <a href="#hide">
+              Hide license
+            </a>
+          </div>
         </div>
       </div>
     </div>
@@ -1234,7 +1352,7 @@ Public License instead of this License.
     </div>
     <div>
       <a href="https://geti2p.net/">
-        <img src="i2plogo.png"></img>
+        <img class="i2plogo" src="i2plogo.png"></img>
         I2P
       </a>
     </div>

CHANGES.md

@@ -1,3 +1,27 @@
+Thu, March 7
+------------
+
+ - re-implement Plugin functions with Destop GUI API.
+ - Fix several NPE's
+ - Delete redundant code
+ - CI/CD improvements, packaging improvements
+
+Tue, January 17
+---------------
+
+ - Remove HTTPS everywhere from all profiles
+ - Generate a Tor Browser install to go inside Linux jpackage portables
+
+Sat, December 31
+----------------
+
+ - Add environment variables which customize behavior of Tor Browser
+
+Sun, December 18
+----------------
+
+ - Enable use as a Java I2P Console Plugin
+
 Tue, November 22
 ----------------
 

Dockerfile.fedora

@@ -1,6 +1,14 @@
-FROM fedora
-RUN yum -y update
-RUN yum -y install rpm-build
+FROM fedora:36
+# Note,
+RUN echo [Adoptium] >> /etc/yum.repos.d/adoptium.repo 
+RUN echo name=Adoptium >> /etc/yum.repos.d/adoptium.repo
+RUN . /etc/os-release; echo baseurl=https://packages.adoptium.net/artifactory/rpm/fedora/$VERSION_ID/x86_64/ >> /etc/yum.repos.d/adoptium.repo
+RUN echo enabled=1 >> /etc/yum.repos.d/adoptium.repo
+RUN echo gpgcheck=1 >> /etc/yum.repos.d/adoptium.repo
+RUN echo gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public >> /etc/yum.repos.d/adoptium.repo
+RUN cat /etc/yum.repos.d/adoptium.repo
+RUN dnf clean all && rm -r /var/cache/dnf  && dnf upgrade -y && dnf update -y
+RUN dnf -y install rpm-build temurin-19-jdk
 ADD . /src/i2p.plugins.firefox
 WORKDIR /src/i2p.plugins.firefox
 CMD ./fedora-docker.sh

README.md

@@ -47,15 +47,15 @@ directory for Firefox, and the `src/i2p.chromium.*.profile/extensions/*.js/*` di
 
 For platform specific instructions, see
 
-- [LINUX.md](LINUX.md)/[LINUX.html](LINUX.html)
-- [OSX.md](OSX.md)/[OSX.html](OSX.html)
-- [WINDOWS.md](WINDOWS.md)/[WINDOWS.html](WINDOWS.html)
+- [LINUX.md](docs/LINUX.md)/[LINUX.html](docs/LINUX.html)
+- [OSX.md](docs/OSX.md)/[OSX.html](docs/OSX.html)
+- [WINDOWS.md](docs/WINDOWS.md)/[WINDOWS.html](docs/WINDOWS.html)
 
 #### All platforms, using a zip: `.zip` and a non-bundled Java
 
 ```sh
 mkdir ~/tmp-i2pfirefox && cd ~/tmp-i2pfirefox
-wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.5/i2pfirefox.zip
+wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.3.0/i2pfirefox.zip
 unzip i2pfirefox.zip
 ./i2pfirefox.cmd
 

VERSION.html

@@ -8,142 +8,209 @@
     <meta name="keywords" content="main" />
     <link rel="stylesheet" type="text/css" href="style.css" />
     <link rel="stylesheet" type="text/css" href="showhider.css" />
+    <link rel="stylesheet" type="text/css" href="darklight.css" />
   </head>
   <body>
-    <div id="navbar">
-      <a href="#shownav">
-        Show navigation
-      </a>
-      <div id="shownav">
-        <div id="hidenav">
-          <ul>
-            <li>
-              <a href="..">
-                Up one level ^
-              </a>
-            </li>
-            <li>
-              <a href="index.html">
-                index
-              </a>
-            </li>
-            <li>
-              <a href="CHANGES.html">
-                CHANGES
-              </a>
-            </li>
-            <li>
-              <a href="LICENSE.html">
-                LICENSE
-              </a>
-            </li>
-            <li>
-              <a href="LINUX.html">
-                LINUX
-              </a>
-            </li>
-            <li>
-              <a href="OSX.html">
-                OSX
-              </a>
-            </li>
-            <li>
-              <a href="VERSION.html">
-                VERSION
-              </a>
-            </li>
-            <li>
-              <a href="WINDOWS.html">
-                WINDOWS
-              </a>
-            </li>
-            <li>
-              <a href="index.html">
-                index.html
-              </a>
-            </li>
-          </ul>
-          <br>
-          <a href="#hidenav">
-            Hide Navigation
-          </a>
+    <input type="checkbox" id="checkboxDarkLight">
+    <div class="container">
+      <div id="navbar">
+        <a href="#shownav">
+          Show navigation
+        </a>
+        <div id="shownav">
+          <div id="hidenav">
+            <ul>
+              <li>
+                <a href="..">
+                  Up one level ^
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index
+                </a>
+              </li>
+              <li>
+                <a href="CHANGES.html">
+                  CHANGES
+                </a>
+              </li>
+              <li>
+                <a href="LICENSE.html">
+                  LICENSE
+                </a>
+              </li>
+              <li>
+                <a href="VERSION.html">
+                  VERSION
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index.html
+                </a>
+              </li>
+              <li>
+                <a href="docs/BUILD.html">
+                  docs/BUILD
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PBrowser.html">
+                  docs/I2PBrowser
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PBrowserPlugin.html">
+                  docs/I2PBrowserPlugin.html
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PChromium.html">
+                  docs/I2PChromium
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PChromiumProfileBuilder.html">
+                  docs/I2PChromiumProfileBuilder
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PChromiumProfileChecker.html">
+                  docs/I2PChromiumProfileChecker
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PChromiumProfileUnpacker.html">
+                  docs/I2PChromiumProfileUnpacker
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PCommonBrowser.html">
+                  docs/I2PCommonBrowser
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PFirefox.html">
+                  docs/I2PFirefox
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PFirefoxProfileBuilder.html">
+                  docs/I2PFirefoxProfileBuilder
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PFirefoxProfileChecker.html">
+                  docs/I2PFirefoxProfileChecker
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PFirefoxProfileUnpacker.html">
+                  docs/I2PFirefoxProfileUnpacker
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PGenericUnsafeBrowser.html">
+                  docs/I2PGenericUnsafeBrowser
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PLibreWolf.html">
+                  docs/I2PLibreWolf.html
+                </a>
+              </li>
+              <li>
+                <a href="docs/LINUX.html">
+                  docs/LINUX
+                </a>
+              </li>
+              <li>
+                <a href="docs/OSX.html">
+                  docs/OSX
+                </a>
+              </li>
+              <li>
+                <a href="docs/WINDOWS.html">
+                  docs/WINDOWS
+                </a>
+              </li>
+            </ul>
+            <br>
+            <a href="#hidenav">
+              Hide Navigation
+            </a>
+          </div>
         </div>
       </div>
-    </div>
-    <a id="returnhome" href="/">
-      /
-    </a>
-    <h1>
-      Extension Versions
-    </h1>
-    <h2>
-      Firefox
-    </h2>
-    <pre><code class="language-md">i2p-in-private-browsing
-1.44
-https://addons.mozilla.org/firefox/downloads/file/4020669/i2p_in_private_browsing-1.44.xpi
+      <a id="returnhome" href="/">
+        /
+      </a>
+      <h1>
+        Extension Versions
+      </h1>
+      <h2>
+        Firefox
+      </h2>
+      <pre><code class="language-md">i2p-in-private-browsing
+1.48
+https://addons.mozilla.org/firefox/downloads/file/4123613/i2p_in_private_browsing-1.48.xpi
 noscript
-11.4.13
-https://addons.mozilla.org/firefox/downloads/file/4033638/noscript-11.4.13.xpi
+11.4.29
+https://addons.mozilla.org/firefox/downloads/file/4206186/noscript-11.4.29.xpi
 localcdn-fork-of-decentraleyes
-2.6.40
-https://addons.mozilla.org/firefox/downloads/file/4032517/localcdn_fork_of_decentraleyes-2.6.40.xpi
-https-everywhere
-2021.7.13
-https://addons.mozilla.org/firefox/downloads/file/3809748/https_everywhere-2021.7.13.xpi
+2.6.64
+https://addons.mozilla.org/firefox/downloads/file/4243456/localcdn_fork_of_decentraleyes-2.6.64.xpi
 onion-in-container-browsing
 0.82
 https://addons.mozilla.org/firefox/downloads/file/3904685/onion_in_container_browsing-0.82.xpi
 javascript-restrictor
-0.11.1
-https://addons.mozilla.org/firefox/downloads/file/3950710/javascript_restrictor-0.11.1.xpi
+0.17
+https://addons.mozilla.org/firefox/downloads/file/4190089/javascript_restrictor-0.17.xpi
 ublock-origin
-1.45.2
-https://addons.mozilla.org/firefox/downloads/file/4028976/ublock_origin-1.45.2.xpi
+1.56.0
+https://addons.mozilla.org/firefox/downloads/file/4237670/ublock_origin-1.56.0.xpi
 </code></pre>
-    <h2>
-      Chromium
-    </h2>
-    <pre><code class="language-md">__MSG_extensionName__
+      <h2>
+        Chromium
+      </h2>
+      <pre><code class="language-md">__MSG_extensionName__
 1.29
 https://clients2.google.com/service/update2/crx
 NoScript
-11.4.13
-https://clients2.google.com/service/update2/crx
-__MSG_about_ext_name__
-2022.5.24
+11.4.18
 https://clients2.google.com/service/update2/crx
 LocalCDN
-2.6.39
+2.6.64
 https://clients2.google.com/service/update2/crx
 uBlock Origin
-1.45.2
+1.56.0
 https://clients2.google.com/service/update2/crx
-JShelter
-0.11.1
+__MSG_extensionName__
+0.17
 https://clients2.google.com/service/update2/crx
 </code></pre>
-    <div id="sourcecode">
-      <span id="sourcehead">
-        <strong>
-          Get the source code:
-        </strong>
-      </span>
-      <ul>
-        <li>
-          <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
-            Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
-          </a>
-        </li>
-      </ul>
-    </div>
-    <div>
-      <a href="#show">
-        Show license
-      </a>
-      <div id="show">
-        <div id="hide">
-          <pre><code>   Copyright 2022 idk (hankhill19580@gmail.com)
+      <div id="sourcecode">
+        <span id="sourcehead">
+          <strong>
+            Get the source code:
+          </strong>
+        </span>
+        <ul>
+          <li>
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+            </a>
+          </li>
+        </ul>
+      </div>
+      <div>
+        <a href="#show">
+          Show license
+        </a>
+        <div id="show">
+          <div id="hide">
+            <pre><code>   Copyright 2022 idk (hankhill19580@gmail.com)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -986,9 +1053,10 @@ consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
 </code></pre>
-          <a href="#hide">
-            Hide license
-          </a>
+            <a href="#hide">
+              Hide license
+            </a>
+          </div>
         </div>
       </div>
     </div>
@@ -997,7 +1065,7 @@ Public License instead of this License.
     </div>
     <div>
       <a href="https://geti2p.net/">
-        <img src="i2plogo.png"></img>
+        <img class="i2plogo" src="i2plogo.png"></img>
         I2P
       </a>
     </div>

VERSION.md

@@ -6,26 +6,23 @@ Extension Versions
 
 ```md
 i2p-in-private-browsing
-1.44
-https://addons.mozilla.org/firefox/downloads/file/4020669/i2p_in_private_browsing-1.44.xpi
+1.48
+https://addons.mozilla.org/firefox/downloads/file/4123613/i2p_in_private_browsing-1.48.xpi
 noscript
-11.4.13
-https://addons.mozilla.org/firefox/downloads/file/4033638/noscript-11.4.13.xpi
+11.4.29
+https://addons.mozilla.org/firefox/downloads/file/4206186/noscript-11.4.29.xpi
 localcdn-fork-of-decentraleyes
-2.6.40
-https://addons.mozilla.org/firefox/downloads/file/4032517/localcdn_fork_of_decentraleyes-2.6.40.xpi
-https-everywhere
-2021.7.13
-https://addons.mozilla.org/firefox/downloads/file/3809748/https_everywhere-2021.7.13.xpi
+2.6.64
+https://addons.mozilla.org/firefox/downloads/file/4243456/localcdn_fork_of_decentraleyes-2.6.64.xpi
 onion-in-container-browsing
 0.82
 https://addons.mozilla.org/firefox/downloads/file/3904685/onion_in_container_browsing-0.82.xpi
 javascript-restrictor
-0.11.1
-https://addons.mozilla.org/firefox/downloads/file/3950710/javascript_restrictor-0.11.1.xpi
+0.17
+https://addons.mozilla.org/firefox/downloads/file/4190089/javascript_restrictor-0.17.xpi
 ublock-origin
-1.45.2
-https://addons.mozilla.org/firefox/downloads/file/4028976/ublock_origin-1.45.2.xpi
+1.56.0
+https://addons.mozilla.org/firefox/downloads/file/4237670/ublock_origin-1.56.0.xpi
 ```
 
 ## Chromium
@@ -35,18 +32,15 @@ __MSG_extensionName__
 1.29
 https://clients2.google.com/service/update2/crx
 NoScript
-11.4.13
-https://clients2.google.com/service/update2/crx
-__MSG_about_ext_name__
-2022.5.24
+11.4.18
 https://clients2.google.com/service/update2/crx
 LocalCDN
-2.6.39
+2.6.64
 https://clients2.google.com/service/update2/crx
 uBlock Origin
-1.45.2
+1.56.0
 https://clients2.google.com/service/update2/crx
-JShelter
-0.11.1
+__MSG_extensionName__
+0.17
 https://clients2.google.com/service/update2/crx
 ```

build.xml

@@ -4,10 +4,6 @@
 
     <target name="all" depends="clean,versionMd,i2pFirefoxBaseProfileZip,i2pChromiumBaseProfileZip,jar" />
 
-    <target name="war" >
-        <ant dir="src" target="build" />
-    </target>
-
     <target name="tarball">
         <exec executable="git">
             <arg value="archive"/>
@@ -179,6 +175,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
 
     <target name="jar" depends="versionMd,i2pFirefoxBaseProfileZip,i2pFirefoxUsabilityProfileZip,i2pChromiumBaseProfileZip,i2pChromiumUsabilityProfileZip">
         <ant dir="src" target="jar" />
+        <ant dir="src" target="pluginjar" />
     </target>
 
     <target name="i2pFirefoxBaseProfileZip">
@@ -331,7 +328,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
 
     <target name="buildNum">
         <buildnumber file="scripts/build.number" />
-        <property name="release.number" value="1.0.5" />
+        <property name="release.number" value="1.3.0" />
         <exec executable="echo" osfamily="unix">
             <arg value="${release.number}-${build.number}" />
         </exec>
@@ -343,7 +340,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
         </exec>
     </target>
 
-    <target name="plugin" depends="war, buildNum">
+    <target name="pluginzip" depends="all, buildNum">
         <delete>
            <!-- in installer but not update -->
            <fileset dir="plugin/" includes="i2ptunnel.config i2pfirefox.config eepsite/docroot/index.html eepsite/docroot/robots.txt" />
@@ -357,15 +354,52 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
         <copy file="LICENSE.md" todir="plugin/" overwrite="true" />
         <copy file="README.md" todir="plugin/" overwrite="true" />
         <copy file="CHANGES.md" todir="plugin/" overwrite="true" />
-        <copy file="scripts/firefox.css" todir="plugin/eepsite/docroot/" overwrite="true" />
-        <copy file="scripts/firefox-purple.css" todir="plugin/eepsite/docroot/" overwrite="true" />
-        <copy file="scripts/favicon.png" todir="plugin/eepsite/docroot/" overwrite="true" />
         <copy file="scripts/plugin.config" todir="plugin/" overwrite="true" />
+        <mkdir dir="plugin/lib/" />
+        <copy file="src/build/i2pfirefox-plugin.jar" todir="plugin/lib/" overwrite="true" />
         <exec executable="echo" osfamily="unix" failonerror="true" output="plugin/plugin.config" append="true">
             <arg value="update-only=true" />
         </exec>
         <exec executable="echo" osfamily="unix" failonerror="true" output="plugin/plugin.config" append="true">
-            <arg value="${release.number}-${build.number}" />
+            <arg value="version=${release.number}-${build.number}" />
+        </exec>
+
+        <!-- make the install xpi2p -->
+        <copy file="scripts/plugin.config" todir="plugin/" overwrite="true" />
+        <!-- Files in installer but not update. Be sure to Add to delete fileset above and clean target below -->
+        <copy file="scripts/i2ptunnel.config" todir="plugin/" overwrite="true" />
+        <exec executable="echo" osfamily="unix" failonerror="true" output="plugin/plugin.config" append="true">
+            <arg value="version=${release.number}-${build.number}" />
+        </exec>
+        <exec executable="zip">
+            <arg value="-r"/>
+            <arg value="plugin.zip"/>
+            <arg value="plugin"/>
+        </exec>
+    </target>
+
+    <target name="plugin" depends="all, buildNum">
+        <delete>
+           <!-- in installer but not update -->
+           <fileset dir="plugin/" includes="i2ptunnel.config i2pfirefox.config eepsite/docroot/index.html eepsite/docroot/robots.txt" />
+        </delete>
+        <delete dir="plugin/eepsite/docroot/torrents/" />
+        <!-- get version number -->
+
+
+        <!-- make the update xpi2p -->
+        <!-- this contains everything except i2ptunnel.config -->
+        <copy file="LICENSE.md" todir="plugin/" overwrite="true" />
+        <copy file="README.md" todir="plugin/" overwrite="true" />
+        <copy file="CHANGES.md" todir="plugin/" overwrite="true" />
+        <copy file="scripts/plugin.config" todir="plugin/" overwrite="true" />
+        <mkdir dir="plugin/lib/" />
+        <copy file="src/build/i2pfirefox-plugin.jar" todir="plugin/lib/" overwrite="true" />
+        <exec executable="echo" osfamily="unix" failonerror="true" output="plugin/plugin.config" append="true">
+            <arg value="update-only=true" />
+        </exec>
+        <exec executable="echo" osfamily="unix" failonerror="true" output="plugin/plugin.config" append="true">
+            <arg value="version=${release.number}-${build.number}" />
         </exec>
         <input message="Enter su3 signing key password:" addproperty="release.password.su3" />
         <fail message="You must enter a password." >
@@ -373,40 +407,66 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
                 <equals arg1="${release.password.su3}" arg2=""/>
             </condition>
         </fail>
-        <!-- this will fail if no su3 keys exist, as it needs the password twice -->
-        <exec executable="scripts/makeplugin.sh" inputstring="${release.password.su3}" failonerror="true" >
-            <arg value="plugin" />
-        </exec>
-        <move file="i2pfirefox.xpi2p" tofile="i2pfirefox-update.xpi2p" overwrite="true" />
-        <move file="i2pfirefox.su3" tofile="i2pfirefox-update.su3" overwrite="true" />
 
         <!-- make the install xpi2p -->
         <copy file="scripts/plugin.config" todir="plugin/" overwrite="true" />
         <!-- Files in installer but not update. Be sure to Add to delete fileset above and clean target below -->
         <copy file="scripts/i2ptunnel.config" todir="plugin/" overwrite="true" />
-        <copy file="scripts/i2pfirefox.config" todir="plugin/" overwrite="true" />
-        <copy file="scripts/robots.txt" todir="plugin/eepsite/docroot/" overwrite="true" />
-        <mkdir dir="plugin/eepsite/docroot/torrents/" />
         <exec executable="echo" osfamily="unix" failonerror="true" output="plugin/plugin.config" append="true">
-            <arg value="${release.number}-${build.number}" />
+            <arg value="version=${release.number}-${build.number}" />
         </exec>
+
         <exec executable="scripts/makeplugin.sh" inputstring="${release.password.su3}" failonerror="true" >
             <arg value="plugin" />
         </exec>
+        <mkdir dir="i2p.plugins.firefox" />
+        <copy file="i2pfirefox.su3" todir="i2p.plugins.firefox" overwrite="true" />
+        <copy file="i2pfirefox.xpi2p" todir="i2p.plugins.firefox" overwrite="true" />
+    </target>
+    <target name="torrent">
+        <delete file="i2p.plugins.firefox.torrent" failonerror="false" />
+        <exec executable="mktorrent" osfamily="unix" failonerror="true">
+            <arg value='--announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a,http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a' />
+            <arg value='--piece-length=20' />
+            <arg value='--name=i2p.plugins.firefox' />
+            <arg value='--web-seed=http://idk.i2p/i2p.plugins.firefox,http://idk.i2p/i2p.plugins.firefox' />
+            <arg value='--output=i2p.plugins.firefox.torrent' />
+            <arg value='i2p.plugins.firefox' />
+        </exec>
+        <exec executable="zip">
+            <arg value="-r" />
+            <arg value="i2p.plugins.firefox.torrent.zip" />
+            <arg value="i2p.plugins.firefox" />
+            <arg value="i2p.plugins.firefox.torrent" />
+        </exec>
+        <exec executable="unzip">
+            <arg value="i2p.plugins.firefox.torrent.zip" />
+            <arg value="-d" />
+            <arg value="${user.home}/.i2p/i2psnark/" />
+        </exec>
+    </target>
+    <target name="seed" depends="torrent">
+        <exec executable="cp">
+            <arg value="-rv" />
+            <arg value="i2p.plugins.firefox" />
+            <arg value="i2p.plugins.firefox.torrent" />
+            <arg value="${user.home}/.i2p/i2psnark/" />
+        </exec>
     </target>
-
     <target name="distclean" depends="clean" />
 
     <target name="clangFmt">
         <exec executable="clang-format">
             <arg value="-i"/>
             <arg value="src/java/net/i2p/i2pfirefox/I2PBrowser.java"/>
+            <arg value="src/plugin/net/i2p/i2pfirefox/plugin/plugin/I2PBrowserPlugin.java"/>
             <arg value="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java"/>
             <arg value="src/java/net/i2p/i2pfirefox/I2PChromium.java"/>
             <arg value="src/java/net/i2p/i2pfirefox/I2PChromiumProfileBuilder.java"/>
             <arg value="src/java/net/i2p/i2pfirefox/I2PChromiumProfileChecker.java"/>
             <arg value="src/java/net/i2p/i2pfirefox/I2PChromiumProfileUnpacker.java"/>
             <arg value="src/java/net/i2p/i2pfirefox/I2PFirefox.java"/>
+            <arg value="src/java/net/i2p/i2pfirefox/I2PLibreWolf.java"/>
             <arg value="src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java"/>
             <arg value="src/java/net/i2p/i2pfirefox/I2PFirefoxProfileChecker.java"/>
             <arg value="src/java/net/i2p/i2pfirefox/I2PFirefoxProfileUnpacker.java"/>
@@ -457,34 +517,276 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
         <exec executable="jpackage" failonerror="true">
             <arg value="--type"/> <arg value="app-image"/>
             <arg value="--name"/> <arg value="i2pbrowser"/>
-            <arg value="--app-version"/> <arg value="${release_number}"/>
+            <arg value="--app-version"/> <arg value="${release.number}"/>
             <arg value="--app-content"/> <arg value="etc/scripts/torbrowser.sh"/>
             <arg value="--input"/> <arg value="src/build"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
         </exec>
-        <exec executable="rm" failonerror="true">
+        <exec executable="rm" failonerror="true" osfamily="windows">
             <arg value="-rf" />
             <arg value="i2pbrowser.zip" />
         </exec>
-        <exec executable="dzip" failonerror="true">
+        <exec executable="dzip" failonerror="true" osfamily="windows">
             <arg value="-O"/>
             <arg value="i2pbrowser.zip"/>
             <arg value="i2pbrowser"/>
-        </exec>        
+        </exec>
+        <exec executable="rm" failonerror="true" osfamily="unix">
+            <arg value="-rf" />
+            <arg value="i2pbrowser.tar.gz" />
+        </exec>
+        <exec executable="./lib/torbrowser.sh" failonerror="true" osfamily="unix" dir="i2pbrowser">
+        </exec>
+        <exec executable="tar" failonerror="true" osfamily="unix">
+            <arg value="cvzf"/>
+            <arg value="i2pbrowser.tar.gz"/>
+            <arg value="i2pbrowser"/>
+        </exec>
     </target>
     <target name="debian" depends="jar">
-        <exec executable="bash" failonerror="true">
-            <arg value="--verbose"/>
-            <arg value="-c"/>
-            <arg value="./debian.sh"/>
+        <exec executable="jpackage" failonerror="true">
+            <arg value="--type"/> <arg value="deb"/>
+            <arg value="--linux-deb-maintainer"/> <arg value="hankhill19580@gmail.com"/>
+            <arg value="--linux-menu-group"/> <arg value="Network;WebBrowser;P2P"/>
+            <arg value="--linux-app-category"/> <arg value="Network"/>
+            <arg value="--linux-package-deps"/> <arg value="firefox|chromium|brave|firefox-esr|librewolf|icecat"/>
+            <arg value="--linux-shortcut"/>
+            <arg value="--license-file"/> <arg value="LICENSE.md"/>
+            <arg value="--name"/> <arg value="i2pbrowser"/>
+            <arg value="--icon"/> <arg value="src/icon.png"/>
+            <arg value="--app-version"/> <arg value="1.0.0"/>
+            <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
+            <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+        </exec>
+    </target>
+    <target name="debian-release" depends="jar">
+        <exec executable="jpackage" failonerror="true">
+            <arg value="--type"/> <arg value="deb"/>
+            <arg value="--linux-deb-maintainer"/> <arg value="hankhill19580@gmail.com"/>
+            <arg value="--linux-menu-group"/> <arg value="Network;WebBrowser;P2P"/>
+            <arg value="--linux-app-category"/> <arg value="Network"/>
+            <arg value="--linux-package-deps"/> <arg value="firefox|chromium|brave|firefox-esr|librewolf|icecat"/>
+            <arg value="--linux-shortcut"/>
+            <arg value="--license-file"/> <arg value="LICENSE.md"/>
+            <arg value="--name"/> <arg value="i2pbrowser"/>
+            <arg value="--icon"/> <arg value="src/icon.png"/>
+            <arg value="--app-version"/> <arg value="${release.number}"/>
+            <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
+            <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
         </exec>
     </target>
     <target name="fedora" depends="jar">
-        <exec executable="bash" failonerror="true">
+        <exec executable="jpackage" failonerror="true">
+            <arg value="--type"/> <arg value="rpm"/>
+            <arg value="--linux-menu-group"/> <arg value="Network;WebBrowser;P2P"/>
+            <arg value="--linux-app-category"/> <arg value="Network"/>
+            <arg value="--linux-package-deps"/> <arg value="firefox|chromium|brave|firefox-esr|librewolf|icecat"/>
+            <arg value="--linux-shortcut"/>
+            <arg value="--license-file"/> <arg value="LICENSE.md"/>
+            <arg value="--name"/> <arg value="i2pbrowser"/>
+            <arg value="--icon"/> <arg value="src/icon.png"/>
+            <arg value="--app-version"/> <arg value="1.0.0"/>
+            <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
+            <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+        </exec>
+    </target>
+    <target name="fedora-release" depends="jar">
+        <exec executable="jpackage" failonerror="true">
+            <arg value="--type"/> <arg value="rpm"/>
+            <arg value="--linux-menu-group"/> <arg value="Network;WebBrowser;P2P"/>
+            <arg value="--linux-app-category"/> <arg value="Network"/>
+            <arg value="--linux-package-deps"/> <arg value="firefox|chromium|brave|firefox-esr|librewolf|icecat"/>
+            <arg value="--linux-shortcut"/>
+            <arg value="--license-file"/> <arg value="LICENSE.md"/>
+            <arg value="--name"/> <arg value="i2pbrowser"/>
+            <arg value="--icon"/> <arg value="src/icon.png"/>
+            <arg value="--app-version"/> <arg value="${release.number}"/>
+            <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
+            <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+        </exec>
+    </target>
+    <target name="windows" depends="jar">
+        <exec executable="jpackage" failonerror="true">
             <arg value="--verbose"/>
-            <arg value="-c"/>
-            <arg value="./fedora.sh"/>
+            <arg value="--type"/> <arg value="exe"/>
+            <arg value="--win-dir-chooser"/>
+            <arg value="--win-help-url"/> <arg value="https://geti2p.net"/>
+            <arg value="--win-menu"/>
+            <arg value="--win-menu-group"/> <arg value="I2P Browser Configurer"/>
+            <arg value="--win-shortcut"/>
+            <arg value="--win-shortcut-prompt"/>
+            <arg value="--win-per-user-install"/>
+            <arg value="--license-file"/> <arg value="LICENSE.md"/>
+            <arg value="--name"/> <arg value="i2pbrowser"/>
+            <arg value="--icon"/> <arg value="src/icon.png"/>
+            <arg value="--app-version"/> <arg value="1.0.0"/>
+            <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
+            <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+        </exec>
+    </target>
+    <target name="windows-release" depends="jar">
+        <exec executable="jpackage" failonerror="true">
+            <arg value="--verbose"/>
+            <arg value="--type"/> <arg value="exe"/>
+            <arg value="--win-dir-chooser"/>
+            <arg value="--win-help-url"/> <arg value="https://geti2p.net"/>
+            <arg value="--win-menu"/>
+            <arg value="--win-menu-group"/> <arg value="I2P Browser Configurer"/>
+            <arg value="--win-shortcut"/>
+            <arg value="--win-shortcut-prompt"/>
+            <arg value="--win-per-user-install"/>
+            <arg value="--license-file"/> <arg value="LICENSE.md"/>
+            <arg value="--name"/> <arg value="i2pbrowser"/>
+            <arg value="--icon"/> <arg value="src/icon.png"/>
+            <arg value="--app-version"/> <arg value="${release.number}"/>
+            <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
+            <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+        </exec>
+    </target>
+    <target name="windows-msi" depends="jar">
+        <exec executable="jpackage" failonerror="true">
+            <arg value="--verbose"/>
+            <arg value="--type"/> <arg value="msi"/>
+            <arg value="--win-dir-chooser"/>
+            <arg value="--win-help-url"/> <arg value="https://geti2p.net"/>
+            <arg value="--win-menu"/>
+            <arg value="--win-menu-group"/> <arg value="I2P Browser Configurer"/>
+            <arg value="--win-shortcut"/>
+            <arg value="--win-shortcut-prompt"/>
+            <arg value="--win-per-user-install"/>
+            <arg value="--license-file"/> <arg value="LICENSE.md"/>
+            <arg value="--name"/> <arg value="i2pbrowser"/>
+            <arg value="--icon"/> <arg value="src/icon.png"/>
+            <arg value="--app-version"/> <arg value="1.0.0"/>
+            <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
+            <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+        </exec>
+    </target>
+    <target name="windows-msi-release" depends="jar">
+        <exec executable="jpackage" failonerror="true">
+            <arg value="--verbose"/>
+            <arg value="--type"/> <arg value="msi"/>
+            <arg value="--win-dir-chooser"/>
+            <arg value="--win-help-url"/> <arg value="https://geti2p.net"/>
+            <arg value="--win-menu"/>
+            <arg value="--win-menu-group"/> <arg value="I2P Browser Configurer"/>
+            <arg value="--win-shortcut"/>
+            <arg value="--win-shortcut-prompt"/>
+            <arg value="--win-per-user-install"/>
+            <arg value="--license-file"/> <arg value="LICENSE.md"/>
+            <arg value="--name"/> <arg value="i2pbrowser"/>
+            <arg value="--icon"/> <arg value="src/icon.png"/>
+            <arg value="--app-version"/> <arg value="${release.number}"/>
+            <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
+            <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+        </exec>
+    </target>
+    <target name="windows-portable" depends="jar">
+        <exec executable="jpackage" failonerror="true">
+            <arg value="--verbose"/>
+            <arg value="--type"/> <arg value="app-image"/>
+            <arg value="--name"/> <arg value="i2pbrowser-portable"/>
+            <arg value="--icon"/> <arg value="src/icon.png"/>
+            <arg value="--app-version"/> <arg value="1.0.0"/>
+            <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
+            <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+        </exec>
+        <copy file="LICENSE.md" todir="i2pbrowser-portable" overwrite="true"/>
+        <delete file="i2pbrowser-portable.zip"/>
+        <exec executable="powershell" failonerror="false">
+            <arg value="Compress-Archive"/>
+            <arg value="-LiteralPath"/> <arg value="i2pbrowser-portable"/>
+            <arg value="-DestinationPath"/> <arg value="i2pbrowser-portable.zip"/>
+        </exec>
+    </target>
+    <target name="windows-portable-release" depends="jar">
+        <exec executable="jpackage" failonerror="true">
+            <arg value="--verbose"/>
+            <arg value="--type"/> <arg value="app-image"/>
+            <arg value="--name"/> <arg value="i2pbrowser-portable"/>
+            <arg value="--icon"/> <arg value="src/icon.png"/>
+            <arg value="--app-version"/> <arg value="${release.number}"/>
+            <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
+            <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+        </exec>
+        <copy file="LICENSE.md" todir="i2pbrowser-portable" overwrite="true"/>
+        <delete file="i2pbrowser-portable.zip"/>
+        <exec executable="powershell" failonerror="false">
+            <arg value="Compress-Archive"/>
+            <arg value="-LiteralPath"/> <arg value="i2pbrowser-portable"/>
+            <arg value="-DestinationPath"/> <arg value="i2pbrowser-portable-${release.number}.zip"/>
+        </exec>
+    </target>
+
+    <target name="macos" depends="jar">
+        <exec executable="jpackage" failonerror="true">
+            <arg value="--verbose"/>
+            <arg value="--type"/> <arg value="dmg"/>
+            <arg value="--mac-package-name"/> <arg value="I2P Browser"/>
+            <arg value="--mac-app-category"/> <arg value="Reference"/>
+            <arg value="--license-file"/> <arg value="LICENSE.md"/>
+            <arg value="--name"/> <arg value="i2pbrowser"/>
+            <arg value="--icon"/> <arg value="src/icon.png"/>
+            <arg value="--app-version"/> <arg value="1.0.0"/>
+            <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
+            <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+        </exec>
+    </target>
+    <target name="macos-release" depends="jar">
+        <exec executable="jpackage" failonerror="true">
+            <arg value="--verbose"/>
+            <arg value="--type"/> <arg value="dmg"/>
+            <arg value="--mac-package-name"/> <arg value="I2P Browser"/>
+            <arg value="--mac-app-category"/> <arg value="Reference"/>
+            <arg value="--license-file"/> <arg value="LICENSE.md"/>
+            <arg value="--name"/> <arg value="i2pbrowser"/>
+            <arg value="--icon"/> <arg value="src/icon.png"/>
+            <arg value="--app-version"/> <arg value="${release.number}"/>
+            <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
+            <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+        </exec>
+    </target>
+    <target name="macos-pkg" depends="jar">
+        <exec executable="jpackage" failonerror="true">
+            <arg value="--verbose"/>
+            <arg value="--type"/> <arg value="pkg"/>
+            <arg value="--mac-package-name"/> <arg value="I2P Browser"/>
+            <arg value="--mac-app-category"/> <arg value="Reference"/>
+            <arg value="--license-file"/> <arg value="LICENSE.md"/>
+            <arg value="--name"/> <arg value="i2pbrowser"/>
+            <arg value="--icon"/> <arg value="src/icon.png"/>
+            <arg value="--app-version"/> <arg value="1.0.0"/>
+            <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
+            <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
+        </exec>
+    </target>
+    <target name="macos-pkg-release" depends="jar">
+        <exec executable="jpackage" failonerror="true">
+            <arg value="--verbose"/>
+            <arg value="--type"/> <arg value="pkg"/>
+            <arg value="--mac-package-name"/> <arg value="I2P Browser"/>
+            <arg value="--mac-app-category"/> <arg value="Reference"/>
+            <arg value="--license-file"/> <arg value="LICENSE.md"/>
+            <arg value="--name"/> <arg value="i2pbrowser"/>
+            <arg value="--icon"/> <arg value="src/icon.png"/>
+            <arg value="--app-version"/> <arg value="${release.number}"/>
+            <arg value="--input"/> <arg value="src/build"/>
+            <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
+            <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
         </exec>
     </target>
 
@@ -533,11 +835,6 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="-n"/>
             <arg value="localcdn-fork-of-decentraleyes"/>
         </exec>
-        <exec executable="amo-version" failonerror="true">
-            <redirector output="VERSION.md" error="VERSION.md" alwayslog="true" append="true"></redirector>
-            <arg value="-n"/>
-            <arg value="https-everywhere"/>
-        </exec>
         <exec executable="amo-version" failonerror="true">
             <redirector output="VERSION.md" error="VERSION.md" alwayslog="true" append="true"></redirector>
             <arg value="-n"/>
@@ -583,11 +880,6 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="-mf"/>
             <arg value="src/i2p.chromium.base.profile/extensions/noscript.js/manifest.json"/>
         </exec>
-        <exec executable="manifest-json-version" failonerror="true">
-            <redirector output="VERSION.md" error="VERSION.md" alwayslog="true" append="true"></redirector>
-            <arg value="-mf"/>
-            <arg value="src/i2p.chromium.base.profile/extensions/https-everywhere.js/manifest.json"/>
-        </exec>
         <exec executable="manifest-json-version" failonerror="true">
             <redirector output="VERSION.md" error="VERSION.md" alwayslog="true" append="true"></redirector>
             <arg value="-mf"/>
@@ -625,13 +917,6 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="-o" />
             <arg value="src/i2p.chromium.base.profile/extensions/noscript.js.crx" />
         </exec>
-        <exec executable="crx3" failonerror="true">
-            <arg value="download"/>
-            <arg value="gcbommkclmclpchllfjekcdonpmejbdp" />
-            <arg value="-u=true"/>
-            <arg value="-o" />
-            <arg value="src/i2p.chromium.base.profile/extensions/https-everywhere.js.crx" />
-        </exec>
         <exec executable="echo" failonerror="true" append="false" output="src/i2p.chromium.base.profile/version.md">
             <arg value="Profile Version" />
         </exec>
@@ -679,13 +964,6 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="-o" />
             <arg value="src/i2p.chromium.usability.profile/extensions/localcdn.js.crx" />
         </exec>
-        <exec executable="crx3" failonerror="true">
-            <arg value="download"/>
-            <arg value="gcbommkclmclpchllfjekcdonpmejbdp" />
-            <arg value="-u=true"/>
-            <arg value="-o" />
-            <arg value="src/i2p.chromium.usability.profile/extensions/https-everywhere.js.crx" />
-        </exec>
         <exec executable="echo" failonerror="true" append="false" output="src/i2p.chromium.usability.profile/version.md">
             <arg value="Profile Version" />
         </exec>
@@ -721,13 +999,6 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="-o" />
             <arg value="src/i2p.firefox.base.profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" />
         </exec>
-        <exec executable="amo-version" failonerror="true">
-            <arg value="-n"/>
-            <arg value="https-everywhere"/>
-            <arg value="-d"/>
-            <arg value="-o" />
-            <arg value="src/i2p.firefox.base.profile/extensions/https-everywhere-eff@eff.org.xpi" />
-        </exec>
         <exec executable="echo" failonerror="true" append="false" output="src/i2p.firefox.base.profile/version.md">
             <arg value="Profile Version" />
         </exec>
@@ -764,13 +1035,6 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <arg value="-o" />
             <arg value="./src/i2p.firefox.usability.profile/extensions/{b86e4813-687a-43e6-ab65-0bde4ab75758}.xpi" />
         </exec>
-        <exec executable="amo-version" failonerror="true">
-            <arg value="-n"/>
-            <arg value="https-everywhere"/>
-            <arg value="-d"/>
-            <arg value="-o" />
-            <arg value="src/i2p.firefox.usability.profile/extensions/https-everywhere-eff@eff.org.xpi" />
-        </exec>
         <exec executable="amo-version" failonerror="true">
             <arg value="-n"/>
             <arg value="onion-in-container-browsing"/>

config.sh

@@ -1,6 +1,6 @@
 #! /usr/bin/env sh
 export GITHUB_USER=eyedeekay
 export GITHUB_REPO=i2p.plugins.firefox
-export GITHUB_NAME="Enforces App and Browser Modes"
+export GITHUB_NAME="Updates extensions, plugin support temporarily removed(Stay on the old version)"
 export GITHUB_DESCRIPTION=$(cat CHANGES.md VERSION.md)
-export GITHUB_TAG=1.0.5
+export GITHUB_TAG=1.4.0

darklight.css

@@ -0,0 +1,24 @@
+/* edgar darklight CSS file */
+#checkboxDarkLight:checked + .container {
+    background-color: #202020;
+    filter: invert(100%);
+}
+#checkboxDarkLight{
+    appearance: none;
+    width: 80px;
+    height: 40px;
+    background: black;
+    border-radius: 22px;
+    cursor: pointer;
+    outline: none;
+}
+#checkboxDarkLight::before{
+    content: '';
+    width: 40px;
+    height: 35px;
+    background-color:white;
+    border-radius: 35px;
+    cursor: pointer;
+    transition: .3s linear;
+}
+

debian-torbrowser.sh

@@ -1,7 +1,11 @@
 #! /usr/bin/env sh
-
+# debian build which automatically configures Tor Browser.
+# I do not think that it has write permission to it's own directory, making Tor Browser updates probably impossible.
+# Don't use it yet.
 . ./config.sh
+ant jpackage
 jpackage --verbose \
+    --app-image i2pbrowser \
     --type deb \
     --linux-deb-maintainer hankhill19580@gmail.com \
     --linux-menu-group "Network;WebBrowser;P2P" \
@@ -12,6 +16,3 @@ jpackage --verbose \
     --name i2pbrowser \
     --icon src/icon.png \
     --app-version "$GITHUB_TAG" \
-    --input src/build \
-    --main-jar i2pfirefox.jar \
-    --main-class net.i2p.i2pfirefox.I2PBrowser

docs/BUILD.md

@@ -0,0 +1,228 @@
+# Building
+
+## Build Dependencies
+
+You will need `ant` and java `java` and for building the jar. You will need
+`jpackage` for many of the potential build targets. I've been using Java 18
+on Debian mostly, on Debian and Ubuntu, install the dependencies with:
+
+```sh
+sudo apt-get install openjdk-18* ant
+```
+
+Some of the targets use scripts written in Go to help generate resources. If
+you want to update the profiles, you will need them. To install Go on Debian
+and Ubuntu:
+
+```sh
+sudo apt-get install golang-go
+```
+
+Add `$HOME/go/bin` to your `$PATH` so `ant` can find Go applications.
+
+`export PATH=$PATH:$HOME/go/bin`
+
+Then use Go to download the applications you need and add them to `$HOME/go/bin`.
+
+If you want to build the Chromium profiles you will need a Go application
+called `crx3` which is used to interact with the Chrome app store to download
+and update extensions.
+
+```sh
+go install github.com/mediabuyerbot/go-crx3/crx3@latest
+```
+
+Another Go application, called `amo-version`, is used to fetch extensions from addons.mozilla.org.
+Like the Chrome profiles, generating the Firefox profiles requires this application. If you don't
+want to update the profiles, you don't need it.
+
+```sh
+go install github.com/eyedeekay/amo-version@latest
+```
+
+One last Go application, called `dzip` is used to generate zip files deterministically for
+redistribution.
+
+```sh
+go install github.com/delicb/dzip@latest
+```
+
+If you don't want to use it, you can work around it by creating a file called
+`dzip` in `/usr/local/bin/dzip` and adding the contents:
+
+```sh
+#! /usr/bin/env sh
+zip -r $@
+```
+
+This will break deterministic builds, but for testing it will continue to work. More elaborate
+scripts or other deterministic zip utilities can be easily substituted in by placing them
+in the `$PATH` under the name `dzip`.
+
+For Fedora, use Yum, for Arch use pacman or something else but make sure to tell everyone
+about it. Once you have that installed, when building, make sure to add `$GOPATH/bin/`
+to your `$PATH`.
+
+```sh
+export PATH=$PATH:$HOME/go/bin
+```
+
+Will almost always work.
+
+## Building
+
+This is not actually a plugin yet, but it will be soon. The important bit is the jar.
+To generate that, you can either generate the full plugin, which will not work but
+produces the jar as a by-product, or you can:
+
+```sh
+
+ant jar
+```
+
+To build just the jar. You'll know it worked if you can:
+
+```sh
+
+java -cp ./src/build/i2pfirefox.jar net.i2p.i2pfirefox.I2PFirefox
+```
+
+and a new Firefox instance comes up with a fresh profile, ready-to-use for I2P browsing.
+
+The cooler thing you can do with it is add it to an I2P distribution and somewhere in it,
+add a UI element that triggers something along the lines of this:
+
+```java
+
+// Firefox Example
+if (i2pIsRunning()) {
+    logger.warning("I2P is already running");
+    System.out.println("I2PFirefox");
+    I2PFirefox i2pFirefox = new I2PFirefox();
+    i2pFirefox.launch();
+}
+```
+
+```java
+
+// Chromium Example
+if (i2pIsRunning()) {
+    logger.warning("I2P is already running");
+    System.out.println("I2PChromium");
+    I2PChromium i2pChromium = new I2PChromium();
+    i2pChromium.launch();
+}
+```
+
+```java
+
+// Auto-Select Example, chooses Firefox first, then Chromium
+if (i2pIsRunning()) {
+    logger.warning("I2P is already running");
+    System.out.println("I2PBrowser");
+    I2PBrowser i2pBrowser = new I2PBrowser();
+    /*
+     * toggle chromium to the top of the order by doing:
+    I2PBrowser.chromiumFirst = true;
+     * 
+    */
+    i2pBrowser.launch(privateBrowsing);
+}
+```
+
+to add a browser management tool to it.
+
+## Browser Discovery Methods
+
+This tool looks for browsers on the host system, creates a workspace to use for I2P
+purposes, and launches the browser inside of that workspace. The details of the
+workspace vary from browser to browser but roughly corresponds to a browser profile.
+In order to be successful this tool uses 3 main types of browser discovery methods,
+in this order:
+
+ 1. "Local" discovery, where a browser is in a subdirectory of the directory where you
+ ran the launcher. This will only happen if the user unpacked a portable browser into
+ the same directory where they ran the launcher.
+ 2. "Path-Based" discovery, where it scans common browser installation directories
+ until it finds one which it can use. On Unix, it simply scans the directories on the
+ `PATH` for a browser it knows about. On Windows, default paths to browser install
+ directories are hard-coded and included in the binary. This is what usually happens.
+ 3. "System-Based" discovery, where it defers to the host system to make a choice
+ about the browser and counts on browser vendors to honor the system proxy environment
+ variables. This is a catch-all solution which works with most browsers, but does
+ not apply any customizations.
+
+There is a little subtlety here though.
+
+- The path to Edgium on Windows will **always** resolve during path-based discovery,
+resulting in a positive test for Chromium when launching the browser in auto-select
+mode. So Windows will never reach stage 3 unless expressly forced to. If Firefox or
+a variant is installed, it will be chosen before Edgium unless directed otherwise.
+- Even though it will launch you into Edgium if it has no other choice, I recommend
+you do not use it. Edgium will in a constant, incessant way try to induce you to
+share your behavior with Microsoft. If you try to resist this, it negatively affects
+the performance of the browser. Google also does this with Chrome, ant this negatively
+affects Chrome performance too, but less than with Edgium. TL:DR Edgium sucks and is
+pointless and terrible. Literally any other browser would be better.
+- Linux is unaware of a Tor Browser path because Tor Browser is rarely, if ever,
+installed on-path. What is on path is virtually always a wrapper for Tor Browser
+which is installed either as the main user or it's own user. Linux will only use
+Tor Browser if it's discovered in "Local" mode. To set this up automatically, you
+can `cd` to the `I2P` directory where you unpacked the `.tar.gz` file, and run the
+`./lib/torbrowser.sh` script from there.
+- I really only test Phase 3 with Dillo and Edgium. **YMMV.**
+
+## Usability vs Strict
+
+This is basically a profile-management tool geared toward minimizing the
+differences between browser users which are passively discernible while
+they are browsing I2P. It assumes that they are part of a highly fragmented
+browsing environment where they are already unique, and therefore consolidation
+on configuration is a goal. However, this goal sometimes also conflicts with
+usability. To allow users a safe set of choices, we offer "Coarse" configuration
+in 2 modes. We recommend that you do not deviate from these configurations if
+you have browser application fingerprinting as a concern.
+
+### Usability Mode
+
+TODO: description
+
+Pros: Allows a restricted subset of Javascript
+Pros: Less likely to try and reach the clearnet
+
+Cons: Looks very different from Tor Browser
+Cons: Plugin updates can create temporary uniqueness
+
+#### Usability Extension Set
+
+- **I2P In Private Browsing**
+- **uMatrix**
+- **jsRestrictor**
+- **LocalCDN**
+- **Onion in Container Tabs**
+- **HTTPS EveryWhere** in some configurations
+
+### Usability user.js characteristics
+
+TODO: Summarize differences
+
+### Strict Mode
+
+TODO: description
+
+Pros: Does not allow Javascript by default
+Pros: Looks a lot like Tor Browser especially if you're using Tor Browser
+
+Cons: More work to use
+Cons: Temporary uniqueness can be created by enabling Javascript for specific sites
+Cons: More likely to try and reach the clearnet
+
+#### Strict Extension Set
+
+- **NoScript**
+- **I2P In Private Browsing**
+- **HTTPS EveryWhere** in some configurations
+
+#### Strict user.js characteristics
+
+TODO: Summarize differences

docs/I2PBrowser.md

@@ -0,0 +1,431 @@
+# Class I2PBrowser [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java)  
+
+ > */  
+
+Access: public  
+Description:  
+ > I2PBrowser.java Copyright C 2022 idk <hankhill19580@gmail.com> This program is free software: you can redistribute it and/or modify it under the terms of the MIT License. See LICENSE.md for details. This program is distributed in the hope that it will be useful but WITHOUT ANY WARRANTY without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @description I2PBrowser is a that is used to open a browser window to the I2P network. It automatically detects the operating system and available browsers and selects the best one to use with Tor Browser at the top for Firefox and Brave at the top for Chrome.  
+
+Author: idk   
+Parent class: I2PGenericUnsafeBrowser  
+package: net.i2p.i2pfirefox  
+
+## Dependencies
+
+<details>  
+  <summary>  
+    Show dependencies  
+  </summary>  
+  <ul>  
+<li>java.awt.AWTException</li>
+<li>java.awt.Component</li>
+<li>java.awt.Image</li>
+<li>java.awt.Menu</li>
+<li>java.awt.MenuItem</li>
+<li>java.awt.PopupMenu</li>
+<li>java.awt.SystemTray</li>
+<li>java.awt.Toolkit</li>
+<li>java.awt.TrayIcon</li>
+<li>java.awt.event.ActionEvent</li>
+<li>java.awt.event.ActionListener</li>
+<li>java.awt.event.MouseAdapter</li>
+<li>java.awt.event.MouseEvent</li>
+<li>java.awt.event.MouseListener</li>
+<li>java.io.File</li>
+<li>java.io.FileOutputStream</li>
+<li>java.io.FileWriter</li>
+<li>java.io.IOException</li>
+<li>java.io.InputStream</li>
+<li>java.io.OutputStream</li>
+<li>java.util.ArrayList</li>
+<li>java.util.Arrays</li>
+  </ul>  
+</details>  
+
+## Member Variables
+
+####  I2PFirefox i2pFirefox  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  I2PChromium i2pChromium  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  I2PGenericUnsafeBrowser i2pGeneral  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  Toolkit toolkit  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  SystemTray tray  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  Image image  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  TrayIcon icon  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  PopupMenu menu  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  Menu submenuStrict  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  MenuItem launchRegularBrowserStrict  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  MenuItem launchPrivateBrowserStrict  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  Menu submenuUsability  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  MenuItem launchRegularBrowserUsability  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  MenuItem launchPrivateBrowserUsability  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  MenuItem launchConfigBrowserUsability  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  MenuItem closeItem  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  boolean firefox  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: public  
+
+####  boolean chromium  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: public  
+
+####  boolean generic  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: public  
+
+####  boolean chromiumFirst  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: public  
+
+####  boolean usability  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: public  
+
+####  int privateBrowsing  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: public  
+
+####  boolean outputConfig  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
+
+####  boolean useSystray  [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L)
+
+ >   
+
++ Access: private  
+
+## Methods
+
+### launchFirefox [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L78)
+
++ Description:   
++ Access: private  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | int |  |  
+| url | String[] |  |  
+
+
+### launchChromium [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L85)
+
++ Description:   
++ Access: private  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | int |  |  
+| url | String[] |  |  
+
+
+### launchGeneric [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L92)
+
++ Description:   
++ Access: private  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindowInt | int |  |  
+| url | String[] |  |  
+
+
+### setBrowser [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L121)
+
++ Description:   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| browserPath | String |  |  
+
+
+### hasChromium [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L129)
+
++ Description: Return true if there is a Chromium available   
++ Access: public  
++ return: true if Chromium is available false otherwise   
+
+This method has no parameters.  
+
+
+### hasFirefox [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L146)
+
++ Description: Return true if there is a Firefox variant available   
++ Access: public  
++ return: true if Firefox variant is available false otherwise   
+
+This method has no parameters.  
+
+
+### launch [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L166)
+
++ Description: Populates a profile directory with a proxy configuration. Waits for an HTTP proxy on the port 4444 to be ready. Launches either Firefox or Chromium with the profile directory.   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | int |  |  
+| url | String[] |  |  
+
+
+### launch [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L211)
+
++ Description: Populates a profile directory with a proxy configuration. Waits for an HTTP proxy on the port 4444 to be ready. Launches either Firefox or Chromium with the profile directory.   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | boolean |  |  
+
+
+### launch [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L225)
+
++ Description: Populates a profile directory with a proxy configuration. Waits for an HTTP proxy on the port 4444 to be ready. Launches either Firefox or Chromium with the profile directory.   
++ Access: public  
++ return: void  
+
+This method has no parameters.  
+
+
+### ValidURL [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L227)
+
++ Description:   
++ Access: private  
++ return: String  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| inUrl | String |  |  
+
+
+### main [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L237)
+
++ Description:   
++ Access: public  
++ Modifiers: static 
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] |  |  
+
+
+### parseArgs [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L241)
+
++ Description:   
++ Access: public  
++ return: ArrayList<String>  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] |  |  
+
+
+### startup [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L288)
+
++ Description:   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] |  |  
+
+
+### createSystrayRunningFile [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L307)
+
++ Description:   
++ Access: protected  
++ return: boolean  
+
+This method has no parameters.  
+
+
+### systrayRunningExternally [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L323)
+
++ Description:   
++ Access: protected  
++ return: boolean  
+
+This method has no parameters.  
+
+
+### initTray [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L334)
+
++ Description:   
++ Access: private  
++ return: SystemTray  
+
+This method has no parameters.  
+
+
+### initMenu [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L345)
+
++ Description:   
++ Access: private  
++ return: PopupMenu  
+
+This method has no parameters.  
+
+
+### initIconFile [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L350)
+
++ Description:   
++ Access: private  
++ return: File  
+
+This method has no parameters.  
+
+
+### initIcon [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L364)
+
++ Description:   
++ Access: private  
++ return: TrayIcon  
+
+This method has no parameters.  
+
+
+### startupSystray [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L377)
+
++ Description:   
++ Access: protected  
++ return: void  
+
+This method has no parameters.  
+
+
+### shutdownSystray [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L404)
+
++ Description:   
++ Access: protected  
++ return: void  
+
+This method has no parameters.  
+
+
+### systray [[src]](src/java/net/i2p/i2pfirefox/I2PBrowser.java#L413)
+
++ Description:   
++ Access: public  
++ return: boolean  
+
+This method has no parameters.  
+
+

docs/I2PChromium.md

@@ -0,0 +1,358 @@
+# Class I2PChromium [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java)  
+
+ > */  
+
+Access: public  
+Description:  
+ > I2PChromium.java Copyright C 2022 idk <hankhill19580@gmail.com> This program is free software: you can redistribute it and/or modify it under the terms of the MIT License. See LICENSE.md for details. This program is distributed in the hope that it will be useful but WITHOUT ANY WARRANTY without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+Author: idk   
+Parent class: I2PChromiumProfileUnpacker  
+package: net.i2p.i2pfirefox  
+
+## Dependencies
+
+<details>  
+  <summary>  
+    Show dependencies  
+  </summary>  
+  <ul>  
+<li>java.io.File</li>
+<li>java.io.FileOutputStream</li>
+<li>java.io.FileWriter</li>
+<li>java.io.IOException</li>
+<li>java.io.OutputStream</li>
+<li>java.io.PrintWriter</li>
+<li>java.util.ArrayList</li>
+<li>java.util.Arrays</li>
+<li>java.util.List</li>
+<li>java.util.stream.Collectors</li>
+<li>java.util.stream.Stream</li>
+  </ul>  
+</details>  
+
+## Member Variables
+
+####  String[] CHROMIUM_SEARCH_PATHS  [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  Process p  [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L)
+
+ >   
+
++ Access: private  
+
+## Methods
+
+### storeChromiumDefaults [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L60)
+
++ Description:   
++ Access: public  
++ return: void  
+
+This method has no parameters.  
+
+
+### chromiumPathsUnix [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L89)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### chromiumBinsUnix [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L98)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### FIND_CHROMIUM_SEARCH_PATHS_UNIX [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L114)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### chromiumPathsOSX [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L128)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### FIND_CHROMIUM_SEARCH_PATHS_OSX [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L137)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### chromiumPathsWindows [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L151)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### chromiumBinsWindows [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L184)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### FIND_CHROMIUM_SEARCH_PATHS_WINDOWS [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L196)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### FIND_ALL_CHROMIUM_SEARCH_PATHS [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L210)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### FIND_CHROMIUM_SEARCH_PATHS [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L230)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### NEARBY_CHROMIUM_SEARCH_PATHS [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L244)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### CHROMIUM_FINDER [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L337)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### onlyValidChromiums [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L358)
+
++ Description: Check our list of chrome paths for a valid chrome binary. Just an existence check for now but should check versions in the future.   
++ Access: public  
++ return: a list of usable Chromiums or an empty list if none are found.   
+
+This method has no parameters.  
+
+
+### topChromium [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L378)
+
++ Description: Return the best available Chromium from the list of Chromiums we have.   
++ Access: public  
++ return: the path to the best available Chromium or null if none are found.   
+
+This method has no parameters.  
+
+
+### topChromium [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L407)
+
++ Description: Return the best available Chromium from the list of Chromiums we have. if override is passed it will be validated and if it validates it will be used.   
++ Access: public  
++ return: the path to the best available Chromium or null if none are found.   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| overrideChromium | String |  |  
+
+
+### defaultProcessBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L425)
+
++ Description: Build a ProcessBuilder for the top Chromium binary and the default profile.   
++ Access: public  
++ return: a ProcessBuilder for the top Chromium binary and the default profile.   
+
+This method has no parameters.  
+
+
+### defaultProcessBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L438)
+
++ Description: Build a ProcessBuilder for the top Chromium binary and the default profile. @args the arguments to pass to the Chromium binary   
++ Access: public  
++ return: a ProcessBuilder for the top Chromium binary and the default profile.   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] |  |  
+
+
+### privateProcessBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L450)
+
++ Description: Build a ProcessBuilder for the top Chromium binary and the default profile.   
++ Access: public  
++ return: a ProcessBuilder for the top Chromium binary and the default profile. Always passes the --incognito flag.   
+
+This method has no parameters.  
+
+
+### privateProcessBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L463)
+
++ Description: Build a ProcessBuilder for the top Chromium binary and the default profile.   
++ Access: public  
++ return: a ProcessBuilder for the top Chromium binary and the default profile. Always passes the --incognito flag.   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] | the arguments to pass to the Chromium binary.  |  
+
+
+### appProcessBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L485)
+
++ Description: Build a ProcessBuilder for the top Chromium binary and the default profile.   
++ Access: public  
++ return: a ProcessBuilder for the top Chromium binary and the default profile. Always passes the --app flag.   
+
+This method has no parameters.  
+
+
+### appProcessBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L498)
+
++ Description: Build a ProcessBuilder for the top Chromium binary and the default profile.   
++ Access: public  
++ return: a ProcessBuilder for the top Chromium binary and the default profile. Always passes the --app flag.   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] | the arguments to pass to the Chromium binary.  |  
+
+
+### processBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L545)
+
++ Description: Build a ProcessBuilder for the top Chromium binary and the default profile with a specific set of extended arguments.   
++ Access: public  
++ return: a ProcessBuilder for the top Chromium binary and default profile with a specific set of extended arguments.   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] | the extended arguments to pass to the Chromium binary.  |  
+
+
+### launchAndDetatch [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L662)
+
++ Description:   
++ Access: public  
++ return: Process  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | boolean |  |  
+| url | String[] |  |  
+
+
+### launchAndDetatch [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L669)
+
++ Description:   
++ Access: public  
++ return: Process  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | int |  |  
+| url | String[] |  |  
+
+
+### launch [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L725)
+
++ Description: Populates a profile directory with a proxy configuration. Waits for an HTTP proxy on the port 4444 to be ready. Launches Chromium with the profile directory.   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | boolean |  |  
+| url | String[] |  |  
+
+
+### launch [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L731)
+
++ Description:   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | int |  |  
+| url | String[] |  |  
+
+
+### launch [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L756)
+
++ Description: Populates a profile directory with a proxy configuration. Waits for an HTTP proxy on the port 4444 to be ready. Launches Chromium with the profile directory.   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | boolean |  |  
+
+
+### launch [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L765)
+
++ Description: Populates a profile directory with a proxy configuration. Waits for an HTTP proxy on the port 4444 to be ready. Launches Chromium with the profile directory.   
++ Access: public  
++ return: void  
+
+This method has no parameters.  
+
+
+### ValidURL [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L767)
+
++ Description:   
++ Access: private  
++ return: String  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| inUrl | String |  |  
+
+
+### main [[src]](src/java/net/i2p/i2pfirefox/I2PChromium.java#L777)
+
++ Description:   
++ Access: public  
++ Modifiers: static 
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] |  |  
+
+

docs/I2PChromiumProfileBuilder.md

@@ -0,0 +1,94 @@
+# Class I2PChromiumProfileBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileBuilder.java)  
+
+ > */  
+
+Access: public  
+Description:  
+ > I2PChromiumProfileBuilder.java Copyright C 2022 idk <hankhill19580@gmail.com> This program is free software: you can redistribute it and/or modify it under the terms of the MIT License. See LICENSE.md for details. This program is distributed in the hope that it will be useful but WITHOUT ANY WARRANTY without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. I2PChromiumProfileBuilder is a that builds a profile directory which contains the I2P browser profile for the Chromium browser family. It manages the base profile directory and copies it's contents to the active profile directory which is actually used by Chromium.  
+
+Author: idk   
+Parent class: I2PChromiumProfileChecker  
+package: net.i2p.i2pfirefox  
+
+## Dependencies
+
+<details>  
+  <summary>  
+    Show dependencies  
+  </summary>  
+  <ul>  
+<li>java.io.File</li>
+  </ul>  
+</details>  
+
+## Member Variables
+
+#### boolean usability [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileBuilder.java#L)
+
+ >   
+
++ Access: public  
+
+## Methods
+
+### baseProfileDir [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileBuilder.java#L26)
+
++ Description:   
++ Access: private  
++ return: String  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| file | String |  |  
+| mode | String |  |  
+
+
+### baseProfileDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileBuilder.java#L50)
+
++ Description:   
++ Access: public  
++ return: String  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| mode | String |  |  
+
+
+### runtimeDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileBuilder.java#L74)
+
++ Description: get the runtime directory creating it if create=true   
++ Access: public  
++ return: the runtime directory or null if it could not be created   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| create | boolean | if true create the runtime directory if it does not exist  |  
+
+
+### runtimeDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileBuilder.java#L85)
+
++ Description: get the correct runtime directory   
++ Access: public  
++ return: the runtime directory or null if it could not be created or found   
+
+This method has no parameters.  
+
+
+### usabilityMode [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileBuilder.java#L100)
+
++ Description:   
++ Access: public  
++ return: String  
+
+This method has no parameters.  
+
+
+### copyBaseProfiletoProfile [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileBuilder.java#L111)
+
++ Description: Copy the inert base profile directory to the runtime profile directory   
++ Access: public  
++ return: boolean  
+
+This method has no parameters.  
+
+

docs/I2PChromiumProfileChecker.md

@@ -0,0 +1,83 @@
+# Class I2PChromiumProfileChecker [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileChecker.java)  
+
+ > */  
+
+Access: public  
+Description:  
+ > I2PChromiumProfileChecker.java Copyright C 2022 idk <hankhill19580@gmail.com> This program is free software: you can redistribute it and/or modify it under the terms of the MIT License. See LICENSE.md for details. This program is distributed in the hope that it will be useful but WITHOUT ANY WARRANTY without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. I2PChromiumProfileChecker is a that checks if the Chromium profile directory exists and is valid.  
+
+Author: idk   
+Parent class: I2PCommonBrowser  
+package: net.i2p.i2pfirefox  
+
+## Dependencies
+
+<details>  
+  <summary>  
+    Show dependencies  
+  </summary>  
+  <ul>  
+<li>java.io.File</li>
+  </ul>  
+</details>  
+
+## No member variables in this class
+
+## Methods
+
+### main [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileChecker.java#L29)
+
++ Description: Output feedback if the profile directory is valid or invalid @description Output feedback if the profile directory is valid or invalid @args unused   
++ Access: public  
++ Modifiers: static 
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] |  |  
+
+
+### profileDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileChecker.java#L50)
+
++ Description: get the profile directory creating it if necessary   
++ Access: public  
++ return: String  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| base | String |  |  
+
+
+### validateProfileDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileChecker.java#L61)
+
++ Description: Return true if the profile directory is valid.   
++ Access: public  
++ return: true if the profile directory is valid false otherwise   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| profileDirectory | String | the profile directory to check  |  
+
+
+### validateFile [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileChecker.java#L92)
+
++ Description: Return true if the file is valid.   
++ Access: public  
++ return: true if the file is valid false otherwise   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| file | String | the file to check  |  
+
+
+### validateExtensionDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileChecker.java#L119)
+
++ Description: Return true if the extension directory is valid.   
++ Access: public  
++ return: true if the extension directory is valid false otherwise   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| extensionDirectory | String | the extension directory to check  |  
+
+

docs/I2PChromiumProfileUnpacker.md

@@ -0,0 +1,50 @@
+# Class I2PChromiumProfileUnpacker [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileUnpacker.java)  
+
+ > */  
+
+Access: public  
+Description:  
+ > I2PChromiumProfileUnpacker.java Copyright C 2022 idk <hankhill19580@gmail.com> This program is free software: you can redistribute it and/or modify it under the terms of the MIT License. See LICENSE.md for details. This program is distributed in the hope that it will be useful but WITHOUT ANY WARRANTY without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. I2PChromiumProfileUnpacker is a that unpacks the Chromium profile zip file into the Chromium base profile directory. This is not used by the Chromium browser instance it's unpacked to the disk to be copied to the active profile directory.  
+
+Author: idk   
+Parent class: I2PChromiumProfileBuilder  
+package: net.i2p.i2pfirefox  
+
+## Dependencies
+
+<details>  
+  <summary>  
+    Show dependencies  
+  </summary>  
+  <ul>  
+  </ul>  
+</details>  
+
+## No member variables in this class
+
+## Methods
+
+### main [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileUnpacker.java#L23)
+
++ Description:   
++ Access: public  
++ Modifiers: static 
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] |  |  
+
+
+### unpackProfile [[src]](src/java/net/i2p/i2pfirefox/I2PChromiumProfileUnpacker.java#L38)
+
++ Description: unpack the profile directory   
++ Access: public  
++ return: true if the profile directory was successfully unpacked   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| profileDirectory | String |  |  
+| mode | String |  |  
+
+

docs/I2PCommonBrowser.md

@@ -0,0 +1,335 @@
+# Class I2PCommonBrowser [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java)  
+
+ >   
+
+Access: public  
+Description:  
+ > I2PCommonBrowser.java Copyright C 2022 idk <hankhill19580@gmail.com> This program is free software: you can redistribute it and/or modify it under the terms of the MIT License. See LICENSE.md for details. This program is distributed in the hope that it will be useful but WITHOUT ANY WARRANTY without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+Author: idk   
+package: net.i2p.i2pfirefox  
+
+## Dependencies
+
+<details>  
+  <summary>  
+    Show dependencies  
+  </summary>  
+  <ul>  
+<li>java.io.File</li>
+<li>java.io.FileInputStream</li>
+<li>java.io.FileOutputStream</li>
+<li>java.io.IOException</li>
+<li>java.io.InputStream</li>
+<li>java.io.OutputStream</li>
+<li>java.net.Socket</li>
+<li>java.nio.file.Files</li>
+<li>java.nio.file.StandardCopyOption</li>
+<li>java.util.Arrays</li>
+<li>java.util.Properties</li>
+<li>java.util.logging.FileHandler</li>
+<li>java.util.logging.Logger</li>
+<li>java.util.logging.SimpleFormatter</li>
+<li>java.util.zip.ZipEntry</li>
+<li>java.util.zip.ZipInputStream</li>
+  </ul>  
+</details>  
+
+## Member Variables
+
+####  Properties prop  [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L)
+
+ >   
+
++ Access: public  
+
+####  Logger logger  [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L)
+
+ >   
+
++ Access: public  
+
+#### FileHandler fh [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L)
+
+ >   
+
++ Access: private  
+
+## Methods
+
+### loadPropertiesFile [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L58)
+
++ Description:   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| props | File |  |  
+
+
+### validateUserDir [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L68)
+
++ Description:   
++ Access: public  
++ return: void  
+
+This method has no parameters.  
+
+
+### getOperatingSystem [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L113)
+
++ Description:   
++ Access: public  
++ return: String  
+
+This method has no parameters.  
+
+
+### isWindows [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L127)
+
++ Description:   
++ Access: protected  
++ return: boolean  
+
+This method has no parameters.  
+
+
+### isOSX [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L139)
+
++ Description:   
++ Access: protected  
++ return: boolean  
+
+This method has no parameters.  
+
+
+### runtimeDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L179)
+
++ Description: get the runtime directory creating it if create=true   
++ Access: protected  
++ return: the runtime directory or null if it could not be created   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| create | boolean | if true create the runtime directory if it does not exist  |  
+| override | String |  |  
+
+
+### runtimeDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L196)
+
++ Description: get the correct runtime directory   
++ Access: protected  
++ return: the runtime directory or null if it could not be created or found   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| override | String |  |  
+
+
+### profileDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L244)
+
++ Description: get the profile directory creating it if necessary   
++ Access: protected  
++ return: the profile directory or null if it could not be created   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| envVar | String |  |  
+| browser | String |  |  
+| base | String |  |  
+| app | boolean |  |  
+
+
+### profileDir [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L257)
+
++ Description:   
++ Access: protected  
++ return: String  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| file | String |  |  
+| browser | String |  |  
+| base | String |  |  
+| app | boolean |  |  
+
+
+### unpackProfile [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L268)
+
++ Description:   
++ Access: protected  
++ return: boolean  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| profileDirectory | String |  |  
+| browser | String |  |  
+| base | String |  |  
+
+
+### copyDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L313)
+
++ Description:   
++ Access: protected  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| sourceDirectory | File |  |  
+| destinationDirectory | File |  |  
+| browser | String |  |  
+| base | String |  |  
+
+
+### copyDirectoryCompatibilityMode [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L328)
+
++ Description:   
++ Access: private  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| source | File |  |  
+| destination | File |  |  
+| browser | String |  |  
+| base | String |  |  
+
+
+### copy [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L336)
+
++ Description:   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| source | InputStream |  |  
+| target | OutputStream |  |  
+
+
+### copyFile [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L345)
+
++ Description:   
++ Access: private  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| sourceFile | File |  |  
+| destinationFile | File |  |  
+
+
+### validateProfileFirstRun [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L356)
+
++ Description:   
++ Access: public  
++ return: boolean  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| profileDirectory | String |  |  
+
+
+### waitForProxy [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L382)
+
++ Description: Waits for an HTTP proxy on port 4444 to be ready. Returns false on timeout of 200 seconds.   
++ Access: public  
++ return: true if the proxy is ready false if it is not.   
+
+This method has no parameters.  
+
+
+### waitForProxy [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L392)
+
++ Description: Waits for an HTTP proxy on port 4444 to be ready. Returns false on timeout of the specified number of seconds.   
++ Access: public  
++ return: true if the proxy is ready false if it is not.   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| timeout | int | the number of seconds to wait for the proxy to be ready.  |  
+
+
+### waitForProxy [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L404)
+
++ Description: Waits for an HTTP proxy on the specified port to be ready. Returns false on timeout of the specified number of seconds.   
++ Access: public  
++ return: true if the proxy is ready false if it is not.   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| timeout | int | the number of seconds to wait for the proxy to be ready.  |  
+| port | int | the port to wait for the proxy to be ready on.  |  
+
+
+### waitForProxy [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L419)
+
++ Description: Waits for an HTTP proxy on the specified port to be ready. Returns false on timeout of the specified number of seconds. If the timeout is zero or less the check is disabled and always returns true.   
++ Access: public  
++ return: true if the proxy is ready false if it is not.   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| timeout | int | the number of seconds to wait for the proxy to be ready.  |  
+| port | int | the port to wait for the proxy to be ready on.  |  
+| host | String | the host to wait for the proxy to be ready on.  |  
+
+
+### checkifPortIsOccupied [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L437)
+
++ Description:   
++ Access: public  
++ return: boolean  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| port | int |  |  
+| host | String |  |  
+
+
+### setProxyTimeoutTime [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L452)
+
++ Description: Alters the proxy timeout to customized value time in seconds. May be zero.   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| time | int |  |  
+
+
+### join [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L457)
+
++ Description:   
++ Access: protected  
++ return: String  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| arr | String[] |  |  
+
+
+### sleep [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L466)
+
++ Description:   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| millis | int |  |  
+
+
+### searchFile [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L474)
+
++ Description:   
++ Access: public  
++ return: File  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| file | File |  |  
+| search | String |  |  
+
+

docs/I2PFirefox.md

@@ -0,0 +1,395 @@
+# Class I2PFirefox [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java)  
+
+ > */  
+
+Access: public  
+Description:  
+ > I2PFirefox.java Copyright C 2022 idk <hankhill19580@gmail.com> This program is free software: you can redistribute it and/or modify it under the terms of the MIT License. See LICENSE.md for details. This program is distributed in the hope that it will be useful but WITHOUT ANY WARRANTY without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+Author: idk   
+Parent class: I2PFirefoxProfileUnpacker  
+package: net.i2p.i2pfirefox  
+
+## Dependencies
+
+<details>  
+  <summary>  
+    Show dependencies  
+  </summary>  
+  <ul>  
+<li>java.io.File</li>
+<li>java.io.FileOutputStream</li>
+<li>java.io.FileWriter</li>
+<li>java.io.IOException</li>
+<li>java.io.OutputStream</li>
+<li>java.io.PrintWriter</li>
+<li>java.util.ArrayList</li>
+<li>java.util.Arrays</li>
+<li>java.util.List</li>
+<li>java.util.concurrent.TimeUnit</li>
+<li>java.util.stream.Collectors</li>
+<li>java.util.stream.Stream</li>
+  </ul>  
+</details>  
+
+## Member Variables
+
+####  String[] FIREFOX_SEARCH_PATHS  [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  Process process  [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L)
+
+ >   
+
++ Access: private  
+
+####  boolean usability  [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L)
+
+ >   
+
++ Access: public  
+
+## Methods
+
+### baseMode [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L35)
+
++ Description:   
++ Access: private  
++ return: String  
+
+This method has no parameters.  
+
+
+### storeFirefoxDefaults [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L58)
+
++ Description:   
++ Access: public  
++ return: void  
+
+This method has no parameters.  
+
+
+### firefoxPathsUnix [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L87)
+
++ Description:   
++ Access: public  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### firefoxBinsUnix [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L96)
+
++ Description:   
++ Access: public  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### FIND_FIREFOX_SEARCH_PATHS_UNIX [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L113)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### firefoxPathsOSX [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L126)
+
++ Description:   
++ Access: public  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### FIND_FIREFOX_SEARCH_PATHS_OSX [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L136)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### firefoxPathsWindows [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L149)
+
++ Description:   
++ Access: public  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### firefoxBinsWindows [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L182)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### FIND_FIREFOX_SEARCH_PATHS_WINDOWS [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L192)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### FIND_ALL_FIREFOX_SEARCH_PATHS [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L206)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### FIND_FIREFOX_SEARCH_PATHS [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L226)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### NEARBY_FIREFOX_SEARCH_PATHS [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L241)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### FIREFOX_FINDER [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L337)
+
++ Description:   
++ Access: private  
++ return: String[]  
+
+This method has no parameters.  
+
+
+### onlyValidFirefoxes [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L358)
+
++ Description: Check our list of firefox paths for a valid firefox binary. Just an existence check for now but should check versions in the future.   
++ Access: public  
++ return: a list of usable Firefoxes or an empty list if none are found.   
+
+This method has no parameters.  
+
+
+### topFirefox [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L379)
+
++ Description: Return the best available Firefox from the list of Firefoxes we have.   
++ Access: public  
++ return: the path to the best available Firefox or null if none are found.   
+
+This method has no parameters.  
+
+
+### topFirefox [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L409)
+
++ Description: Return the best available Firefox from the list of Firefoxes we have. if override is passed it will be validated and if it validates it will be used.   
++ Access: public  
++ return: the path to the best available Firefox or null if none are found.   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| overrideFirefox | String |  |  
+
+
+### defaultProcessBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L427)
+
++ Description: Build a ProcessBuilder for the top Firefox binary and the default profile.   
++ Access: public  
++ return: a ProcessBuilder for the top Firefox binary and the default profile.   
+
+This method has no parameters.  
+
+
+### defaultProcessBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L439)
+
++ Description: Build a ProcessBuilder for the top Firefox binary and the default profile.   
++ Access: public  
++ return: ProcessBuilder  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] | the args to pass to the Firefox binary  |  
+
+
+### privateProcessBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L453)
+
++ Description: Build a ProcessBuilder for the top Firefox binary and the default profile. Pass the --private-window flag to open a window.   
++ Access: public  
++ return: a ProcessBuilder for the top Firefox binary and the default profile.   
+
+This method has no parameters.  
+
+
+### privateProcessBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L466)
+
++ Description: Build a ProcessBuilder for the top Firefox binary and the default profile. Pass the --private-window flag to open a window.   
++ Access: public  
++ return: ProcessBuilder  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] | the arguments to pass to the Firefox binary  |  
+
+
+### appProcessBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L489)
+
++ Description: Build a ProcessBuilder for the top Firefox binary and the default profile. Pass the --private-window flag to open a window.   
++ Access: public  
++ return: a ProcessBuilder for the top Firefox binary and the default profile.   
+
+This method has no parameters.  
+
+
+### appProcessBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L502)
+
++ Description: Build a ProcessBuilder for the top Firefox binary and the default profile. Pass the --private-window flag to open a window.   
++ Access: public  
++ return: ProcessBuilder  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] | the arguments to pass to the Firefox binary  |  
+
+
+### headlessProcessBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L523)
+
++ Description: Build a ProcessBuilder for the top Firefox binary and the default profile. Pass the --headless flag to open without a window.   
++ Access: public  
++ return: ProcessBuilder  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] | the arguments to pass to the Firefox binary  |  
+
+
+### processBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L551)
+
++ Description:   
++ Access: public  
++ return: ProcessBuilder  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] |  |  
+| app | boolean |  |  
+
+
+### usabilityMode [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L682)
+
++ Description:   
++ Access: private  
++ return: String  
+
+This method has no parameters.  
+
+
+### launchAndDetatch [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L688)
+
++ Description:   
++ Access: public  
++ return: Process  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | boolean |  |  
+| url | String[] |  |  
+
+
+### launchAndDetatch [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L694)
+
++ Description:   
++ Access: public  
++ return: Process  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | int |  |  
+| url | String[] |  |  
+
+
+### launch [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L786)
+
++ Description: Populates a profile directory with a proxy configuration. Waits for an HTTP proxy on the port 4444 to be ready. Launches Firefox with the profile directory.   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | boolean |  |  
+| url | String[] |  |  
+
+
+### launch [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L792)
+
++ Description:   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | int |  |  
+| url | String[] |  |  
+
+
+### launch [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L818)
+
++ Description: Populates a profile directory with a proxy configuration. Waits for an HTTP proxy on the port 4444 to be ready. Launches Firefox with the profile directory.   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | boolean |  |  
+
+
+### launch [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L828)
+
++ Description: Populates a profile directory with a proxy configuration. Waits for an HTTP proxy on the port 4444 to be ready. Launches Firefox with the profile directory. Uses a semi-permanent profile.   
++ Access: public  
++ return: void  
+
+This method has no parameters.  
+
+
+### ValidURL [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L830)
+
++ Description:   
++ Access: private  
++ return: String  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| inUrl | String |  |  
+
+
+### main [[src]](src/java/net/i2p/i2pfirefox/I2PFirefox.java#L841)
+
++ Description:   
++ Access: public  
++ Modifiers: static 
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] |  |  
+
+

docs/I2PFirefoxProfileBuilder.md

@@ -0,0 +1,134 @@
+# Class I2PFirefoxProfileBuilder [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java)  
+
+ > */  
+
+Access: public  
+Description:  
+ > I2PFirefoxProfileBuilder.java Copyright C 2022 idk <hankhill19580@gmail.com> This program is free software: you can redistribute it and/or modify it under the terms of the MIT License. See LICENSE.md for details. This program is distributed in the hope that it will be useful but WITHOUT ANY WARRANTY without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. I2PFirefoxProfileBuilder is a that builds a profile directory which contains the I2P browser profile for the Firefox browser family. It manages the base profile directory and copies it's contents to the active profile directory which is actually used by Firefox.  
+
+Author: idk   
+Parent class: I2PFirefoxProfileChecker  
+package: net.i2p.i2pfirefox  
+
+## Dependencies
+
+<details>  
+  <summary>  
+    Show dependencies  
+  </summary>  
+  <ul>  
+<li>java.io.File</li>
+<li>java.io.IOException</li>
+<li>java.nio.file.Files</li>
+<li>java.nio.file.StandardCopyOption</li>
+  </ul>  
+</details>  
+
+## Member Variables
+
+#### boolean strict [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java#L)
+
+ >   
+
++ Access: private  
+
+## Methods
+
+### userChromeCSS [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java#L28)
+
++ Description:   
++ Access: private  
++ return: String  
+
+This method has no parameters.  
+
+
+### baseProfileDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java#L125)
+
++ Description: get the base profile directory creating it if necessary   
++ Access: public  
++ return: String  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| base | String |  |  
+
+
+### runtimeDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java#L149)
+
++ Description: get the runtime directory creating it if create=true   
++ Access: public  
++ return: the runtime directory or null if it could not be created   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| create | boolean | if true create the runtime directory if it does not exist  |  
+
+
+### runtimeDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java#L160)
+
++ Description: get the correct runtime directory   
++ Access: public  
++ return: the runtime directory or null if it could not be created or found   
+
+This method has no parameters.  
+
+
+### copyBaseProfiletoProfile [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java#L180)
+
++ Description: Copy the inert base profile directory to the runtime profile directory   
++ Access: public  
++ return: boolean  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| base | String |  |  
+| app | boolean |  |  
+
+
+### writeAppChrome [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java#L213)
+
++ Description:   
++ Access: protected  
++ return: boolean  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| profile | String |  |  
+
+
+### deleteAppChrome [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java#L226)
+
++ Description:   
++ Access: protected  
++ return: boolean  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| profile | String |  |  
+
+
+### copyStrictOptions [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java#L241)
+
++ Description: Copy the strict options from the base profile to the profile   
++ Access: public  
++ return: true if successful false otherwise   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| base | String |  |  
+| app | boolean |  |  
+
+
+### setupUserChrome [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java#L276)
+
++ Description:   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| profileDir | File |  |  
+| app | boolean |  |  
+
+

docs/I2PFirefoxProfileChecker.md

@@ -0,0 +1,136 @@
+# Class I2PFirefoxProfileChecker [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileChecker.java)  
+
+ > */  
+
+Access: public  
+Description:  
+ > I2PFirefoxProfileChecker.java Copyright C 2022 idk <hankhill19580@gmail.com> This program is free software: you can redistribute it and/or modify it under the terms of the MIT License. See LICENSE.md for details. This program is distributed in the hope that it will be useful but WITHOUT ANY WARRANTY without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. I2PFirefoxProfileChecker is a that checks if the Firefox profile directory exists and is valid.  
+
+Author: idk   
+Parent class: I2PCommonBrowser  
+package: net.i2p.i2pfirefox  
+
+## Dependencies
+
+<details>  
+  <summary>  
+    Show dependencies  
+  </summary>  
+  <ul>  
+<li>java.io.BufferedReader</li>
+<li>java.io.File</li>
+<li>java.io.FileNotFoundException</li>
+<li>java.io.FileReader</li>
+<li>java.io.FileWriter</li>
+<li>java.io.IOException</li>
+<li>java.util.Scanner</li>
+  </ul>  
+</details>  
+
+## No member variables in this class
+
+## Methods
+
+### main [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileChecker.java#L32)
+
++ Description:   
++ Access: public  
++ Modifiers: static 
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] |  |  
+
+
+### profileDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileChecker.java#L53)
+
++ Description: get the profile directory creating it if necessary   
++ Access: public  
++ return: String  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| app | boolean |  |  
+| base | String |  |  
+
+
+### validateProfileDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileChecker.java#L64)
+
++ Description: Return true if the profile directory is valid.   
++ Access: public  
++ return: true if the profile directory is valid false otherwise   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| profileDirectory | String | the profile directory to check  |  
+
+
+### deRestrictHTTPSAndSetupHomepage [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileChecker.java#L97)
+
++ Description:   
++ Access: private  
++ return: boolean  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| profile | String |  |  
+
+
+### undoHttpsOnlyMode [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileChecker.java#L120)
+
++ Description:   
++ Access: private  
++ return: boolean  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| fileToBeModified | File |  |  
+
+
+### undoHomepage [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileChecker.java#L126)
+
++ Description:   
++ Access: private  
++ return: boolean  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| fileToBeModified | File |  |  
+
+
+### undoValue [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileChecker.java#L149)
+
++ Description:   
++ Access: public  
++ return: boolean  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| oldString | String |  |  
+| newString | String |  |  
+| fileToBeModified | File |  |  
+
+
+### validateFile [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileChecker.java#L183)
+
++ Description: Return true if the file is valid.   
++ Access: public  
++ return: true if the file is valid false otherwise   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| file | String | the file to check  |  
+
+
+### validateExtensionDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileChecker.java#L210)
+
++ Description: Return true if the extension directory is valid.   
++ Access: public  
++ return: true if the extension directory is valid false otherwise   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| extensionDirectory | String | the extension directory to check  |  
+
+

docs/I2PFirefoxProfileUnpacker.md

@@ -0,0 +1,50 @@
+# Class I2PFirefoxProfileUnpacker [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileUnpacker.java)  
+
+ > */  
+
+Access: public  
+Description:  
+ > I2PFirefoxProfileUnpacker.java Copyright C 2022 idk <hankhill19580@gmail.com> This program is free software: you can redistribute it and/or modify it under the terms of the MIT License. See LICENSE.md for details. This program is distributed in the hope that it will be useful but WITHOUT ANY WARRANTY without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. I2PFirefoxProfileUnpacker is a that unpacks the I2P Firefox profile from a zip file embedded in the `jar` file. The zip is unpacked to a base directory where it is left untouched and the base profile is copied to the active profile directory.  
+
+Author: idk   
+Parent class: I2PFirefoxProfileBuilder  
+package: net.i2p.i2pfirefox  
+
+## Dependencies
+
+<details>  
+  <summary>  
+    Show dependencies  
+  </summary>  
+  <ul>  
+  </ul>  
+</details>  
+
+## No member variables in this class
+
+## Methods
+
+### main [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileUnpacker.java#L23)
+
++ Description:   
++ Access: public  
++ Modifiers: static 
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] |  |  
+
+
+### unpackProfile [[src]](src/java/net/i2p/i2pfirefox/I2PFirefoxProfileUnpacker.java#L38)
+
++ Description: unpack the profile directory   
++ Access: public  
++ return: true if the profile directory was successfully unpacked   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| profileDirectory | String |  |  
+| base | String |  |  
+
+

docs/I2PGenericUnsafeBrowser.md

@@ -0,0 +1,214 @@
+# Class I2PGenericUnsafeBrowser [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java)  
+
+ >   
+
+Access: public  
+Description:  
+ > I2PChromiumProfileChecker.java Copyright C 2022 idk <hankhill19580@gmail.com> This program is free software: you can redistribute it and/or modify it under the terms of the MIT License. See LICENSE.md for details. This program is distributed in the hope that it will be useful but WITHOUT ANY WARRANTY without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. I2PGenericUnsafeBrowser is a wrapper which sets common environment variables for the process controlled by a processbuilder. ALWAYS ALWAYS ALWAYS try the Firefox and Chromium specific launchers first.  
+
+Author: idk   
+Parent class: I2PCommonBrowser  
+package: net.i2p.i2pfirefox  
+
+## Dependencies
+
+<details>  
+  <summary>  
+    Show dependencies  
+  </summary>  
+  <ul>  
+<li>java.io.File</li>
+<li>java.io.FileOutputStream</li>
+<li>java.io.IOException</li>
+<li>java.io.OutputStream</li>
+<li>java.net.Socket</li>
+<li>java.util.ArrayList</li>
+<li>java.util.Arrays</li>
+<li>java.util.List</li>
+<li>java.util.Scanner</li>
+<li>java.util.stream.Collectors</li>
+  </ul>  
+</details>  
+
+## Member Variables
+
+####  int DEFAULT_TIMEOUT  [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L)
+
+ >   
+
++ Access: private  
++ Modifiers: final 
+
+####  String BROWSER  [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L)
+
+ >   
+
++ Access: public  
+
+####  Process p  [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L)
+
+ >   
+
++ Access: private  
+
+## Methods
+
+### getDefaultWindowsBrowser [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L101)
+
++ Description: Obtains the default browser for the Windows platform which by now should be Edgium in the worst-case scenario but in case it isn't we can use this function to figure it out. It can find: 1. The current user's HTTPS default browser if they configured it to be non-default 2. The current user's HTTP default browser if they configured it to be non-default 3. Edgium if it's available 4. iexplore if it's not and it will return the first one we find in exactly that order. Adapted from:   
++ Access: public  
++ return: path to command[0] and target URL[1] to the default browser ready for execution or null if not found   
+
+This method has no parameters.  
+
+
+### registryQuery [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L142)
+
++ Description: obtains a value matching a key contained in the windows registry at a path represented by hkeyquery   
++ Access: private  
++ return: either a registry "Default" value or null if one does not exist/is empty   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| hkeyquery | String | registry entry to ask for.  |  
+| key | String | key to retrieve value from  |  
+
+
+### followUserConfiguredBrowserToCommand [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L180)
+
++ Description: If following a query back to the Default value doesn't work then what we have is a "ProgID" which will be registered in \HKEY_CLASSES_ROOT\%ProgId% and will have an entry \shell\open\command where \shell\open\command yields the value that contains the command it needs. This function takes a registry query in the same format as getDefaultOutOfRegistry but instead of looking for the default entry   
++ Access: private  
++ return: the command required to run the application referenced in hkeyquery or null   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| hkeyquery | String |  |  
+
+
+### followProgIdToCommand [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L196)
+
++ Description: Cross-references a progId obtained by followUserConfiguredBrowserToCommand against HKEY_CLASSES_ROOT\%ProgId%\shell\open\command which holds the value of the command which we need to run to launch the default browser.   
++ Access: private  
++ return: the command required to run the application referenced in hkeyquery or null   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| progid | String |  |  
+
+
+### getDefaultOutOfRegistry [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L215)
+
++ Description: obtains a default browsing command out of the Windows registry.   
++ Access: private  
++ return: either a registry "Default" value or null if one does not exist/is empty   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| hkeyquery | String | registry entry to ask for.  |  
+
+
+### scanAPath [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L230)
+
++ Description:   
++ Access: private  
++ return: String  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| dir | String |  |  
+
+
+### getAnyUnixBrowser [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L245)
+
++ Description: Find any browser in our list within a UNIX path   
++ Access: public  
++ return: String  
+
+This method has no parameters.  
+
+
+### findUnsafeBrowserAnywhere [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L264)
+
++ Description: Find any usable browser and output the whole path   
++ Access: public  
++ return: String  
+
+This method has no parameters.  
+
+
+### deleteRuntimeDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L325)
+
++ Description: delete the runtime directory   
++ Access: public  
++ return: boolean  
+
+This method has no parameters.  
+
+
+### runtimeDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L341)
+
++ Description: get the runtime directory creating it if create=true   
++ Access: public  
++ return: the runtime directory or null if it could not be created   
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| create | boolean | if true create the runtime directory if it does not exist  |  
+
+
+### runtimeDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L353)
+
++ Description: get the correct runtime directory   
++ Access: public  
++ return: the runtime directory or null if it could not be created or found   
+
+This method has no parameters.  
+
+
+### launchAndDetatch [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L368)
+
++ Description:   
++ Access: public  
++ return: Process  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | boolean |  |  
+| url | String[] |  |  
+
+
+### launch [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L390)
+
++ Description:   
++ Access: public  
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| privateWindow | boolean |  |  
+| url | String[] |  |  
+
+
+### ValidURL [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L408)
+
++ Description:   
++ Access: private  
++ return: String  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| inUrl | String |  |  
+
+
+### main [[src]](src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java#L419)
+
++ Description:   
++ Access: public  
++ Modifiers: static 
++ return: void  
+
+| Name | Type | Description |  
+| ----- | ----- | ----- |  
+| args | String[] |  |  
+
+

docs/LINUX.html

@@ -8,93 +8,166 @@
     <meta name="keywords" content="main" />
     <link rel="stylesheet" type="text/css" href="style.css" />
     <link rel="stylesheet" type="text/css" href="showhider.css" />
+    <link rel="stylesheet" type="text/css" href="darklight.css" />
   </head>
   <body>
-    <div id="navbar">
-      <a href="#shownav">
-        Show navigation
-      </a>
-      <div id="shownav">
-        <div id="hidenav">
-          <ul>
-            <li>
-              <a href="..">
-                Up one level ^
-              </a>
-            </li>
-            <li>
-              <a href="index.html">
-                index
-              </a>
-            </li>
-            <li>
-              <a href="CHANGES.html">
-                CHANGES
-              </a>
-            </li>
-            <li>
-              <a href="LICENSE.html">
-                LICENSE
-              </a>
-            </li>
-            <li>
-              <a href="LINUX.html">
-                LINUX
-              </a>
-            </li>
-            <li>
-              <a href="OSX.html">
-                OSX
-              </a>
-            </li>
-            <li>
-              <a href="VERSION.html">
-                VERSION
-              </a>
-            </li>
-            <li>
-              <a href="WINDOWS.html">
-                WINDOWS
-              </a>
-            </li>
-            <li>
-              <a href="index.html">
-                index.html
-              </a>
-            </li>
-          </ul>
-          <br>
-          <a href="#hidenav">
-            Hide Navigation
-          </a>
+    <input type="checkbox" id="checkboxDarkLight">
+    <div class="container">
+      <div id="navbar">
+        <a href="#shownav">
+          Show navigation
+        </a>
+        <div id="shownav">
+          <div id="hidenav">
+            <ul>
+              <li>
+                <a href="..">
+                  Up one level ^
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index
+                </a>
+              </li>
+              <li>
+                <a href="CHANGES.html">
+                  CHANGES
+                </a>
+              </li>
+              <li>
+                <a href="LICENSE.html">
+                  LICENSE
+                </a>
+              </li>
+              <li>
+                <a href="VERSION.html">
+                  VERSION
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index.html
+                </a>
+              </li>
+              <li>
+                <a href="BUILD.html">
+                  BUILD
+                </a>
+              </li>
+              <li>
+                <a href="I2PBrowser.html">
+                  I2PBrowser
+                </a>
+              </li>
+              <li>
+                <a href="I2PBrowserPlugin.html">
+                  I2PBrowserPlugin.html
+                </a>
+              </li>
+              <li>
+                <a href="I2PChromium.html">
+                  I2PChromium
+                </a>
+              </li>
+              <li>
+                <a href="I2PChromiumProfileBuilder.html">
+                  I2PChromiumProfileBuilder
+                </a>
+              </li>
+              <li>
+                <a href="I2PChromiumProfileChecker.html">
+                  I2PChromiumProfileChecker
+                </a>
+              </li>
+              <li>
+                <a href="I2PChromiumProfileUnpacker.html">
+                  I2PChromiumProfileUnpacker
+                </a>
+              </li>
+              <li>
+                <a href="I2PCommonBrowser.html">
+                  I2PCommonBrowser
+                </a>
+              </li>
+              <li>
+                <a href="I2PFirefox.html">
+                  I2PFirefox
+                </a>
+              </li>
+              <li>
+                <a href="I2PFirefoxProfileBuilder.html">
+                  I2PFirefoxProfileBuilder
+                </a>
+              </li>
+              <li>
+                <a href="I2PFirefoxProfileChecker.html">
+                  I2PFirefoxProfileChecker
+                </a>
+              </li>
+              <li>
+                <a href="I2PFirefoxProfileUnpacker.html">
+                  I2PFirefoxProfileUnpacker
+                </a>
+              </li>
+              <li>
+                <a href="I2PGenericUnsafeBrowser.html">
+                  I2PGenericUnsafeBrowser
+                </a>
+              </li>
+              <li>
+                <a href="I2PLibreWolf.html">
+                  I2PLibreWolf.html
+                </a>
+              </li>
+              <li>
+                <a href="LINUX.html">
+                  LINUX
+                </a>
+              </li>
+              <li>
+                <a href="OSX.html">
+                  OSX
+                </a>
+              </li>
+              <li>
+                <a href="WINDOWS.html">
+                  WINDOWS
+                </a>
+              </li>
+            </ul>
+            <br>
+            <a href="#hidenav">
+              Hide Navigation
+            </a>
+          </div>
         </div>
       </div>
-    </div>
-    <a id="returnhome" href="/">
-      /
-    </a>
-    <h3>
-      Linux Support
-    </h3>
-    <p>
-      It&rsquo;s possible to use this package in the following binary formats on
-      Linux. These packages are for the
-      <strong>
+      <a id="returnhome" href="/">
+        /
+      </a>
+      <h3>
+        Linux Support
+      </h3>
+      <p>
+        It&rsquo;s possible to use this package in the following binary formats on
+        Linux. These packages are for the
+        <strong>
+          <code>
+            amd64
+          </code>
+        </strong>
+        architecture.
+      </p>
+      <h4>
+        Linux jpackage:
         <code>
-          amd64
+          .tar.gz
         </code>
-      </strong>
-      architecture.
-    </p>
-    <h4>
-      Linux jpackage:
-      <code>
-        .zip
-      </code>
-    </h4>
-    <pre><code class="language-sh">mkdir ~/tmp-i2pbrowser &amp;&amp; cd ~/tmp-i2pbrowser
-wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.5/i2pbrowser.zip
-unzip i2pbrowser.zip &amp;&amp; cd i2pbrowser
+      </h4>
+      <pre><code class="language-sh">mkdir ~/tmp-i2pbrowser &amp;&amp; cd ~/tmp-i2pbrowser
+wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.3.0/i2pbrowser.tar.gz
+tar xvzf i2pbrowser.tar.gz &amp;&amp; cd i2pbrowser
 ## THIS STEP IS OPTIONAL but it will force the system to use Tor Browser from within the i2pbrowser directory.
 # This probably offers better security than vanilla Firefox.
 # This will also make the directory the launcher is in relocatable to a flash drive, for instance.
@@ -104,98 +177,98 @@ unzip i2pbrowser.zip &amp;&amp; cd i2pbrowser
 # end of optional step.
 ./bin/i2pbrowser
 </code></pre>
-    <h4>
-      Debian/Ubuntu and variants Jpackage:
-      <code>
-        .deb
-      </code>
-    </h4>
-    <ol>
-      <li>
-        Start your I2P Router
-      </li>
-      <li>
-        Download the latest release
+      <h4>
+        Debian/Ubuntu and variants Jpackage:
         <code>
           .deb
         </code>
-        from
-        <a href="https://github.com/eyedeekay/i2p.plugins.firefox/releases">
-          Github
-        </a>
-        and verify it&rsquo;s hash.
-      </li>
-      <li>
-        Run
-        <code>
-          sudo apt-get install ./i2pbrowser*.deb
-        </code>
-        (Only needs to be done once per update)
-      </li>
-      <li>
-        Use the applications menu shortcut to launch the pre-configured I2P browser
-      </li>
-    </ol>
-    <h4>
-      Fedora and variants Jpackage:
-      <code>
-        .rpm
-      </code>
-    </h4>
-    <ol>
-      <li>
-        Start your I2P Router
-      </li>
-      <li>
-        Download the latest release
-        <code>
-          .r[m
-        </code>
-        from
-        <a href="https://github.com/eyedeekay/i2p.plugins.firefox/releases">
-          Github
-        </a>
-        and verify it&rsquo;s hash.
-      </li>
-      <li>
-        Run
-        <code>
-          sudo rpm -i ./i2pbrowser*.rpm
-        </code>
-        (Only needs to be done the first time)
-      </li>
-      <li>
-        Run
-        <code>
-          sudo rpm -U ./i2pbrowser*.rpm
-        </code>
-        (Only needs to be done once per update)
-      </li>
-      <li>
-        Use the applications menu shortcut to launch the pre-configured I2P browser
-      </li>
-    </ol>
-    <div id="sourcecode">
-      <span id="sourcehead">
-        <strong>
-          Get the source code:
-        </strong>
-      </span>
-      <ul>
+      </h4>
+      <ol>
         <li>
-          <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
-            Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
-          </a>
+          Start your I2P Router
         </li>
-      </ul>
-    </div>
-    <div>
-      <a href="#show">
-        Show license
-      </a>
-      <div id="show">
-        <div id="hide">
-          <pre><code>   Copyright 2022 idk (hankhill19580@gmail.com)
+        <li>
+          Download the latest release
+          <code>
+            .deb
+          </code>
+          from
+          <a href="https://github.com/eyedeekay/i2p.plugins.firefox/releases">
+            Github
+          </a>
+          and verify it&rsquo;s hash.
+        </li>
+        <li>
+          Run
+          <code>
+            sudo apt-get install ./i2pbrowser*.deb
+          </code>
+          (Only needs to be done once per update)
+        </li>
+        <li>
+          Use the applications menu shortcut to launch the pre-configured I2P browser
+        </li>
+      </ol>
+      <h4>
+        Fedora and variants Jpackage:
+        <code>
+          .rpm
+        </code>
+      </h4>
+      <ol>
+        <li>
+          Start your I2P Router
+        </li>
+        <li>
+          Download the latest release
+          <code>
+            .r[m
+          </code>
+          from
+          <a href="https://github.com/eyedeekay/i2p.plugins.firefox/releases">
+            Github
+          </a>
+          and verify it&rsquo;s hash.
+        </li>
+        <li>
+          Run
+          <code>
+            sudo rpm -i ./i2pbrowser*.rpm
+          </code>
+          (Only needs to be done the first time)
+        </li>
+        <li>
+          Run
+          <code>
+            sudo rpm -U ./i2pbrowser*.rpm
+          </code>
+          (Only needs to be done once per update)
+        </li>
+        <li>
+          Use the applications menu shortcut to launch the pre-configured I2P browser
+        </li>
+      </ol>
+      <div id="sourcecode">
+        <span id="sourcehead">
+          <strong>
+            Get the source code:
+          </strong>
+        </span>
+        <ul>
+          <li>
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+            </a>
+          </li>
+        </ul>
+      </div>
+      <div>
+        <a href="#show">
+          Show license
+        </a>
+        <div id="show">
+          <div id="hide">
+            <pre><code>   Copyright 2022 idk (hankhill19580@gmail.com)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -1038,9 +1111,10 @@ consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
 </code></pre>
-          <a href="#hide">
-            Hide license
-          </a>
+            <a href="#hide">
+              Hide license
+            </a>
+          </div>
         </div>
       </div>
     </div>
@@ -1049,7 +1123,7 @@ Public License instead of this License.
     </div>
     <div>
       <a href="https://geti2p.net/">
-        <img src="i2plogo.png"></img>
+        <img class="i2plogo" src="i2plogo.png"></img>
         I2P
       </a>
     </div>

docs/LINUX.md

@@ -3,12 +3,12 @@
 It's possible to use this package in the following binary formats on
 Linux. These packages are for the **`amd64`** architecture.
 
-#### Linux jpackage: `.zip`
+#### Linux jpackage: `.tar.gz`
 
 ```sh
 mkdir ~/tmp-i2pbrowser && cd ~/tmp-i2pbrowser
-wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.5/i2pbrowser.zip
-unzip i2pbrowser.zip && cd i2pbrowser
+wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.3.0/i2pbrowser.tar.gz
+tar xvzf i2pbrowser.tar.gz && cd i2pbrowser
 ## THIS STEP IS OPTIONAL but it will force the system to use Tor Browser from within the i2pbrowser directory.
 # This probably offers better security than vanilla Firefox.
 # This will also make the directory the launcher is in relocatable to a flash drive, for instance.

docs/OSX.html

@@ -8,85 +8,158 @@
     <meta name="keywords" content="main" />
     <link rel="stylesheet" type="text/css" href="style.css" />
     <link rel="stylesheet" type="text/css" href="showhider.css" />
+    <link rel="stylesheet" type="text/css" href="darklight.css" />
   </head>
   <body>
-    <div id="navbar">
-      <a href="#shownav">
-        Show navigation
-      </a>
-      <div id="shownav">
-        <div id="hidenav">
-          <ul>
-            <li>
-              <a href="..">
-                Up one level ^
-              </a>
-            </li>
-            <li>
-              <a href="index.html">
-                index
-              </a>
-            </li>
-            <li>
-              <a href="CHANGES.html">
-                CHANGES
-              </a>
-            </li>
-            <li>
-              <a href="LICENSE.html">
-                LICENSE
-              </a>
-            </li>
-            <li>
-              <a href="LINUX.html">
-                LINUX
-              </a>
-            </li>
-            <li>
-              <a href="OSX.html">
-                OSX
-              </a>
-            </li>
-            <li>
-              <a href="VERSION.html">
-                VERSION
-              </a>
-            </li>
-            <li>
-              <a href="WINDOWS.html">
-                WINDOWS
-              </a>
-            </li>
-            <li>
-              <a href="index.html">
-                index.html
-              </a>
-            </li>
-          </ul>
-          <br>
-          <a href="#hidenav">
-            Hide Navigation
-          </a>
+    <input type="checkbox" id="checkboxDarkLight">
+    <div class="container">
+      <div id="navbar">
+        <a href="#shownav">
+          Show navigation
+        </a>
+        <div id="shownav">
+          <div id="hidenav">
+            <ul>
+              <li>
+                <a href="..">
+                  Up one level ^
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index
+                </a>
+              </li>
+              <li>
+                <a href="CHANGES.html">
+                  CHANGES
+                </a>
+              </li>
+              <li>
+                <a href="LICENSE.html">
+                  LICENSE
+                </a>
+              </li>
+              <li>
+                <a href="VERSION.html">
+                  VERSION
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index.html
+                </a>
+              </li>
+              <li>
+                <a href="BUILD.html">
+                  BUILD
+                </a>
+              </li>
+              <li>
+                <a href="I2PBrowser.html">
+                  I2PBrowser
+                </a>
+              </li>
+              <li>
+                <a href="I2PBrowserPlugin.html">
+                  I2PBrowserPlugin.html
+                </a>
+              </li>
+              <li>
+                <a href="I2PChromium.html">
+                  I2PChromium
+                </a>
+              </li>
+              <li>
+                <a href="I2PChromiumProfileBuilder.html">
+                  I2PChromiumProfileBuilder
+                </a>
+              </li>
+              <li>
+                <a href="I2PChromiumProfileChecker.html">
+                  I2PChromiumProfileChecker
+                </a>
+              </li>
+              <li>
+                <a href="I2PChromiumProfileUnpacker.html">
+                  I2PChromiumProfileUnpacker
+                </a>
+              </li>
+              <li>
+                <a href="I2PCommonBrowser.html">
+                  I2PCommonBrowser
+                </a>
+              </li>
+              <li>
+                <a href="I2PFirefox.html">
+                  I2PFirefox
+                </a>
+              </li>
+              <li>
+                <a href="I2PFirefoxProfileBuilder.html">
+                  I2PFirefoxProfileBuilder
+                </a>
+              </li>
+              <li>
+                <a href="I2PFirefoxProfileChecker.html">
+                  I2PFirefoxProfileChecker
+                </a>
+              </li>
+              <li>
+                <a href="I2PFirefoxProfileUnpacker.html">
+                  I2PFirefoxProfileUnpacker
+                </a>
+              </li>
+              <li>
+                <a href="I2PGenericUnsafeBrowser.html">
+                  I2PGenericUnsafeBrowser
+                </a>
+              </li>
+              <li>
+                <a href="I2PLibreWolf.html">
+                  I2PLibreWolf.html
+                </a>
+              </li>
+              <li>
+                <a href="LINUX.html">
+                  LINUX
+                </a>
+              </li>
+              <li>
+                <a href="OSX.html">
+                  OSX
+                </a>
+              </li>
+              <li>
+                <a href="WINDOWS.html">
+                  WINDOWS
+                </a>
+              </li>
+            </ul>
+            <br>
+            <a href="#hidenav">
+              Hide Navigation
+            </a>
+          </div>
         </div>
       </div>
-    </div>
-    <a id="returnhome" href="/">
-      /
-    </a>
-    <h1>
-      Using this on OSX
-    </h1>
-    <p>
-      This code will launch an I2P-Configured Browser on OSX, but at this time
-      there are no packages for it because it&rsquo;s not possible for me to sign OSX
-      packages. You can use the
-      <code>
-        .jar
-      </code>
-      file with any Java greater than Java 8.
-    </p>
-    <pre><code class="language-sh">mkdir ~/tmp-i2pfirefox &amp;&amp; cd ~/tmp-i2pfirefox
-wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.5/i2pfirefox.zip
+      <a id="returnhome" href="/">
+        /
+      </a>
+      <h1>
+        Using this on OSX
+      </h1>
+      <p>
+        This code will launch an I2P-Configured Browser on OSX, but at this time
+        there are no packages for it because it&rsquo;s not possible for me to sign OSX
+        packages. You can use the
+        <code>
+          .jar
+        </code>
+        file with any Java greater than Java 8.
+      </p>
+      <pre><code class="language-sh">mkdir ~/tmp-i2pfirefox &amp;&amp; cd ~/tmp-i2pfirefox
+wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.3.0/i2pfirefox.zip
 unzip i2pfirefox.zip
 ./cmd/i2pfirefox.cmd
 
@@ -94,57 +167,57 @@ unzip i2pfirefox.zip
 
 ./cmd/i2pchromium.cmd
 </code></pre>
-    <h2>
-      Building a
-      <code>
-        jpackage
-      </code>
-    </h2>
-    <p>
-      In order to build a
-      <code>
-        jpackage
-      </code>
-      , install at least Java 17. To set up Java
-      17 and configure it to be the Java used by the system for the rest of the
-      session, use these commands:
-    </p>
-    <pre><code class="language-sh">brew install openjdk@17 
+      <h2>
+        Building a
+        <code>
+          jpackage
+        </code>
+      </h2>
+      <p>
+        In order to build a
+        <code>
+          jpackage
+        </code>
+        , install at least Java 17. To set up Java
+        17 and configure it to be the Java used by the system for the rest of the
+        session, use these commands:
+      </p>
+      <pre><code class="language-sh">brew install openjdk@17 
 sudo ln -sfn /usr/local/opt/openjdk/libexec/openjdk.jdk /Library/Java/JavaVirtualMachines/openjdk.jdk
 export JAVA_HOME=`/usr/libexec/java_home -v 17`
 </code></pre>
-    <p>
-      Once you&rsquo;re finished, run
-      <code>
-        ./osx-dmg.sh
-      </code>
-      in the repository root to produce a
-      <code>
-        .dmg
-      </code>
-      package.
-    </p>
-    <div id="sourcecode">
-      <span id="sourcehead">
-        <strong>
-          Get the source code:
-        </strong>
-      </span>
-      <ul>
-        <li>
-          <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
-            Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
-          </a>
-        </li>
-      </ul>
-    </div>
-    <div>
-      <a href="#show">
-        Show license
-      </a>
-      <div id="show">
-        <div id="hide">
-          <pre><code>   Copyright 2022 idk (hankhill19580@gmail.com)
+      <p>
+        Once you&rsquo;re finished, run
+        <code>
+          ./osx-dmg.sh
+        </code>
+        in the repository root to produce a
+        <code>
+          .dmg
+        </code>
+        package.
+      </p>
+      <div id="sourcecode">
+        <span id="sourcehead">
+          <strong>
+            Get the source code:
+          </strong>
+        </span>
+        <ul>
+          <li>
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+            </a>
+          </li>
+        </ul>
+      </div>
+      <div>
+        <a href="#show">
+          Show license
+        </a>
+        <div id="show">
+          <div id="hide">
+            <pre><code>   Copyright 2022 idk (hankhill19580@gmail.com)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -987,9 +1060,10 @@ consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
 </code></pre>
-          <a href="#hide">
-            Hide license
-          </a>
+            <a href="#hide">
+              Hide license
+            </a>
+          </div>
         </div>
       </div>
     </div>
@@ -998,7 +1072,7 @@ Public License instead of this License.
     </div>
     <div>
       <a href="https://geti2p.net/">
-        <img src="i2plogo.png"></img>
+        <img class="i2plogo" src="i2plogo.png"></img>
         I2P
       </a>
     </div>

docs/OSX.md

@@ -7,7 +7,7 @@ packages. You can use the `.jar` file with any Java greater than Java 8.
 
 ```sh
 mkdir ~/tmp-i2pfirefox && cd ~/tmp-i2pfirefox
-wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.5/i2pfirefox.zip
+wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.3.0/i2pfirefox.zip
 unzip i2pfirefox.zip
 ./cmd/i2pfirefox.cmd
 

docs/WINDOWS.html

@@ -8,216 +8,289 @@
     <meta name="keywords" content="main" />
     <link rel="stylesheet" type="text/css" href="style.css" />
     <link rel="stylesheet" type="text/css" href="showhider.css" />
+    <link rel="stylesheet" type="text/css" href="darklight.css" />
   </head>
   <body>
-    <div id="navbar">
-      <a href="#shownav">
-        Show navigation
-      </a>
-      <div id="shownav">
-        <div id="hidenav">
-          <ul>
-            <li>
-              <a href="..">
-                Up one level ^
-              </a>
-            </li>
-            <li>
-              <a href="index.html">
-                index
-              </a>
-            </li>
-            <li>
-              <a href="CHANGES.html">
-                CHANGES
-              </a>
-            </li>
-            <li>
-              <a href="LICENSE.html">
-                LICENSE
-              </a>
-            </li>
-            <li>
-              <a href="LINUX.html">
-                LINUX
-              </a>
-            </li>
-            <li>
-              <a href="OSX.html">
-                OSX
-              </a>
-            </li>
-            <li>
-              <a href="VERSION.html">
-                VERSION
-              </a>
-            </li>
-            <li>
-              <a href="WINDOWS.html">
-                WINDOWS
-              </a>
-            </li>
-            <li>
-              <a href="index.html">
-                index.html
-              </a>
-            </li>
-          </ul>
-          <br>
-          <a href="#hidenav">
-            Hide Navigation
-          </a>
+    <input type="checkbox" id="checkboxDarkLight">
+    <div class="container">
+      <div id="navbar">
+        <a href="#shownav">
+          Show navigation
+        </a>
+        <div id="shownav">
+          <div id="hidenav">
+            <ul>
+              <li>
+                <a href="..">
+                  Up one level ^
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index
+                </a>
+              </li>
+              <li>
+                <a href="CHANGES.html">
+                  CHANGES
+                </a>
+              </li>
+              <li>
+                <a href="LICENSE.html">
+                  LICENSE
+                </a>
+              </li>
+              <li>
+                <a href="VERSION.html">
+                  VERSION
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index.html
+                </a>
+              </li>
+              <li>
+                <a href="BUILD.html">
+                  BUILD
+                </a>
+              </li>
+              <li>
+                <a href="I2PBrowser.html">
+                  I2PBrowser
+                </a>
+              </li>
+              <li>
+                <a href="I2PBrowserPlugin.html">
+                  I2PBrowserPlugin.html
+                </a>
+              </li>
+              <li>
+                <a href="I2PChromium.html">
+                  I2PChromium
+                </a>
+              </li>
+              <li>
+                <a href="I2PChromiumProfileBuilder.html">
+                  I2PChromiumProfileBuilder
+                </a>
+              </li>
+              <li>
+                <a href="I2PChromiumProfileChecker.html">
+                  I2PChromiumProfileChecker
+                </a>
+              </li>
+              <li>
+                <a href="I2PChromiumProfileUnpacker.html">
+                  I2PChromiumProfileUnpacker
+                </a>
+              </li>
+              <li>
+                <a href="I2PCommonBrowser.html">
+                  I2PCommonBrowser
+                </a>
+              </li>
+              <li>
+                <a href="I2PFirefox.html">
+                  I2PFirefox
+                </a>
+              </li>
+              <li>
+                <a href="I2PFirefoxProfileBuilder.html">
+                  I2PFirefoxProfileBuilder
+                </a>
+              </li>
+              <li>
+                <a href="I2PFirefoxProfileChecker.html">
+                  I2PFirefoxProfileChecker
+                </a>
+              </li>
+              <li>
+                <a href="I2PFirefoxProfileUnpacker.html">
+                  I2PFirefoxProfileUnpacker
+                </a>
+              </li>
+              <li>
+                <a href="I2PGenericUnsafeBrowser.html">
+                  I2PGenericUnsafeBrowser
+                </a>
+              </li>
+              <li>
+                <a href="I2PLibreWolf.html">
+                  I2PLibreWolf.html
+                </a>
+              </li>
+              <li>
+                <a href="LINUX.html">
+                  LINUX
+                </a>
+              </li>
+              <li>
+                <a href="OSX.html">
+                  OSX
+                </a>
+              </li>
+              <li>
+                <a href="WINDOWS.html">
+                  WINDOWS
+                </a>
+              </li>
+            </ul>
+            <br>
+            <a href="#hidenav">
+              Hide Navigation
+            </a>
+          </div>
         </div>
       </div>
-    </div>
-    <a id="returnhome" href="/">
-      /
-    </a>
-    <h3>
-      Windows Support
-    </h3>
-    <p>
-      It&rsquo;s possible to use this package on Windows, but it&rsquo;s recommended that
-      you get it through the Easy-Install bundle which includes this functionality
-      already. Use this only if you want to test new features or if you prefer
-      an unbundled I2P router with an external JVM.
-    </p>
-    <h4>
-      Windows Jpackage:
-      <code>
-        .zip
-      </code>
-    </h4>
-    <p>
-      <strong>
-        (Not Recommended! This functionality is already included in the Easy-Install Bundle for Windows)
-      </strong>
-    </p>
-    <ol>
-      <li>
-        Start your I2P Router
-      </li>
-      <li>
-        Download the latest release
+      <a id="returnhome" href="/">
+        /
+      </a>
+      <h3>
+        Windows Support
+      </h3>
+      <p>
+        It&rsquo;s possible to use this package on Windows, but it&rsquo;s recommended that
+        you get it through the Easy-Install bundle which includes this functionality
+        already. Use this only if you want to test new features or if you prefer
+        an unbundled I2P router with an external JVM.
+      </p>
+      <h4>
+        Windows Jpackage:
         <code>
           .zip
         </code>
-        from
-        <a href="https://github.com/eyedeekay/i2p.plugins.firefox/releases">
-          Github
-        </a>
-        and verify it&rsquo;s hash.
-      </li>
-      <li>
-        Unzip the
-        <code>
-          .zip
-        </code>
-        directory
-      </li>
-      <li>
-        run the
-        <code>
-          i2pbrowser.exe
-        </code>
-        file inside the unzipped directory.
-      </li>
-    </ol>
-    <h4>
-      Windows Jpackage:
-      <code>
-        .msi
-      </code>
-    </h4>
-    <p>
-      <strong>
-        (Not Recommended! This functionality is already included in the Easy-Install Bundle for Windows)
-      </strong>
-    </p>
-    <ol>
-      <li>
-        Start your I2P Router
-      </li>
-      <li>
-        Download the latest release
+      </h4>
+      <p>
+        <strong>
+          (Not Recommended! This functionality is already included in the Easy-Install Bundle for Windows)
+        </strong>
+      </p>
+      <ol>
+        <li>
+          Start your I2P Router
+        </li>
+        <li>
+          Download the latest release
+          <code>
+            .zip
+          </code>
+          from
+          <a href="https://github.com/eyedeekay/i2p.plugins.firefox/releases">
+            Github
+          </a>
+          and verify it&rsquo;s hash.
+        </li>
+        <li>
+          Unzip the
+          <code>
+            .zip
+          </code>
+          directory
+        </li>
+        <li>
+          run the
+          <code>
+            i2pbrowser.exe
+          </code>
+          file inside the unzipped directory.
+        </li>
+      </ol>
+      <h4>
+        Windows Jpackage:
         <code>
           .msi
         </code>
-        from
-        <a href="https://github.com/eyedeekay/i2p.plugins.firefox/releases">
-          Github
-        </a>
-        and verify it&rsquo;s hash.
-      </li>
-      <li>
-        Run the
-        <code>
-          .msi
-        </code>
-        installer(Only needs to be done once per update)
-      </li>
-      <li>
-        Use the start menu shortcut to launch the pre-configured I2P browser
-      </li>
-    </ol>
-    <h4>
-      Windows Jpackage:
-      <code>
-        .exe
-      </code>
-    </h4>
-    <p>
-      <strong>
-        (Not Recommended! This functionality is already included in the Easy-Install Bundle for Windows)
-      </strong>
-    </p>
-    <ol>
-      <li>
-        Start your I2P Router
-      </li>
-      <li>
-        Download the latest release
+      </h4>
+      <p>
+        <strong>
+          (Not Recommended! This functionality is already included in the Easy-Install Bundle for Windows)
+        </strong>
+      </p>
+      <ol>
+        <li>
+          Start your I2P Router
+        </li>
+        <li>
+          Download the latest release
+          <code>
+            .msi
+          </code>
+          from
+          <a href="https://github.com/eyedeekay/i2p.plugins.firefox/releases">
+            Github
+          </a>
+          and verify it&rsquo;s hash.
+        </li>
+        <li>
+          Run the
+          <code>
+            .msi
+          </code>
+          installer(Only needs to be done once per update)
+        </li>
+        <li>
+          Use the start menu shortcut to launch the pre-configured I2P browser
+        </li>
+      </ol>
+      <h4>
+        Windows Jpackage:
         <code>
           .exe
         </code>
-        from
-        <a href="https://github.com/eyedeekay/i2p.plugins.firefox/releases">
-          Github
-        </a>
-        and verify it&rsquo;s hash.
-      </li>
-      <li>
-        Run the
-        <code>
-          .msi
-        </code>
-        installer(Only needs to be done once per update)
-      </li>
-      <li>
-        Use the start menu shortcut to launch the pre-configured I2P browser
-      </li>
-    </ol>
-    <div id="sourcecode">
-      <span id="sourcehead">
+      </h4>
+      <p>
         <strong>
-          Get the source code:
+          (Not Recommended! This functionality is already included in the Easy-Install Bundle for Windows)
         </strong>
-      </span>
-      <ul>
+      </p>
+      <ol>
         <li>
-          <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
-            Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
-          </a>
+          Start your I2P Router
         </li>
-      </ul>
-    </div>
-    <div>
-      <a href="#show">
-        Show license
-      </a>
-      <div id="show">
-        <div id="hide">
-          <pre><code>   Copyright 2022 idk (hankhill19580@gmail.com)
+        <li>
+          Download the latest release
+          <code>
+            .exe
+          </code>
+          from
+          <a href="https://github.com/eyedeekay/i2p.plugins.firefox/releases">
+            Github
+          </a>
+          and verify it&rsquo;s hash.
+        </li>
+        <li>
+          Run the
+          <code>
+            .msi
+          </code>
+          installer(Only needs to be done once per update)
+        </li>
+        <li>
+          Use the start menu shortcut to launch the pre-configured I2P browser
+        </li>
+      </ol>
+      <div id="sourcecode">
+        <span id="sourcehead">
+          <strong>
+            Get the source code:
+          </strong>
+        </span>
+        <ul>
+          <li>
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+            </a>
+          </li>
+        </ul>
+      </div>
+      <div>
+        <a href="#show">
+          Show license
+        </a>
+        <div id="show">
+          <div id="hide">
+            <pre><code>   Copyright 2022 idk (hankhill19580@gmail.com)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -1060,9 +1133,10 @@ consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
 </code></pre>
-          <a href="#hide">
-            Hide license
-          </a>
+            <a href="#hide">
+              Hide license
+            </a>
+          </div>
         </div>
       </div>
     </div>
@@ -1071,7 +1145,7 @@ Public License instead of this License.
     </div>
     <div>
       <a href="https://geti2p.net/">
-        <img src="i2plogo.png"></img>
+        <img class="i2plogo" src="i2plogo.png"></img>
         I2P
       </a>
     </div>

docs/darklight.css

@@ -0,0 +1,24 @@
+/* edgar darklight CSS file */
+#checkboxDarkLight:checked + .container {
+    background-color: #202020;
+    filter: invert(100%);
+}
+#checkboxDarkLight{
+    appearance: none;
+    width: 80px;
+    height: 40px;
+    background: black;
+    border-radius: 22px;
+    cursor: pointer;
+    outline: none;
+}
+#checkboxDarkLight::before{
+    content: '';
+    width: 40px;
+    height: 35px;
+    background-color:white;
+    border-radius: 35px;
+    cursor: pointer;
+    transition: .3s linear;
+}
+

docs/showhider.css

@@ -0,0 +1,15 @@
+/* edgar showhider CSS file */
+#show {display:none; }
+#hide {display:block; }
+#show:target {display: block; }
+#hide:target {display: none; }
+
+#shownav {display:none; }
+#hidenav {display:block; }
+#shownav:target {display: block; }
+#hidenav:target {display: none; }
+
+#donate {display:none; }
+#hidedonate {display:block; }
+#donate:target {display: block; }
+#hidedonate:target {display: none; }

docs/style.css

@@ -0,0 +1,163 @@
+/* edgar default CSS file */
+
+body {
+    font-family: "Roboto";
+    font-family: monospace;
+    text-align: justify;
+    background-color: #373636;
+    color: whitesmoke;
+    font-size: 1.15em;
+}
+
+ul {
+    width: 55%;
+    display: block;
+}
+
+ol {
+    width: 55%;
+    display: block;
+}
+
+li {
+    margin-top: 1%;
+}
+
+p {
+    max-width: 90%;
+    margin-top: 1%;
+    margin-left: 3%;
+    margin-right: 3%;
+}
+
+img {
+    float: left;
+    top: 5%;
+    left: 5%;
+    max-width: 60%;
+    display: inline;
+    padding-right: 2%;
+}
+
+.inline {
+    display: inline;
+}
+
+.link-button:focus {
+    outline: none;
+}
+
+.link-button:active {
+    color: red;
+}
+
+code {
+    font-family: monospace;
+    border-radius: 5%;
+    padding: 1%;
+    border-color: darkgray;
+    font-size: .9em;
+}
+
+a {
+    color: #C6D9FE;
+    padding: 1%;
+}
+
+ul li {
+    color: #C6D9FE;
+}
+
+iframe {
+    background: aliceblue;
+    border-radius: 15%;
+    margin: 2%;
+}
+
+.container {
+    display: inline-block;
+    margin: 0;
+    padding: 0;
+}
+
+.editor-toolbar a {
+    display: inline-block;
+    text-align: center;
+    text-decoration: none !important;
+    color: whitesmoke !important;
+}
+
+#feed {
+    width: 60vw;
+    height: unset !important;
+    margin: 0;
+    padding: 0;
+    float: right;
+    background-color: #373636;
+    color: whitesmoke;
+    border: #C6D9FE solid 1px;
+}
+
+.thread-post,
+.thread {
+    color: whitesmoke !important;
+    background-color: #373636;
+    border: 1px solid darkgray;
+    font-size: inherit;
+    padding-top: 1%;
+    padding-bottom: 1%;
+}
+
+.thread-post {
+    margin-left: 4%;
+}
+
+input {
+    text-align: center;
+    color: whitesmoke !important;
+    background-color: #373636;
+    border: 1px solid darkgray;
+    font: normal normal normal 14px/1 FontAwesome;
+    font-size: inherit;
+    padding-top: 1%;
+    padding-bottom: 1%;
+}
+
+.thread-hash {
+    text-align: right;
+    color: whitesmoke !important;
+    background-color: #373636;
+    border: 1px solid darkgray;
+    font-size: inherit;
+    padding-top: 1%;
+    padding-bottom: 1%;
+}
+
+.post-body {
+    text-align: left;
+    color: whitesmoke !important;
+    font-size: inherit;
+    padding-top: 1%;
+    padding-bottom: 1%;
+}
+#show {display:none; }
+#hide {display:block; }
+#show:target {display: block; }
+#hide:target {display: none; }
+
+#shownav {display:none; }
+#hidenav {display:block; }
+#shownav:target {display: block; }
+#hidenav:target {display: none; }
+
+#navbar {
+	float: right;
+	width: 15%;
+}
+#returnhome {
+    font-size: xxx-large;
+    display: inline;
+}
+h1 {
+    display: inline;
+}

etc/scripts/torbrowser-windows.sh

@@ -5,11 +5,11 @@ TORSOCKS=$(which torsocks)
 #    . "${TORSOCKS}" on
 #fi
 
-version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
-locale="en-US" # mention your locale. default = en-US
-if [ -d /etc/default/locale ]; then
-    . /etc/default/locale
-    locale=$(echo "${LANG}" | cut -d . -f1)
+if [ -z $version ]; then
+    version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
+fi
+if [ -z $locale ]; then
+    locale="ALL" # mention your locale. default = ALL
 fi
 
 if [ ! -f ./tor.keyring ]; then

etc/scripts/torbrowser.sh

@@ -6,11 +6,11 @@ if [ -f "${TORSOCKS}" ]; then
     echo ""
 fi
 
-version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
-locale="en-US" # mention your locale. default = en-US
-if [ -d /etc/default/locale ]; then
-    . /etc/default/locale
-    locale=$(echo "${LANG}" | cut -d . -f1)
+if [ -z $version ]; then
+    version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
+fi
+if [ -z $locale ]; then
+    locale="ALL" # mention your locale. default = ALL
 fi
 
 if [ ! -f ./tor.keyring ]; then

fedora-docker.sh

@@ -2,16 +2,8 @@
 
 . ./config.sh
 
-cat <<EOF > /etc/yum.repos.d/adoptium.repo
-[Adoptium]
-name=Adoptium
-baseurl=https://packages.adoptium.net/artifactory/rpm/${DISTRIBUTION_NAME:-$(. /etc/os-release; echo $ID)}/\$releasever/\$basearch
-enabled=1
-gpgcheck=1
-gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public
-EOF
-yum -y update
-yum -y install temurin-18-jdk
+dnf -y update
+dnf -y install temurin-19-jdk
 
 jpackage --verbose \
     --type rpm \

index.html

@@ -8,231 +8,304 @@
     <meta name="keywords" content="main" />
     <link rel="stylesheet" type="text/css" href="style.css" />
     <link rel="stylesheet" type="text/css" href="showhider.css" />
+    <link rel="stylesheet" type="text/css" href="darklight.css" />
   </head>
   <body>
-    <div id="navbar">
-      <a href="#shownav">
-        Show navigation
-      </a>
-      <div id="shownav">
-        <div id="hidenav">
-          <ul>
-            <li>
-              <a href="..">
-                Up one level ^
-              </a>
-            </li>
-            <li>
-              <a href="index.html">
-                index
-              </a>
-            </li>
-            <li>
-              <a href="CHANGES.html">
-                CHANGES
-              </a>
-            </li>
-            <li>
-              <a href="LICENSE.html">
-                LICENSE
-              </a>
-            </li>
-            <li>
-              <a href="LINUX.html">
-                LINUX
-              </a>
-            </li>
-            <li>
-              <a href="OSX.html">
-                OSX
-              </a>
-            </li>
-            <li>
-              <a href="VERSION.html">
-                VERSION
-              </a>
-            </li>
-            <li>
-              <a href="WINDOWS.html">
-                WINDOWS
-              </a>
-            </li>
-            <li>
-              <a href="index.html">
-                index.html
-              </a>
-            </li>
-          </ul>
-          <br>
-          <a href="#hidenav">
-            Hide Navigation
-          </a>
+    <input type="checkbox" id="checkboxDarkLight">
+    <div class="container">
+      <div id="navbar">
+        <a href="#shownav">
+          Show navigation
+        </a>
+        <div id="shownav">
+          <div id="hidenav">
+            <ul>
+              <li>
+                <a href="..">
+                  Up one level ^
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index
+                </a>
+              </li>
+              <li>
+                <a href="CHANGES.html">
+                  CHANGES
+                </a>
+              </li>
+              <li>
+                <a href="LICENSE.html">
+                  LICENSE
+                </a>
+              </li>
+              <li>
+                <a href="VERSION.html">
+                  VERSION
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index.html
+                </a>
+              </li>
+              <li>
+                <a href="docs/BUILD.html">
+                  docs/BUILD
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PBrowser.html">
+                  docs/I2PBrowser
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PBrowserPlugin.html">
+                  docs/I2PBrowserPlugin.html
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PChromium.html">
+                  docs/I2PChromium
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PChromiumProfileBuilder.html">
+                  docs/I2PChromiumProfileBuilder
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PChromiumProfileChecker.html">
+                  docs/I2PChromiumProfileChecker
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PChromiumProfileUnpacker.html">
+                  docs/I2PChromiumProfileUnpacker
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PCommonBrowser.html">
+                  docs/I2PCommonBrowser
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PFirefox.html">
+                  docs/I2PFirefox
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PFirefoxProfileBuilder.html">
+                  docs/I2PFirefoxProfileBuilder
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PFirefoxProfileChecker.html">
+                  docs/I2PFirefoxProfileChecker
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PFirefoxProfileUnpacker.html">
+                  docs/I2PFirefoxProfileUnpacker
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PGenericUnsafeBrowser.html">
+                  docs/I2PGenericUnsafeBrowser
+                </a>
+              </li>
+              <li>
+                <a href="docs/I2PLibreWolf.html">
+                  docs/I2PLibreWolf.html
+                </a>
+              </li>
+              <li>
+                <a href="docs/LINUX.html">
+                  docs/LINUX
+                </a>
+              </li>
+              <li>
+                <a href="docs/OSX.html">
+                  docs/OSX
+                </a>
+              </li>
+              <li>
+                <a href="docs/WINDOWS.html">
+                  docs/WINDOWS
+                </a>
+              </li>
+            </ul>
+            <br>
+            <a href="#hidenav">
+              Hide Navigation
+            </a>
+          </div>
         </div>
       </div>
-    </div>
-    <a id="returnhome" href="/">
-      /
-    </a>
-    <h1>
-      i2p.plugins.firefox
-    </h1>
-    <p>
-      A port of the batch scripts from
-      <code>
-        i2p.firefox
-      </code>
-      to Java.
-    </p>
-    <p>
-      <strong>
-        Status:
-      </strong>
-      This package is maintained. It cannot solve all your problems. Fingerprinting
-      is a reality in modern browsers. Exploits are too. This software attempts to provide a
-      best-possible baseline of privacy first, security a close second for browsing the web that
-      exists within I2P. Do not expect it to withstand attacks from very powerful adversaries
-      who can spend time and money to screw up your life. Do expect it to resist advertisers,
-      trackers, and jerks using off-the-shelf techniques and exploits. It is fundamentally unable
-      to make changes which un-trust your browser vendor, your OS, your package manager or any
-      other system that exists underneath it.
-      <strong>
-        It is just a profile manager.
-      </strong>
-    </p>
-    <p>
-      <strong>
-        All packages require a running I2P router.
-      </strong>
-    </p>
-    <p>
-      <strong>
-        <a href="https://i2pgit.org/i2p-hackers/i2p.firefox">
-          Windows users should see the Easy-Install Bundle
-        </a>
-      </strong>
-    </p>
-    <h2>
-      Credits
-    </h2>
-    <p>
-      This profile manager makes use of a set of browser extensions which are largely the work of others.
-      It makes use of dependencies that are the work of others. In many ways, it&rsquo;s merely an elaborate
-      configuration tool. A smart one, but a configuration tool nonetheless. Many thanks to the following
-      projects, developers, and communities:
-    </p>
-    <h3>
-      Firefox and Chrome Extensions
-    </h3>
-    <ul>
-      <li>
-        <a href="https://noscript.net">
-          NoScript - Giorgio Maone and others
-        </a>
-      </li>
-      <li>
-        <a href="https://www.eff.org/https-everywhere">
-          HTTPS Everywhere - Electronic Frontier Foundation
-        </a>
-      </li>
-      <li>
-        <a href="https://ublockorigin.com/">
-          uBlock Origin - Raymond Gorhill and others
-        </a>
-      </li>
-      <li>
-        <a href="https://www.localcdn.org/">
-          LocalCDN - nobody and others
-        </a>
-      </li>
-      <li>
-        <a href="https://jshelter.org/">
-          jShelter - Libor Polčák and others
-        </a>
-      </li>
-    </ul>
-    <h3>
-      Firefox Configuration Modifiations
-    </h3>
-    <ul>
-      <li>
-        <a href="https://github.com/arkenfox/user.js/">
-          Arkenfox - Thorin Oakenpants and Others
-        </a>
-      </li>
-    </ul>
-    <p>
-      You can find the license files for each of the these projects in the
-      <code>
-        src/i2p.firefox.*.profile/extensions/*
-      </code>
-      directory for Firefox, and the
-      <code>
-        src/i2p.chromium.*.profile/extensions/*.js/*
-      </code>
-      directories for Chromium.
-    </p>
-    <h2>
-      Getting started
-    </h2>
-    <h3>
-      Building the package:
-    </h3>
-    <ul>
-      <li>
-        See:
-        <a href="docs/BUILD.md">
-          BUILD.md
-        </a>
+      <a id="returnhome" href="/">
         /
-        <a href="docs/BUILD.html">
-          BUILD.html
-        </a>
-      </li>
-    </ul>
-    <h3>
-      Using a Binary
-    </h3>
-    <p>
-      For platform specific instructions, see
-    </p>
-    <ul>
-      <li>
-        <a href="LINUX.md">
-          LINUX.md
-        </a>
-        /
-        <a href="LINUX.html">
-          LINUX.html
-        </a>
-      </li>
-      <li>
-        <a href="OSX.md">
-          OSX.md
-        </a>
-        /
-        <a href="OSX.html">
-          OSX.html
-        </a>
-      </li>
-      <li>
-        <a href="WINDOWS.md">
-          WINDOWS.md
-        </a>
-        /
-        <a href="WINDOWS.html">
-          WINDOWS.html
-        </a>
-      </li>
-    </ul>
-    <h4>
-      All platforms, using a zip:
-      <code>
-        .zip
-      </code>
-      and a non-bundled Java
-    </h4>
-    <pre><code class="language-sh">mkdir ~/tmp-i2pfirefox &amp;&amp; cd ~/tmp-i2pfirefox
-wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.0.5/i2pfirefox.zip
+      </a>
+      <h1>
+        i2p.plugins.firefox
+      </h1>
+      <p>
+        A port of the batch scripts from
+        <code>
+          i2p.firefox
+        </code>
+        to Java.
+      </p>
+      <p>
+        <strong>
+          Status:
+        </strong>
+        This package is maintained. It cannot solve all your problems. Fingerprinting
+        is a reality in modern browsers. Exploits are too. This software attempts to provide a
+        best-possible baseline of privacy first, security a close second for browsing the web that
+        exists within I2P. Do not expect it to withstand attacks from very powerful adversaries
+        who can spend time and money to screw up your life. Do expect it to resist advertisers,
+        trackers, and jerks using off-the-shelf techniques and exploits. It is fundamentally unable
+        to make changes which un-trust your browser vendor, your OS, your package manager or any
+        other system that exists underneath it.
+        <strong>
+          It is just a profile manager.
+        </strong>
+      </p>
+      <p>
+        <strong>
+          All packages require a running I2P router.
+        </strong>
+      </p>
+      <p>
+        <strong>
+          <a href="https://i2pgit.org/i2p-hackers/i2p.firefox">
+            Windows users should see the Easy-Install Bundle
+          </a>
+        </strong>
+      </p>
+      <h2>
+        Credits
+      </h2>
+      <p>
+        This profile manager makes use of a set of browser extensions which are largely the work of others.
+        It makes use of dependencies that are the work of others. In many ways, it&rsquo;s merely an elaborate
+        configuration tool. A smart one, but a configuration tool nonetheless. Many thanks to the following
+        projects, developers, and communities:
+      </p>
+      <h3>
+        Firefox and Chrome Extensions
+      </h3>
+      <ul>
+        <li>
+          <a href="https://noscript.net">
+            NoScript - Giorgio Maone and others
+          </a>
+        </li>
+        <li>
+          <a href="https://www.eff.org/https-everywhere">
+            HTTPS Everywhere - Electronic Frontier Foundation
+          </a>
+        </li>
+        <li>
+          <a href="https://ublockorigin.com/">
+            uBlock Origin - Raymond Gorhill and others
+          </a>
+        </li>
+        <li>
+          <a href="https://www.localcdn.org/">
+            LocalCDN - nobody and others
+          </a>
+        </li>
+        <li>
+          <a href="https://jshelter.org/">
+            jShelter - Libor Polčák and others
+          </a>
+        </li>
+      </ul>
+      <h3>
+        Firefox Configuration Modifiations
+      </h3>
+      <ul>
+        <li>
+          <a href="https://github.com/arkenfox/user.js/">
+            Arkenfox - Thorin Oakenpants and Others
+          </a>
+        </li>
+      </ul>
+      <p>
+        You can find the license files for each of the these projects in the
+        <code>
+          src/i2p.firefox.*.profile/extensions/*
+        </code>
+        directory for Firefox, and the
+        <code>
+          src/i2p.chromium.*.profile/extensions/*.js/*
+        </code>
+        directories for Chromium.
+      </p>
+      <h2>
+        Getting started
+      </h2>
+      <h3>
+        Building the package:
+      </h3>
+      <ul>
+        <li>
+          See:
+          <a href="docs/BUILD.md">
+            BUILD.md
+          </a>
+          /
+          <a href="docs/BUILD.html">
+            BUILD.html
+          </a>
+        </li>
+      </ul>
+      <h3>
+        Using a Binary
+      </h3>
+      <p>
+        For platform specific instructions, see
+      </p>
+      <ul>
+        <li>
+          <a href="docs/LINUX.md">
+            LINUX.md
+          </a>
+          /
+          <a href="docs/LINUX.html">
+            LINUX.html
+          </a>
+        </li>
+        <li>
+          <a href="docs/OSX.md">
+            OSX.md
+          </a>
+          /
+          <a href="docs/OSX.html">
+            OSX.html
+          </a>
+        </li>
+        <li>
+          <a href="docs/WINDOWS.md">
+            WINDOWS.md
+          </a>
+          /
+          <a href="docs/WINDOWS.html">
+            WINDOWS.html
+          </a>
+        </li>
+      </ul>
+      <h4>
+        All platforms, using a zip:
+        <code>
+          .zip
+        </code>
+        and a non-bundled Java
+      </h4>
+      <pre><code class="language-sh">mkdir ~/tmp-i2pfirefox &amp;&amp; cd ~/tmp-i2pfirefox
+wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/1.3.0/i2pfirefox.zip
 unzip i2pfirefox.zip
 ./i2pfirefox.cmd
 
@@ -240,27 +313,27 @@ unzip i2pfirefox.zip
 
 ./i2pchromium.cmd
 </code></pre>
-    <div id="sourcecode">
-      <span id="sourcehead">
-        <strong>
-          Get the source code:
-        </strong>
-      </span>
-      <ul>
-        <li>
-          <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
-            Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
-          </a>
-        </li>
-      </ul>
-    </div>
-    <div>
-      <a href="#show">
-        Show license
-      </a>
-      <div id="show">
-        <div id="hide">
-          <pre><code>   Copyright 2022 idk (hankhill19580@gmail.com)
+      <div id="sourcecode">
+        <span id="sourcehead">
+          <strong>
+            Get the source code:
+          </strong>
+        </span>
+        <ul>
+          <li>
+            <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.plugins.firefox)
+            </a>
+          </li>
+        </ul>
+      </div>
+      <div>
+        <a href="#show">
+          Show license
+        </a>
+        <div id="show">
+          <div id="hide">
+            <pre><code>   Copyright 2022 idk (hankhill19580@gmail.com)
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -1103,9 +1176,10 @@ consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
 </code></pre>
-          <a href="#hide">
-            Hide license
-          </a>
+            <a href="#hide">
+              Hide license
+            </a>
+          </div>
         </div>
       </div>
     </div>
@@ -1114,7 +1188,7 @@ Public License instead of this License.
     </div>
     <div>
       <a href="https://geti2p.net/">
-        <img src="i2plogo.png"></img>
+        <img class="i2plogo" src="i2plogo.png"></img>
         I2P
       </a>
     </div>

javadoc.sh

@@ -1,6 +1,5 @@
 #! /usr/bin/env bash
 
-rm -rf docs
 
 ~/.cargo/bin/lojidoc src/java/net/i2p/i2pfirefox/ -s -l > report.log
 ~/.cargo/bin/lojidoc -c src/java/net/i2p/i2pfirefox/ -s

osx-dmg.sh

@@ -1,5 +1,13 @@
 #! /usr/bin/env sh
 . ./config.sh
+
+if [ -z "$I2P_SIGNER_USERPHRASE" ]; then
+    I2P_SIGNER_USERPHRASE=$(security find-identity -v -p codesigning | cut -d ' ' -f 4)
+    echo "Warning: using automatically configured signer ID, make sure this is the one you want: $I2P_SIGNER_USERPHRASE"
+    echo "continuing in 10 seconds"
+    sleep 10
+fi
+
 jpackage \
     --verbose \
     --type dmg \
@@ -8,4 +16,7 @@ jpackage \
     --icon src/icon.icns \
     --input src/build \
     --main-jar i2pfirefox.jar \
+    --mac-sign \
+    --mac-signing-key-user-name "$I2P_SIGNER_USERPHRASE" \
+    --mac-entitlements resources/entitlements.xml \
     --main-class net.i2p.i2pfirefox.I2PBrowser

plugin/LICENSE.txt

@@ -0,0 +1,842 @@
+   Copyright 2022 idk (hankhill19580@gmail.com)
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+   ========================================================================
+   Includes code from zzzot:
+
+   Copyright 2010 zzz (zzz@mail.i2p)
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+   ========================================================================
+   Includes code from Jetty 5.1.15:
+
+   Copyright 199-2004 Mort Bay Consulting Pty. Ltd.
+   ------------------------------------------------------------------------
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at 
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+MIT License
+
+Copyright (c) 2019 idk
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+HTTPS Everwyhere:
+Copyright © 2010-2012 Mike Perry <mikeperry@fscked.org>
+                      Peter Eckersley <pde@eff.org>
+                      and many others
+                      (Licensed GPL v2+)
+
+Incorporating code from NoScript,
+Copyright © 2004-2007 Giorgio Maone <g.maone@informaction.com>
+Licensed GPL v2+
+
+Incorporating code from Convergence
+Copyright © Moxie Marlinspike
+Licensed GPL v3+
+
+Incorporating code from URI.js
+Copyright © Rodney Rehm
+Licensed MIT, GPL V3
+
+Incorporating code from js-lru
+Copyright © 2010 Rasmus Andersson
+Licensed MIT
+
+The build system incorporates code from Python 2.6,
+Copyright © 2001-2006 Python Software Foundation
+Python Software Foundation License Version 2
+
+Net License:  GPL v3+ (complete tree)
+              GPL v2+ (if Moxie's NSS.js is absent)
+
+
+Text of MIT License:
+====================
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+MIT License
+
+Copyright (c) 2019 idk
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+HTTPS Everwyhere:
+Copyright © 2010-2012 Mike Perry <mikeperry@fscked.org>
+                      Peter Eckersley <pde@eff.org>
+                      and many others
+                      (Licensed GPL v2+)
+
+Incorporating code from NoScript,
+Copyright © 2004-2007 Giorgio Maone <g.maone@informaction.com>
+Licensed GPL v2+
+
+Incorporating code from Convergence
+Copyright © Moxie Marlinspike
+Licensed GPL v3+
+
+Incorporating code from URI.js
+Copyright © Rodney Rehm
+Licensed MIT, GPL V3
+
+Incorporating code from js-lru
+Copyright © 2010 Rasmus Andersson
+Licensed MIT
+
+The build system incorporates code from Python 2.6,
+Copyright © 2001-2006 Python Software Foundation
+Python Software Foundation License Version 2
+
+Net License:  GPL v3+ (complete tree)
+              GPL v2+ (if Moxie's NSS.js is absent)
+
+
+Text of MIT License:
+====================
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

plugin/clients.config

@@ -1,8 +1,5 @@
-clientApp.0.main=net.i2p.i2pfirefox.I2PFirefoxController
-clientApp.0.name=I2PFirefox
-clientApp.0.args=-d $PLUGIN start
-clientApp.0.stopargs=-d $PLUGIN stop
+clientApp.0.main=net.i2p.i2pfirefox.plugin.I2PBrowserPlugin
+clientApp.0.name=i2pfirefox
 clientApp.0.delay=0
 clientApp.0.startOnLoad=true
-# we also use i2p.jar and i2ptunnel.jar, they are in the standard router classpath
-clientApp.0.classpath=$PLUGIN/lib/i2pfirefox.jar,$I2P/lib/i2psnark.jar
+clientApp.0.classpath=$PLUGIN/lib/i2pfirefox-plugin.jar

plugin/i2pbrowser.cmd

@@ -0,0 +1,3 @@
+:; dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd); java -cp "$dir"/lib/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser; exit $?
+@ECHO OFF
+java -cp %cd%/lib/i2pfirefox.jar net.i2p.i2pfirefox.I2PBrowser

plugin/templates/contexts/base-context.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0"  encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!--
-Configure a custom context for the eepsite.
-
-This context contains only a ServletContextHandler with a default servlet
-to serve static html files and images.
--->
-
-<Configure class="org.eclipse.jetty.servlet.ServletContextHandler">
-  <Set name="contextPath">/</Set>
-  <Set name="resourceBase">$PLUGIN/eepsite/docroot/</Set>
-  <Call name="setInitParameter">
-    <Arg>cacheControl</Arg>
-    <Arg>max-age=3600,public</Arg>
-  </Call>
-  <Call name="addServlet">
-    <Arg>net.i2p.servlet.I2PDefaultServlet</Arg>
-    <Arg>/</Arg>
-  </Call>
-</Configure>
-

plugin/templates/contexts/cgi-context.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0"  encoding="ISO-8859-1"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!--
-Configure a custom context for the eepsite.
-
- * CGI Servlet.
- * 
- * The cgi bin directory can be set with the "cgibinResourceBase" init parameter
- * or it will default to the resource base of the context.
- * 
- * The "commandPrefix" init parameter may be used to set a prefix to all
- * commands passed to exec. This can be used on systems that need assistance to
- * execute a particular file type. For example on windows this can be set to
- * "perl" so that perl scripts are executed.
- * 
- * The "Path" init param is passed to the exec environment as PATH. Note: Must
- * be run unpacked somewhere in the filesystem.
- * 
- * Any initParameter that starts with ENV_ is used to set an environment
- * variable with the name stripped of the leading ENV_ and using the init
- * parameter value.
--->
-
-<Configure class="org.eclipse.jetty.servlet.ServletContextHandler">
-  <Set name="contextPath">/cgi-bin</Set>
-  <Set name="resourceBase">$PLUGIN/eepsite/cgi-bin/</Set>
-  <Call name="setInitParameter">
-    <Arg>Path</Arg>
-    <Arg>/usr/local/bin:/bin:/usr/bin</Arg>
-  </Call>
-  <Call name="addServlet">
-    <Arg>org.eclipse.jetty.servlets.CGI</Arg>
-    <Arg>/</Arg>
-  </Call>
-</Configure>

plugin/templates/etc/realm.properties

@@ -1,21 +0,0 @@
-#
-# This file defines users passwords and roles for a HashUserRealm
-#
-# The format is
-#  <username>: <password>[,<rolename> ...]
-#
-# Passwords may be clear text, obfuscated or checksummed.  The class 
-# org.mortbay.util.Password should be used to generate obfuscated
-# passwords or password checksums
-#
-# If DIGEST Authentication is used, the password must be in a recoverable
-# format, either plain text or OBF:.
-#
-jetty: MD5:164c88b302622e17050af52c89945d44,user
-admin: CRYPT:ad1ks..kc.1Ug,server-administrator,content-administrator,admin
-other: OBF:1xmk1w261u9r1w1c1xmq
-plain: plain
-user: password
-
-# This entry is for digest auth.  The credential is a MD5 hash of username:realmname:password
-digest: MD5:6e120743ad67abfbc385bc2bb754e297

plugin/templates/etc/webdefault.xml

@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!-- ===================================================================== -->
-<!-- This file contains the default descriptor for web applications.       -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- The intent of this descriptor is to include jetty specific or common  -->
-<!-- configuration for all webapps.   If a context has a webdefault.xml    -->
-<!-- descriptor, it is applied before the contexts own web.xml file        -->
-<!--                                                                       -->
-<!-- A context may be assigned a default descriptor by:                    -->
-<!--  + Calling WebApplicationContext.setDefaultsDescriptor                -->
-<!--  + Passed an arg to addWebApplications                                -->
-<!--                                                                       -->
-<!-- This file is used both as the resource within the jetty.jar (which is -->
-<!-- used as the default if no explicit defaults descriptor is set) and it -->
-<!-- is copied to the etc directory of the Jetty distro and explicitly     -->
-<!-- by the jetty.xml file.                                                -->
-<!--                                                                       -->
-<!-- ===================================================================== -->
-<web-app 
-   xmlns="http://java.sun.com/xml/ns/javaee" 
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" 
-   metadata-complete="true"
-   version="2.5"> 
-
-  <description>
-    Default web.xml file.  
-    This file is applied to a Web application before it's own WEB_INF/web.xml file
-  </description>
-
-
-  <!-- ==================================================================== -->
-  <!-- Context params to control Session Cookies                            -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-  <!-- UNCOMMENT TO ACTIVATE
-  <context-param>
-    <param-name>org.eclipse.jetty.servlet.SessionDomain</param-name>
-    <param-value>127.0.0.1</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>org.eclipse.jetty.servlet.SessionPath</param-name>
-    <param-value>/</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>org.eclipse.jetty.servlet.MaxAge</param-name>
-    <param-value>-1</param-value>
-  </context-param>
-  -->
-
-  <context-param>
-    <param-name>org.eclipse.jetty.webapp.NoTLDJarPattern</param-name>
-    <param-value>start.jar|ant-.*\.jar|dojo-.*\.jar|jetty-.*\.jar|jsp-api-.*\.jar|junit-.*\.jar|servlet-api-.*\.jar|dnsns\.jar|rt\.jar|jsse\.jar|tools\.jar|sunpkcs11\.jar|sunjce_provider\.jar|xerces.*\.jar</param-value>
-  </context-param>
-            
-
-
-  <!-- ==================================================================== -->
-  <!-- The default servlet.                                                 -->
-  <!-- This servlet, normally mapped to /, provides the handling for static -->
-  <!-- content, OPTIONS and TRACE methods for the context.                  -->
-  <!-- The following initParameters are supported:                          -->
-  <!--                                                                      -->
-  <!--   acceptRanges     If true, range requests and responses are         -->
-  <!--                    supported                                         -->
-  <!--                                                                      -->
-  <!--   dirAllowed       If true, directory listings are returned if no    -->
-  <!--                    welcome file is found. Else 403 Forbidden.        -->
-  <!--                                                                      -->
-  <!--   welcomeServlets  If true, attempt to dispatch to welcome files     -->
-  <!--                    that are servlets, if no matching static          --> 
-  <!--                    resources can be found.                           -->
-  <!--                                                                      -->
-  <!--   redirectWelcome  If true, redirect welcome file requests           -->
-  <!--                    else use request dispatcher forwards              -->
-  <!--                                                                      -->
-  <!--   gzip             If set to true, then static content will be served--> 
-  <!--                    as gzip content encoded if a matching resource is -->
-  <!--                    found ending with ".gz"                           -->
-  <!--                                                                      -->
-  <!--   resoureBase      Can be set to replace the context resource base   -->
-  <!--                                                                      -->
-  <!--   relativeResourceBase                                               -->
-  <!--                    Set with a pathname relative to the base of the   -->
-  <!--                    servlet context root. Useful for only serving     -->
-  <!--                    static content from only specific subdirectories. -->
-  <!--                                                                      -->
-  <!--   useFileMappedBuffer                                                -->
-  <!--                    If set to true (the default), a  memory mapped    -->
-  <!--                    file buffer will be used to serve static content  -->
-  <!--                    when using an NIO connector. Setting this value   -->
-  <!--                    to false means that a direct buffer will be used  -->
-  <!--                    instead. If you are having trouble with Windows   -->
-  <!--                    file locking, set this to false.                  -->
-  <!--                                                                      -->
-  <!--  cacheControl      If set, all static content will have this value   -->
-  <!--                    set as the cache-control header.                  -->
-  <!--                                                                      -->
-  <!--  maxCacheSize      Maximum size of the static resource cache         -->
-  <!--                                                                      -->
-  <!--  maxCachedFileSize Maximum size of any single file in the cache      -->
-  <!--                                                                      -->
-  <!--  maxCachedFiles    Maximum number of files in the cache              -->
-  <!--                                                                      -->
-  <!--  cacheType         "nio", "bio" or "both" to determine the type(s)   -->
-  <!--                    of resource cache. A bio cached buffer may be used-->
-  <!--                    by nio but is not as efficient as a nio buffer.   -->
-  <!--                    An nio cached buffer may not be used by bio.      -->
-  <!--                                                                      -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-  <servlet>
-    <servlet-name>default</servlet-name>
-    <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
-    <init-param>
-      <param-name>acceptRanges</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <init-param>
-      <param-name>dirAllowed</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <init-param>
-      <param-name>welcomeServlets</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <param-name>redirectWelcome</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <param-name>maxCacheSize</param-name>
-      <param-value>256000000</param-value>
-    </init-param>
-    <init-param>
-      <param-name>maxCachedFileSize</param-name>
-      <param-value>10000000</param-value>
-    </init-param>
-    <init-param>
-      <param-name>maxCachedFiles</param-name>
-      <param-value>1000</param-value>
-    </init-param>
-    <init-param>
-      <param-name>cacheType</param-name>
-      <param-value>both</param-value>
-    </init-param>
-    <init-param>
-      <param-name>gzip</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <init-param>
-      <param-name>useFileMappedBuffer</param-name>
-      <param-value>true</param-value>
-    </init-param>  
-    <init-param>
-      <param-name>cacheControl</param-name>
-      <param-value>max-age=3600,public</param-value>
-    </init-param>
-    <load-on-startup>0</load-on-startup>
-  </servlet> 
-
-  <servlet-mapping> <servlet-name>default</servlet-name> <url-pattern>/</url-pattern> </servlet-mapping>
-  
-
-  <!-- ==================================================================== -->
-  <!-- JSP Servlet                                                          -->
-  <!-- This is the jasper JSP servlet from the jakarta project              -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-  <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
-  <!-- used by Glassfish to support JSP pages.  Traditionally, this servlet -->
-  <!-- is mapped to URL patterh "*.jsp".  This servlet supports the         -->
-  <!-- following initialization parameters (default values are in square    -->
-  <!-- brackets):                                                           -->
-  <!--                                                                      -->
-  <!--   checkInterval       If development is false and reloading is true, -->
-  <!--                       background compiles are enabled. checkInterval -->
-  <!--                       is the time in seconds between checks to see   -->
-  <!--                       if a JSP page needs to be recompiled. [300]    -->
-  <!--                                                                      -->
-  <!--   compiler            Which compiler Ant should use to compile JSP   -->
-  <!--                       pages.  See the Ant documenation for more      -->
-  <!--                       information. [javac]                           -->
-  <!--                                                                      -->
-  <!--   classdebuginfo      Should the class file be compiled with         -->
-  <!--                       debugging information?  [true]                 -->
-  <!--                                                                      -->
-  <!--   classpath           What class path should I use while compiling   -->
-  <!--                       generated servlets?  [Created dynamically      -->
-  <!--                       based on the current web application]          -->
-  <!--                       Set to ? to make the container explicitly set  -->
-  <!--                       this parameter.                                -->
-  <!--                                                                      -->
-  <!--   development         Is Jasper used in development mode (will check -->
-  <!--                       for JSP modification on every access)?  [true] -->
-  <!--                                                                      -->
-  <!--   enablePooling       Determines whether tag handler pooling is      -->
-  <!--                       enabled  [true]                                -->
-  <!--                                                                      -->
-  <!--   fork                Tell Ant to fork compiles of JSP pages so that -->
-  <!--                       a separate JVM is used for JSP page compiles   -->
-  <!--                       from the one Tomcat is running in. [true]      -->
-  <!--                                                                      -->
-  <!--   ieClassId           The class-id value to be sent to Internet      -->
-  <!--                       Explorer when using <jsp:plugin> tags.         -->
-  <!--                       [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93]   -->
-  <!--                                                                      -->
-  <!--   javaEncoding        Java file encoding to use for generating java  -->
-  <!--                       source files. [UTF-8]                          -->
-  <!--                                                                      -->
-  <!--   keepgenerated       Should we keep the generated Java source code  -->
-  <!--                       for each page instead of deleting it? [true]   -->
-  <!--                                                                      -->
-  <!--   logVerbosityLevel   The level of detailed messages to be produced  -->
-  <!--                       by this servlet.  Increasing levels cause the  -->
-  <!--                       generation of more messages.  Valid values are -->
-  <!--                       FATAL, ERROR, WARNING, INFORMATION, and DEBUG. -->
-  <!--                       [WARNING]                                      -->
-  <!--                                                                      -->
-  <!--   mappedfile          Should we generate static content with one     -->
-  <!--                       print statement per input line, to ease        -->
-  <!--                       debugging?  [false]                            -->
-  <!--                                                                      -->
-  <!--                                                                      -->
-  <!--   reloading           Should Jasper check for modified JSPs?  [true] -->
-  <!--                                                                      -->
-  <!--   suppressSmap        Should the generation of SMAP info for JSR45   -->
-  <!--                       debugging be suppressed?  [false]              -->
-  <!--                                                                      -->
-  <!--   dumpSmap            Should the SMAP info for JSR45 debugging be    -->
-  <!--                       dumped to a file? [false]                      -->
-  <!--                       False if suppressSmap is true                  -->
-  <!--                                                                      -->
-  <!--   scratchdir          What scratch directory should we use when      -->
-  <!--                       compiling JSP pages?  [default work directory  -->
-  <!--                       for the current web application]               -->
-  <!--                                                                      -->
-  <!--   tagpoolMaxSize      The maximum tag handler pool size  [5]         -->
-  <!--                                                                      -->
-  <!--   xpoweredBy          Determines whether X-Powered-By response       -->
-  <!--                       header is added by generated servlet  [false]  -->
-  <!--                                                                      -->
-  <!-- If you wish to use Jikes to compile JSP pages:                       -->
-  <!--   Set the init parameter "compiler" to "jikes".  Define              -->
-  <!--   the property "-Dbuild.compiler.emacs=true" when starting Jetty     -->
-  <!--   to cause Jikes to emit error messages in a format compatible with  -->
-  <!--   Jasper.                                                            -->
-  <!--   If you get an error reporting that jikes can't use UTF-8 encoding, -->
-  <!--   try setting the init parameter "javaEncoding" to "ISO-8859-1".     -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-  <servlet id="jsp">
-    <servlet-name>jsp</servlet-name>
-    <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-    <init-param>
-        <param-name>logVerbosityLevel</param-name>
-        <param-value>DEBUG</param-value>
-    </init-param>
-    <init-param>
-        <param-name>fork</param-name>
-        <param-value>false</param-value>
-    </init-param>
-    <init-param>
-        <param-name>xpoweredBy</param-name>
-        <param-value>false</param-value>
-    </init-param>
-    <!--  
-    <init-param>
-        <param-name>classpath</param-name>
-        <param-value>?</param-value>
-    </init-param>
-    -->
-    <load-on-startup>0</load-on-startup>
-  </servlet>
-
-  <servlet-mapping> 
-    <servlet-name>jsp</servlet-name> 
-    <url-pattern>*.jsp</url-pattern> 
-    <url-pattern>*.jspf</url-pattern>
-    <url-pattern>*.jspx</url-pattern>
-    <url-pattern>*.xsp</url-pattern>
-    <url-pattern>*.JSP</url-pattern> 
-    <url-pattern>*.JSPF</url-pattern>
-    <url-pattern>*.JSPX</url-pattern>
-    <url-pattern>*.XSP</url-pattern>
-  </servlet-mapping>
-  
-  <!-- ==================================================================== -->
-  <!-- Dynamic Servlet Invoker.                                             -->
-  <!-- This servlet invokes anonymous servlets that have not been defined   -->
-  <!-- in the web.xml or by other means. The first element of the pathInfo  -->
-  <!-- of a request passed to the envoker is treated as a servlet name for  -->
-  <!-- an existing servlet, or as a class name of a new servlet.            -->
-  <!-- This servlet is normally mapped to /servlet/*                        -->
-  <!-- This servlet support the following initParams:                       -->
-  <!--                                                                      -->
-  <!--  nonContextServlets       If false, the invoker can only load        -->
-  <!--                           servlets from the contexts classloader.    -->
-  <!--                           This is false by default and setting this  -->
-  <!--                           to true may have security implications.    -->
-  <!--                                                                      -->
-  <!--  verbose                  If true, log dynamic loads                 -->
-  <!--                                                                      -->
-  <!--  *                        All other parameters are copied to the     -->
-  <!--                           each dynamic servlet as init parameters    -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-  <!-- Uncomment for dynamic invocation
-  <servlet>
-    <servlet-name>invoker</servlet-name>
-    <servlet-class>org.eclipse.jetty.servlet.Invoker</servlet-class>
-    <init-param>
-      <param-name>verbose</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <param-name>nonContextServlets</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <param-name>dynamicParam</param-name>
-      <param-value>anyValue</param-value>
-    </init-param>
-    <load-on-startup>0</load-on-startup>
-  </servlet>
-
-  <servlet-mapping> <servlet-name>invoker</servlet-name> <url-pattern>/servlet/*</url-pattern> </servlet-mapping>
-  -->
-
-
-
-  <!-- ==================================================================== -->
-  <session-config>
-    <session-timeout>30</session-timeout>
-  </session-config>
-
-  <!-- ==================================================================== -->
-  <!-- Default MIME mappings                                                -->
-  <!-- The default MIME mappings are provided by the mime.properties        -->
-  <!-- resource in the org.mortbay.jetty.jar file.  Additional or modified  -->
-  <!-- mappings may be specified here                                       -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-  <!-- UNCOMMENT TO ACTIVATE
-  <mime-mapping>
-    <extension>mysuffix</extension>
-    <mime-type>mymime/type</mime-type>
-  </mime-mapping>
-  -->
-
-  <!-- ==================================================================== -->
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-    <welcome-file>index.htm</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-
-  <!-- ==================================================================== -->
-  <locale-encoding-mapping-list>
-    <locale-encoding-mapping><locale>ar</locale><encoding>ISO-8859-6</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>be</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>bg</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ca</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>cs</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>da</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>de</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>el</locale><encoding>ISO-8859-7</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>en</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>es</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>et</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>fi</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>fr</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>hr</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>hu</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>is</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>it</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>iw</locale><encoding>ISO-8859-8</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ja</locale><encoding>Shift_JIS</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ko</locale><encoding>EUC-KR</encoding></locale-encoding-mapping>     
-    <locale-encoding-mapping><locale>lt</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>lv</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>mk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>nl</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>no</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>pl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>pt</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ro</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ru</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sh</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sk</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sq</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sr</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sv</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>tr</locale><encoding>ISO-8859-9</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>uk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>zh</locale><encoding>GB2312</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>zh_TW</locale><encoding>Big5</encoding></locale-encoding-mapping>   
-  </locale-encoding-mapping-list>
-  
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>Disable TRACE</web-resource-name>
-      <url-pattern>/</url-pattern>
-      <http-method>TRACE</http-method>
-    </web-resource-collection>
-    <auth-constraint/>
-  </security-constraint>
-  
-</web-app>
-

plugin/templates/help.html

@@ -1,360 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-
-<head>
-   <meta charset="UTF-8">
-   <title>I2P Firefox | HELP</title>
-   <link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAABwlBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADzlhbzeBbzfRbzihbzkxbzdRbzbBbzhhbzjxbzgxYDAQDzbxbzehbzgBbzchbziBbzfxYHAwEJBAHzjBYVCwIFAwAxGQQZDgIVCQINBwFuOQoeEAMcDgIQCQEpFgTwjBbphBXubBW/ZBGkTQ9yPwpVMAhWKAglEgPxgRbwkxXfdxTdaxTKbBLKZBLAahGiYw6IPQxkMQlDJwbqehXocRXnaBXdghTgZxTWfhPWdxPLcRK7XhHCWBG6WBG3URCZWw6KRw2YRQ2IUgyBQQtIJAdJLAY3HAUkFQPxiBbvdhbpfRXscRXcfhTWZRPKexLCeBK5cBG7bBG7ZxG8WBG0XBCsUQ+hWw6hTA6ITwx7OQt0OAtxRApuPQprMwpgNwhbNQhPKQdEHwY6IAUsGQTrjRXpjBXeiRThgRTgfRTibhS0aRCsZxCYTQ6TTQ2RTQ19SwtPLge07EnRAAAAJHRSTlMABK+M1/Xz7YlpJRoMBtzNyIRWT+T7tJBwbl86NRAO5cTCtYFtLGI6AAAEcklEQVRYw5XXd0PTQBQA8LSltUCVlqGIuB9gWScFUxtKF6MLREBkyFC2gHvvvff6vt57ubYkTWr8/ZGmJXfk3ch7kcxU1rjt3loAqKutsvuqK6X/0ugoA50yxwGrrT31e8BQWf1BC80PuV2Qx/o4KHD5PFJptvJdoIpnntydHziNbtx98joEql3ltlLtK7xAwi8m2nUm0qKPoxXm7RucgHrXhtoMDKX6ATmrzW7fASj26ISZK49igPYZhrHbTsOWHuzp6fmS2U5f6TEw+IIBZ99t0H4vDd0y3uzssAzyWpuhZZqVvUU92OwU/Wg7eiXjebux0V66B30UFP/mIIW6SLcZPCEMftaOxOAUjYO2fTVwb4dOkrcM0Cx9GcoyiF06udPQZeAaNPPvxHu+1kkWQTWGX0Yu83BYolPjGkbhrNgxAEdw8VzoUL1WAMnf8AsNByQ6tC6E+Y/ewjCU4/wtdau+ykCCa/zLU4X6etmts4RRlue3H67/aEBYDYoONgKBnwwQGwvoRXFfHBIdHMf199EvbIOQ8X9nQPr9RT7gmnRL5CDu31SrMM5AGL6fC2a1tVgKd7e6uffjxS05UWpFIuKTjbYYwJnYLyF8ep1rEs6EIIcp4nOzycg5/qc92P4AP+m72ixcZKCnPGw2chWnslEs4mddOeeLO2Cs//yP8eYuPZwIh4jgdj6CBBhhQZA3P+liuK3GUMk/Qi05GIEJ5U2LTpz/WinV8GM2HxhGYEaeadbK8h9rJB8/rvsFjMCUvOLXWqe1dIwfk6eEJIMSek9pJfHBIlXx49lW4aUMpdxs1bjJf6qSDvNjR04YSpGfd2gxgMNSHZ+ETmGMQUnsza+xkc4CXLUSrsOTwlMZSmNBJm89ezgnru8THYROC9tghSzDHzVphnIdtKsWwCp2jxrwDupwEFmbajIIFsnL1ICf1dI0LpwgU2DZIl5/g6YRM9JEDwmDZQt4/T1+ckxy8+NkG5oF6+YoZH7io82UUUsIBpZRgwxuJtrOcRqCFctjKPJmiLazhCUZ5T7cyhYl8PpLWLiJR1q0k9sCixRlFa9Pi0daI+bFAb41ImANm5rv4AYwAiw+KYbH3d1zFtdQX6qbpDCCfGJ5Hwg8UKyMHotOB8jIcD6xeFyYWfzrwX82Vt79vuUXMK+4ROnrxpm8ni3dWH63sXS9NW8Gk+vxXHlM6b2/xLBtbSS7WjQovXs0BUa/Yvrvnzfp3REFhmDz4lPBdBrlB806Z3EKj9h0RdYwM1s4F7u0ZjRFFmkAnEuzHm41aZyhB4eu5N5HpYxJD+Oa8ZumMtFhWOrGmHEHmvhFqWtcbCciMhSb9xfciYti26zcjxnM5uipnOm0cblPbPsA9RXdRCF3Po4Bcpi9N1U7AYWDui7UInhgpReQs6HES9dRIJEw7NxamA+T0TAQb4W1175InHcRREy5P5mNW3ntIx6fCwoikUiCQZ7LfUj6t4P1ZWBoT71HsuiA0ct3o/RfKqt99qraOsyfXru7xvT1/y8HBiJNY8d/vwAAAABJRU5ErkJggg==">
-   <style type="text/css">
-      html,
-      body {
-         min-width: 800px;
-         min-height: 100%;
-         line-height: 1.4;
-         font-size: 14pt;
-         font-family: "Droid Sans", "Open Sans", "Noto Sans", Ubuntu, "Segoe UI", "Lucida Grande", "DejaVu Sans", Helvetica, sans-serif;
-         color: #ccc;
-         background: #111;
-         overflow-x: hidden;
-         scrollbar-color: #222 #111;
-      }
-
-      @supports (background-blend-mode: overlay) {
-         html, body {
-         background: repeating-linear-gradient(45deg, #333, #111 2px, #111 3px),
-                     repeating-linear-gradient(135deg, #444, #333 2px, #222 3px) #111;
-         background-blend-mode: overlay, normal;
-         background-size: 100% 100%, 100% 100%;
-         background-attachment: fixed;
-         }
-      }
-
-      ::selection,
-      ::-moz-selection {
-         text-shadow: none;
-         background: #431;
-         color: #fff;
-      }
-
-      code::-moz-selection,
-      #b64::-moz-selection,
-      code::selection,
-      #b64::selection {
-         background: #150;
-         color: #fff;
-      }
-
-      p,
-      li,
-      code {
-         text-shadow: 0 1px 1px #000;
-      }
-
-      #container {
-         padding: 5% 15%;
-      }
-
-      #panel {
-         padding: 20px 40px 15px;
-         font-size: 85%;
-         text-align: justify;
-         border: 1px solid #555;
-         box-shadow: inset 0 0 0 1px #111, inset 0 0 2px 1px #444, 0 0 2px 2px #000;
-         background: #181818;
-         background: repeating-linear-gradient(to right, rgba(255, 255, 255, .05), rgba(0, 0, 0, .08) 2px),
-                     repeating-linear-gradient(to bottom, #222, #111 2px);
-         background-blend-mode: overlay;
-         will-change: transform;
-      }
-
-      @supports not (-moz-appearance: none) {
-        #panel {
-           background: repeating-linear-gradient(to bottom, #222, #111 2px);
-        }
-      }
-
-      #sitename,
-      #sitename:hover,
-      #sitename:focus {
-         margin: -8px 0 -14px;
-         display: inline-block;
-         font-size: 500%;
-         -moz-user-select: none;
-         -webkit-user-select: none;
-         user-select: none;
-      }
-
-      #sitename::before {
-         margin-top: 4px;
-         display: inline-block;
-         content: "";
-         width: 68px;
-         height: 56px;
-         background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAMAAADVRocKAAABdFBMVEUAAADOzs7g4ODb29vZ2dnd3d3T09Pi4uLq6urr6+vX19fk5OTl5eXm5ubp6ene3t7h4eHk5OTn5+fo6Ojk5OTm5ubq6urp6em7u7v///8dEgrX19fg4OBSPTF/W0VsTzxKNywgFg/k5OTS0tLAv7/p6Oh3VkHv7+9iRzjNzc2EX0hyUz9aQjRnSzra2trJycn19fXGxsby8vJfRjXDw8P7+/vc3Nw/MScmGxOIYUlEMyn4+Pg6KyItIRoxJRzq6up6WUXPz8+KZEw0KCA8LSWwrau/t7FgV1JFPDe5uLe3tLKzsbC6raStopqZlZSIg4GgjICEa1zc1dHDubOgnZuyoZapmY+mk4eVioRtVEXCvbqsqaiFgH2AenZ1b2qKdWdpYV5RR0I8Miy9saqxqaWSc192ZVrUzsumo6Gypp6jmpSSg3mXemluZ2JjXVhZUk7j3tnLwLm9ubech3qZgXJ/ZVNnWE9wXE5fS0A+NjGNiYbSycJQXgkWAAAAGHRSTlMA/NAH6uD4vEk+7qymkGPbwp96b7GFNSKLdq62AAAFzUlEQVRo3qzTSW/aQBgG4DE4G82etH1HbWIUDWCRRIGAIyU9FCGB1BQkFrFeOBCIshzaZpX65wvGIeOBjMc0j82Bz2ZeZvmIss9by4G5obX15c1P5F0tbesag0ta09cXybv4qCdhY6ydH6q2GRvFHekrQfJ/NkNpe+x87fbU5b6Wt0OYvkpm90EDwKqNbHyqbL3KAGgLs00jGEgCGIx+KtNoA0guEP+WjwDW7WU99QoMONom/qxqALvKniopDyM0X2cqwIBuNq4sO4hgAaJqUQPavbgvtwzQlhRXn4HV4r7VGNIrSssDsN7uDHoM8F6moA7kd2cTzwMhr/HngavdmdWA+aDX+I1dl7tq4VY9oe6RMA+Uoi4FSql1H1VWkiaEJsav0aFI1FeCLjk/9YxLx6K224y6xptnaQUoRt1+0ZFa1Ici8IFMsZRGft+tRB2/B18M+8MxJj6OLti0ntbAMvsu0Qh1VLjqQ6Hy629pXyLKoE3bAFYWXqzTF5HXYifmzEmizCa3YZGhbggi9EViXHs4dkplQ6IOtjrRAW1DcEdf7Tu1zEuolTFk/oiLtA028ZcqXMCDYRsfK1oxpMrABuEd4WriHcrp2KXW5bhQMuQukOQbegGsdSjoUs69XfrNbcqhXMu1z8EkiocCI0E5jWGpQMeqh16ukZRPoER5hUGlzi+ZZ4DBuH7WUDRFFcq7NM07i45FTG8XrwdpFWilBE8W5cXMDl8opry1gC0youOPKSpStyK/JdaTqeAcIWeLGW5M0R6VqJgqbpAmthWwlKhvWfTNy7pJqTAZPjordH4gupIFHJsHSs6hO13cPBBFLImTTksp4GbUCovAs/iob3n4Wm2Un70CTGDJ7jLsiC6+KUhUus3Ujsyo10LI7Yj2vin6ciALyEG327gpPugnlDVlAU27mdPoiw+K6gGXsoAnMEI+AWHRSSJxrHglHsMSwGeyCSaWH499uJYFMGyRjclDdO0n4ER+jDbIOn6IuZcxP/qSGfxAgKzh55nbc8yXi7Oz8NRrIIc1MoecENv0F7C3E35TDnOjgDPuDqdj32M+7lgzbP9OvLmAf63ay2+iUBgF8AtlprU++m5PKAtpPxfdlJCQljSlk4k2oCa6cTU+omYWZhJrMotJ2r9+AhGBggjc/sTNXZwTicnV7/IUMWv8yKfx51/9Kdm64DFi3Mjv5ldvMnuMcwuOPhd0GgXd/u7b9WhWF0dMRCeyVlcaHJSOHQ5r45idAM9hyxs+9/VQGHDCzkCRgsUNp2kojHDKroBWyOM1d0EoDbhkjDALddoKLzsUBsPbcEYvgbHCaxaE9b0NR8IwVDBQHhSuS6kHYUNvyywDzcBfhdc8CAPcaWEJaAal1w+8gqwW4A3ydEwsn3PP687amEBjLgmvlu+Nu8AICtxfLa4L0Iu/Nr7m1Q4KCFXmMbA01wbcBUPTtwTt+WOiV38R3AU909fdDI7OgLnpsW558wctP38O1II/gete55YPrcyNXmiaUAaZqsvmir8bm+qGRQjN5HX0VdeIJ38wV0N6kVmCCLK8L9HPwsg2w/wPEMwSBm4t7ooaWWpEDxoLOwHeZdkqFt79sJtylBMbDAroqqpTILxvN9W4dmxqVyOM1KmWix8eNwIdJExlnb6WWWe0asrbvBNEFiOgvdA0PdNLe5NTmIDA4kqEjp5RT00zhFFiCcpAW89mqaboA9Wtw3EYmaTdoUnKQYsEIt6CKXCYdgBCmazUbabAd8Z2NBi7Llql3J/dhzi020xO9uHlpztEBskF6gKQ9tguIlyU8gYcNYHTBkSWQdXALo4cNwaowjIpCfkL3ru5TnxFQqq5HGUNABJZDgdCjgKzT4BQY/mca9iuJQeaPQK0CstvX8c2z7JvOgSgiwWfS9gXkMySXeZkSACEMiuuJlFygTNewGUcnjI+e1VJw2frVl26YF/i4FgSDESQIJ2X2Je6PK0cH31ziZWzK5bVf0D9anRc2+uqAAAAAElFTkSuQmCC) center center no-repeat;
-         background-size: 56px 56px;
-         opacity: 0.7;
-         filter: drop-shadow(0 0 3px rgba(0,0,0,.75));
-      }
-
-      hr.heading {
-         margin: -10px 0 15px;
-         height: 1px;
-         color: transparent;
-         border: none;
-         background: repeating-linear-gradient(to right, rgba(255, 255, 255, .05), rgba(0, 0, 0, .08) 2px),
-                     linear-gradient(to right, #888, #666 20%, rgba(0, 0, 0, 0) 90%);
-         filter: drop-shadow(0 1px 1px #000);
-         animation: ease-out underline 1s forwards;
-         will-change: transform;
-      }
-
-      @keyframes underline {
-          from {
-             width: 0;
-          }
-          to {
-             width: 100%;
-          }
-      }
-
-      #v {
-         margin-left: -10px;
-      }
-
-      h2,
-      h3 {
-         color: #ccc;
-         text-shadow: 0 0 2px #181818, 0 3px 1px #000;
-      }
-
-      h2 {
-         margin-top: 10px;
-      }
-
-      h3 {
-         padding: 5px 0 0;
-      }
-
-      h2::first-letter,
-      h3::first-letter {
-         font-size: 114%;
-      }
-
-      a:link,
-      .urls li {
-         font-weight: bold;
-         text-decoration: none;
-         color: #c4ad9d;
-         outline: none;
-      }
-
-      #local {
-         font-weight: normal;
-         color: #bbb;
-      }
-
-      a:visited {
-         color: #a98770;
-      }
-
-      a:hover,
-      a:focus {
-         color: #e88b44;
-      }
-
-      code,
-      #b64 {
-         white-space: nowrap;
-         font-weight: bold;
-         font-family: "Droid Sans Mono", "Noto Mono", "DejaVu Sans Mono", "Lucida Console", monospace;
-         font-size: 90%;
-         color: #292;
-         -moz-user-select: all;
-         -webkit-user-select: all;
-         user-select: all;
-      }
-
-      #b64 {
-         margin-bottom: -5px;
-         width: 100%;
-         display: inline-block;
-         white-space: no-wrap;
-         overflow: hidden;
-         text-overflow: ellipsis;
-      }
-
-      #b64:focus {
-         white-space: normal;
-         word-break: break-all;
-         overflow: normal;
-         outline: none;
-      }
-
-      .warn {
-         margin-top: 18px;
-         padding: 15px 18px 15px 54px;
-         line-height: 1.2;
-         border: 1px solid #900;
-         border-radius: 4px;
-         box-shadow: inset 0 0 0 1px #000, inset 0 0 2px 1px #900, 0 0 2px 1px rgba(0, 0, 0, .2);
-         background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACcAAAAhCAMAAAEaI3KMAAAACXBIWXMAAA7DAAAOwwHHb6hkAAACbVBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAgIDAAADAgIEBAQGBAQGBQUGBgYHAQAHBwcICAgJCQkKAQAKCgoLAQALCwsMCwsODg4PDw8QAQAQAgASAAASAwAVCwsaGhobDw8bExMbGxskHx8mJiYpAwAqKiotKysuAQAwLi4yMjI8HR08JiY9CAA/CAA/Pz9BQUFDQ0NKBwBLPDxLS0tTAwBhBABmZmZpAABpPT1tEABvEAB4RUV4WFh4a2uCBwCECACGhoaHeHiUAQCWFgCaFgCclZWkDgClVFSlb2+0lZW0tLS2FQC4BQC9vb3GGQDGxsbIVlbKWFjMFwDOCgDPfn7RFADUrKnV1dXWCgDWEgDWLR7YBATYEADYg4PZ2dnaAwPakozbEADbp6fbysrb29vezc3e1NTe3t7hDQDhIxjk5OTlb2nlcWvmCwDqwL7qysnq6urrCQDrDAPrDgbtAADtgIDv7+/wQkLwS0bxBgDxPTjzBADzhITzq6vz8/P1oJ/1qKf19fX2BAD209P51tb7AgD7HBv77+/7+/v8/Pz/AAD/DAz/amr/bm7/cnL/enr/goL/ior/k5P/lJT/mJj/m5v/o6P/q6v/s7P/t7f/uLj/u7v/vr7/w8P/xcX/yMj/y8v/09P/2Nj/29v/4+P/5OT/6en/6ur/6+v/8fH/8vL/9PT//Pz//f3////ZtbwoAAAAJXRSTlMAAwYMEhUYGyEkMDxCS1ppeISHkJacpairtMPP2Nvk5+3w8/n8UHR7egAAAp9JREFUGBmFwYlDi2EcB/BvB6lRjoxOS/1ykzPkFrmv3GdCyZEzLMRcrZdhjjG3MV4du/S2aU1puXn+Js87G/WWfD4I8W4FkMpaARgEwYAexAHQgFM1gbOPtAPThPUCQNxQyOb5w/Db2aYsKR4y62txgWglILosaDVkQxAS5p+HoK1NXhUC4qVxjccRYG/NYvZUcGQVF4uvreAMgrBeEAyTgNVlQb2QRkE9EaK+fFENhbQWToMOyO3++dPtJrQz2+lkmdnM6ZyJkJgN9+oYmzuZsbp7G2IQ0P+A+b7JZCooMJlMD8wH+oNLOaM7X8GtWlXBndedSQGSSztJRoiKekNpypcxUEh66X+RhA6i1rS0tKzpgfbI6/3q9RLaidvrbmTv3Hvj8NcoSbpEJyVpBP5IfORsfkIHm513ExEUucRuZ4xuMrt9SQR+yzhd+5kxYuxz7bkMBMQWWl+JokiiKL6yFsZCRmaziSMTZzYTuIRThmsCRwJ31XAsAQjP1ekqZFQh0+lyw5FeppSO5aVKy6AmpUFQitIs2rMwLQr/oaKdbW1t20iFbsVRyQdZCcWhG+rRF3w+33ufz3dhtBr/EpY057HH4/Ezv8fjeTwnKQxditQsbeA+5VP+xwZuqSYSXYjJ2OJyueq/HxpP2fu+1btcro0ZMegkloodDsfbH4wNo4kn2Y+3DoejmGKhED/8iM1mkxg3legNY0yy2WyHhw9AB4k5d6qrayQmm0+zmEyqqa6+k5OIvyJS8x5aLJZnzwNW0ornAU8tFsvDvNQIBEWnrzMajbdv3FS6fstoNK5Nj0ZAH9qh1+urrlQGZVJmZdCVKr1ev536gOtHRVqttvxE18q1Wm0R9QUGTth/9H/2j43HoBmbd+3u3q5N0wf/ApzdYLKMtOjLAAAAAElFTkSuQmCC) 12px center no-repeat, repeating-linear-gradient(to bottom, rgba(0, 0, 0, .5), rgba(64, 0, 0, .2) 2px), linear-gradient(to bottom, #222, #111);
-         background-size: 32px auto, 100% 100%, 100% 100%;
-         will-change: transform;
-      }
-
-      .emphasis {
-         margin-top: 4px;
-         display: inline-block;
-         line-height: 110%;
-         color: #900;
-         font-weight: bold;
-      }
-
-      ul {
-         margin-top: -10px;
-      }
-
-      ul#config {
-         list-style-type: none;
-      }
-
-      #config li {
-         padding: 10px 15px 5px 0;
-         position: relative;
-      }
-
-      #config li::before {
-         content: "";
-         display: inline-block;
-         width: 25px;
-         height: 20px;
-         position: absolute;
-         top: 12px;
-         left: -22px;
-         background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAABwlBMVEUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADzlhbzeBbzfRbzihbzkxbzdRbzbBbzhhbzjxbzgxYDAQDzbxbzehbzgBbzchbziBbzfxYHAwEJBAHzjBYVCwIFAwAxGQQZDgIVCQINBwFuOQoeEAMcDgIQCQEpFgTwjBbphBXubBW/ZBGkTQ9yPwpVMAhWKAglEgPxgRbwkxXfdxTdaxTKbBLKZBLAahGiYw6IPQxkMQlDJwbqehXocRXnaBXdghTgZxTWfhPWdxPLcRK7XhHCWBG6WBG3URCZWw6KRw2YRQ2IUgyBQQtIJAdJLAY3HAUkFQPxiBbvdhbpfRXscRXcfhTWZRPKexLCeBK5cBG7bBG7ZxG8WBG0XBCsUQ+hWw6hTA6ITwx7OQt0OAtxRApuPQprMwpgNwhbNQhPKQdEHwY6IAUsGQTrjRXpjBXeiRThgRTgfRTibhS0aRCsZxCYTQ6TTQ2RTQ19SwtPLge07EnRAAAAJHRSTlMABK+M1/Xz7YlpJRoMBtzNyIRWT+T7tJBwbl86NRAO5cTCtYFtLGI6AAAEcklEQVRYw5XXd0PTQBQA8LSltUCVlqGIuB9gWScFUxtKF6MLREBkyFC2gHvvvff6vt57ubYkTWr8/ZGmJXfk3ch7kcxU1rjt3loAqKutsvuqK6X/0ugoA50yxwGrrT31e8BQWf1BC80PuV2Qx/o4KHD5PFJptvJdoIpnntydHziNbtx98joEql3ltlLtK7xAwi8m2nUm0qKPoxXm7RucgHrXhtoMDKX6ATmrzW7fASj26ISZK49igPYZhrHbTsOWHuzp6fmS2U5f6TEw+IIBZ99t0H4vDd0y3uzssAzyWpuhZZqVvUU92OwU/Wg7eiXjebux0V66B30UFP/mIIW6SLcZPCEMftaOxOAUjYO2fTVwb4dOkrcM0Cx9GcoyiF06udPQZeAaNPPvxHu+1kkWQTWGX0Yu83BYolPjGkbhrNgxAEdw8VzoUL1WAMnf8AsNByQ6tC6E+Y/ewjCU4/wtdau+ykCCa/zLU4X6etmts4RRlue3H67/aEBYDYoONgKBnwwQGwvoRXFfHBIdHMf199EvbIOQ8X9nQPr9RT7gmnRL5CDu31SrMM5AGL6fC2a1tVgKd7e6uffjxS05UWpFIuKTjbYYwJnYLyF8ep1rEs6EIIcp4nOzycg5/qc92P4AP+m72ixcZKCnPGw2chWnslEs4mddOeeLO2Cs//yP8eYuPZwIh4jgdj6CBBhhQZA3P+liuK3GUMk/Qi05GIEJ5U2LTpz/WinV8GM2HxhGYEaeadbK8h9rJB8/rvsFjMCUvOLXWqe1dIwfk6eEJIMSek9pJfHBIlXx49lW4aUMpdxs1bjJf6qSDvNjR04YSpGfd2gxgMNSHZ+ETmGMQUnsza+xkc4CXLUSrsOTwlMZSmNBJm89ezgnru8THYROC9tghSzDHzVphnIdtKsWwCp2jxrwDupwEFmbajIIFsnL1ICf1dI0LpwgU2DZIl5/g6YRM9JEDwmDZQt4/T1+ckxy8+NkG5oF6+YoZH7io82UUUsIBpZRgwxuJtrOcRqCFctjKPJmiLazhCUZ5T7cyhYl8PpLWLiJR1q0k9sCixRlFa9Pi0daI+bFAb41ImANm5rv4AYwAiw+KYbH3d1zFtdQX6qbpDCCfGJ5Hwg8UKyMHotOB8jIcD6xeFyYWfzrwX82Vt79vuUXMK+4ROnrxpm8ni3dWH63sXS9NW8Gk+vxXHlM6b2/xLBtbSS7WjQovXs0BUa/Yvrvnzfp3REFhmDz4lPBdBrlB806Z3EKj9h0RdYwM1s4F7u0ZjRFFmkAnEuzHm41aZyhB4eu5N5HpYxJD+Oa8ZumMtFhWOrGmHEHmvhFqWtcbCciMhSb9xfciYti26zcjxnM5uipnOm0cblPbPsA9RXdRCF3Po4Bcpi9N1U7AYWDui7UInhgpReQs6HES9dRIJEw7NxamA+T0TAQb4W1175InHcRREy5P5mNW3ntIx6fCwoikUiCQZ7LfUj6t4P1ZWBoT71HsuiA0ct3o/RfKqt99qraOsyfXru7xvT1/y8HBiJNY8d/vwAAAABJRU5ErkJggg==) left top no-repeat;
-         background-size: 14px 14px;
-         opacity: .85;
-         filter: saturate(0) brightness(1.6) drop-shadow(0 1px 1px #000);
-      }
-
-      #config li br {
-         display: none;
-      }
-
-      .urls li {
-         margin-left: -15px;
-         list-style-type: none;
-      }
-
-      .urls li::before {
-         margin: 2px 0 -3px;
-         width: 22px;
-         height: 20px;
-         display: inline-block;
-         content: "";
-         background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAABEVBMVEUAAAAAAAAAAAAAAAAAAABDREYAAAAAAAAAAACDhYgAAABmaGuPkZRZWlyFh4oAAABkZWcAAAAAAABRUlRiY2ZPUVN4eXtydHdcXV9YWVtCQ0QxMjM2Nzh6fH6DhIcAAAAAAAB3eXt3enxoaWtlZ2p2d3pwcnWCg4Z7fH5OTlBnaWtdXmAxMTJXWFoyMjRAQEIAAABeYGJmZ2qIio2jpKfx8vOKjZDLzM7v7+6wsrWdnqCAgYSbnJ6Nj5KMjY58foFxcnXp6urh4uTOz9KztreYmp2QkJOFh4uSlJaPkJF/f4NVVljR0tS/vsC8vsCsrrKgoqSXl5uQkpN6e31ub3JsbXBdYGJaW12/v8G+vb+SlJjRk2qVAAAAMnRSTlMABAwWJ4UHQiBhEWDohWEw7ToU8e3r5dKRg3tpXz05Nw/v7ejEvrGtfHRtaGZXV0w5MLROkgwAAAE3SURBVDjLndHXcoJAFIBhlyWEGA2WJJY003tjAQ2hKQIGe4tJ3v9BsjDOeLEcLzy335nZPfOnNpzTjEnILYIY7SnNVm/g2QLgO4ra/jPHw8kNgvyDlJ9KvuJwoGcl/sUezQtJ78fO17i7X0/G7MJJ5BWeQ7thPcixC0Km2Sb3kX/WNfk4zSykzVZn6lwKsW+J7J1Yc21dXTzHziccgYlvNKzu0lHCwnnkPy7k6FBvWN+6Eazxr6Izk/ePqDP9NHJB/WCbzplInenn+gb1vIgxTgsJ/To2/V8xjxHUZxr9zxFBrzqq1dVnGOpXecst5L4B9svyolQNXagfdU54XNOvHPUF+5Ge+VqjDvcbjEvvDyHYr3DtDX27D3qKk+yJMvICyFMI56+c+aofOwKWVv0SB3GFuN9m8w950jtLubKVyAAAAABJRU5ErkJggg==) left center no-repeat;
-         background-size: 16px 16px;
-         filter: sepia(1) saturate(.4) drop-shadow(0 1px 1px #000);
-      }
-
-      .external::before {
-         content: "";
-         display: inline-block;
-         width: 16px;
-         height: 14px;
-         vertical-align: middle;
-         background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAC61BMVEUAAAAAAAAAAAAAAAAAAAAAAAAYf7wbfa8AAAACDBESfbwZbpwVd64dgLITfrUVfLcadqkVX4YXZ5AKLT8MNUkEExsAAAAAAAAWcqQMOlIUaJQeeqoXerMXeq0WfrgVfrMUYYsUYYgypuIintwso+AmoN6f6QAYmNk5q+U1qOUem9oVgcoZgrec5gCa5QCN2wC/6P0yp+6h6wGd6ACY4wCQ3gBRufApot4bmtwSldcLktYDjdUbhL4fhrsehbmu7Rqq8QCl7QCV4gA6qv6m3Pmg2vlJs/RkwPI5q+xGsucZmOc/ruYHjt7i/Jmx7iyV3wCw4v+L0P/G6v665f2s4PzQ7fu04/uX1/iHz/V7y/U4qfROt+xHsuwRlN0NfMHj/3iK2hx2zhmS3wGe2v8vpP+l3/6X1P1Wuf2X2fyQ1PkooPUamfJcve8rouQRlNY/m84fjsUSiMVVu7RjxKdJtZM/rYbS9oPb+oLT+GnF81eD10W48Dm38iGf5x2R3xKw8wWc4QKG1wKe6AC15P9gvv8dmv/a8f56yf6Gzvo8rfduyPV0x/JVvPKv4+4Oku0noes+relxveQmn+S95+MRlOOn399ruN9Xu9NAr9Akls8Zks8Ih85isszr/sEOfcHJ8btOt7eb3rQnobKHy7BAr7BntKpOuaVNuJ5xzZlkw5fl/o+q34+g145dwIbG7oV20YGBzXpYvm+w5m1vym1uymTO+FyS3FZ1z0zB9EWP2kOc5kKx6UF2zjrB9DlqyDh40TSE1y6l5Rao7BGp7w990wuq7Adtxf+w3+kwn+eY2ONiv9qIz9ktndVUqtRjwdMnlNPF7NENgtG96c4Li8tvyMcwpcZOtr/h+76157wUjLwdm7tEnbbl/LFTqazV9Kq97qUnn6Momp9Xu54fnJ6Pzpt6wJmH1YJiw3k6rHbh/3V/13SJ22V70l2b4Fy27Fi68FZTuVNcv0ij4TprySaF1xSU4RCc6Aie4Qa4/QHF9Rd9AAAAInRSTlMABhYPNh3q3EIv07J37OfC0ZmNWUxLOikiGQ7NnZ2ZmSkpxqDDBgAAAzRJREFUeNplklNgJEsAAHeWcc56DNa2bdsb27Zztm3bNp9t2zY+r2f2nPqtajfqPjMy0rYUArakZcxAjWVammL3oc4iQOeh3YrsaY9o6CnG1z8ccB7o6v71zIXL3V07FU9CD/mspsXvbXY6Vz63utJbtUd3vedIEx560K/hbP7Y+aknYAjXzJtbf1Yn/PPIJlDc9/45QWfXSo/BWOl9aecs/boRofvEvQJ6oqliTtDH2fpmoKzSe8KlPrPWUn58hH3wo8eTRQ7DyAH+9c7T75e9ELn4ywDp2rV1e0uEuw7Sn0YmyF5eDY/vPt3T81tfv/rbFweL9Vxu7Tsl17/JhqeYrqo2+jj+mTM/O3euz6V+5hhrP+tdS24D8dbIRfp0MEHGKwv8/lDI41l8GfZvHx1t08coufkr6q4Mf5IBoSDC8kWcUCBQUbG636W+MVC1jzm4fz41N59o62AfS4NQGEZUFDIYjGXV2/vVN3gkUi9LwDzFBYFkCfs8HYNCMxaIDMZwuMa7fegmj8Rn/iMQFH/JzRXnSZaU/EdHg8AsioZrIvPmujRaOBCwdCdj1HwQrPp9GAkWicyRSDT67M1kwGKe0sNbyJMU7EgGpn0m88KF5lk/JQMmSW+hghVoZKnDoYAD6/9rTfXm+qpXh7Q8sEnS2Rg8AQgaZXIVCAjPX/jRFI/HRaIBjVbbe3JwGzgCMoFM/hYBjcJMeK3taCJhTcRNbec1P5eXbztcu3TFnQlaJmBQUKrCYllmt1qtifmtQ/+2Fu/5rvRSnc22qsAhlytTwU3iCC9TKBQ7YFmstZevOTx7dnv78R0djs+/3/gYDrwWZpIql0qlwFDBI+4d3VXMEujcbrfgK8UkDPzcuPTm3Ls0NCyta+frSoVsNvuvN9LBBABMaub6/CRiMTHPdpUFe+GtD/CpmOSXQ2Mz1xNh8gAS29VRMIO7ZCMeiwYTJIspmc3A0QBkckHBpb8FrD9a8FMQf3eOdOUGCRkglTY6PuRf+YKejoy/X6ROHKds3iCVymQyeUcLfdzE1Ac9KDA47OTxBJVKqVQpCeMnY3EY2D+STMWmIGCnjtVIAmHQCBjoAX0bgdwQZFvzARQAAAAASUVORK5CYII=) center top no-repeat;
-         background-size: 12px 12px;
-         opacity: .7;
-      }
-
-      .external:hover::before {
-         opacity: 1;
-      }
-
-      @supports (-webkit-text-stroke-width: 1px) {
-         #sitename,
-         #sitename:hover,
-         #sitename:focus {
-            background: #731;
-            background: repeating-linear-gradient(to bottom, rgba(0, 0, 0, .2), rgba(0, 0, 0, .5) 2px),
-                        linear-gradient(to bottom, rgba(255, 96, 0, .2), rgba(0, 0, 0, .9) 100%),
-                        linear-gradient(to bottom, #210, #310 15%, #fff 50%, #310 80%);
-            -moz-background-clip: text !important;
-            -webkit-background-clip: text !important;
-            background-clip: text !important;
-            -moz-text-fill-color: transparent !important;
-            -webkit-text-fill-color: transparent !important;
-            text-fill-color: transparent !important;
-            filter: drop-shadow(0 0 2px #000);
-            -webkit-text-stroke-color: #999;
-            -webkit-text-stroke-width: 0.02em;
-         }
-
-         #sitename:hover,
-         #sitename:focus {
-            background: #951;
-            background: repeating-linear-gradient(to bottom, rgba(0, 0, 0, .2), rgba(0, 0, 0, .3) 2px),
-                        linear-gradient(to bottom, rgba(255, 255, 255, .2), rgba(0, 0, 0, .7) 100%),
-                        linear-gradient(to bottom, #930, #d50 15%, #fff 50%, #930 80%, #000 100%, #ff0 150%);
-            filter: drop-shadow(0 0 2px #b00);
-            -webkit-text-stroke-color: #bbb;
-         }
-      }
-
-      @media screen and (max-width: 1200px) {
-         #help {
-            font-size: 90%;
-         }
-
-         .external::before {
-            margin-left: -2px;
-         }
-
-         #sitename::before {
-            height: 52px;
-            background-size: 52px 52px;
-         }
-      }
-
-      @media screen and (max-width: 1400px) {
-         #container {
-            padding: 2% !important;
-         }
-
-         #panel {
-            padding: 20px 35px 10px;
-         }
-
-         #sitename,
-         #sitename:hover,
-         #sitename:focus {
-            margin: -14px 0;
-         }
-
-         code:not(#b64) {
-            display: inline-block;
-            white-space: normal;
-            text-align: left;
-         }
-
-         br + code {
-            margin-top: 3px;
-         }
-
-         #config li br {
-            display: block;
-         }
-      }
-   </style>
-</head>
-
-<body id="help">
-   <div id="container">
-      <div id="panel">
-         <a href="http://127.0.0.1:7662/" title="Firefox Manager Homepage" alt="Firefox Manager Homepage"><span id="sitename">I2P Firefox</span></a>
-      </div>
-   </div>
-</body>
-
-</html>

plugin/templates/index.html

@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!-- edit this file if you want to change your home page -->
-
-<head>
-    <meta charset="UTF-8">
-    <title>I2P Firefox</title>
-      <style type="text/css">
-        body, html {min-height: 100%; font-size: 0;}
-        body {background: #111;}
-        body {background: repeating-linear-gradient(45deg, #444, #333 2px, #222 3px), repeating-linear-gradient(135deg, #444, #333 2px, #222 3px); background-blend-mode: multiply, normal;}
-      </style>
-    <link href="/firefox.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-    <div id="container">
-        <div id="panel">
-            <a href="/launch" title="Launch Firefox configured for I2P"><span id="sitename">i2pfirefox</span></a>
-            <span id="footer" class="b32">$B32</span>
-        </div>
-    </div>
-</body>
-
-</html>

plugin/templates/jetty.xml

@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-
-<!-- ========================================================================= -->
-<!-- This file configures the Jetty server.                                    -->
-<!-- All changes require a restart of I2P.                                     -->
-<!--                                                                           -->
-<!-- Commonly changed settings:                                                -->
-<!--   * host: Change 127.0.0.1 to 0.0.0.0 in the addListener section          -->
-<!--           to access the server directly (bypassing i2p)                   -->
-<!--           from other computers.                                           -->
-<!--   * port: Default 7662 in the addConnector section                         -->
-<!--   * docroot: Change the ResourceBase in the contexts/base-context.xml file -->
-<!--           to serve files from a different location.                       -->
-<!--   * threads: Raise maximumPoolSize in the ThreadPool section              -->
-<!--           if you have a high-traffic site and get a lot of warnings.      -->
-<!--                                                                           -->
-<!-- I2P uses Jetty 9. If you need web server features not found               -->
-<!-- in I2P's Jetty 9, you may install and run Jetty 9 in a different JVM      -->
-<!-- or run any other web server such as Apache. If you do run another web     -->
-<!-- server instead, be sure and disable the Jetty 9 server for your           -->
-<!-- eepsite on http://127.0.0.1:7657/configclients.jsp .                      -->
-<!--                                                                           -->
-<!-- Jetty now uses the I2P logging system rather than wrapper.log.            -->
-<!-- Use the log override org.eclipse.jetty.server.Server to adjust the log level.  -->
-<!--                                                                           -->
-<!-- Note that the XML encoding for this file is UTF-8.                        -->
-<!--                                                                           -->
-<!-- ========================================================================= -->
-
-<!-- =============================================================== -->
-<!-- Configure the Jetty Server                                      -->
-<!--                                                                 -->
-<!-- Documentation of this file format can be found at:              -->
-<!-- http://docs.codehaus.org/display/JETTY/jetty.xml                -->
-<!--                                                                 -->
-<!-- =============================================================== -->
-
-
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
-    <!-- =========================================================== -->
-    <!-- Server Thread Pool                                          -->
-    <!-- =========================================================== -->
-    <Arg>
-
-      <!--
-           Requests above the maxThreads + queue_size will be rejected and logged.
-           ref:
-           https://wiki.eclipse.org/Jetty/Howto/High_Load
-           http://trac.i2p2.i2p/ticket/1395
-       -->
-      <New class="org.eclipse.jetty.util.thread.QueuedThreadPool">
-        <Arg type="int">20</Arg>     <!-- maxThreads, overridden below -->
-        <Arg type="int">3</Arg>      <!-- minThreads, overridden below -->
-        <Arg type="int">60000</Arg>  <!-- maxIdleTimeMs, overridden below -->
-        <Arg>
-           <New class="java.util.concurrent.LinkedBlockingQueue">
-              <Arg type="int">50</Arg>
-           </New>
-        </Arg>
-        <Set name="minThreads">4</Set>
-        <Set name="maxThreads">20</Set>
-        <Set name="idleTimeout">60000</Set>
-        <Set name="daemon">true</Set>
-        <Set name="name">I2PFirefox Jetty</Set>
-      </New>
-    </Arg>
-
-
-
-    <!-- =========================================================== -->
-    <!-- Set connectors                                              -->
-    <!-- =========================================================== -->
-    <!-- One of each type!                                           -->
-    <!-- =========================================================== -->
-
-    <!-- Use this connector for many frequently idle connections
-         and for threadless continuations.
-         Not recommended on Java 5 - comment this out, and uncomment the
-         SocketConnector below.
-         Do not use for gij or JamVM - comment this out, and uncomment the
-         SocketConnector below.
-    -->
-    <Call name="addConnector">
-      <Arg>
-          <New class="org.eclipse.jetty.server.ServerConnector">
-            <Arg><Ref id="Server" /></Arg>
-            <Arg type="int">1</Arg>     <!-- number of acceptors -->
-            <Arg type="int">0</Arg>     <!-- default number of selectors -->
-            <Arg>
-              <Array type="org.eclipse.jetty.server.ConnectionFactory">    <!-- varargs so we need an array -->
-                <Item>
-                  <New class="org.eclipse.jetty.server.HttpConnectionFactory">
-                    <Arg>
-                      <New class="org.eclipse.jetty.server.HttpConfiguration">
-                        <Set name="sendServerVersion">false</Set>
-                        <Set name="sendDateHeader">true</Set>
-                      </New>
-                    </Arg>
-                  </New>
-                </Item>
-              </Array>
-            </Arg>
-            <Set name="host">127.0.0.1</Set>
-            <Set name="port">7662</Set>
-            <Set name="idleTimeout">600000</Set>
-          </New>
-      </Arg>
-    </Call>
-
-    <!-- =========================================================== -->
-    <!-- Set up global session ID manager                            -->
-    <!-- =========================================================== -->
-    <!--
-    <Set name="sessionIdManager">
-      <New class="org.eclipse.jetty.server.session.HashSessionIdManager">
-        <Set name="workerName">node1</Set>
-      </New>
-    </Set>
-    -->
-
-    <!-- =========================================================== -->
-    <!-- Set handler Collection Structure                            -->
-    <!--                                                             -->
-    <!-- We use a RewriteHandler at the top level so that we may     -->
-    <!-- convert any top-level URLs for the firefox down into the    -->
-    <!-- firefox servlet, without interfering with anything else     -->
-    <!-- that is hosted on the same eepsite.                         -->
-    <!-- =========================================================== -->
-    <Set name="handler">
-      <New id="Rewrite" class="org.eclipse.jetty.rewrite.handler.RewriteHandler">
-        <Set name="rewriteRequestURI">true</Set>
-        <Set name="rewritePathInfo">false</Set>
-        <Set name="originalPathAttribute">requestedPath</Set>
-        <Set name="rules">
-          <Array type="org.eclipse.jetty.rewrite.handler.Rule">
-            <Item>
-              <New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule">
-                <Set name="pattern">/help</Set>
-                <Set name="replacement">/help.html</Set>
-              </New>
-            </Item>
-            <Item>
-              <New class="org.eclipse.jetty.rewrite.handler.RewritePatternRule">
-                <Set name="pattern">/help/</Set>
-                <Set name="replacement">/help.html</Set>
-              </New>
-            </Item>
-          </Array>
-        </Set>
-        <Set name="handler">
-          <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
-            <Set name="handlers">
-             <Array type="org.eclipse.jetty.server.Handler">
-               <Item>
-                 <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
-               </Item>
-               <Item>
-                 <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
-               </Item>
-               <Item>
-                 <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler"/>
-               </Item>
-             </Array>
-            </Set>
-          </New>
-        </Set>
-      </New>
-    </Set>
-
-    <!-- =============================================================== -->
-    <!-- Create the deployment manager                                   -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-    <!-- The deplyment manager handles the lifecycle of deploying web    -->
-    <!-- applications. Apps are provided by instances of the             -->
-    <!-- AppProvider interface.  Typically these are provided by         -->
-    <!-- one or more of:                                                 -->
-    <!--   jetty-webapps.xml       - monitors webapps for wars and dirs  -->
-    <!--   jetty-contexts.xml      - monitors contexts for context xml   -->
-    <!--   jetty-templates.xml     - monitors contexts and templates     -->
-    <!-- =============================================================== -->
-    <Call name="addBean">
-      <Arg>
-        <New id="DeploymentManager" class="org.eclipse.jetty.deploy.DeploymentManager">
-          <Set name="contexts">
-            <Ref id="Contexts" />
-          </Set>
-          <Call name="setContextAttribute">
-            <Arg>org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern</Arg>
-            <Arg>.*/.*jsp-api-[^/]*\.jar$|.*/.*jsp-[^/]*\.jar$|.*/.*taglibs[^/]*\.jar$</Arg>
-          </Call>
-        </New>
-      </Arg>
-    </Call>
-
-    <!-- =========================================================== -->
-    <!-- Configure the context deployer                              -->
-    <!-- A context deployer will deploy contexts described in        -->
-    <!-- configuration files discovered in a directory.              -->
-    <!-- The configuration directory can be scanned for hot          -->
-    <!-- deployments at the configured scanInterval.                 -->
-    <!--                                                             -->
-    <!-- This deployer is configured to deploy contexts configured   -->
-    <!-- in the $JETTY_HOME/contexts directory                       -->
-    <!--                                                             -->
-    <!-- =========================================================== -->
-    <Ref id="DeploymentManager">
-      <Call name="addAppProvider">
-        <Arg>
-          <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
-            <Set name="monitoredDirName">$PLUGIN/contexts</Set>
-            <Set name="scanInterval">120</Set>
-          </New>
-        </Arg>
-      </Call>
-    </Ref>
-
-    <!-- =========================================================== -->
-    <!-- Configure the webapp deployer.                              -->
-    <!-- A webapp  deployer will deploy standard webapps discovered  -->
-    <!-- in a directory at startup, without the need for additional  -->
-    <!-- configuration files.    It does not support hot deploy or   -->
-    <!-- non standard contexts (see ContextDeployer above).          -->
-    <!--                                                             -->
-    <!-- This deployer is configured to deploy webapps from the      -->
-    <!-- $JETTY_HOME/webapps directory                               -->
-    <!--                                                             -->
-    <!-- Normally only one type of deployer need be used.            -->
-    <!--                                                             -->
-    <!-- =========================================================== -->
-    <Ref id="DeploymentManager">
-      <Call id="webappprovider" name="addAppProvider">
-        <Arg>
-          <New class="org.eclipse.jetty.deploy.providers.WebAppProvider">
-            <Set name="monitoredDirName">$PLUGIN/eepsite/webapps</Set>
-            <Set name="parentLoaderPriority">false</Set>
-            <Set name="extractWars">false</Set>
-            <Set name="defaultsDescriptor">$PLUGIN/etc/webdefault.xml</Set>
-          </New>
-        </Arg>
-      </Call>
-    </Ref>
-
-    <!-- =========================================================== -->
-    <!-- Configure Authentication Realms                             -->
-    <!-- Realms may be configured for the entire server here, or     -->
-    <!-- they can be configured for a specific web app in a context  -->
-    <!-- configuration (see $(jetty.home)/contexts/test.xml for an   -->
-    <!-- example).                                                   -->
-    <!-- =========================================================== -->
-  <!-- UNCOMMENT TO ACTIVATE
-    <Set name="UserRealms">
-      <Array type="org.eclipse.jetty.security.LoginService">
-        <Item>
-          <New class="org.eclipse.jetty.security.HashLoginService">
-            <Set name="name">Test Realm</Set>
-            <Set name="config">$PLUGIN/etc/realm.properties</Set>
-            <Set name="refreshInterval">0</Set>
-          </New>
-        </Item>
-      </Array>
-    </Set>
-  -->
-
-    <!-- =========================================================== -->
-    <!-- Configure Request Log                                       -->
-    <!-- Request logs  may be configured for the entire server here, -->
-    <!-- or they can be configured for a specific web app in a       -->
-    <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
-    <!-- for an example).                                            -->
-    <!-- =========================================================== -->
-    <Ref id="RequestLog">
-      <Set name="requestLog">
-        <New id="RequestLogImpl" class="net.i2p.jetty.I2PRequestLog">
-          <Set name="filename">$PLUGIN/eepsite/logs/yyyy_mm_dd.request.log</Set>
-          <Set name="filenameDateFormat">yyyy_MM_dd</Set>
-          <Set name="retainDays">90</Set>
-          <Set name="append">true</Set>
-          <Set name="extended">false</Set>
-          <Set name="logCookies">false</Set>
-          <Set name="LogTimeZone">GMT</Set>
-        </New>
-      </Set>
-    </Ref>
-
-    <!-- =========================================================== -->
-    <!-- extra options                                               -->
-    <!-- =========================================================== -->
-    <Set name="stopAtShutdown">true</Set>
-    <Set name="stopTimeout">1000</Set>
-
-</Configure>

preprelease.sh

@@ -6,10 +6,10 @@ ant distclean clangFmt versionMd
 NUMLINE=`grep release.number build.xml | head -n 1`
 READMELINE=`grep 'i2p.plugins.firefox/releases/download' README.md | grep i2pfirefox`
 sed -i "s|${READMELINE}|wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/${GITHUB_TAG}/i2pfirefox.zip|g" README.md
-READMELINE=`grep 'i2p.plugins.firefox/releases/download' LINUX.md | grep i2pbrowser`
-sed -i "s|${READMELINE}|wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/${GITHUB_TAG}/i2pbrowser.zip|g" LINUX.md
-READMELINE=`grep 'i2p.plugins.firefox/releases/download' OSX.md | grep i2pfirefox`
-sed -i "s|${READMELINE}|wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/${GITHUB_TAG}/i2pfirefox.zip|g" OSX.md
+READMELINE=`grep 'i2p.plugins.firefox/releases/download' docs/LINUX.md | grep i2pbrowser`
+sed -i "s|${READMELINE}|wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/${GITHUB_TAG}/i2pbrowser.tar.gz|g" docs/LINUX.md
+READMELINE=`grep 'i2p.plugins.firefox/releases/download' docs/OSX.md | grep i2pfirefox`
+sed -i "s|${READMELINE}|wget https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/${GITHUB_TAG}/i2pfirefox.zip|g" docs/OSX.md
 sed -i "s|${NUMLINE}|        <property name=\"release.number\" value=\"$GITHUB_TAG\" />|g" build.xml
 edgar && git push --all
-ant distclean tarball versionMd jar freeZip jpackage debian fedora
+ant distclean versionMd jar plugin torrent freeZip jpackage debian tarball

release.sh

@@ -1,12 +1,13 @@
 #! /usr/bin/env sh
 
 . ./config.sh
-./preprelease.sh
+#./preprelease.sh
 github-release release --user "${GITHUB_USER}" \
     --repo "${GITHUB_REPO}" \
     --name "${GITHUB_NAME}" \
     --description "${GITHUB_DESCRIPTION}" \
     --tag "${GITHUB_TAG}"; true
+sleep 2s
 ./profiles-upload.sh
 sleep 2s
 github-release edit --user "${GITHUB_USER}" \
@@ -17,6 +18,7 @@ github-release edit --user "${GITHUB_USER}" \
 echo "Relase ${GITHUB_TAG} setup"
 tarsum=$(sha256sum i2p.plugins.firefox.tar.gz)
 github-release upload --user "${GITHUB_USER}" \
+    --replace \
     --repo "${GITHUB_REPO}" \
     --tag "${GITHUB_TAG}" \
     --label "I2P Browser launcher source tarball. ${tarsum}" \
@@ -24,6 +26,7 @@ github-release upload --user "${GITHUB_USER}" \
     --file "i2p.plugins.firefox.tar.gz" 
 jarsum=$(sha256sum "src/build/i2pfirefox.jar")
 github-release upload --user "${GITHUB_USER}" \
+    --replace \
     --repo "${GITHUB_REPO}" \
     --tag "${GITHUB_TAG}" \
     --label "I2P Browser launcher as a .jar. Useful as a library or for advanced users. ${jarsum}" \
@@ -32,22 +35,25 @@ github-release upload --user "${GITHUB_USER}" \
 echo "Uploaded jar"
 zipsum=$(sha256sum "i2pfirefox.zip")
 github-release upload --user "${GITHUB_USER}" \
+    --replace \
     --repo "${GITHUB_REPO}" \
     --tag "${GITHUB_TAG}" \
     --label "I2P Browser launcher as a .jar and a set of semi-univeral launcher scripts. ${zipsum}" \
     --name "i2pfirefox.zip" \
     --file "i2pfirefox.zip" 
 echo "Uploaded freestanding zip"
-jvmsum=$(sha256sum "i2pbrowser.zip")
+jvmsum=$(sha256sum "i2pbrowser.tar.gz")
 github-release upload --user "${GITHUB_USER}" \
+    --replace \
     --repo "${GITHUB_REPO}" \
     --tag "${GITHUB_TAG}" \
     --label "I2P Browser launcher as a Jpackage, does not require a JVM. ${jvmsum}" \
-    --name "i2pbrowser.zip" \
-    --file "i2pbrowser.zip" 
+    --name "i2pbrowser.tar.gz" \
+    --file "i2pbrowser.tar.gz" 
 echo "Uploaded jpackage zip"
 debsum=$(sha256sum "i2pbrowser_${GITHUB_TAG}_amd64.deb")
 github-release upload --user "${GITHUB_USER}" \
+    --replace \
     --repo "${GITHUB_REPO}" \
     --tag "${GITHUB_TAG}" \
     --label "I2P Browser launcher as a Jpackage inside of a Debian package. ${debsum}" \
@@ -56,12 +62,39 @@ github-release upload --user "${GITHUB_USER}" \
 echo "Uploaded debian package"
 rpmsum=$(sha256sum i2pbrowser-${GITHUB_TAG}-1.x86_64.rpm)
 github-release upload --user "${GITHUB_USER}" \
+    --replace \
     --repo "${GITHUB_REPO}" \
     --tag "${GITHUB_TAG}" \
     --label "I2P Browser launcher as a Jpackage inside of a Fedora package. ${rpmsum}" \
     --name "i2pbrowser-${GITHUB_TAG}-1.x86_64.rpm" \
-    --file "i2pbrowser-${GITHUB_TAG}-1.x86_64.rpm" 
+    --file "i2pbrowser-${GITHUB_TAG}-1.x86_64.rpm"
 echo "Uploaded fedora package"
+susum=$(sha256sum i2pfirefox.su3)
+github-release upload --user "${GITHUB_USER}" \
+    --replace \
+    --repo "${GITHUB_REPO}" \
+    --tag "${GITHUB_TAG}" \
+    --label "I2P Browser launcher as an I2P Console Plugin. ${susum}" \
+    --name "i2pfirefox.su3" \
+    --file "i2pfirefox.su3"
+susum=$(sha256sum i2pfirefox-update.su3)
+github-release upload --user "${GITHUB_USER}" \
+    --replace \
+    --repo "${GITHUB_REPO}" \
+    --tag "${GITHUB_TAG}" \
+    --label "I2P Browser launcher as an I2P Console Plugin, update-only. ${susum}" \
+    --name "i2pfirefox-update.su3" \
+    --file "i2pfirefox-update.su3"
+echo "Uploaded su3 package"
+torsum=$(sha256sum i2p.plugins.firefox.torrent.zip)
+github-release upload --user "${GITHUB_USER}" \
+    --replace \
+    --repo "${GITHUB_REPO}" \
+    --tag "${GITHUB_TAG}" \
+    --label "I2P Browser launcher as an I2P Console Plugin, release torrent. ${torsum}" \
+    --name "i2p.plugins.firefox.torrent.zip" \
+    --file "i2p.plugins.firefox.torrent.zip"
+echo "Uploaded torrent package"
 
 git pull github --tags
 git push --all

scripts/build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Tue Nov 22 23:56:43 EST 2022
-build.number=165
+#Thu Mar 07 15:18:16 EST 2024
+build.number=709

scripts/favicon.png.b64

@@ -0,0 +1 @@
+iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAABmJLR0QA/wD/AP+gvaeTAAAGyklEQVRIibWWe0xU2R3Hv+e+5g4zI/NixnFgsIUBqQLulogbtgrF1X1odzXbWmhS2pLs9g9Tk9202wYTLd0IpomkSTebbrK1NpuUuLuxhUXFalEpUZcZFRSKneX9GmEGBubFnbl3Tv+ADviAdk17/jr39/udz/f+7vmd+zvkSE0t/p+D+2+C4vHYxMT4+Pi4zzcly7LeYNhgs9vtGTqd7n8gMDQ0ePly64L04NAh5OYqPI+pKba5WTn7HvvCrhcLCp4RBOEpBSild+64L/615f33lf37WaNx2fXmm3C7cfRoS8u50ZdefEUU1atBmDUEPJ77ly43XbmiVFfDaFQA5d8eheexfbvS2Iji4u6/tV1SFGU1yKoC4XDos5a/NDZi2zZ0d8PlQiSy5AoGcf48zp5FLIa6OiQSnQOD/V9a4It+T3l5eM8eNDQUzcy0EeI6frxqbg6RCE6cqMzKul9UNPLBBz9nWRw7hhvXOxKJxBM5T94DSmnPvbv1JzA6ivz8X5WWllJKTaZj166dtlrx+us/zcnJoZRWVFS7XPUlJRgdGwwEZo1G03/IgDIUBABiMWl4ZNDpRCwGjUbT09Ozc+fOkZERSQLPY2xsrL6+vrOzU5IknofJhN27EQzOL0IESjlKH81AVsdnM3xSSpQkiHZWz3kERVG0WjgcePfdBo2muL29vabmh2fOwGzGxx+/WleXqKqqcjgi77wDQmC3IxKWU5X4zukhS2iaghlPXX/F7FggDDlSU0tZ+iBvTObiSVnBqz711oednbHCQoTDuHED0Si2bYPFAgCyjPv3IcvIzYVKBUqxdy+s5h+9xYRTo4EkxLvO2mzNZgAs6KMr6QDiaQsbs77i8QCARoPycuzdu0QHwHLYvBkFhVCJAMHsLC5cQIGKW0kHYJ2fSlXiDADKPFoAlKVb8gs++gix2BNKgDw86eiA05ln0K17LIyKiQQDQAiJoA/5xEhKliP77+3m1tYnCNAVE980amtRXPzcpKiRWX5lWETQ+HgVA4CLcgZvWnIdF+f1oyZRVL/88r6KCty8uWoGcwHU1MDtxozfFybMTWuuwiyVZZwVOqxOJVlFmgc61bw6plsgCiMG1EQh0Wh0YHAgHEZ5CXnvQ1pZCX7F+ykKbt/GJ0eNFefsTsz94lwTx/Ekv3AysygzGqQE/erUEMti5UGzgmYL8YU4ey+BkfGxCxc+2+wNXEHBs8q6Nxq6Dh4MtrYiEgHPw+tFf7Nxz/kNv4RBBaYMxq8jtbzpU5UoZuc5vWlqUCLMMySBZYEdG31luS6Oic2Fle7b0qk/9DZgYzWe0YF7gNiuQ0FZRtdhe9VAhgKqA2sAT5bzwTdg2Arhuqdde0BMsAoATubNg+u5MM8BsOli5bmfM4wsxenBI30XO6Nnkfcq0vyQr2Laj3jJ8+jqwq6BtHSolreaUEIJgCBkDVg9q9KUZCzSAchc3O+Ysv7DzgDISwswjAxAxZPqfVYQtGEmBvpbjOxD759f8zidaG3m8vFQ/1qkT0Aqh3sK8atK0OK0rAyIqyRZjHMAZGU53W9/05yq4V752RdOJcUCAcDWrZiYgP2kI+WxX28ESp162Muyvw+NW/NsOuujHZRQwgDo8hokWZO07i7Wnzm++0jq7K/TAmdqDvvcLxQUwBZX4bHxT0RK3z7Ydfo3UmXR9k0lKkVc6RVDKazEMQDmJO7T28VzUTMASpn+6Zy+yHOVFd+PJUi23Vb7g++erP7x99B3DbMSEounJQH0I3KKHQ8tLFCKnAybfp3eNLheFV3SUIc0xmELAJK8thCCDVopHGMD0lJpuW913ulzTY9Opeg1Za+VaVO15042llJt4aGX5qyG1Eyr3qRvOtV07+bd+enQ4Z+8zfMCAEWlgIKNsYuQ5XNAKcaDD32HuUCg5nc1DGEEUWBYBoDRYmw+3Vz+refTCKGUAjjwxgH/pH9LtnWRDoCV2JWQtZo+BZWiklqrZjmWEEII2fTspszcTEIIgEULAEVRRFFcDbKWwHqrzdPtecToanP5Jn3Jx2g4qtaoTSbz0wg4HJkX/3TR7/UnLb2u3vSvpre3tEfDUQoamg9d+uSSIAgWi3U1CLtjR9lqPpVK5Zvy9fX2qrXqgC9w6+ot77BXikpptjRPtycSjLjb3PFYXE/N6ekZq0HWutkNDQ3cuN6R7kxv+WMLz/OqFHFmyu+54wkGglmbswZ7ByeHJ3s7e0VRbbFYbbYNX1rA5f5cUZThvuGkxWAw5jg3+cd8d309Ai/wPP+1vC2CIARDQdtTZHBg/3coTSSvIJRShiEMw1JKk4W0xvLF8S/sWeeRQ7BG4QAAAABJRU5ErkJggg==

scripts/firefox-purple.css

@@ -1,235 +0,0 @@
-/* I2P Firefox theme (purrrrple) */
-/* Author: dr|z3d 2019 */
-
-html, body {
-    margin: 0;
-    padding: 0;
-    min-height: 100%;
-    color: #fef;
-    background: #111;
-    font-size: 14pt;
-    font-family: "Droid Sans", "Open Sans", "Noto Sans", Ubuntu, "Segoe UI", "Lucida Grande", Verdana, Helvetica, sans-serif;
-
-}
-
-@supports (background-blend-mode: overlay) {
-    html, body {
-        background: repeating-linear-gradient(45deg, #313, #000 2px, #000 3px), repeating-linear-gradient(135deg, #414, #313 2px, #212 3px);
-        background-blend-mode: overlay, normal;
-        background-size: 100% 100%, 100% 100%;
-        background-attachment: fixed;
-    }
-}
-
-#container {
-    padding: 2%;
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 100%;
-    width: 100%;
-    display: table;
-    text-align: center;
-    box-sizing: border-box;
-}
-
-#panel {
-    padding: 20px;
-    position: relative;
-    display: table-cell;
-    vertical-align: middle;
-    text-align: center;
-    border: 1px solid #535;
-    box-shadow: inset 0 0 0 1px #111, inset 0 0 2px 1px #444, 0 0 2px 2px #000;
-    background: #180618;
-    background: repeating-linear-gradient(to right, rgba(255, 200, 255, .05), rgba(0, 0, 0, .08) 2px), repeating-linear-gradient(to bottom, #212, #101 2px); /* purple */
-    background-blend-mode: overlay;
-    will-change: transform;
-}
-
-code {
-    font-family: "Droid Sans Mono", "Noto Mono", "DejaVu Sans Mono", "Lucida Console", monospace;
-}
-
-#sitename, #sitename:hover, #sitename:focus {
-    margin: 0 auto;
-    font-size: 10em;
-    font-weight: bold;
-    text-transform: uppercase;
-    line-height: 1;
-    letter-spacing: .05em;
-    transition: ease background .3s;
-    color: #731;
-    -moz-user-select: none;
-    -webkit-user-select: none;
-    user-select: none;
-}
-
-#stats #sitename, #stats #sitename:hover, #stats #sitename:focus {
-    font-size: 8em;
-}
-
-#sitename:hover, #sitename:focus {
-    color: #951;
-}
-
-@supports (-webkit-text-stroke-width: 1px) {
-    #sitename, #sitename:hover, #sitename:focus {
-        background: #731;
-        background: repeating-linear-gradient(to bottom, rgba(0, 0, 0, .2), rgba(0, 0, 0, .5) 2px), linear-gradient(to bottom, rgba(255, 96, 0, .2), rgba(0, 0, 0, .9) 100%), linear-gradient(to bottom, #414, #313 15%, #fff 50%, #313 80%);
-        -moz-background-clip: text !important;
-        -webkit-background-clip: text !important;
-        background-clip: text !important;
-        -moz-text-fill-color: transparent !important;
-        -webkit-text-fill-color: transparent !important;
-        text-fill-color: transparent !important;
-        filter: hue-rotate(0) drop-shadow(0 0 2px #181818) drop-shadow(0 3px 0.01em #000);
-        -webkit-text-stroke-color: #fef;
-        -webkit-text-stroke-width: 0.02em;
-        animation: ease-in-out spinwash 120s alternate infinite;
-        mix-blend-mode: soft-light;
-    }
-
-    #sitename:hover, #sitename:focus {
-        background: #951;
-        background: repeating-linear-gradient(to bottom, rgba(0, 0, 0, .2), rgba(0, 0, 0, .3) 2px), linear-gradient(to bottom, rgba(255, 255, 255, .2), rgba(0, 0, 0, .95)), linear-gradient(to bottom, #d59, #a39 15%, #fff 50%, #839 70%, #000);
-        filter: drop-shadow(0 0 0.02em #f00);
-        -webkit-text-stroke-color: #fef;
-        opacity: .5;
-        mix-blend-mode: normal;
-        background-blend-mode: overlay;
-        animation: none;
-    }
-}
-
-@keyframes spinwash {
-   from {
-       background: repeating-linear-gradient(to bottom, rgba(0, 0, 0, .2), rgba(0, 0, 0, .3) 2px), linear-gradient(45deg, rgba(64,16,64,.1), rgba(16,0,16,.2)), linear-gradient(to bottom, rgba(255, 255, 255, .2), rgba(0, 0, 0, .7) 100%), linear-gradient(to bottom, #930, #d50 15%, #fff 50%, #930 80%, #000 100%, #ff0 150%);
-       filter: sepia(0) hue-rotate(0) drop-shadow(0 0 2px #181818) drop-shadow(0 3px 0.01em #000);
-   }
-   to {
-       background: repeating-linear-gradient(to bottom, rgba(0, 0, 0, .2), rgba(0, 0, 0, .3) 2px), linear-gradient(45deg, rgba(16,0,16,.1), rgba(64,16,64,.2)), linear-gradient(to bottom, rgba(255, 255, 255, .2), rgba(0, 0, 0, .7) 100%), linear-gradient(to bottom, #930, #d50 15%, #fff 50%, #930 80%, #000 100%, #ff0 150%);
-       filter: sepia(0) hue-rotate(1440deg) drop-shadow(0 0 2px #181818) drop-shadow(0 3px 0.01em #000);
-   }
-}
-
-a, a:visited {
-    color: #f60;
-    text-decoration: none;
-    outline: none;
-}
-
-a:hover, a:focus {
-    color: #f90;
-}
-
-hr {
-    margin: 20px 10px;
-    height: 1px;
-    color: transparent;
-    border: none;
-    background: #555;
-    background: linear-gradient(to right, rgba(0, 0, 0, 0), #535, rgba(0, 0, 0, 0));
-}
-
-::selection,
-::-moz-selection {
-    text-shadow: none;
-    background: #515;
-    color: #fff;
-}
-
-#totals {
-    padding-top: 6px;
-    line-height: 140%;
-    text-shadow: 0 1px 1px #000;
-}
-
-#footer {
-    padding: 4px;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    font-size: 11pt;
-    font-weight: bold;
-    border-top: 1px solid #535;
-    box-shadow: inset 0 0 0 1px #000, inset 0 0 2px 1px #333;
-    background: rgba(16, 0, 16, .5);
-    -moz-user-select: all;
-    -webkit-user-select: all;
-    user-select: all;
-}
-
-#footer.version {
-    font-size: 9.5pt;
-}
-
-#footer.version a {
-    margin: 0 1px 0 2px;
-}
-
-#footer.version::before {
-    margin-left: -10px;
-    content: "";
-    display: inline-block;
-    margin-top: 1px;
-    width: 20px;
-    height: 18px;
-    vertical-align: middle;
-    background: url(/favicon.png) left top no-repeat;
-    background-size: 16px 16px;
-    filter: hue-rotate(-110deg) saturate(.4) brightness(1.4);
-}
-
-#initializing::before {
-    margin-left: -20px;
-    content: "";
-    display: inline-block;
-    width: 28px;
-    height: 24px;
-    vertical-align: text-bottom;
-    background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABRhJREFUeNq0Vd1vk1UYP+f9bruPrmu70W1lrLKJzE0o+BEFt4yLRZJpgl4YZ6IXhiuT/Slcqlw6QyIauNEYIhHlAgMrJDjUDQejdF3Xj7Xv24/3+xyf01LWOpArTvLr6XnOOc/X7znPiyml6HkOgf28+cXDxwLMcYgDsBljHAS8AeJjgDFAGMAByoAk4Ddw8GdAihKCmLMcz7N7s7CXu/JpOCE8xbAXMC0KaGYwLMeG9yj7ujuEPkXmAiDnDZNYasUx1jeNqVTWOG3Z6CLIzwK2AfNgaOGRniNPMtADB+ZiEXl8Yn9nTOD4AcMgnXoVydUy4R4FKXtFQT482tU98YIvcvtuuf+fhzUW6RXiuvMfn4zEv/4hnXicIhA209MlYDrz6rg/Gu33BlWViLbtPDW/lQpBoojlw2Pdw8Fu0Xd9uRh9/8TAIU0jiDjODgcuLCBvEqY0fnQyEOzrUXybmzZqFgDsMUWI53F97boU2Tat71sWQrUaRn0BJXRqJhJKpy3U3S3AGXfHAAGCQEn0xeFOPyj3bm5a9ctMsSxjkteqhdRWNV8qWyxFnL9TUgb7fIFgl7fXNCnPzqbTO5FacMxtjQBSJMsSHz4w4vekUnrdQ6Zc8WDnxp+5B4WSsQqCH+HoHRZQxrQnMrnKh71+5fgro6GYoVOptdwtC7cbcGy7JzbUIWsli9drdqOMfDxZupNNbavGZSi975nBJl9w+VdYD23l7COel/sktWi0cWOZHNPZxkHXUL9Pym2V4T+lmMNORrdT2Xx5GRTVlZt6DYJohM7z/DwsFk4eG4kn10u7yDcNuisCiSOE08t19/OixOfXN0oaHPqdUoKqmlo/LCkeNs06jrMwNx2Lq0WoXWl3dVHi/CcCWDimqVpGTW2sOVRUa1XXJduu20KeriNBFHMs3xcu/Z14RpdItEbw+cXLq/Fn9RVK6GkovwSk7EhTBpyIHIdfOjDY6WvKIgM96NK1da2Vg/hHHxz6XwPfnL/FPAoxkiVFqZMNqQKjJNDhk4dtjLtY9cGwq7arurajtUaAdIugm8vpXYoPj0fQt98tMa/PQBP8yTZNVCmVkCBJjGz2+o+HwsFxmxd4m7oFxmFZtwnotNo4qDoUGbzYpnxyfxCdO3ctAX6dgeWiY1moJTUICvdUj987HR7slZPZSg7xHPbKAtpIFyzISksEEGqFYKQL8mMFPkVAEJTlD/i8+az6FqSC9fTbjArAQSD6HdgbfW3qoLyypRead30y56aSOdOxnWJbBJrLI13cMaBDKyEqlV6fjY9m7m323l/deLuU19iLIv5gF9k3OoD7R/aQv7JmfhvuIpFHHTKP0itrulHVs5BSs63ZlVHDQCwgoZTmINMhaAMyks+4/N7IQDg+ujfcIXH17FQsUs5UnOLVjF0wHZDBPVngkJHZqKVXH5SAl2Tz5TcMQD41JKJQQEQ3Fy/c6j06OYijwyGd8cLyojKw7ui2MAQKMLwyoM0jQO9JrldTN/7IU1bGlFqo1QDr3RUsoNTZxQRsLG5dvT7lGytMipMTewzFK0MwT/7egvOKUbP1pdv56spaEu5eBu815O44gtmrFN/9aulR42eluAiyAJD6GZbl9+ThaB8fGwlQf49CPR7WGFys69u4VNxy1+7dN9eTa9Q0meJfADX2uWsO4/wnDQPC3JdxmEOsztlHm8lYGcI8COdOAI4DooBOFjAgC1gBXAVcg3znucabQE808DzHvwIMALq5vhJjsCXwAAAAAElFTkSuQmCC") center center no-repeat;
-    background-size: 16px 16px;
-    filter: hue-rotate(90deg) saturate(.6);
-    animation: spin linear 3s forwards infinite;
-}
-
-@keyframes spin {
-    from {
-        transform: rotate(0)
-    }
-    to {
-        transform: rotate(360deg)
-    }
-}
-
-@media screen and (max-height: 600px) {
-    #container {
-        padding: 1%;
-    }
-}
-
-@media screen and (max-width: 1000px) {
-    html, body {
-        font-size: 12pt;
-    }
-    #container {
-        padding: 1%;
-    }
-    #sitename, #sitename:hover, #sitename:focus {
-        font-size: 8em;
-    }
-    #stats #sitename, #stats #sitename:hover, #stas #sitename:focus {
-        font-size: 6em;
-    }
-    #footer.b32 {
-        font-size: 10pt;
-    }
-    #footer.version {
-        font-size: 8.5pt;
-    }
-    #initializing::before {
-        height: 20px;
-    }
-}

scripts/firefox.css

@@ -1,247 +0,0 @@
-/* I2P Firefox theme */
-/* Author: dr|z3d 2019 */
-
-html, body {
-    margin: 0;
-    padding: 0;
-    min-height: 100%;
-    color: #bbb;
-    background: #111;
-    font-size: 14pt;
-    font-family: "Droid Sans", "Open Sans", "Noto Sans", Ubuntu, "Segoe UI", "Lucida Grande", Verdana, Helvetica, sans-serif;
-}
-
-@supports (background-blend-mode: overlay) {
-    html, body {
-        background: repeating-linear-gradient(45deg, #333, #111 2px, #111 3px),
-                    repeating-linear-gradient(135deg, #444, #333 2px, #222 3px);
-        background-blend-mode: overlay, normal;
-        background-size: 100% 100%, 100% 100%;
-        background-attachment: fixed;
-    }
-}
-
-#container {
-    padding: 2%;
-    position: absolute;
-    top: 0;
-    left: 0;
-    height: 100%;
-    width: 100%;
-    display: table;
-    text-align: center;
-    box-sizing: border-box;
-}
-
-#panel {
-    padding: 20px;
-    position: relative;
-    display: table-cell;
-    vertical-align: middle;
-    text-align: center;
-    border: 1px solid #555;
-    box-shadow: inset 0 0 0 1px #111, inset 0 0 2px 1px #444, 0 0 2px 2px #000;
-    background: #181818;
-    background: repeating-linear-gradient(to right, rgba(255, 255, 255, .05), rgba(0, 0, 0, .08) 2px),
-                repeating-linear-gradient(to bottom, #222, #111 2px);
-    background-blend-mode: overlay;
-    will-change: transform;
-}
-
-code {
-    font-family: "Droid Sans Mono", "Noto Mono", "DejaVu Sans Mono", "Lucida Console", monospace;
-}
-
-#sitename, #sitename:hover, #sitename:focus {
-    margin: 0 auto;
-    font-size: 10em;
-    font-weight: bold;
-    text-transform: uppercase;
-    line-height: 1;
-    letter-spacing: .05em;
-    transition: ease background .3s;
-    color: #731;
-    -moz-user-select: none;
-    -webkit-user-select: none;
-    user-select: none;
-}
-
-#stats #sitename, #stats #sitename:hover, #stats #sitename:focus {
-    font-size: 8em;
-}
-
-#sitename:hover, #sitename:focus {
-    color: #951;
-}
-
-@supports (-webkit-text-stroke-width: 1px) {
-    #sitename, #sitename:hover, #sitename:focus {
-        background: #731;
-        background: repeating-linear-gradient(to bottom, rgba(0, 0, 0, .2), rgba(0, 0, 0, .5) 2px),
-                    linear-gradient(to bottom, rgba(255, 96, 0, .2), rgba(0, 0, 0, .9) 100%),
-                    linear-gradient(to bottom, #210, #310 15%, #fff 50%, #310 80%);
-        -moz-background-clip: text !important;
-        -webkit-background-clip: text !important;
-        background-clip: text !important;
-        -moz-text-fill-color: transparent !important;
-        -webkit-text-fill-color: transparent !important;
-        text-fill-color: transparent !important;
-        filter: drop-shadow(0 0 2px #000);
-        -webkit-text-stroke-color: #999;
-        -webkit-text-stroke-width: 0.02em;
-        animation: ease-in-out spinwash 60s 15s forwards infinite;
-    }
-
-    #sitename:hover, #sitename:focus {
-        background: #951;
-        background: repeating-linear-gradient(to bottom, rgba(0, 0, 0, .2), rgba(0, 0, 0, .3) 2px),
-                    linear-gradient(to bottom, rgba(255, 255, 255, .2), rgba(0, 0, 0, .7) 100%),
-                    linear-gradient(to bottom, #930, #d50 15%, #fff 50%, #930 80%, #000 100%, #ff0 150%);
-        filter: drop-shadow(0 0 2px #b00);
-        -webkit-text-stroke-color: #bbb;
-        animation: none;
-    }
-}
-
-@keyframes spinwash {
-   from {
-       filter: hue-rotate(0) drop-shadow(0 0 2px #000);
-   }
-   to {
-       filter: hue-rotate(360deg) drop-shadow(0 0 2px #000);
-   }
-}
-
-a, a:visited {
-    font-weight: bold;
-    color: #c4ad9d;
-    text-decoration: none;
-    outline: none;
-}
-
-a:hover, a:focus {
-    color: #e88b44;
-}
-
-a:active {
-    color: #f60;
-}
-
-hr {
-    margin: 20px 10px;
-    height: 1px;
-    color: transparent;
-    border: none;
-    background: #555;
-    background: linear-gradient(to right, rgba(0,0,0,0) 35%, rgba(255,255,255,.3), rgba(0,0,0,0) 65%),
-                linear-gradient(to right, rgba(0, 0, 0, 0), #605555, rgba(0, 0, 0, 0));
-}
-
-::selection,
-::-moz-selection {
-    text-shadow: none;
-    background: #431;
-    color: #fff;
-}
-
-#totals {
-    padding-top: 6px;
-    line-height: 140%;
-    text-shadow: 0 1px 1px #000;
-}
-
-#footer {
-    padding: 4px;
-    position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    font-size: 11pt;
-    font-weight: bold;
-    border-top: 1px solid #555;
-    box-shadow: inset 0 0 0 1px #000, inset 0 0 2px 1px #333;
-    background: rgba(0, 0, 0, .5);
-    -moz-user-select: all;
-    -webkit-user-select: all;
-    user-select: all;
-}
-
-#footer.version {
-    padding: 4px;
-    line-height: 19px;
-    font-size: 9.5pt;
-    -moz-user-select: none;
-    -webkit-user-select: none;
-    user-select: none;
-}
-
-#footer.version a {
-    margin: 0 1px 0 2px;
-}
-
-#footer.version::before {
-    margin-left: -10px;
-    content: "";
-    display: inline-block;
-    margin-top: 1px;
-    width: 20px;
-    height: 18px;
-    vertical-align: middle;
-    background: url(/favicon.png) left top no-repeat;
-    background-size: 16px 16px;
-    mix-blend-mode: luminosity;
-}
-
-#initializing::before {
-    margin-left: -20px;
-    content: "";
-    display: inline-block;
-    width: 28px;
-    height: 24px;
-    vertical-align: text-bottom;
-    background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABRhJREFUeNq0Vd1vk1UYP+f9bruPrmu70W1lrLKJzE0o+BEFt4yLRZJpgl4YZ6IXhiuT/Slcqlw6QyIauNEYIhHlAgMrJDjUDQejdF3Xj7Xv24/3+xyf01LWOpArTvLr6XnOOc/X7znPiyml6HkOgf28+cXDxwLMcYgDsBljHAS8AeJjgDFAGMAByoAk4Ddw8GdAihKCmLMcz7N7s7CXu/JpOCE8xbAXMC0KaGYwLMeG9yj7ujuEPkXmAiDnDZNYasUx1jeNqVTWOG3Z6CLIzwK2AfNgaOGRniNPMtADB+ZiEXl8Yn9nTOD4AcMgnXoVydUy4R4FKXtFQT482tU98YIvcvtuuf+fhzUW6RXiuvMfn4zEv/4hnXicIhA209MlYDrz6rg/Gu33BlWViLbtPDW/lQpBoojlw2Pdw8Fu0Xd9uRh9/8TAIU0jiDjODgcuLCBvEqY0fnQyEOzrUXybmzZqFgDsMUWI53F97boU2Tat71sWQrUaRn0BJXRqJhJKpy3U3S3AGXfHAAGCQEn0xeFOPyj3bm5a9ctMsSxjkteqhdRWNV8qWyxFnL9TUgb7fIFgl7fXNCnPzqbTO5FacMxtjQBSJMsSHz4w4vekUnrdQ6Zc8WDnxp+5B4WSsQqCH+HoHRZQxrQnMrnKh71+5fgro6GYoVOptdwtC7cbcGy7JzbUIWsli9drdqOMfDxZupNNbavGZSi975nBJl9w+VdYD23l7COel/sktWi0cWOZHNPZxkHXUL9Pym2V4T+lmMNORrdT2Xx5GRTVlZt6DYJohM7z/DwsFk4eG4kn10u7yDcNuisCiSOE08t19/OixOfXN0oaHPqdUoKqmlo/LCkeNs06jrMwNx2Lq0WoXWl3dVHi/CcCWDimqVpGTW2sOVRUa1XXJduu20KeriNBFHMs3xcu/Z14RpdItEbw+cXLq/Fn9RVK6GkovwSk7EhTBpyIHIdfOjDY6WvKIgM96NK1da2Vg/hHHxz6XwPfnL/FPAoxkiVFqZMNqQKjJNDhk4dtjLtY9cGwq7arurajtUaAdIugm8vpXYoPj0fQt98tMa/PQBP8yTZNVCmVkCBJjGz2+o+HwsFxmxd4m7oFxmFZtwnotNo4qDoUGbzYpnxyfxCdO3ctAX6dgeWiY1moJTUICvdUj987HR7slZPZSg7xHPbKAtpIFyzISksEEGqFYKQL8mMFPkVAEJTlD/i8+az6FqSC9fTbjArAQSD6HdgbfW3qoLyypRead30y56aSOdOxnWJbBJrLI13cMaBDKyEqlV6fjY9m7m323l/deLuU19iLIv5gF9k3OoD7R/aQv7JmfhvuIpFHHTKP0itrulHVs5BSs63ZlVHDQCwgoZTmINMhaAMyks+4/N7IQDg+ujfcIXH17FQsUs5UnOLVjF0wHZDBPVngkJHZqKVXH5SAl2Tz5TcMQD41JKJQQEQ3Fy/c6j06OYijwyGd8cLyojKw7ui2MAQKMLwyoM0jQO9JrldTN/7IU1bGlFqo1QDr3RUsoNTZxQRsLG5dvT7lGytMipMTewzFK0MwT/7egvOKUbP1pdv56spaEu5eBu815O44gtmrFN/9aulR42eluAiyAJD6GZbl9+ThaB8fGwlQf49CPR7WGFys69u4VNxy1+7dN9eTa9Q0meJfADX2uWsO4/wnDQPC3JdxmEOsztlHm8lYGcI8COdOAI4DooBOFjAgC1gBXAVcg3znucabQE808DzHvwIMALq5vhJjsCXwAAAAAElFTkSuQmCC") center center no-repeat;
-    background-size: 16px 16px;
-    filter: hue-rotate(180deg) saturate(.6);
-    animation: spin linear 3s forwards infinite;
-}
-
-@keyframes spin {
-    from {
-        transform: rotate(0)
-    }
-    to {
-        transform: rotate(360deg)
-    }
-}
-
-@media screen and (max-height: 600px) {
-    #container {
-        padding: 1%;
-    }
-}
-
-@media screen and (max-width: 1000px) {
-    html, body {
-        font-size: 12pt;
-    }
-    #container {
-        padding: 1%;
-    }
-    #sitename, #sitename:hover, #sitename:focus {
-        font-size: 8em;
-    }
-    #stats #sitename, #stats #sitename:hover, #stas #sitename:focus {
-        font-size: 6em;
-    }
-    #footer.b32 {
-        font-size: 10pt;
-    }
-    #footer.version {
-        margin-top: 0;
-        line-height: 18px;
-        font-size: 8.5pt;
-    }
-    #initializing::before {
-        height: 20px;
-    }
-}

scripts/i2pfirefox.config

@@ -1,3 +0,0 @@
-# announce interval in seconds
-# minimum 900 (15 minutes), maximum 21600 (6 hours)
-interval=1620

scripts/plugin.config

@@ -1,13 +1,13 @@
 name=i2pfirefox
 signer=idki2p@mail.i2p
 consoleLinkName=I2PFirefox
-consoleLinkURL=http://127.0.0.1:7662/firefox/
+consoleLinkURL=/
 consoleLinkTooltip=Firefox process manager for I2P
-icon-code=iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAABm1BMVEUAAAAZGRkZGRkaGhoZGRkZGRkZGRkZGRkYGBgZGRkYGBgZGRkYGBgZGRkZGRkXFxcYGBgZGRkZGRkZGRkZGRkAAAAZGRnziRYTExPzfhbzbhbzdxbzgxbzlRYLCwvzjhbzcxbMzMzzkBb~~~~~~Pl0dHRdXV3GxsYnJyfe3t7OycbBwcGcnJyHh4cjEgP39~f96dSurq5~f397e3tra2tlZWU7OzseHh7haRSGSAsOBwGpqKeWlpbgpnRUVFRNTU00NDTxmynPbRJwNgpXLwdEJQY4IAUVCwLy8vL83sK7u7uysrL7yqf6v5Tdr4H4t3H4rGz2pEvnjUnqnkQvLy~zii30gyjxdCLqdhXLexK9bhGQTQ1-QAtlLgn-9u~Pxr7Uvqr71KbYuJz6yZn5v4T3pVv3s1rkmVr1nzr1kzLyjiPzex~pbBXJYxLJXRK~XxG4aBCYRQ5iNQlMKgctGgT7-~vas4zhnGj2qlNERETlhRTefxTedRTVfxOsZhC0YBC4UhCpWw9wQgr4sH~kqF7sizVpSyfWXxOZVw56Yx8pAAAAFXRSTlMAjPQOr8vV7eVwaVtPNyUa27WCwoZvol0xAAAEx0lEQVRYw72XZ1PbQBCGXQEnVMNJAjtyjpPcbWxsMB2SQOg1tCT0EiA9kN578rOzd4eQZUuO8iXPjGfkmdv3dm-v7DqsaKht8XhrBKDG6~HXNjj-iTpnlVBClbPOrrXb18htJElmSNK5hs9tx9zp4saCXOgOq6qaH-qWkCQzEZf~rxKXqvnU0c6pCUKIohDKREKNckeqL1U0r~cyc6kzRpTJg8OTILBysji~nyEkpnKJ5npr-8suZp7sUHbvXTFybX6SvEhKVMJ12creSaeXUx1bB6utJqzsKx0pthZOc3sPnX4kpsw-uNozmr5xtZzVGRIboU54zOyb6PQ5kjkWxbdphNBd0YTFDFGpE03m88v9ZD8Ew04R8Fw0I7RLsrKZD05qH1EWqKePEUNz~GGPIY4FMkUVnCXrT-2nlMNWyhhirLM~66MIpZ-0FnGoJKjCZUP-XWCfJTx3txHnNvt3hoBxQ0rvKf2g4CreD83ggErmg4xRxPkUBE7ZZ1~QwALJgQveov0L9iNkpo3Rg855Bn82-Odmm5FZMgIKF7vaXQ0BxDIil7-rCWzo39eDRsRMDIKo1k6WHxxIkcV2TloTGG3~iDjP20s5VlJ6JtywglLHTIDzCHHo2mtfvYEyZjskWEfugg8cSCqrAc4NdEGf9tFTLvBgKwku-JhAFazAi93QOeOojLGQCQfUhUZ2~7EUnoicp6icL6IJ95VOcKGOb2I5NqklaBOZkN589ritlJmYDMvII4iSBW2f9iErxt63GlgkURZDAzigkmtXOHeQNaNXjLAYGhy1sASJjCZ7iiqwbnRhcgoup1pHiyCgiVktMMsI-N428G0C0UVogl1E5kWOdQQmV8xrIkhwsXgFqZu8DnG-oop8CBVzTLolOJI1gjxEVq5yxlFFjBdtgIRlocYBSciTVf0cVOTs7qOAjqLCTnCwLLZzepENbn79-JYP39IEwttBThrZ5IwNx2FNIM7z8gvZ5jMMX8NDIEAXcRgHGbYi0O~LFfwGFpGmcRnznTyGbMJv7Ft4mabRAxsJL7VSxpFtrsPwIww3QhM9zSjxir1AyD70sRpMwFZuYYdpYI~vY~uIwE5SpoepAQS64iLw-98E7rMsQvnXKEgFvAQubSLb9MHwI1yQhKrzKy37EhblJrJNLwzfmz6~0upYDJDIPmSTsQ-0aGIRsOKzkVYGg8H3yB7jX4KUOSzzCPjD0rm99hnZ4sbDNspaPAcO-PSnLTLYa-ckbmjP7FxEpk-bXt7k8c-~GffeCV1wC-fBAX~x8z7dX3HmJ-uGl3Eny5734gIjilXruAMlzOEoLzA0vDSVeBhZ8DRk5DtLYXNpkZWKdFsJiAZu4RQrssrKvGTCQsH4si7FB1iZZ1JoDuBhq9OvcxRPskLTtNRN4Zz5~aMzx~wXPBbFdhj3Ryt58GMHd-nFtpkP0SzOSWX3TxtnbRBPR1m5X6nhyEciaonEO17UDG5H8rzhqNjyyHIO44FhuViAbt6X8Uhn5ZYHqG8WmER4GuN-dWhEYq4Ull7txXG2izdd3nobbZ8sF8LJBGZE4JcY6CrYavsAt98lcA0kLb8ZCofDw8sSor4DLqfbVutbZd76Nvrc~6P51tt~v97-t1i3~38A57d5M52iLPcAAAAASUVORK5CYII=
+icon-code=iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAIAAAD8GO2jAAAABmJLR0QA/wD/AP+gvaeTAAAGyklEQVRIibWWe0xU2R3Hv+e+5g4zI/NixnFgsIUBqQLulogbtgrF1X1odzXbWmhS2pLs9g9Tk9202wYTLd0IpomkSTebbrK1NpuUuLuxhUXFalEpUZcZFRSKneX9GmEGBubFnbl3Tv+ADviAdk17/jr39/udz/f+7vmd+zvkSE0t/p+D+2+C4vHYxMT4+Pi4zzcly7LeYNhgs9vtGTqd7n8gMDQ0ePly64L04NAh5OYqPI+pKba5WTn7HvvCrhcLCp4RBOEpBSild+64L/615f33lf37WaNx2fXmm3C7cfRoS8u50ZdefEUU1atBmDUEPJ77ly43XbmiVFfDaFQA5d8eheexfbvS2Iji4u6/tV1SFGU1yKoC4XDos5a/NDZi2zZ0d8PlQiSy5AoGcf48zp5FLIa6OiQSnQOD/V9a4It+T3l5eM8eNDQUzcy0EeI6frxqbg6RCE6cqMzKul9UNPLBBz9nWRw7hhvXOxKJxBM5T94DSmnPvbv1JzA6ivz8X5WWllJKTaZj166dtlrx+us/zcnJoZRWVFS7XPUlJRgdGwwEZo1G03/IgDIUBABiMWl4ZNDpRCwGjUbT09Ozc+fOkZERSQLPY2xsrL6+vrOzU5IknofJhN27EQzOL0IESjlKH81AVsdnM3xSSpQkiHZWz3kERVG0WjgcePfdBo2muL29vabmh2fOwGzGxx+/WleXqKqqcjgi77wDQmC3IxKWU5X4zukhS2iaghlPXX/F7FggDDlSU0tZ+iBvTObiSVnBqz711oednbHCQoTDuHED0Si2bYPFAgCyjPv3IcvIzYVKBUqxdy+s5h+9xYRTo4EkxLvO2mzNZgAs6KMr6QDiaQsbs77i8QCARoPycuzdu0QHwHLYvBkFhVCJAMHsLC5cQIGKW0kHYJ2fSlXiDADKPFoAlKVb8gs++gix2BNKgDw86eiA05ln0K17LIyKiQQDQAiJoA/5xEhKliP77+3m1tYnCNAVE980amtRXPzcpKiRWX5lWETQ+HgVA4CLcgZvWnIdF+f1oyZRVL/88r6KCty8uWoGcwHU1MDtxozfFybMTWuuwiyVZZwVOqxOJVlFmgc61bw6plsgCiMG1EQh0Wh0YHAgHEZ5CXnvQ1pZCX7F+ykKbt/GJ0eNFefsTsz94lwTx/Ekv3AysygzGqQE/erUEMti5UGzgmYL8YU4ey+BkfGxCxc+2+wNXEHBs8q6Nxq6Dh4MtrYiEgHPw+tFf7Nxz/kNv4RBBaYMxq8jtbzpU5UoZuc5vWlqUCLMMySBZYEdG31luS6Oic2Fle7b0qk/9DZgYzWe0YF7gNiuQ0FZRtdhe9VAhgKqA2sAT5bzwTdg2Arhuqdde0BMsAoATubNg+u5MM8BsOli5bmfM4wsxenBI30XO6Nnkfcq0vyQr2Laj3jJ8+jqwq6BtHSolreaUEIJgCBkDVg9q9KUZCzSAchc3O+Ysv7DzgDISwswjAxAxZPqfVYQtGEmBvpbjOxD759f8zidaG3m8vFQ/1qkT0Aqh3sK8atK0OK0rAyIqyRZjHMAZGU53W9/05yq4V752RdOJcUCAcDWrZiYgP2kI+WxX28ESp162Muyvw+NW/NsOuujHZRQwgDo8hokWZO07i7Wnzm++0jq7K/TAmdqDvvcLxQUwBZX4bHxT0RK3z7Ydfo3UmXR9k0lKkVc6RVDKazEMQDmJO7T28VzUTMASpn+6Zy+yHOVFd+PJUi23Vb7g++erP7x99B3DbMSEounJQH0I3KKHQ8tLFCKnAybfp3eNLheFV3SUIc0xmELAJK8thCCDVopHGMD0lJpuW913ulzTY9Opeg1Za+VaVO15042llJt4aGX5qyG1Eyr3qRvOtV07+bd+enQ4Z+8zfMCAEWlgIKNsYuQ5XNAKcaDD32HuUCg5nc1DGEEUWBYBoDRYmw+3Vz+refTCKGUAjjwxgH/pH9LtnWRDoCV2JWQtZo+BZWiklqrZjmWEEII2fTspszcTEIIgEULAEVRRFFcDbKWwHqrzdPtecToanP5Jn3Jx2g4qtaoTSbz0wg4HJkX/3TR7/UnLb2u3vSvpre3tEfDUQoamg9d+uSSIAgWi3U1CLtjR9lqPpVK5Zvy9fX2qrXqgC9w6+ot77BXikpptjRPtycSjLjb3PFYXE/N6ekZq0HWutkNDQ3cuN6R7kxv+WMLz/OqFHFmyu+54wkGglmbswZ7ByeHJ3s7e0VRbbFYbbYNX1rA5f5cUZThvuGkxWAw5jg3+cd8d309Ai/wPP+1vC2CIARDQdtTZHBg/3coTSSvIJRShiEMw1JKk4W0xvLF8S/sWeeRQ7BG4QAAAABJRU5ErkJggg==
 description=Firefox process manager for I2P
 author=idk
-updateURL=http://idk.i2p/i2p.plugins.firefox/plugins/i2pfirefox-update.xpi2p
-updateURL.su3=http://idk.i2p/i2p.plugins.firefox/plugins/i2pfirefox-update.su3
+updateURL=/i2psnark/i2p.plugins.firefox/i2pfirefox-update.xpi2p
+updateURL.su3=/i2psnark/i2p.plugins.firefox/i2pfirefox-update.su3
 websiteURL=http://idk.i2p/i2p.plugins.firefox/
 license=Apache 2.0
 min-jetty-version=9

src/build.xml

@@ -9,6 +9,7 @@
         <pathelement location="${i2plib}/i2ptunnel.jar" />
         <pathelement location="${i2plib}/i2psnark.jar" />
         <pathelement location="${i2plib}/mstreaming.jar" />
+        <pathelement location="${i2plib}/desktopgui.jar" />
         <pathelement location="${ant.home}/lib/ant.jar"/>
         <pathelement location="${jettylib}/org.mortbay.jetty.jar"/>
         <pathelement location="${jettylib}/jasper-runtime.jar" />
@@ -23,6 +24,11 @@
     <target name="build" depends="jar" />
     <target name="builddep">
     </target>
+    <target name="cp">
+     <exec executable="echo">
+        <arg value="${java.class.path}"></arg>
+     </exec>
+    </target>
 
     <property name="javac.compilerargs" value="" />
     <property name="javac.version" value="1.8" />
@@ -35,11 +41,31 @@
             debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
             destdir="./build/obj" 
             includeAntRuntime="false"
-            classpath="${i2plib}/i2p.jar:${i2plib}/i2ptunnel.jar:${i2plib}/i2psnark.jar:${i2plib}/mstreaming.jar:${i2plib}/systray.jar:${jettylib}/org.mortbay.jetty.jar:${jettylib}/jetty-util.jar:${jettylib}/jetty-xml.jar" >
+            classpath="${i2plib}/i2p.jar:${i2plib}/i2ptunnel.jar:${i2plib}/i2psnark.jar:${i2plib}/mstreaming.jar:${i2plib}/systray.jar:${i2plib}/desktopgui.jar:${jettylib}/org.mortbay.jetty.jar:${jettylib}/jetty-util.jar:${jettylib}/jetty-xml.jar" >
             <compilerarg line="${javac.compilerargs}" />
         </javac>
     </target>
 
+    <target name="pluginjar" depends="jar">
+        <mkdir dir="./build" />
+        <mkdir dir="./build/obj" />
+        <javac 
+            srcdir="./plugin" 
+            debug="true" deprecation="on" source="${javac.version}" target="${javac.version}" 
+            destdir="./build/obj" 
+            includeAntRuntime="false"
+            classpath="${i2plib}/i2p.jar:${i2plib}/i2ptunnel.jar:${i2plib}/i2psnark.jar:${i2plib}/mstreaming.jar:${i2plib}/systray.jar:${i2plib}/desktopgui.jar:${jettylib}/org.mortbay.jetty.jar:${jettylib}/jetty-util.jar:${jettylib}/jetty-xml.jar:./build/i2pfirefox.jar" >
+            <compilerarg line="${javac.compilerargs}" />
+        </javac>
+        <jar destfile="build/i2pfirefox-plugin.jar" basedir="./build/obj" includes="**/*.class" >
+            <fileset file="i2p.firefox.base.profile.zip" />
+            <fileset file="i2p.firefox.usability.profile.zip" />
+            <fileset file="i2p.chromium.base.profile.zip" />
+            <fileset file="i2p.chromium.usability.profile.zip" />
+            <fileset file="icon.png" />
+        </jar>
+    </target>
+
     <target name="jar" depends="builddep, compile">
         <jar destfile="build/i2pfirefox.jar" basedir="./build/obj" includes="**/*.class" >
             <fileset file="i2p.firefox.base.profile.zip" />

src/java/net/i2p/i2pfirefox/I2PBrowser.java

@@ -1,5 +1,7 @@
 package net.i2p.i2pfirefox;
 
+/*import java.awt.AWTException;
+import java.awt.Component;
 import java.awt.Image;
 import java.awt.Menu;
 import java.awt.MenuItem;
@@ -9,6 +11,9 @@ import java.awt.Toolkit;
 import java.awt.TrayIcon;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;*/
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileWriter;
@@ -36,7 +41,7 @@ import java.util.Arrays;
  * @author idk
  * @since 0.0.16
  */
-public class I2PBrowser extends I2PCommonBrowser {
+public class I2PBrowser extends I2PGenericUnsafeBrowser {
   private final I2PFirefox i2pFirefox = new I2PFirefox();
   private final I2PChromium i2pChromium = new I2PChromium();
   private final I2PGenericUnsafeBrowser i2pGeneral =
@@ -46,30 +51,39 @@ public class I2PBrowser extends I2PCommonBrowser {
   public boolean generic = false;
   public boolean chromiumFirst = false;
   public boolean usability = false;
-  static private boolean outputConfig = false;
-  static private boolean useSystray = true;
+  public int privateBrowsing = 0;
+  private boolean outputConfig = false;
 
-  private void launchFirefox(int privateWindow, String[] url) {
-    logger.info("I2PFirefox" + privateWindow);
-    I2PFirefox.usability = usability;
+  public void launchFirefox(int privateWindow, String[] url) {
+    String priv = privateWindow == 1 ? "private-window" : "long-profile";
+    logger.info("I2PFirefox" + priv);
+    i2pFirefox.usability = usability;
+    if (url == null)
+      url = new String[] {"about:blank"};
     if (outputConfig)
       i2pFirefox.storeFirefoxDefaults();
     i2pFirefox.launch(privateWindow, url);
   }
-  private void launchChromium(int privateWindow, String[] url) {
-    logger.info("I2PChromium" + privateWindow);
-    I2PChromiumProfileBuilder.usability = usability;
+  public void launchChromium(int privateWindow, String[] url) {
+    String priv = privateWindow == 1 ? "private-window" : "long-profile";
+    logger.info("I2PChromium" + priv);
+    i2pChromium.usability = usability;
+    if (url == null)
+      url = new String[] {"about:blank"};
     if (outputConfig)
       i2pChromium.storeChromiumDefaults();
     i2pChromium.launch(privateWindow, url);
   }
   private void launchGeneric(int privateWindowInt, String[] url) {
+    String priv = privateWindowInt == 1 ? "private-window" : "long-profile";
     boolean privateWindow = false;
+    if (url == null)
+      url = new String[] {"about:blank"};
     if (privateWindowInt == 1)
       privateWindow = true;
     if (outputConfig)
       i2pGeneral.storeGenericDefaults();
-    logger.info("I2PGeneric" + privateWindowInt);
+    logger.info("I2PGeneric" + priv);
     i2pGeneral.launch(privateWindow, url);
   }
 
@@ -87,13 +101,9 @@ public class I2PBrowser extends I2PCommonBrowser {
    *
    * @since 0.0.18
    */
-  public I2PBrowser(String browserPath) {
-    I2PGenericUnsafeBrowser.BROWSER = browserPath;
-  }
+  public I2PBrowser(String browserPath) { this.BROWSER = browserPath; }
 
-  public void setBrowser(String browserPath) {
-    I2PGenericUnsafeBrowser.BROWSER = browserPath;
-  }
+  public void setBrowser(String browserPath) { this.BROWSER = browserPath; }
 
   /**
    * Return true if there is a Chromium available
@@ -139,21 +149,6 @@ public class I2PBrowser extends I2PCommonBrowser {
    * @since 0.0.17
    */
   public void launch(int privateWindow, String[] url) {
-    validateUserDir();
-    if (generic) {
-      this.launchGeneric(privateWindow, url);
-      return;
-    }
-    if ((chromium && firefox) || (!chromium && !firefox)) {
-      if (this.hasFirefox()) {
-        this.launchFirefox(privateWindow, url);
-      } else if (this.hasChromium()) {
-        this.launchChromium(privateWindow, url);
-      } else {
-        this.launchGeneric(privateWindow, url);
-      }
-      return;
-    }
     if (chromiumFirst) {
       if (chromium) {
         this.launchChromium(privateWindow, url);
@@ -199,7 +194,33 @@ public class I2PBrowser extends I2PCommonBrowser {
    */
   public void launch() { launch(false); }
 
-  private static String ValidURL(String inUrl) {
+  /**
+   * Stop all running processes managed by the browser manager.
+   *
+   * @return true if successful, false if not
+   */
+  public boolean stop() {
+    boolean r = true;
+    if (i2pFirefox != null)
+      r = i2pFirefox.stop();
+    if (i2pChromium != null)
+      r = i2pChromium.stop();
+    if (i2pGeneral != null)
+      r = i2pGeneral.stop();
+    return r;
+  }
+
+  public boolean running() {
+    if (i2pFirefox != null)
+      return i2pFirefox.running();
+    if (i2pChromium != null)
+      return i2pChromium.running();
+    if (i2pGeneral != null)
+      return i2pGeneral.running();
+    return false;
+  }
+
+  private String ValidURL(String inUrl) {
     String[] schemes = {"http", "https"};
     for (String scheme : schemes) {
       if (inUrl.startsWith(scheme)) {
@@ -210,45 +231,43 @@ public class I2PBrowser extends I2PCommonBrowser {
   }
 
   public static void main(String[] args) {
-    validateUserDir();
-    int privateBrowsing = 0;
-    logger.info("I2PBrowser");
     I2PBrowser i2pBrowser = new I2PBrowser();
+    i2pBrowser.startup(args);
+  }
+  public ArrayList<String> parseArgs(String[] args) {
+    logger.info("I2PBrowser");
     ArrayList<String> visitURL = new ArrayList<String>();
     if (args != null) {
       if (args.length > 0) {
         for (String arg : args) {
           if (arg.equals("-private")) {
-            privateBrowsing = 1;
+            this.privateBrowsing = 1;
           }
           if (arg.equals("-chromium")) {
-            i2pBrowser.chromium = true;
+            this.chromium = true;
           }
           if (arg.equals("-firefox")) {
-            i2pBrowser.firefox = true;
+            this.firefox = true;
           }
           if (arg.equals("-usability")) {
-            i2pBrowser.usability = true;
+            this.usability = true;
           }
           if (arg.equals("-strict")) {
-            i2pBrowser.usability = false;
+            this.usability = false;
           }
           if (arg.equals("-generic")) {
-            i2pBrowser.generic = true;
+            this.generic = true;
           }
           if (arg.equals("-app")) {
-            i2pBrowser.usability = true;
+            this.usability = true;
             privateBrowsing = 2;
           }
           if (arg.equals("-outputconfig")) {
             outputConfig = true;
           }
-          if (arg.equals("-nosystray")) {
-            useSystray = false;
-          }
           if (arg.equals("-noproxycheck")) {
             logger.info("zeroing out proxy check");
-            i2pBrowser.setProxyTimeoutTime(0);
+            this.setProxyTimeoutTime(0);
           }
           if (!arg.startsWith("-")) {
             visitURL.add(ValidURL(arg));
@@ -256,155 +275,19 @@ public class I2PBrowser extends I2PCommonBrowser {
         }
       }
     }
+    return visitURL;
+  }
+  public void startup(String[] args) {
+    ArrayList<String> visitURL = parseArgs(args);
     try {
-      if (useSystray) {
-        logger.info("Starting systray");
-        systray(args);
-        Runtime.getRuntime().addShutdownHook(new Thread() {
-          @Override
-          public void run() {
-            shutdownSystray();
-          }
-        });
-      }
+      Runtime.getRuntime().addShutdownHook(new Thread() {
+        @Override
+        public void run() {}
+      });
     } catch (Exception e) {
       logger.warning(e.toString());
     }
-    i2pBrowser.launch(privateBrowsing,
-                      visitURL.toArray(new String[visitURL.size()]));
-  }
-  private static boolean systrayIsRunningExternally() {
-    File systrayIsRunningFile =
-        new File(runtimeDirectory(""), "systray.running");
-    if (systrayIsRunningFile.exists()) {
-      logger.info("Systray is already running in another process");
-      return true;
-    }
-    try {
-      FileWriter myWriter = new FileWriter(systrayIsRunningFile);
-      myWriter.write("systray is running");
-      myWriter.close();
-    } catch (IOException ioe) {
-      logger.warning(ioe.toString());
-      return true;
-    }
-    return false;
-  }
-  private static void shutdownSystray() {
-    File systrayIsRunningFile =
-        new File(runtimeDirectory(""), "systray.running");
-    if (systrayIsRunningFile.exists())
-      systrayIsRunningFile.delete();
-  }
-  public static boolean systray(String[] args) throws Exception {
-    if (systrayIsRunningExternally()) {
-      return false;
-    }
-    if (!SystemTray.isSupported()) {
-      logger.warning("SystemTray is not supported");
-      return false;
-    }
-
-    SystemTray tray = SystemTray.getSystemTray();
-    Toolkit toolkit = Toolkit.getDefaultToolkit();
-    File iconFile = new File(runtimeDirectory(""), "icon.png");
-    if (!iconFile.exists()) {
-      InputStream resources =
-          I2PBrowser.class.getClassLoader().getResourceAsStream("icon.png");
-      OutputStream fos = new FileOutputStream(iconFile);
-      copy(resources, fos);
-    }
-    Image image = toolkit.getImage("icon.png");
-
-    PopupMenu menu = new PopupMenu();
-    TrayIcon icon = new TrayIcon(image, "I2P Browser Profile Controller", menu);
-    icon.setImageAutoSize(true);
-
-    tray.add(icon);
-    Menu submenuStrict = new Menu("Strict Mode");
-    MenuItem launchRegularBrowserStrict = new MenuItem("Launch I2P Browser");
-    launchRegularBrowserStrict.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        ArrayList<String> argsList = new ArrayList<String>();
-        argsList.addAll(Arrays.asList(args));
-        argsList.add("-strict");
-        main(argsList.toArray(args));
-      }
-    });
-    submenuStrict.add(launchRegularBrowserStrict);
-
-    MenuItem launchPrivateBrowserStrict =
-        new MenuItem("Launch I2P Browser - Throwaway Session");
-    launchPrivateBrowserStrict.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        ArrayList<String> argsList =
-            new ArrayList<String>(Arrays.asList(new String[] {"-private"}));
-        argsList.addAll(Arrays.asList(args));
-        argsList.add("-strict");
-        main(argsList.toArray(args));
-      }
-    });
-    submenuStrict.add(launchPrivateBrowserStrict);
-
-    MenuItem launchConfigBrowserStrict = new MenuItem("Launch I2P Console");
-    launchConfigBrowserStrict.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        ArrayList<String> argsList = new ArrayList<String>(
-            Arrays.asList(new String[] {"-app", "http://127.0.0.1:7657"}));
-        argsList.addAll(Arrays.asList(args));
-        argsList.add("-strict");
-        main(argsList.toArray(args));
-      }
-    });
-    submenuStrict.add(launchConfigBrowserStrict);
-    menu.add(submenuStrict);
-
-    Menu submenuUsability = new Menu("Usability Mode");
-    MenuItem launchRegularBrowserUsability = new MenuItem("Launch I2P Browser");
-    launchRegularBrowserUsability.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        ArrayList<String> argsList = new ArrayList<String>();
-        argsList.addAll(Arrays.asList(args));
-        argsList.add("-usability");
-        main(argsList.toArray(args));
-      }
-    });
-    submenuUsability.add(launchRegularBrowserUsability);
-
-    MenuItem launchPrivateBrowserUsability =
-        new MenuItem("Launch I2P Browser - Throwaway Session");
-    launchPrivateBrowserUsability.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        ArrayList<String> argsList =
-            new ArrayList<String>(Arrays.asList(new String[] {"-private"}));
-        argsList.addAll(Arrays.asList(args));
-        argsList.add("-usability");
-        main(argsList.toArray(args));
-      }
-    });
-    submenuUsability.add(launchPrivateBrowserUsability);
-
-    MenuItem launchConfigBrowserUsability = new MenuItem("Launch I2P Console");
-    launchConfigBrowserUsability.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        ArrayList<String> argsList = new ArrayList<String>(
-            Arrays.asList(new String[] {"-app", "http://127.0.0.1:7657"}));
-        argsList.addAll(Arrays.asList(args));
-        argsList.add("-usability");
-        main(argsList.toArray(args));
-      }
-    });
-    submenuUsability.add(launchConfigBrowserUsability);
-    menu.add(submenuUsability);
-
-    MenuItem closeItem = new MenuItem("Close");
-    closeItem.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        shutdownSystray();
-        System.exit(0);
-      }
-    });
-    menu.add(closeItem);
-    return true;
+    this.launch(this.privateBrowsing,
+                visitURL.toArray(new String[visitURL.size()]));
   }
 }

src/java/net/i2p/i2pfirefox/I2PChromium.java

@@ -26,9 +26,10 @@ import java.util.stream.Stream;
  * @author idk
  * @since 0.0.1
  */
-public class I2PChromium extends I2PCommonBrowser {
+public class I2PChromium extends I2PChromiumProfileUnpacker {
   private final String[] CHROMIUM_SEARCH_PATHS = CHROMIUM_FINDER();
   private Process p = null;
+  private String chromePath;
 
   /**
    * Construct an I2PChromium class which manages an instance of Chromium and
@@ -54,40 +55,41 @@ public class I2PChromium extends I2PCommonBrowser {
         return;
       }
     }
-    I2PChromiumProfileBuilder.usability = true;
+    this.usability = true;
   }
 
-  public static void storeChromiumDefaults() {
+  public void storeChromiumDefaults() {
     List<String> list = new ArrayList<String>();
     list = Arrays.asList(chromiumPathsWindows());
-    prop.setProperty("chromium.paths.windows",
-                     list.stream().collect(Collectors.joining(",")));
+    getProperties().setProperty("chromium.paths.windows",
+                                list.stream().collect(Collectors.joining(",")));
     list = Arrays.asList(chromiumPathsUnix());
-    prop.setProperty("chromium.paths.linux",
-                     list.stream().collect(Collectors.joining(",")));
+    getProperties().setProperty("chromium.paths.linux",
+                                list.stream().collect(Collectors.joining(",")));
     list = Arrays.asList(chromiumPathsOSX());
-    prop.setProperty("chromium.paths.osx",
-                     list.stream().collect(Collectors.joining(",")));
+    getProperties().setProperty("chromium.paths.osx",
+                                list.stream().collect(Collectors.joining(",")));
 
     list = Arrays.asList(chromiumBinsWindows());
-    prop.setProperty("chromium.bins.windows",
-                     list.stream().collect(Collectors.joining(",")));
+    getProperties().setProperty("chromium.bins.windows",
+                                list.stream().collect(Collectors.joining(",")));
     list = Arrays.asList(chromiumBinsUnix());
-    prop.setProperty("chromium.bins.linux",
-                     list.stream().collect(Collectors.joining(",")));
+    getProperties().setProperty("chromium.bins.linux",
+                                list.stream().collect(Collectors.joining(",")));
     list = Arrays.asList(chromiumBinsUnix());
-    prop.setProperty("chromium.bins.osx",
-                     list.stream().collect(Collectors.joining(",")));
+    getProperties().setProperty("chromium.bins.osx",
+                                list.stream().collect(Collectors.joining(",")));
     try (OutputStream fos = new FileOutputStream(
              new File(runtimeDirectory(""), "browser.config"))) {
-      prop.store(fos, "Chromium Configuration Section");
+      getProperties().store(fos, "Chromium Configuration Section");
     } catch (IOException ioe) {
       logger.warning(ioe.toString());
     }
   }
 
-  private static String[] chromiumPathsUnix() {
-    String chromiumPathsProp = prop.getProperty("chromium.paths.unix");
+  private String[] chromiumPathsUnix() {
+    String chromiumPathsProp =
+        getProperties().getProperty("chromium.paths.unix");
     if (chromiumPathsProp != null)
       if (!chromiumPathsProp.equals(""))
         return chromiumPathsProp.split(",");
@@ -95,15 +97,15 @@ public class I2PChromium extends I2PCommonBrowser {
                          "/snap/bin"};
   }
 
-  private static String[] chromiumBinsUnix() {
+  private String[] chromiumBinsUnix() {
     String chromiumPathsProp;
     if (isOSX()) {
-      chromiumPathsProp = prop.getProperty("chromium.bins.osx");
+      chromiumPathsProp = getProperties().getProperty("chromium.bins.osx");
       if (chromiumPathsProp != null)
         if (!chromiumPathsProp.equals(""))
           return chromiumPathsProp.split(",");
     }
-    chromiumPathsProp = prop.getProperty("chromium.bins.unix");
+    chromiumPathsProp = getProperties().getProperty("chromium.bins.unix");
     if (chromiumPathsProp != null)
       if (!chromiumPathsProp.equals(""))
         return chromiumPathsProp.split(",");
@@ -111,7 +113,7 @@ public class I2PChromium extends I2PCommonBrowser {
         "ungoogled-chromium", "chromium", "brave", "edge", "msedge", "chrome"};
   }
 
-  private static String[] FIND_CHROMIUM_SEARCH_PATHS_UNIX() {
+  private String[] FIND_CHROMIUM_SEARCH_PATHS_UNIX() {
     String[] path = chromiumPathsUnix();
     String[] exes = chromiumBinsUnix();
 
@@ -125,8 +127,9 @@ public class I2PChromium extends I2PCommonBrowser {
     }
     return exePath;
   }
-  private static String[] chromiumPathsOSX() {
-    String chromiumPathsProp = prop.getProperty("chromium.paths.osx");
+  private String[] chromiumPathsOSX() {
+    String chromiumPathsProp =
+        getProperties().getProperty("chromium.paths.osx");
     if (chromiumPathsProp != null)
       if (!chromiumPathsProp.equals(""))
         return chromiumPathsProp.split(",");
@@ -134,7 +137,7 @@ public class I2PChromium extends I2PCommonBrowser {
                          "/Applications/Chrome.app/Contents/MacOS",
                          "/Applications/Brave.app/Contents/MacOS"};
   }
-  private static String[] FIND_CHROMIUM_SEARCH_PATHS_OSX() {
+  private String[] FIND_CHROMIUM_SEARCH_PATHS_OSX() {
     String[] path = chromiumPathsOSX();
     String[] exes = chromiumBinsUnix();
     String[] exePath = new String[path.length * exes.length];
@@ -148,8 +151,9 @@ public class I2PChromium extends I2PCommonBrowser {
     return exePath;
   }
 
-  private static String[] chromiumPathsWindows() {
-    String chromiumPathsProp = prop.getProperty("chromium.paths.windows");
+  private String[] chromiumPathsWindows() {
+    String chromiumPathsProp =
+        getProperties().getProperty("chromium.paths.windows");
     if (chromiumPathsProp != null)
       if (!chromiumPathsProp.equals(""))
         return chromiumPathsProp.split(",");
@@ -181,8 +185,9 @@ public class I2PChromium extends I2PCommonBrowser {
         new File(programFiles, "/Microsoft/Edge/Application/").toString(),
     };
   }
-  private static String[] chromiumBinsWindows() {
-    String chromiumPathsProp = prop.getProperty("chromium.bins.windows");
+  private String[] chromiumBinsWindows() {
+    String chromiumPathsProp =
+        getProperties().getProperty("chromium.bins.windows");
     if (chromiumPathsProp != null)
       if (!chromiumPathsProp.equals(""))
         return chromiumPathsProp.split(",");
@@ -193,7 +198,7 @@ public class I2PChromium extends I2PCommonBrowser {
                          "msedge.exe",
                          "chrome.exe"};
   }
-  private static String[] FIND_CHROMIUM_SEARCH_PATHS_WINDOWS() {
+  private String[] FIND_CHROMIUM_SEARCH_PATHS_WINDOWS() {
     String[] path = chromiumPathsWindows();
     String[] exes = chromiumBinsWindows();
     String[] exePath = new String[path.length * exes.length];
@@ -207,7 +212,7 @@ public class I2PChromium extends I2PCommonBrowser {
     return exePath;
   }
 
-  private static String[] FIND_ALL_CHROMIUM_SEARCH_PATHS() {
+  private String[] FIND_ALL_CHROMIUM_SEARCH_PATHS() {
     String[] Unix = FIND_CHROMIUM_SEARCH_PATHS_UNIX();
     String[] Windows = FIND_CHROMIUM_SEARCH_PATHS_WINDOWS();
     String[] Mac = FIND_CHROMIUM_SEARCH_PATHS_OSX();
@@ -227,7 +232,7 @@ public class I2PChromium extends I2PCommonBrowser {
     }
     return exePath;
   }
-  private static String[] FIND_CHROMIUM_SEARCH_PATHS() {
+  private String[] FIND_CHROMIUM_SEARCH_PATHS() {
     switch (getOperatingSystem()) {
     case "Windows":
       return FIND_CHROMIUM_SEARCH_PATHS_WINDOWS();
@@ -241,7 +246,7 @@ public class I2PChromium extends I2PCommonBrowser {
       return FIND_ALL_CHROMIUM_SEARCH_PATHS();
     }
   }
-  private static String[] NEARBY_CHROMIUM_SEARCH_PATHS() {
+  private String[] NEARBY_CHROMIUM_SEARCH_PATHS() {
     // obtain the PLUGIN environment variable
     String plugin = System.getenv("PLUGIN");
     if (plugin != null && !plugin.isEmpty()) {
@@ -334,7 +339,7 @@ public class I2PChromium extends I2PCommonBrowser {
     }
     return new String[] {};
   }
-  private static String[] CHROMIUM_FINDER() {
+  private String[] CHROMIUM_FINDER() {
     String[] nearby = NEARBY_CHROMIUM_SEARCH_PATHS();
     String[] all = FIND_CHROMIUM_SEARCH_PATHS();
 
@@ -384,11 +389,13 @@ public class I2PChromium extends I2PCommonBrowser {
       File chromeFile = new File(chrome);
       if (chromeFile.exists()) {
         // if it does, return it
+        chromePath = chrome;
         return chrome;
       }
     }
     String[] chromees = onlyValidChromiums();
     if (chromees.length > 0) {
+      chromePath = chromees[0];
       return chromees[0];
     } else {
       return "";
@@ -551,8 +558,7 @@ public class I2PChromium extends I2PCommonBrowser {
       String[] newArgs = new String[arglength + 32];
       newArgs[0] = chrome;
       newArgs[1] =
-          "--user-data-dir=" + I2PChromiumProfileBuilder.profileDirectory(
-                                   I2PChromiumProfileBuilder.usabilityMode());
+          "--user-data-dir=" + this.profileDirectory(this.usabilityMode());
       newArgs[2] = "--proxy-server=http://127.0.0.1:4444";
       newArgs[3] =
           "--proxy-bypass-list=http://localhost:7657,http://127.0.0.1:7657";
@@ -583,42 +589,39 @@ public class I2PChromium extends I2PCommonBrowser {
       newArgs[28] = "--referrer-directive=noreferrers";
       newArgs[29] = "--force-punycode-hostnames";
       newArgs[30] = "--disable-sharing-hub";
-      if (!I2PChromiumProfileBuilder.usability) {
+      if (!this.usability) {
         newArgs[31] =
             "--load-extension=" +
-            new File(I2PChromiumProfileBuilder.profileDirectory("base"),
-                     "extensions/i2pchrome.js")
+            new File(this.profileDirectory("base"), "extensions/i2pchrome.js")
                 .getAbsolutePath() +
             "," +
-            new File(I2PChromiumProfileBuilder.profileDirectory("base"),
+            new File(this.profileDirectory("base"),
                      "extensions/https-everywhere.js")
                 .getAbsolutePath() +
             "," +
-            new File(I2PChromiumProfileBuilder.profileDirectory("base"),
-                     "extensions/noscript.js")
+            new File(this.profileDirectory("base"), "extensions/noscript.js")
                 .getAbsolutePath();
 
       } else {
         newArgs[31] =
             "--load-extension=" +
-            new File(I2PChromiumProfileBuilder.profileDirectory("usability"),
+            new File(this.profileDirectory("usability"),
                      "extensions/i2pchrome.js")
                 .getAbsolutePath() +
             "," +
-            new File(I2PChromiumProfileBuilder.profileDirectory("usability"),
+            new File(this.profileDirectory("usability"),
                      "extensions/https-everywhere.js")
                 .getAbsolutePath() +
             "," +
-            new File(I2PChromiumProfileBuilder.profileDirectory("usability"),
+            new File(this.profileDirectory("usability"),
                      "extensions/jshelter.js")
                 .getAbsolutePath() +
             "," +
-            new File(I2PChromiumProfileBuilder.profileDirectory("usability"),
+            new File(this.profileDirectory("usability"),
                      "extensions/localcdn.js")
                 .getAbsolutePath() +
             "," +
-            new File(I2PChromiumProfileBuilder.profileDirectory("usability"),
-                     "extensions/ublock.js")
+            new File(this.profileDirectory("usability"), "extensions/ublock.js")
                 .getAbsolutePath();
       }
       if (args != null) {
@@ -650,13 +653,13 @@ public class I2PChromium extends I2PCommonBrowser {
             bashScript.setExecutable(true);
           }
           return new ProcessBuilder(bashScript.getAbsolutePath())
-              .directory(I2PChromiumProfileBuilder.runtimeDirectory(true));
+              .directory(this.runtimeDirectory(true));
         } catch (IOException e) {
           logger.warning(e.toString());
         }
       } else {
         return new ProcessBuilder(newArgs).directory(
-            I2PChromiumProfileBuilder.runtimeDirectory(true));
+            this.runtimeDirectory(true));
       }
     }
     logger.info("No Chromium found.");
@@ -671,17 +674,15 @@ public class I2PChromium extends I2PCommonBrowser {
   }
 
   public Process launchAndDetatch(int privateWindow, String[] url) {
-    validateUserDir();
+    validateUserDirectory();
     if (waitForProxy()) {
-      String profileDirectory = I2PChromiumProfileBuilder.profileDirectory(
-          I2PChromiumProfileBuilder.usabilityMode());
-      if (I2PChromiumProfileChecker.validateProfileDirectory(
-              profileDirectory)) {
+      String profileDirectory = this.profileDirectory(this.usabilityMode());
+      if (this.validateProfileDirectory(profileDirectory)) {
         logger.info("Valid profile directory: " + profileDirectory);
       } else {
         logger.info("Invalid profile directory: " + profileDirectory +
                     " rebuilding...");
-        if (!I2PChromiumProfileBuilder.copyBaseProfiletoProfile()) {
+        if (!this.copyBaseProfiletoProfile()) {
           logger.info("Failed to rebuild profile directory: " +
                       profileDirectory);
           return null;
@@ -770,7 +771,26 @@ public class I2PChromium extends I2PCommonBrowser {
    */
   public void launch() { launch(false); }
 
-  private static String ValidURL(String inUrl) {
+  /**
+   * Stop all running processes managed by the browser manager.
+   *
+   * @return true if successful, false if not
+   */
+  public boolean stop() {
+    if (p != null) {
+      p.destroy();
+      return true;
+    }
+    return false;
+  }
+
+  public boolean running() {
+    if (p != null)
+      return p.isAlive();
+    return false;
+  }
+
+  private String ValidURL(String inUrl) {
     String[] schemes = {"http", "https"};
     for (String scheme : schemes) {
       if (inUrl.startsWith(scheme)) {
@@ -781,37 +801,37 @@ public class I2PChromium extends I2PCommonBrowser {
   }
 
   public static void main(String[] args) {
-    validateUserDir();
     int privateBrowsing = 0;
-    logger.info("I2PChromium");
     I2PChromium i2pChromium = new I2PChromium();
-    logger.info("checking for private browsing");
+    i2pChromium.validateUserDirectory();
+    i2pChromium.logger.info("I2PChromium");
+    i2pChromium.logger.info("checking for private browsing");
     ArrayList<String> visitURL = new ArrayList<String>();
     if (args != null) {
       if (args.length > 0) {
         for (String arg : args) {
           if (arg.equals("-private")) {
             privateBrowsing = 1;
-            logger.info(
+            i2pChromium.logger.info(
                 "private browsing is true, profile will be discarded at end of session");
           }
           if (arg.equals("-usability")) {
-            I2PChromiumProfileBuilder.usability = true;
+            i2pChromium.usability = true;
           }
           if (arg.equals("-app")) {
             privateBrowsing = 2;
-            I2PChromiumProfileBuilder.usability = true;
+            i2pChromium.usability = true;
           }
           if (arg.equals("-noproxycheck")) {
-            logger.info("zeroing out proxy check");
+            i2pChromium.logger.info("zeroing out proxy check");
             i2pChromium.setProxyTimeoutTime(0);
           }
           if (!arg.startsWith("-")) {
             // check if it's a URL
             if (privateBrowsing == 2)
-              visitURL.add("--app=" + ValidURL(arg));
+              visitURL.add("--app=" + i2pChromium.ValidURL(arg));
             else
-              visitURL.add(ValidURL(arg));
+              visitURL.add(i2pChromium.ValidURL(arg));
           }
         }
       }

src/java/net/i2p/i2pfirefox/I2PChromiumProfileBuilder.java

@@ -20,19 +20,10 @@ import java.io.File;
  * @author idk
  * @since 0.0.1
  */
-public class I2PChromiumProfileBuilder extends I2PCommonBrowser {
-  public static boolean usability;
+public class I2PChromiumProfileBuilder extends I2PChromiumProfileChecker {
+  public boolean usability;
 
-  /**
-   * get the profile directory, creating it if necessary
-   *
-   * @return the profile directory, or null if it could not be created
-   */
-  public static String profileDirectory(String base) {
-    return profileDirectory("I2P_CHROMIUM_PROFILE", "chromium", base, false);
-  }
-
-  private static String baseProfileDir(String file, String mode) {
+  private String baseProfileDir(String file, String mode) {
     File profileDir = new File(file, "i2p.chromium." + mode + ".profile");
     // make sure the directory exists
     if (profileDir.exists()) {
@@ -52,11 +43,11 @@ public class I2PChromiumProfileBuilder extends I2PCommonBrowser {
    *
    * @return the base profile directory, or null if it could not be created
    */
-  /*public static String baseProfileDirectory() {
+  /*public String baseProfileDirectory() {
     return baseProfileDirectory("base");
   }*/
 
-  public static String baseProfileDirectory(String mode) {
+  public String baseProfileDirectory(String mode) {
     String pd = System.getenv("I2P_CHROMIUM_BASE_PROFILE");
     if (pd != null && !pd.isEmpty()) {
       File pdf = new File(pd);
@@ -80,7 +71,7 @@ public class I2PChromiumProfileBuilder extends I2PCommonBrowser {
    * @return the runtime directory, or null if it could not be created
    * @since 0.0.1
    */
-  public static File runtimeDirectory(boolean create) {
+  public File runtimeDirectory(boolean create) {
     String rtd = runtimeDirectory();
     return runtimeDirectory(create, rtd);
   }
@@ -91,7 +82,7 @@ public class I2PChromiumProfileBuilder extends I2PCommonBrowser {
    * @return the runtime directory, or null if it could not be created or found
    * @since 0.0.1
    */
-  public static String runtimeDirectory() {
+  public String runtimeDirectory() {
     // get the I2P_CHROMIUM_DIR environment variable
     String rtd = System.getenv("I2P_CHROMIUM_DIR");
     // if it is not null and not empty
@@ -106,7 +97,7 @@ public class I2PChromiumProfileBuilder extends I2PCommonBrowser {
     return runtimeDirectory("");
   }
 
-  public static String usabilityMode() {
+  public String usabilityMode() {
     if (usability)
       return "usability";
     return "base";
@@ -117,7 +108,7 @@ public class I2PChromiumProfileBuilder extends I2PCommonBrowser {
    *
    * @since 0.0.1
    */
-  public static boolean copyBaseProfiletoProfile() {
+  public boolean copyBaseProfiletoProfile() {
     String baseProfile = baseProfileDirectory(usabilityMode());
     String profile = profileDirectory(usabilityMode());
     logger.info("Copying base profile to profile directory: " + baseProfile +

src/java/net/i2p/i2pfirefox/I2PChromiumProfileChecker.java

@@ -27,20 +27,30 @@ public class I2PChromiumProfileChecker extends I2PCommonBrowser {
    * @since 0.0.1
    */
   public static void main(String[] args) {
-    String profileDirectory =
-        I2PChromiumProfileBuilder.profileDirectory("base");
+    I2PChromiumProfileChecker pc = new I2PChromiumProfileChecker();
+    String profileDirectory = pc.profileDirectory("base");
     if (profileDirectory == null) {
-      logger.info("No profile directory found");
+      pc.logger.info("No profile directory found");
       return;
     }
-    logger.info("Profile directory: " + profileDirectory);
-    boolean ok = validateProfileDirectory(profileDirectory);
+    pc.logger.info("Profile directory: " + profileDirectory);
+    boolean ok = pc.validateProfileDirectory(profileDirectory);
     if (ok) {
-      logger.info("Profile directory is valid");
+      pc.logger.info("Profile directory is valid");
     } else {
-      logger.info("Profile directory is invalid");
+      pc.logger.info("Profile directory is invalid");
     }
   }
+
+  /**
+   * get the profile directory, creating it if necessary
+   *
+   * @return the profile directory, or null if it could not be created
+   */
+  public String profileDirectory(String base) {
+    return profileDirectory("I2P_CHROMIUM_PROFILE", "chromium", base, false);
+  }
+
   /**
    * Return true if the profile directory is valid.
    *
@@ -48,7 +58,7 @@ public class I2PChromiumProfileChecker extends I2PCommonBrowser {
    * @return true if the profile directory is valid, false otherwise
    * @since 0.0.1
    */
-  public static boolean validateProfileDirectory(String profileDirectory) {
+  public boolean validateProfileDirectory(String profileDirectory) {
     File profileDir = new File(profileDirectory);
     if (!profileDir.exists()) {
       logger.info("Profile directory does not exist");
@@ -79,7 +89,7 @@ public class I2PChromiumProfileChecker extends I2PCommonBrowser {
    * @return true if the file is valid, false otherwise
    * @since 0.0.1
    */
-  public static boolean validateFile(String file) {
+  public boolean validateFile(String file) {
     File f = new File(file);
     if (!f.exists()) {
       logger.info("User JavaScript file does not exist");
@@ -106,7 +116,7 @@ public class I2PChromiumProfileChecker extends I2PCommonBrowser {
    * @return true if the extension directory is valid, false otherwise
    * @since 0.0.1
    */
-  public static boolean validateExtensionDirectory(String extensionDirectory) {
+  public boolean validateExtensionDirectory(String extensionDirectory) {
     File extensionDir = new File(extensionDirectory);
     if (!extensionDir.exists()) {
       logger.info("Extension directory does not exist");

src/java/net/i2p/i2pfirefox/I2PChromiumProfileUnpacker.java

@@ -18,13 +18,13 @@ package net.i2p.i2pfirefox;
  * @author idk
  * @since 0.0.1
  */
-public class I2PChromiumProfileUnpacker extends I2PCommonBrowser {
+public class I2PChromiumProfileUnpacker extends I2PChromiumProfileBuilder {
 
   public static void main(String[] args) {
-    String profileDirectory =
-        I2PChromiumProfileBuilder.profileDirectory("base");
+    I2PChromiumProfileUnpacker pu = new I2PChromiumProfileUnpacker();
+    String profileDirectory = pu.profileDirectory("base");
     if (profileDirectory == null) {
-      logger.info("No profile directory found");
+      pu.logger.info("No profile directory found");
       return;
     }
   }

src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java

@@ -33,47 +33,57 @@ import java.util.zip.ZipInputStream;
  */
 
 public class I2PCommonBrowser {
-  static public Properties prop = new Properties();
-  static public Logger logger = Logger.getLogger("browserlauncher");
-  static FileHandler fh;
-  // private final int DEFAULT_TIMEOUT = 200;
-  private static int CONFIGURED_TIMEOUT = 200;
+  private Properties prop = new Properties();
+  public Logger logger = Logger.getLogger("browserlauncher");
+  private FileHandler fh;
+  int CONFIGURED_TIMEOUT = 200;
 
   public I2PCommonBrowser() {
     try {
-      // This block configure the logger with handler and formatter
-      fh = new FileHandler(logFile().toString());
-      logger.addHandler(fh);
-      SimpleFormatter formatter = new SimpleFormatter();
-      fh.setFormatter(formatter);
-      // the following statement is used to log any messages
       logger.info("Browser log");
     } catch (SecurityException e) {
       e.printStackTrace();
-    } catch (IOException e) {
-      e.printStackTrace();
     }
     loadPropertiesFile(new File(runtimeDirectory(""), "browser.config"));
   }
 
-  public static void loadPropertiesFile(File props) {
-    try (InputStream propsInput = new FileInputStream(props)) {
+  /**
+   * Loads a properties file.
+   *
+   * @param propertiesFile the file to load
+   */
+  public void loadPropertiesFile(File propertiesFile) {
+    try (InputStream inputStream = new FileInputStream(propertiesFile)) {
       prop = new Properties();
-      prop.load(propsInput);
-      System.out.println(prop);
-    } catch (IOException io) {
-      logger.warning(io.toString());
+      prop.load(inputStream);
+    } catch (IOException exception) {
+      logger.warning(exception.toString());
     }
   }
 
-  public static void validateUserDir() {
+  /**
+   * Retrieves the properties of the object.
+   *
+   * @return the properties of the object
+   */
+  public Properties getProperties() { return prop; }
+
+  /**
+   * Validates the user directory.
+   *
+   * @param None No parameters.
+   * @return None No return value.
+   */
+  public void validateUserDirectory() {
     logger.info("Validating user directory");
     String userDir = System.getProperty("user.dir");
     String userHome = System.getProperty("user.home");
     File userDirFile = new File(userDir);
     File userHomeFile = new File(userHome);
-    logger.info("user.dir testing !" + userHomeFile.getAbsolutePath() +
-                ".equals(" + userDirFile.getAbsolutePath() + ")");
+
+    logger.info("user.dir: " + userDirFile.getAbsolutePath());
+    logger.info("user.home: " + userHomeFile.getAbsolutePath());
+
     if (!userDirFile.getAbsolutePath().contains("Program Files")) {
       if (!userDirFile.getAbsolutePath().equals(
               userHomeFile.getAbsolutePath())) {
@@ -88,8 +98,9 @@ public class I2PCommonBrowser {
             } else {
               logger.info("user.dir is not writable");
             }
+          } else {
+            logger.info("user.dir is not actually a directory");
           }
-          { logger.info("user.dir is not actually a directory"); }
         } else {
           logger.info("user.dir does not exist");
         }
@@ -99,11 +110,13 @@ public class I2PCommonBrowser {
     } else {
       logger.info("user.dir cannot run from inside Program Files");
     }
-    if (isWindows())
+    if (isWindows()) {
       userHome = new File(userHome, "AppData/Local/I2P").getAbsolutePath();
+    }
     File defaultPathFile = new File(userHome, "i2p/i2pbrowser");
-    if (!defaultPathFile.exists())
+    if (!defaultPathFile.exists()) {
       defaultPathFile.mkdirs();
+    }
     if (!defaultPathFile.isDirectory()) {
       logger.info(
           "default path exists and is not a directory, get it out of the way");
@@ -111,160 +124,201 @@ public class I2PCommonBrowser {
     }
     System.setProperty("user.dir", defaultPathFile.getAbsolutePath());
   }
-  public static String getOperatingSystem() {
-    String os = System.getProperty("os.name");
-    if (os.startsWith("Windows")) {
+
+  /**
+   * Get the operating system.
+   *
+   * @return the name of the operating system (Windows, Linux, BSD, Mac, or
+   *         Unknown)
+   */
+  public String getOperatingSystem() {
+    if (isWindows()) {
       return "Windows";
-    } else if (os.contains("Linux")) {
+    } else if (isLinux()) {
       return "Linux";
-    } else if (os.contains("BSD")) {
+    } else if (isBSD()) {
       return "BSD";
-    } else if (os.contains("Mac")) {
+    } else if (isOSX()) {
       return "Mac";
     }
     return "Unknown";
   }
 
-  protected static boolean isWindows() {
-    String osName = System.getProperty("os.name");
-    logger.info("os.name" + osName);
-    if (osName.contains("windows"))
-      return true;
-    if (osName.contains("Windows"))
-      return true;
-    if (osName.contains("WINDOWS"))
-      return true;
-    return false;
-  }
-
-  protected static boolean isOSX() {
-    String osName = System.getProperty("os.name");
-    logger.info("os.name" + osName);
-    if (osName.contains("OSX"))
-      return true;
-    if (osName.contains("osx"))
-      return true;
-    if (osName.contains("mac"))
-      return true;
-    if (osName.contains("Mac"))
-      return true;
-    if (osName.contains("apple"))
-      return true;
-    if (osName.contains("Apple"))
-      return true;
-    if (osName.contains("Darwin"))
-      return true;
-    if (osName.contains("darwin"))
-      return true;
-    return false;
-  }
-
-  //  public static void logger.info(String line) { logger.info(line); }
-
-  private static File logFile() {
-    validateUserDir();
-    String userDir = System.getProperty("user.dir");
-    File log = new File(userDir, "logs");
-    if (!log.exists())
-      log.mkdirs();
-    return new File(log, "browserlauncher.log");
+  /**
+   * Determines if the current operating system is Windows.
+   *
+   * @return true if the current operating system is Windows, false otherwise
+   */
+  protected boolean isWindows() {
+    String osName = System.getProperty("os.name").toLowerCase();
+    return osName.contains("windows");
   }
 
   /**
-   * get the runtime directory, creating it if create=true
+   * Determines if the current operating system is macOS.
    *
-   * @param create if true, create the runtime directory if it does not exist
-   * @return the runtime directory, or null if it could not be created
-   * @since 0.0.19
+   * @return true if the operating system is macOS, false otherwise
    */
-  protected static File runtimeDirectory(boolean create, String override) {
-    String rtd = runtimeDirectory(override);
-    File rtdFile = new File(rtd);
-    if (create) {
-      if (!rtdFile.exists()) {
-        rtdFile.mkdir();
-      }
-    }
-    return new File(rtd);
+  protected boolean isOSX() {
+    String osName = System.getProperty("os.name").toLowerCase();
+    return osName.contains("osx") || osName.contains("mac") ||
+        osName.contains("apple") || osName.contains("darwin");
   }
 
   /**
-   * get the correct runtime directory
+   * Determines whether the current operating system is Linux.
    *
-   * @return the runtime directory, or null if it could not be created or found
+   * @return true if the operating system is Linux, false otherwise
+   */
+  protected boolean isLinux() {
+    String osName = System.getProperty("os.name").toLowerCase();
+    return osName.contains("linux");
+  }
+
+  /**
+   * Checks if the current operating system is a BSD variant.
+   *
+   * @return true if the operating system is a BSD variant, false otherwise
+   */
+  protected boolean isBSD() {
+    String osName = System.getProperty("os.name").toLowerCase();
+    return osName.contains("bsd");
+  }
+
+  // public void logger.info(String line) { logger.info(line); }
+
+  /**
+   * Returns the log file for the browser launcher.
+   *
+   * @return the log file for the browser launcher
+   */
+  /*private File logFile() {
+    // validateUserDirectory();
+    String userDirectory = System.getProperty("user.dir");
+    File logDirectory = new File(userDirectory, "logs");
+    if (!logDirectory.exists()) {
+      logDirectory.mkdirs();
+    }
+    return new File(logDirectory, "browserlauncher.log");
+  }*/
+
+  /**
+   * Get the runtime directory, creating it if create=true.
+   *
+   * @param create   If true, create the runtime directory if it does not exist.
+   * @param override The runtime directory override.
+   * @return The runtime directory, or null if it could not be created.
    * @since 0.0.19
    */
-  protected static String runtimeDirectory(String override) {
-    // get the I2P_BROWSER_DIR environment variable
-    String rtd = System.getenv(override);
-    // if it is not null and not empty
-    if (rtd != null && !rtd.isEmpty()) {
-      // check if the file exists
-      File rtdFile = new File(rtd);
-      if (rtdFile.exists()) {
-        // if it does, return it
-        return rtd;
-      }
+  protected File runtimeDirectory(boolean create, String override) {
+    String runtimeDir = runtimeDirectory(override);
+    File runtimeDirFile = new File(runtimeDir);
+    if (create && !runtimeDirFile.exists()) {
+      runtimeDirFile.mkdir();
     }
-    // obtain the PLUGIN environment variable
-    String plugin = System.getenv("PLUGIN");
-    if (plugin != null && !plugin.isEmpty()) {
-      File pluginDir = new File(plugin);
-      if (pluginDir.exists()) {
-        return pluginDir.toString();
-      }
+    return runtimeDirFile;
+  }
+
+  /**
+   * Returns the runtime directory path based on the given override parameter.
+   *
+   * @param override the name of the environment variable to override the
+   *     runtime
+   *                 directory
+   * @return the runtime directory path as a string
+   */
+  protected String runtimeDirectory(String override) {
+    String runtimeDir = System.getenv(override);
+    if (isDirectoryValid(runtimeDir)) {
+      return runtimeDir;
     }
+
+    String pluginDir = System.getenv("PLUGIN");
+    if (isDirectoryValid(pluginDir)) {
+      return pluginDir;
+    }
+
     String userDir = System.getProperty("user.dir");
-    if (userDir != null && !userDir.isEmpty()) {
-      File userDir1 = new File(userDir);
-      if (userDir1.exists()) {
-        return userDir1.toString();
-      }
+    if (isDirectoryValid(userDir)) {
+      return userDir;
     }
+
     String homeDir = System.getProperty("user.home");
-    if (homeDir != null && !homeDir.isEmpty()) {
-      File homeDir1 = new File(homeDir + "/.i2p");
-      if (homeDir1.exists()) {
-        return homeDir.toString();
+    if (isDirectoryValid(homeDir)) {
+      String i2pDir = homeDir + "/.i2p";
+      if (isDirectoryValid(i2pDir)) {
+        return homeDir;
       }
-      File homeDir2 = new File(homeDir + "/i2p");
-      if (homeDir2.exists()) {
-        return homeDir2.toString();
+
+      String altI2pDir = homeDir + "/i2p";
+      if (isDirectoryValid(altI2pDir)) {
+        return altI2pDir;
       }
     }
+
     return "";
   }
 
   /**
-   * get the profile directory, creating it if necessary
+   * Checks if the given directory is valid.
    *
+   * @param directory the directory to check
+   * @return true if the directory is valid, false otherwise
+   */
+  private boolean isDirectoryValid(String directory) {
+    return directory != null && !directory.isEmpty() &&
+        new File(directory).exists();
+  }
+
+  /**
+   * Retrieves the profile directory, creating it if necessary.
+   *
+   * @param envVar  the environment variable name
+   * @param browser the browser name
+   * @param base    the base directory
+   * @param app     indicates if it is an app directory
    * @return the profile directory, or null if it could not be created
    * @since 0.0.19
    */
-  protected static String profileDirectory(String envVar, String browser,
-                                           String base, boolean app) {
-    String pd = System.getenv(envVar);
-    if (pd != null && !pd.isEmpty()) {
-      File pdf = new File(pd);
-      if (pdf.exists() && pdf.isDirectory()) {
-        return pd;
+  protected String profileDirectory(String envVar, String browser, String base,
+                                    boolean app) {
+    String profileDir = System.getenv(envVar);
+    if (profileDir != null && !profileDir.isEmpty()) {
+      File profileDirFile = new File(profileDir);
+      if (profileDirFile.exists() && profileDirFile.isDirectory()) {
+        return profileDir;
       }
     }
-    String rtd = runtimeDirectory("");
-    return profileDir(rtd, browser, base, app);
+    String runtimeDir = runtimeDirectory("");
+    return profileDir(runtimeDir, browser, base, app);
   }
 
-  protected static String profileDir(String file, String browser, String base,
-                                     boolean app) {
-    String appString = "";
-    if (app) {
-      appString = ".app";
-    }
-    File profileDir =
-        new File(file, "i2p." + browser + ".profile." + base + appString);
+  /**
+   * A description of the entire Java function.
+   *
+   * @param file    description of parameter
+   * @param browser description of parameter
+   * @param base    description of parameter
+   * @param app     description of parameter
+   * @return description of return value
+   */
+  protected String profileDir(String file, String browser, String base,
+                              boolean app) {
+    String appString = app ? ".app" : "";
+    String profileDirName =
+        String.format("i2p.%s.profile.%s%s", browser, base, appString);
+    File profileDir = new File(file, profileDirName);
     return profileDir.getAbsolutePath();
   }
 
+  /**
+   * Unpacks the base profile to a specified directory.
+   *
+   * @param profileDirectory the directory where the profile will be unpacked
+   * @param browser          the browser type
+   * @param base             the base profile
+   * @return true if the profile was successfully unpacked, false otherwise
+   */
   protected boolean unpackProfile(String profileDirectory, String browser,
                                   String base) {
     logger.info("Unpacking base profile to " + profileDirectory);
@@ -310,66 +364,101 @@ public class I2PCommonBrowser {
     return true;
   }
 
-  protected static void copyDirectory(File sourceDirectory,
-                                      File destinationDirectory, String browser,
-                                      String base) throws IOException {
-    destinationDirectory = new File(destinationDirectory.toString().replace(
+  /**
+   * Copy a directory from sourceDir to destDir, excluding certain files based
+   * on browser and base.
+   *
+   * @param sourceDir directory to be copied from
+   * @param destDir   directory to be copied to
+   * @param browser   the browser name
+   * @param base      the base name
+   * @throws IOException if an I/O error occurs during copying
+   */
+  protected void copyDirectory(File sourceDir, File destDir, String browser,
+                               String base) throws IOException {
+    destDir = new File(destDir.toString().replace(
         "i2p." + browser + "." + base + ".profile", ""));
-    if (!destinationDirectory.exists()) {
-      destinationDirectory.mkdir();
+    if (!destDir.exists()) {
+      destDir.mkdir();
     }
-    for (String f : sourceDirectory.list()) {
-      copyDirectoryCompatibilityMode(new File(sourceDirectory, f),
-                                     new File(destinationDirectory, f), browser,
-                                     base);
+    for (String file : sourceDir.list()) {
+      copyDirectoryCompatibilityMode(new File(sourceDir, file),
+                                     new File(destDir, file), browser, base);
     }
   }
 
-  private static void
-  copyDirectoryCompatibilityMode(File source, File destination, String browser,
-                                 String base) throws IOException {
-    if (source.isDirectory()) {
-      copyDirectory(source, destination, browser, base);
-    } else {
-      copyFile(source, destination);
-    }
-  }
-
-  public static void copy(InputStream source, OutputStream target)
+  /**
+   * Copy a directory in compatibility mode.
+   *
+   * @param sourceDirectory      the source directory to copy
+   * @param destinationDirectory the destination directory to copy to
+   * @param browser              the browser
+   * @param base                 the base
+   * @throws IOException if an I/O error occurs
+   */
+  private void copyDirectoryCompatibilityMode(File sourceDirectory,
+                                              File destinationDirectory,
+                                              String browser, String base)
       throws IOException {
-    byte[] buf = new byte[8192];
-    int length;
-    while ((length = source.read(buf)) != -1) {
-      target.write(buf, 0, length);
+    if (sourceDirectory.isDirectory()) {
+      copyDirectory(sourceDirectory, destinationDirectory, browser, base);
+    } else {
+      copyFile(sourceDirectory, destinationDirectory);
     }
   }
 
-  private static void copyFile(File sourceFile, File destinationFile)
+  /**
+   * Copies the content from the source InputStream to the target OutputStream.
+   *
+   * @param source the InputStream to copy from
+   * @param target the OutputStream to copy to
+   * @throws IOException if an I/O error occurs during the copying process
+   */
+  public void copy(InputStream source, OutputStream target) throws IOException {
+    byte[] buffer = new byte[8192];
+    int bytesRead;
+    while ((bytesRead = source.read(buffer)) != -1) {
+      target.write(buffer, 0, bytesRead);
+    }
+  }
+
+  /**
+   * Copies a file from the source file to the destination file.
+   *
+   * @param sourceFile      the source file to be copied
+   * @param destinationFile the destination file where the source file will be
+   *                        copied to
+   * @throws IOException if an I/O error occurs during the file copy process
+   */
+  private void copyFile(File sourceFile, File destinationFile)
       throws IOException {
     try (InputStream in = new FileInputStream(sourceFile);
          OutputStream out = new FileOutputStream(destinationFile)) {
-      byte[] buf = new byte[1024];
+      byte[] buffer = new byte[1024];
       int length;
-      while ((length = in.read(buf)) > 0) {
-        out.write(buf, 0, length);
+      while ((length = in.read(buffer)) > 0) {
+        out.write(buffer, 0, length);
       }
     }
   }
 
-  public static boolean validateProfileFirstRun(String profileDirectory) {
+  /**
+   * Validates the profile for the first run.
+   *
+   * @param profileDirectory the directory of the profile
+   * @return true if the profile is valid for the first run, false otherwise
+   */
+  public boolean validateProfileFirstRun(String profileDirectory) {
     File profileDir = new File(profileDirectory);
     if (!profileDir.exists()) {
-      logger.info("Profile directory does not exist");
       return false;
     }
     if (!profileDir.isDirectory()) {
-      logger.info("Profile directory is not a directory");
       return false;
     }
-    File frf = new File(profileDir, "first-run");
-    if (frf.exists()) {
-      frf.delete();
-      // is a first run
+    File firstRunFile = new File(profileDir, "first-run");
+    if (firstRunFile.exists()) {
+      firstRunFile.delete();
       return true;
     }
     return false;
@@ -395,18 +484,20 @@ public class I2PCommonBrowser {
   public boolean waitForProxy(int timeout) {
     return waitForProxy(timeout, 4444);
   }
+
   /**
    * Waits for an HTTP proxy on the specified port to be ready.
    * Returns false on timeout of the specified number of seconds.
    *
    * @param timeout the number of seconds to wait for the proxy to be ready.
-   * @param port the port to wait for the proxy to be ready on.
+   * @param port    the port to wait for the proxy to be ready on.
    * @return true if the proxy is ready, false if it is not.
    * @since 0.0.1
    */
   public boolean waitForProxy(int timeout, int port) {
     return waitForProxy(timeout, port, "localhost");
   }
+
   /**
    * Waits for an HTTP proxy on the specified port to be ready.
    * Returns false on timeout of the specified number of seconds.
@@ -414,19 +505,17 @@ public class I2PCommonBrowser {
    * returns true.
    *
    * @param timeout the number of seconds to wait for the proxy to be ready.
-   * @param port the port to wait for the proxy to be ready on.
-   * @param host the host to wait for the proxy to be ready on.
+   * @param port    the port to wait for the proxy to be ready on.
+   * @param host    the host to wait for the proxy to be ready on.
    * @return true if the proxy is ready, false if it is not.
    * @since 0.0.1
    */
   public boolean waitForProxy(int timeout, int port, String host) {
-    logger.info("waiting up to " + timeout + "seconds for a proxy");
     if (timeout <= 0) {
       return true;
     }
     for (int i = 0; i < timeout; i++) {
-      logger.info("Waiting for proxy");
-      if (checkifPortIsOccupied(port, host)) {
+      if (isPortOccupied(port, host)) {
         return true;
       }
       try {
@@ -437,15 +526,23 @@ public class I2PCommonBrowser {
     }
     return false;
   }
-  public boolean checkifPortIsOccupied(int port, String host) {
+
+  /**
+   * Determines if a given port on a specified host is occupied.
+   *
+   * @param port the port number to check
+   * @param host the host address to check
+   * @return true if the port is occupied, false otherwise
+   */
+  public boolean isPortOccupied(int port, String host) {
     try {
-      Socket socket = new Socket(host, port);
-      socket.close();
+      new Socket(host, port).close();
       return true;
     } catch (IOException e) {
       return false;
     }
   }
+
   /**
    * Alters the proxy timeout to customized value time, in seconds.
    * May be zero.
@@ -455,36 +552,50 @@ public class I2PCommonBrowser {
   public void setProxyTimeoutTime(int time) { CONFIGURED_TIMEOUT = time; }
 
   /**
+   * Joins the elements of the given string array into a single string.
    *
+   * @param arr the string array to be joined
+   * @return the joined string
    */
-  protected static String join(String[] arr) {
-    StringBuilder val = new StringBuilder("");
-    for (int x = 0; x < arr.length; x++) {
-      val.append(" \"");
-      val.append(arr[x]);
-      val.append("\"");
+  protected String join(String[] arr) {
+    StringBuilder result = new StringBuilder();
+    for (String item : arr) {
+      result.append(" \"").append(item).append("\"");
     }
-    return val.toString();
+    return result.toString();
   }
-  public static void sleep(int millis) {
+
+  /**
+   * Sleeps for a specified number of milliseconds.
+   *
+   * @param millis the number of milliseconds to sleep
+   */
+  public void sleep(int millis) {
     try {
       Thread.sleep(millis);
-    } catch (InterruptedException bad) {
-      bad.printStackTrace();
-      throw new RuntimeException(bad);
+    } catch (InterruptedException e) {
+      throw new RuntimeException(e);
     }
   }
-  public static File searchFile(File file, String search) {
-    if (file.isDirectory()) {
-      File[] arr = file.listFiles();
-      for (File f : arr) {
-        File found = searchFile(f, search);
-        if (found != null)
-          return found;
+
+  /**
+   * Searches for a file in a given directory and its subdirectories.
+   *
+   * @param directory the directory to search in
+   * @param search    the name of the file to search for
+   * @return the found file or null if not found
+   */
+  public File searchFile(File directory, String search) {
+    if (directory.isDirectory()) {
+      File[] files = directory.listFiles();
+      for (File file : files) {
+        File foundFile = searchFile(file, search);
+        if (foundFile != null)
+          return foundFile;
       }
     } else {
-      if (file.getName().equals(search)) {
-        return file;
+      if (directory.getName().equals(search)) {
+        return directory;
       }
     }
     return null;

src/java/net/i2p/i2pfirefox/I2PFirefox.java

@@ -27,12 +27,13 @@ import java.util.stream.Stream;
  * @author idk
  * @since 0.0.1
  */
-public class I2PFirefox extends I2PCommonBrowser {
+public class I2PFirefox extends I2PFirefoxProfileUnpacker {
   private final String[] FIREFOX_SEARCH_PATHS = FIREFOX_FINDER();
-  private Process p = null;
-  public static boolean usability = false;
+  private Process process = null;
+  private String firefoxPath;
+  public boolean usability = false;
 
-  private static String baseMode() {
+  private String baseMode() {
     if (usability)
       return "usability";
     return "base";
@@ -55,37 +56,37 @@ public class I2PFirefox extends I2PCommonBrowser {
     }
   }
 
-  public static void storeFirefoxDefaults() {
+  public void storeFirefoxDefaults() {
     List<String> list = new ArrayList<String>();
     list = Arrays.asList(firefoxPathsWindows());
-    prop.setProperty("firefox.paths.windows",
-                     list.stream().collect(Collectors.joining(",")));
+    getProperties().setProperty("firefox.paths.windows",
+                                list.stream().collect(Collectors.joining(",")));
     list = Arrays.asList(firefoxPathsUnix());
-    prop.setProperty("firefox.paths.linux",
-                     list.stream().collect(Collectors.joining(",")));
+    getProperties().setProperty("firefox.paths.linux",
+                                list.stream().collect(Collectors.joining(",")));
     list = Arrays.asList(firefoxPathsOSX());
-    prop.setProperty("firefox.paths.osx",
-                     list.stream().collect(Collectors.joining(",")));
+    getProperties().setProperty("firefox.paths.osx",
+                                list.stream().collect(Collectors.joining(",")));
 
     list = Arrays.asList(firefoxBinsWindows());
-    prop.setProperty("firefox.bins.windows",
-                     list.stream().collect(Collectors.joining(",")));
+    getProperties().setProperty("firefox.bins.windows",
+                                list.stream().collect(Collectors.joining(",")));
     list = Arrays.asList(firefoxBinsUnix());
-    prop.setProperty("firefox.bins.linux",
-                     list.stream().collect(Collectors.joining(",")));
+    getProperties().setProperty("firefox.bins.linux",
+                                list.stream().collect(Collectors.joining(",")));
     list = Arrays.asList(firefoxBinsUnix());
-    prop.setProperty("firefox.bins.osx",
-                     list.stream().collect(Collectors.joining(",")));
+    getProperties().setProperty("firefox.bins.osx",
+                                list.stream().collect(Collectors.joining(",")));
     try (OutputStream fos = new FileOutputStream(
              new File(runtimeDirectory(""), "browser.config"))) {
-      prop.store(fos, "Firefox Configuration Section");
+      getProperties().store(fos, "Firefox Configuration Section");
     } catch (IOException ioe) {
       logger.warning(ioe.toString());
     }
   }
 
-  public static String[] firefoxPathsUnix() {
-    String firefoxPathsProp = prop.getProperty("firefox.paths.unix");
+  public String[] firefoxPathsUnix() {
+    String firefoxPathsProp = getProperties().getProperty("firefox.paths.unix");
     if (firefoxPathsProp != null)
       if (!firefoxPathsProp.equals(""))
         return firefoxPathsProp.split(",");
@@ -93,15 +94,15 @@ public class I2PFirefox extends I2PCommonBrowser {
                          "/snap/bin"};
   }
 
-  public static String[] firefoxBinsUnix() {
+  public String[] firefoxBinsUnix() {
     String firefoxPathsProp;
     if (isOSX()) {
-      firefoxPathsProp = prop.getProperty("firefox.bins.osx");
+      firefoxPathsProp = getProperties().getProperty("firefox.bins.osx");
       if (firefoxPathsProp != null)
         if (!firefoxPathsProp.equals(""))
           return firefoxPathsProp.split(",");
     }
-    firefoxPathsProp = prop.getProperty("firefox.bins.unix");
+    firefoxPathsProp = getProperties().getProperty("firefox.bins.unix");
     if (firefoxPathsProp != null)
       if (!firefoxPathsProp.equals(""))
         return firefoxPathsProp.split(",");
@@ -110,7 +111,7 @@ public class I2PFirefox extends I2PCommonBrowser {
                          "waterfox", "waterfox-bin", "librewolf"};
   }
 
-  private static String[] FIND_FIREFOX_SEARCH_PATHS_UNIX() {
+  private String[] FIND_FIREFOX_SEARCH_PATHS_UNIX() {
     String[] path = firefoxPathsUnix();
     String[] exes = firefoxBinsUnix();
     String[] exePath = new String[path.length * exes.length];
@@ -123,8 +124,8 @@ public class I2PFirefox extends I2PCommonBrowser {
     }
     return exePath;
   }
-  public static String[] firefoxPathsOSX() {
-    String firefoxPathsProp = prop.getProperty("firefox.paths.osx");
+  public String[] firefoxPathsOSX() {
+    String firefoxPathsProp = getProperties().getProperty("firefox.paths.osx");
     if (firefoxPathsProp != null)
       if (!firefoxPathsProp.equals(""))
         return firefoxPathsProp.split(",");
@@ -133,7 +134,7 @@ public class I2PFirefox extends I2PCommonBrowser {
                          "/Applications/Waterfox.app/Contents/MacOS",
                          "/Applications/Librewolf.app/Contents/MacOS"};
   }
-  private static String[] FIND_FIREFOX_SEARCH_PATHS_OSX() {
+  private String[] FIND_FIREFOX_SEARCH_PATHS_OSX() {
     String[] path = firefoxPathsOSX();
     String[] exes = firefoxBinsUnix();
     String[] exePath = new String[path.length * exes.length];
@@ -146,8 +147,9 @@ public class I2PFirefox extends I2PCommonBrowser {
     }
     return exePath;
   }
-  public static String[] firefoxPathsWindows() {
-    String firefoxPathsProp = prop.getProperty("firefox.paths.windows");
+  public String[] firefoxPathsWindows() {
+    String firefoxPathsProp =
+        getProperties().getProperty("firefox.paths.windows");
     if (firefoxPathsProp != null)
       if (!firefoxPathsProp.equals(""))
         return firefoxPathsProp.split(",");
@@ -179,8 +181,9 @@ public class I2PFirefox extends I2PCommonBrowser {
         new File(programFiles, "Librewolf/").toString(),
     };
   }
-  private static String[] firefoxBinsWindows() {
-    String firefoxPathsProp = prop.getProperty("firefox.bins.windows");
+  private String[] firefoxBinsWindows() {
+    String firefoxPathsProp =
+        getProperties().getProperty("firefox.bins.windows");
     if (firefoxPathsProp != null)
       if (!firefoxPathsProp.equals(""))
         return firefoxPathsProp.split(",");
@@ -189,7 +192,7 @@ public class I2PFirefox extends I2PCommonBrowser {
         "waterfox.exe", "waterfox-bin.exe", "librewolf.exe",
     };
   }
-  private static String[] FIND_FIREFOX_SEARCH_PATHS_WINDOWS() {
+  private String[] FIND_FIREFOX_SEARCH_PATHS_WINDOWS() {
     String[] path = firefoxPathsWindows();
     String[] exes = firefoxBinsWindows();
     String[] exePath = new String[path.length * exes.length];
@@ -203,7 +206,7 @@ public class I2PFirefox extends I2PCommonBrowser {
     return exePath;
   }
 
-  private static String[] FIND_ALL_FIREFOX_SEARCH_PATHS() {
+  private String[] FIND_ALL_FIREFOX_SEARCH_PATHS() {
     String[] Unix = FIND_FIREFOX_SEARCH_PATHS_UNIX();
     String[] Windows = FIND_FIREFOX_SEARCH_PATHS_WINDOWS();
     String[] Mac = FIND_FIREFOX_SEARCH_PATHS_OSX();
@@ -223,7 +226,7 @@ public class I2PFirefox extends I2PCommonBrowser {
     }
     return exePath;
   }
-  private static String[] FIND_FIREFOX_SEARCH_PATHS() {
+  private String[] FIND_FIREFOX_SEARCH_PATHS() {
     switch (getOperatingSystem()) {
     case "Windows":
       return FIND_FIREFOX_SEARCH_PATHS_WINDOWS();
@@ -238,8 +241,10 @@ public class I2PFirefox extends I2PCommonBrowser {
     }
   }
 
-  private static String[] NEARBY_FIREFOX_SEARCH_PATHS() {
+  private String[] NEARBY_FIREFOX_SEARCH_PATHS() {
     // obtain the PLUGIN environment variable
+    // crashreporterFolder := utl.CreateFolder(app.DataPath, "crashreporter")
+    // pluginsFolder := utl.CreateFolder(app.DataPath, "plugins")
     String plugin = System.getenv("PLUGIN");
     if (plugin != null && !plugin.isEmpty()) {
       File userDir = new File(plugin);
@@ -332,7 +337,7 @@ public class I2PFirefox extends I2PCommonBrowser {
 
     return new String[] {};
   }
-  private static String[] FIREFOX_FINDER() {
+  private String[] FIREFOX_FINDER() {
     String[] nearby = NEARBY_FIREFOX_SEARCH_PATHS();
     String[] all = FIND_FIREFOX_SEARCH_PATHS();
 
@@ -375,6 +380,9 @@ public class I2PFirefox extends I2PCommonBrowser {
    * @since 0.0.1
    */
   public String topFirefox() {
+    if (firefoxPath != null) {
+      return firefoxPath;
+    }
     // get the FIREFOX environment variable
     String firefox = System.getenv("FIREFOX");
     // if it is not null and not empty
@@ -383,11 +391,13 @@ public class I2PFirefox extends I2PCommonBrowser {
       File firefoxFile = new File(firefox);
       if (firefoxFile.exists()) {
         // if it does, return it
+        firefoxPath = firefox;
         return firefox;
       }
     }
     String[] firefoxes = onlyValidFirefoxes();
     if (firefoxes.length > 0) {
+      firefoxPath = firefoxes[0];
       return firefoxes[0];
     } else {
       return "";
@@ -556,7 +566,7 @@ public class I2PFirefox extends I2PCommonBrowser {
       newArgs[0] = firefox;
       newArgs[1] = "--new-instance";
       newArgs[2] = "--profile";
-      newArgs[3] = I2PFirefoxProfileBuilder.profileDirectory(app, baseMode());
+      newArgs[3] = this.profileDirectory(app, baseMode());
       if (args != null) {
         if (arglength > 0) {
           for (int i = 0; i < arglength; i++) {
@@ -593,20 +603,86 @@ public class I2PFirefox extends I2PCommonBrowser {
           if (!bashScript.canExecute()) {
             bashScript.setExecutable(true);
           }
-          return new ProcessBuilder(bashScript.getAbsolutePath())
-              .directory(I2PFirefoxProfileBuilder.runtimeDirectory(true));
+          ProcessBuilder pb = new ProcessBuilder(bashScript.getAbsolutePath());
+          File rtd = this.runtimeDirectory(true);
+          pb.directory(rtd);
+          String crashreporterFolder =
+              new File(rtd.getAbsolutePath(), "crashreporter").toString();
+          String pluginsFolder =
+              new File(rtd.getAbsolutePath(), "plugins").toString();
+          pb.environment().put("HOME", rtd.getAbsolutePath());
+          pb.environment().put("MOZ_CRASHREPORTER", "0");
+          pb.environment().put("MOZ_CRASHREPORTER_DATA_DIRECTORY",
+                               crashreporterFolder);
+          pb.environment().put("MOZ_CRASHREPORTER_DISABLE", "1");
+          pb.environment().put("MOZ_CRASHREPORTER_NO_REPORT", "1");
+          pb.environment().put("MOZ_DATA_REPORTING", "0");
+          pb.environment().put("MOZ_MAINTENANCE_SERVICE", "0");
+          pb.environment().put("MOZ_PLUGIN_PATH", pluginsFolder);
+          pb.environment().put("MOZ_UPDATER", "0");
+          pb.environment().put("TB_CUSTOM_HOMEPAGE", newArgs[4]);
+          pb.environment().put("TOR_FORCE_NET_CONFIG", "0");
+          pb.environment().put("TOR_SKIP_LAUNCH", "1");
+          pb.environment().put("TOR_SKIP_CONTROLPORTTEST", "1");
+          pb.environment().put("TOR_NONTOR_PROXY", "1");
+          return pb;
         } catch (IOException e) {
           logger.warning(e.toString());
         }
         return null;
       } else {
-        return new ProcessBuilder(newArgs).directory(
-            I2PFirefoxProfileBuilder.runtimeDirectory(true));
+        ProcessBuilder pb = new ProcessBuilder(newArgs);
+        File rtd = this.runtimeDirectory(true);
+        pb.directory(rtd);
+        String crashreporterFolder =
+            new File(rtd.getAbsolutePath(), "crashreporter").toString();
+        String pluginsFolder =
+            new File(rtd.getAbsolutePath(), "crashreporter").toString();
+        pb.environment().put("HOME", rtd.getAbsolutePath());
+        pb.environment().put("MOZ_CRASHREPORTER", "0");
+        pb.environment().put("MOZ_CRASHREPORTER_DATA_DIRECTORY",
+                             crashreporterFolder);
+        pb.environment().put("MOZ_CRASHREPORTER_DISABLE", "1");
+        pb.environment().put("MOZ_CRASHREPORTER_NO_REPORT", "1");
+        pb.environment().put("MOZ_DATA_REPORTING", "0");
+        pb.environment().put("MOZ_MAINTENANCE_SERVICE", "0");
+        pb.environment().put("MOZ_PLUGIN_PATH", pluginsFolder);
+        pb.environment().put("MOZ_UPDATER", "0");
+        if (args.length > 4)
+          pb.environment().put("TB_CUSTOM_HOMEPAGE", args[4]);
+        pb.environment().put("TOR_FORCE_NET_CONFIG", "0");
+        pb.environment().put("TOR_SKIP_LAUNCH", "1");
+        pb.environment().put("TOR_SKIP_CONTROLPORTTEST", "1");
+        pb.environment().put("TOR_NONTOR_PROXY", "1");
+        return pb;
       }
 
     } // else {
     logger.info("No Firefox found.");
-    return new ProcessBuilder(args);
+    ProcessBuilder pb = new ProcessBuilder(args);
+    File rtd = this.runtimeDirectory(true);
+    pb.directory(rtd);
+    String crashreporterFolder =
+        new File(rtd.getAbsolutePath(), "crashreporter").toString();
+    String pluginsFolder =
+        new File(rtd.getAbsolutePath(), "crashreporter").toString();
+    pb.environment().put("HOME", rtd.getAbsolutePath());
+    pb.environment().put("MOZ_CRASHREPORTER", "0");
+    pb.environment().put("MOZ_CRASHREPORTER_DATA_DIRECTORY",
+                         crashreporterFolder);
+    pb.environment().put("MOZ_CRASHREPORTER_DISABLE", "1");
+    pb.environment().put("MOZ_CRASHREPORTER_NO_REPORT", "1");
+    pb.environment().put("MOZ_DATA_REPORTING", "0");
+    pb.environment().put("MOZ_MAINTENANCE_SERVICE", "0");
+    pb.environment().put("MOZ_PLUGIN_PATH", pluginsFolder);
+    pb.environment().put("MOZ_UPDATER", "0");
+    if (args.length > 4)
+      pb.environment().put("TB_CUSTOM_HOMEPAGE", args[4]);
+    pb.environment().put("TOR_FORCE_NET_CONFIG", "0");
+    pb.environment().put("TOR_SKIP_LAUNCH", "1");
+    pb.environment().put("TOR_SKIP_CONTROLPORTTEST", "1");
+    pb.environment().put("TOR_NONTOR_PROXY", "1");
+    return pb;
     //}
     // return null;
   }
@@ -624,20 +700,18 @@ public class I2PFirefox extends I2PCommonBrowser {
     return launchAndDetatch(privateWindowInt, url);
   }
   public Process launchAndDetatch(int privateWindow, String[] url) {
-    validateUserDir();
+    validateUserDirectory();
     boolean app = false;
     if (privateWindow == 2)
       app = true;
     if (waitForProxy()) {
-      String profileDirectory =
-          I2PFirefoxProfileBuilder.profileDirectory(app, baseMode());
-      if (I2PFirefoxProfileChecker.validateProfileDirectory(profileDirectory)) {
+      String profileDirectory = this.profileDirectory(app, baseMode());
+      if (this.validateProfileDirectory(profileDirectory)) {
         logger.info("Valid profile directory: " + profileDirectory);
       } else {
         logger.info("Invalid profile directory: " + profileDirectory +
                     " rebuilding...");
-        if (!I2PFirefoxProfileBuilder.copyBaseProfiletoProfile(usabilityMode(),
-                                                               app)) {
+        if (!this.copyBaseProfiletoProfile(usabilityMode(), app)) {
           logger.info("Failed to rebuild profile directory: " +
                       profileDirectory);
           return null;
@@ -696,10 +770,10 @@ public class I2PFirefox extends I2PCommonBrowser {
       }
       try {
         logger.info(pb.command().toString());
-        p = pb.start();
+        process = pb.start();
         logger.info("I2PFirefox");
         sleep(2000);
-        return p;
+        return process;
       } catch (Throwable e) {
         logger.info(e.toString());
       }
@@ -725,12 +799,12 @@ public class I2PFirefox extends I2PCommonBrowser {
   }
   public void launch(int privateWindow, String[] url) {
     if (waitForProxy()) {
-      p = launchAndDetatch(privateWindow, url);
-      if (p == null)
+      process = launchAndDetatch(privateWindow, url);
+      if (process == null)
         return;
       try {
         logger.info("Waiting for I2PFirefox to close...");
-        int exit = p.waitFor();
+        int exit = process.waitFor();
         logger.info("I2PFirefox exited with value: " + exit);
         if (isOSX())
           System.exit(exit);
@@ -761,7 +835,26 @@ public class I2PFirefox extends I2PCommonBrowser {
    */
   public void launch() { launch(false); }
 
-  private static String ValidURL(String inUrl) {
+  /**
+   * Stop all running processes managed by the browser manager.
+   *
+   * @return true if successful, false if not
+   */
+  public boolean stop() {
+    if (process != null) {
+      process.destroy();
+      return true;
+    }
+    return false;
+  }
+
+  public boolean running() {
+    if (process != null)
+      return process.isAlive();
+    return false;
+  }
+
+  private String ValidURL(String inUrl) {
     String[] schemes = {"http", "https"};
     for (String scheme : schemes) {
       if (inUrl.startsWith(scheme)) {
@@ -773,34 +866,34 @@ public class I2PFirefox extends I2PCommonBrowser {
   }
 
   public static void main(String[] args) {
-    validateUserDir();
     int privateBrowsing = 0;
-    logger.info("checking for private browsing");
-    logger.info("I2PFirefox");
     I2PFirefox i2pFirefox = new I2PFirefox();
+    i2pFirefox.validateUserDirectory();
+    i2pFirefox.logger.info("checking for private browsing");
+    i2pFirefox.logger.info("I2PFirefox");
     ArrayList<String> visitURL = new ArrayList<String>();
     if (args != null) {
       if (args.length > 0) {
         for (String arg : args) {
           if (arg.equals("-private")) {
             privateBrowsing = 1;
-            logger.info(
+            i2pFirefox.logger.info(
                 "private browsing is true, profile will be discarded at end of session");
           }
           if (arg.equals("-usability")) {
-            usability = true;
+            i2pFirefox.usability = true;
           }
           if (arg.equals("-app")) {
-            usability = true;
+            i2pFirefox.usability = true;
             privateBrowsing = 2;
           }
           if (arg.equals("-noproxycheck")) {
-            logger.info("zeroing out proxy check");
+            i2pFirefox.logger.info("zeroing out proxy check");
             i2pFirefox.setProxyTimeoutTime(0);
           }
           if (!arg.startsWith("-")) {
             // check if it's a URL
-            visitURL.add(ValidURL(arg));
+            visitURL.add(i2pFirefox.ValidURL(arg));
           }
         }
       }
@@ -809,7 +902,7 @@ public class I2PFirefox extends I2PCommonBrowser {
                       visitURL.toArray(new String[visitURL.size()]));
   }
 
-  /*private static void sleep(int millis) {
+  /*private void sleep(int millis) {
     try {
       Thread.sleep(millis);
     } catch (InterruptedException bad) {

src/java/net/i2p/i2pfirefox/I2PFirefoxProfileBuilder.java

@@ -23,9 +23,9 @@ import java.nio.file.StandardCopyOption;
  * @author idk
  * @since 0.0.1
  */
-public class I2PFirefoxProfileBuilder extends I2PCommonBrowser {
-  private static boolean strict;
-  private static String userChromeCSS() {
+public class I2PFirefoxProfileBuilder extends I2PFirefoxProfileChecker {
+  private boolean strict;
+  private String userChromeCSS() {
     String ret =
         "@namespace url(\"http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul\")\n";
 
@@ -98,20 +98,11 @@ public class I2PFirefoxProfileBuilder extends I2PCommonBrowser {
    *
    * @return the profile directory, or null if it could not be created
    */
-  // public static String profileDirectory() {
+  // public String profileDirectory() {
   //   return profileDirectory("I2P_FIREFOX_PROFILE", "firefox", false);
   // }
 
-  /**
-   * get the profile directory, creating it if necessary
-   *
-   * @return the profile directory, or null if it could not be created
-   */
-  public static String profileDirectory(boolean app, String base) {
-    return profileDirectory("I2P_FIREFOX_PROFILE", "firefox", base, app);
-  }
-
-  private static String baseProfileDir(String file, String base) {
+  private String baseProfileDir(String file, String base) {
     File profileDir = new File(file, "i2p.firefox." + base + ".profile");
     // make sure the directory exists
     if (profileDir.exists()) {
@@ -131,7 +122,7 @@ public class I2PFirefoxProfileBuilder extends I2PCommonBrowser {
    *
    * @return the base profile directory, or null if it could not be created
    */
-  public static String baseProfileDirectory(String base) {
+  public String baseProfileDirectory(String base) {
     String pd = System.getenv("I2P_FIREFOX_BASE_PROFILE");
     if (pd != null && !pd.isEmpty()) {
       File pdf = new File(pd);
@@ -155,7 +146,7 @@ public class I2PFirefoxProfileBuilder extends I2PCommonBrowser {
    * @return the runtime directory, or null if it could not be created
    * @since 0.0.1
    */
-  public static File runtimeDirectory(boolean create) {
+  public File runtimeDirectory(boolean create) {
     String rtd = runtimeDirectory();
     return runtimeDirectory(create, rtd);
   }
@@ -166,7 +157,7 @@ public class I2PFirefoxProfileBuilder extends I2PCommonBrowser {
    * @return the runtime directory, or null if it could not be created or found
    * @since 0.0.1
    */
-  public static String runtimeDirectory() {
+  public String runtimeDirectory() {
     // get the I2P_FIREFOX_DIR environment variable
     String rtd = System.getenv("I2P_FIREFOX_DIR");
     // if it is not null and not empty
@@ -186,7 +177,7 @@ public class I2PFirefoxProfileBuilder extends I2PCommonBrowser {
    *
    * @since 0.0.1
    */
-  public static boolean copyBaseProfiletoProfile(String base, boolean app) {
+  public boolean copyBaseProfiletoProfile(String base, boolean app) {
     String baseProfile = baseProfileDirectory(base);
     String profile = profileDirectory(app, base);
     logger.info("Copying base profile to profile directory: " + baseProfile +
@@ -219,7 +210,7 @@ public class I2PFirefoxProfileBuilder extends I2PCommonBrowser {
     return copyStrictOptions(base, app);
   }
 
-  protected static boolean writeAppChrome(String profile) {
+  protected boolean writeAppChrome(String profile) {
     File dir = new File(profile, "chrome");
     if (!dir.exists())
       dir.mkdirs();
@@ -232,7 +223,7 @@ public class I2PFirefoxProfileBuilder extends I2PCommonBrowser {
     }
     return true;
   }
-  protected static boolean deleteAppChrome(String profile) {
+  protected boolean deleteAppChrome(String profile) {
     File dir = new File(profile, "chrome");
     if (!dir.exists())
       return true;
@@ -247,7 +238,7 @@ public class I2PFirefoxProfileBuilder extends I2PCommonBrowser {
    * @return true if successful, false otherwise
    * @since 0.0.1
    */
-  public static boolean copyStrictOptions(String base, boolean app) {
+  public boolean copyStrictOptions(String base, boolean app) {
     logger.info("Checking strict options");
     String baseProfile = baseProfileDirectory(base);
     String profile = profileDirectory(app, base);
@@ -282,21 +273,21 @@ public class I2PFirefoxProfileBuilder extends I2PCommonBrowser {
     return true;
   }
 
-  public static void setupUserChrome(File profileDir, boolean app) {
+  public void setupUserChrome(File profileDir, boolean app) {
     File workingUserOverrides = new File(profileDir, "user-overrides.js");
     logger.info(workingUserOverrides.getAbsolutePath());
     if (workingUserOverrides.exists()) {
       logger.info("Checking app mode settings");
       if (app) {
         logger.info("Setting profile to app mode");
-        I2PFirefoxProfileChecker.undoValue(
+        this.undoValue(
             "toolkit.legacyUserProfileCustomizations.stylesheets\", false",
             "toolkit.legacyUserProfileCustomizations.stylesheets\", true",
             workingUserOverrides);
         writeAppChrome(profileDir.toString());
       } else {
         logger.info("Taking profile out of app mode");
-        I2PFirefoxProfileChecker.undoValue(
+        this.undoValue(
             "toolkit.legacyUserProfileCustomizations.stylesheets\", true",
             "toolkit.legacyUserProfileCustomizations.stylesheets\", false",
             workingUserOverrides);
@@ -310,14 +301,14 @@ public class I2PFirefoxProfileBuilder extends I2PCommonBrowser {
       logger.info("Checking app mode settings");
       if (app) {
         logger.info("Setting profile to app mode");
-        I2PFirefoxProfileChecker.undoValue(
+        this.undoValue(
             "toolkit.legacyUserProfileCustomizations.stylesheets\", false",
             "toolkit.legacyUserProfileCustomizations.stylesheets\", true",
             workingPrefOverrides);
         writeAppChrome(profileDir.toString());
       } else {
         logger.info("Taking profile out of app mode");
-        I2PFirefoxProfileChecker.undoValue(
+        this.undoValue(
             "toolkit.legacyUserProfileCustomizations.stylesheets\", true",
             "toolkit.legacyUserProfileCustomizations.stylesheets\", false",
             workingPrefOverrides);
@@ -331,7 +322,7 @@ public class I2PFirefoxProfileBuilder extends I2PCommonBrowser {
    *
    * @since 0.0.1
    */
-  public I2PFirefoxProfileBuilder() { I2PFirefoxProfileBuilder.strict = false; }
+  public I2PFirefoxProfileBuilder() { this.strict = false; }
 
   /**
    * Construct a new Profile Builder
@@ -339,7 +330,5 @@ public class I2PFirefoxProfileBuilder extends I2PCommonBrowser {
    *
    * @since 0.0.1
    */
-  public I2PFirefoxProfileBuilder(boolean strict) {
-    I2PFirefoxProfileBuilder.strict = strict;
-  }
+  public I2PFirefoxProfileBuilder(boolean strict) { this.strict = strict; }
 }

src/java/net/i2p/i2pfirefox/I2PFirefoxProfileChecker.java

@@ -27,23 +27,36 @@ import java.util.Scanner;
 public class I2PFirefoxProfileChecker extends I2PCommonBrowser {
 
   /**
-   * @param args unused
+   * The main method for executing the Java program.
+   *
+   * @param args the command line arguments
    */
   public static void main(String[] args) {
-    String profileDirectory =
-        I2PFirefoxProfileBuilder.profileDirectory(false, "base");
+    I2PFirefoxProfileChecker profileChecker = new I2PFirefoxProfileChecker();
+    String profileDirectory = profileChecker.profileDirectory(false, "base");
     if (profileDirectory == null) {
-      logger.info("No profile directory found");
+      profileChecker.logger.info("No profile directory found");
       return;
     }
-    logger.info("Profile directory: " + profileDirectory);
-    boolean ok = validateProfileDirectory(profileDirectory);
-    if (ok) {
-      logger.info("Profile directory is valid");
+    profileChecker.logger.info("Profile directory: " + profileDirectory);
+    boolean isProfileValid =
+        profileChecker.validateProfileDirectory(profileDirectory);
+    if (isProfileValid) {
+      profileChecker.logger.info("Profile directory is valid");
     } else {
-      logger.info("Profile directory is invalid");
+      profileChecker.logger.info("Profile directory is invalid");
     }
   }
+
+  /**
+   * get the profile directory, creating it if necessary
+   *
+   * @return the profile directory, or null if it could not be created
+   */
+  public String profileDirectory(boolean app, String base) {
+    return profileDirectory("I2P_FIREFOX_PROFILE", "firefox", base, app);
+  }
+
   /**
    * Return true if the profile directory is valid.
    *
@@ -51,82 +64,80 @@ public class I2PFirefoxProfileChecker extends I2PCommonBrowser {
    * @return true if the profile directory is valid, false otherwise
    * @since 0.0.1
    */
-  public static boolean validateProfileDirectory(String profileDirectory) {
+  public boolean validateProfileDirectory(String profileDirectory) {
     File profileDir = new File(profileDirectory);
-    if (!profileDir.exists()) {
-      logger.info("Profile directory does not exist");
-      return false;
-    }
-    if (!profileDir.isDirectory()) {
-      logger.info("Profile directory is not a directory");
-      return false;
-    }
-    if (!profileDir.canRead()) {
-      logger.info("Profile directory is not readable");
-      return false;
-    }
-    if (!profileDir.canWrite()) {
-      logger.info("Profile directory is not writable");
+    if (!profileDir.exists() || !profileDir.isDirectory() ||
+        !profileDir.canRead() || !profileDir.canWrite()) {
       return false;
     }
     if (!validateFile(profileDir + "/prefs.js")) {
-      logger.info("prefs.js is not valid");
       return false;
     }
     if (!validateFile(profileDir + "/user.js")) {
-      logger.info("user.js is not valid");
       return false;
     }
     if (!validateExtensionDirectory(profileDir + "/extensions")) {
-      logger.info("extensions directory is invalid");
       return false;
     }
     return deRestrictHTTPSAndSetupHomepage(profileDir.toString());
   }
 
-  private static boolean deRestrictHTTPSAndSetupHomepage(String profile) {
-    // String profile = profileDirectory();
+  /**
+   * Verify essential values in prefs.js, user.js, and user-overrides.js
+   *
+   * @param profile profile
+   * @return true if successful
+   */
+  private boolean deRestrictHTTPSAndSetupHomepage(String profile) {
     File profileDir = new File(profile);
     if (profileDir.exists()) {
-      File prefOverrides = new File(profile, "prefs.js");
-      if (prefOverrides.exists()) {
-        undoHttpsOnlyMode(prefOverrides);
-        undoHomepage(prefOverrides);
-      }
-      File userSettings = new File(profile, "user.js");
-      if (userSettings.exists()) {
-        undoHttpsOnlyMode(userSettings);
-        undoHomepage(userSettings);
-      }
-      File userOverrides = new File(profile, "user-overrides.js");
-      if (userOverrides.exists()) {
-        undoHttpsOnlyMode(userOverrides);
-        undoHomepage(userOverrides);
-      }
+      cleanUpFile(new File(profile, "prefs.js"));
+      cleanUpFile(new File(profile, "user.js"));
+      cleanUpFile(new File(profile, "user-overrides.js"));
+      return true;
     }
     return false;
   }
 
-  private static boolean undoHttpsOnlyMode(File fileToBeModified) {
+  /**
+   * Cleans up a file by undoing specific modifications if the file exists.
+   *
+   * @param file the file to be cleaned up
+   */
+  private void cleanUpFile(File file) {
+    if (file.exists()) {
+      undoHttpsOnlyMode(file);
+      undoHomepage(file);
+    }
+  }
+
+  /**
+   * Undo the HTTPS-only mode by modifying a file.
+   *
+   * @param fileToBeModified the file to be modified
+   * @return true if the undo operation is successful, false otherwise
+   */
+  private boolean undoHttpsOnlyMode(File fileToBeModified) {
     String oldString = "\"dom.security.https_only_mode\", true";
     String newString = "\"dom.security.https_only_mode\", false";
     return undoValue(oldString, newString, fileToBeModified);
   }
 
-  private static boolean undoHomepage(File fileToBeModified) {
-    String oldString = "\"browser.startup.homepage\", true";
-    File file = new File("Student.txt");
-    String newString =
+  /**
+   * Undo the modification of the homepage in a file.
+   *
+   * @param fileToBeModified the file to be modified
+   * @return true if the modification was successful, otherwise false
+   */
+  private boolean undoHomepage(File fileToBeModified) {
+    String oldStringToFind = "\"browser.startup.homepage\", true";
+    String newStringToReplace =
         "\"browser.startup.homepage\", \"http://127.0.0.1:7657\"";
-    try {
-      try (Scanner scanner = new Scanner(file)) {
-        // now read the file line by line...
-        while (scanner.hasNextLine()) {
-          String line = scanner.nextLine();
-          if (line.contains("browser.startup.homepage")) {
-            oldString = line.toString();
-            return undoValue(oldString, newString, fileToBeModified);
-          }
+    try (Scanner scanner = new Scanner(fileToBeModified)) {
+      while (scanner.hasNextLine()) {
+        String line = scanner.nextLine();
+        if (line.contains(oldStringToFind)) {
+          return undoValue(line, newStringToReplace, fileToBeModified);
         }
       }
     } catch (FileNotFoundException e) {
@@ -135,8 +146,17 @@ public class I2PFirefoxProfileChecker extends I2PCommonBrowser {
     return true;
   }
 
-  public static boolean undoValue(String oldString, String newString,
-                                  File fileToBeModified) {
+  /**
+   * Undo the value by replacing the occurrences of the old string with the new
+   * string in the given file.
+   *
+   * @param oldString        the string to be replaced
+   * @param newString        the string to replace the old string with
+   * @param fileToBeModified the file to be modified
+   * @return true if the value was successfully undone, false otherwise
+   */
+  public boolean undoValue(String oldString, String newString,
+                           File fileToBeModified) {
     String oldContent = "";
     BufferedReader reader = null;
     FileWriter writer = null;
@@ -163,58 +183,38 @@ public class I2PFirefoxProfileChecker extends I2PCommonBrowser {
     }
     return false;
   }
+
   /**
    * Return true if the file is valid.
    *
-   * @param file the file to check
+   * @param filePath the path of the file to check
    * @return true if the file is valid, false otherwise
    * @since 0.0.1
    */
-  public static boolean validateFile(String file) {
-    File f = new File(file);
-    if (!f.exists()) {
-      logger.info("User JavaScript file does not exist");
-      return false;
-    }
-    if (!f.isFile()) {
-      logger.info("User JavaScript file is not a file");
-      return false;
-    }
-    if (!f.canRead()) {
-      logger.info("User JavaScript file is not readable");
-      return false;
-    }
-    if (!f.canWrite()) {
-      logger.info("User JavaScript file is not writable");
+  public boolean validateFile(String filePath) {
+    File file = new File(filePath);
+    if (!file.exists() || !file.isFile() || !file.canRead() ||
+        !file.canWrite()) {
       return false;
     }
     return true;
   }
+
   /**
-   * Return true if the extension directory is valid.
+   * Validates the extension directory.
    *
-   * @param extensionDirectory the extension directory to check
+   * @param extensionDirectory the extension directory to validate
    * @return true if the extension directory is valid, false otherwise
    * @since 0.0.1
    */
-  public static boolean validateExtensionDirectory(String extensionDirectory) {
+  public boolean validateExtensionDirectory(String extensionDirectory) {
     File extensionDir = new File(extensionDirectory);
-    if (!extensionDir.exists()) {
-      logger.info("Extension directory does not exist");
-      return false;
-    }
-    if (!extensionDir.isDirectory()) {
-      logger.info("Extension directory is not a directory");
-      return false;
-    }
-    if (!extensionDir.canRead()) {
-      logger.info("Extension directory is not readable");
-      return false;
-    }
-    if (!extensionDir.canWrite()) {
-      logger.info("Extension directory is not writable");
+
+    if (!extensionDir.exists() || !extensionDir.isDirectory() ||
+        !extensionDir.canRead() || !extensionDir.canWrite()) {
       return false;
     }
+
     return true;
   }
 }

src/java/net/i2p/i2pfirefox/I2PFirefoxProfileUnpacker.java

@@ -18,13 +18,13 @@ package net.i2p.i2pfirefox;
  * @author idk
  * @since 0.0.1
  */
-public class I2PFirefoxProfileUnpacker extends I2PCommonBrowser {
+public class I2PFirefoxProfileUnpacker extends I2PFirefoxProfileBuilder {
 
   public static void main(String[] args) {
-    String profileDirectory =
-        I2PFirefoxProfileBuilder.profileDirectory(false, "base");
+    I2PFirefoxProfileUnpacker up = new I2PFirefoxProfileUnpacker();
+    String profileDirectory = up.profileDirectory(false, "base");
     if (profileDirectory == null) {
-      logger.info("No profile directory found");
+      up.logger.info("No profile directory found");
       return;
     }
   }

src/java/net/i2p/i2pfirefox/I2PGenericUnsafeBrowser.java

@@ -33,14 +33,14 @@ import java.util.stream.Collectors;
 
 public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
   private final int DEFAULT_TIMEOUT = 200;
-  public static String BROWSER = "";
+  public String BROWSER = "";
   private Process p = null;
   // Ideally, EVERY browser in this list should honor http_proxy, https_proxy,
   // ftp_proxy and no_proxy. in practice, this is going to be hard to guarantee.
   // For now, we're just assuming. So don't use this until I understand the
   // situation better, unless you think you know better.
-  private static String[] browsers() {
-    String genericPathsProp = prop.getProperty("generic.bins.unix");
+  private String[] browsers() {
+    String genericPathsProp = getProperties().getProperty("generic.bins.unix");
     if (genericPathsProp != null)
       return genericPathsProp.split(",");
     return new String[] {
@@ -62,15 +62,15 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
         "www-browser", "links", "lynx"};
   }
 
-  public static void storeGenericDefaults() {
+  public void storeGenericDefaults() {
     List<String> list = new ArrayList<String>();
 
     list = Arrays.asList(browsers());
-    prop.setProperty("generic.bins.unix",
-                     list.stream().collect(Collectors.joining(",")));
+    getProperties().setProperty("generic.bins.unix",
+                                list.stream().collect(Collectors.joining(",")));
     try (OutputStream fos = new FileOutputStream(
              new File(runtimeDirectory(""), "browser.config"))) {
-      prop.store(fos, "Chromium Configuration Section");
+      getProperties().store(fos, "Chromium Configuration Section");
     } catch (IOException ioe) {
       logger.warning(ioe.toString());
     }
@@ -98,7 +98,7 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
    *     for execution, or null if not found
    * @since 2.0.0
    */
-  static public String getDefaultWindowsBrowser() {
+  public String getDefaultWindowsBrowser() {
     String defaultBrowser;
     String key;
     // User-Configured HTTPS Browser
@@ -139,7 +139,7 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
    *     exist/is empty
    * @since 2.0.0
    */
-  private static String registryQuery(String hkeyquery, String key) {
+  private String registryQuery(String hkeyquery, String key) {
     try {
       // Get registry where we find the default browser
       String[] cmd = {"REG", "QUERY", hkeyquery};
@@ -177,7 +177,7 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
    *     hkeyquery, or null
    * @since 2.0.0
    */
-  private static String followUserConfiguredBrowserToCommand(String hkeyquery) {
+  private String followUserConfiguredBrowserToCommand(String hkeyquery) {
     String progIdValue = registryQuery(hkeyquery, "ProgId");
     return followProgIdToCommand(progIdValue);
   }
@@ -193,7 +193,7 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
    *     hkeyquery, or null
    * @since 2.0.0
    */
-  private static String followProgIdToCommand(String progid) {
+  private String followProgIdToCommand(String progid) {
     String hkeyquery =
         "HKEY_CLASSES_ROOT\\" + progid + "\\shell\\open\\command";
     String finalValue = registryQuery(hkeyquery, "(Default)");
@@ -212,7 +212,7 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
    *     exist/is empty
    * @since 2.0.0
    */
-  private static String getDefaultOutOfRegistry(String hkeyquery) {
+  private String getDefaultOutOfRegistry(String hkeyquery) {
     String defaultValue = registryQuery(hkeyquery, "(Default)");
     if (defaultValue != null) {
       if (!defaultValue.equals(""))
@@ -227,7 +227,7 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
     return null;
   }
 
-  private static String scanAPath(String dir) {
+  private String scanAPath(String dir) {
     for (String browser : browsers()) {
       File test = new File(dir, browser);
       if (test.exists()) {
@@ -242,7 +242,7 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
    *
    * @return
    */
-  public static String getAnyUnixBrowser() {
+  public String getAnyUnixBrowser() {
     // read the PATH environment variable and split it by ":"
     String[] path = System.getenv("PATH").split(":");
     if (path != null && path.length > 0) {
@@ -261,7 +261,7 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
    *
    * @return
    */
-  public static String findUnsafeBrowserAnywhere() {
+  public String findUnsafeBrowserAnywhere() {
     if (BROWSER != "") {
       File f = new File(BROWSER);
       if (f.exists())
@@ -322,7 +322,7 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
    *
    * @return true if successful, false if not
    */
-  public static boolean deleteRuntimeDirectory() {
+  public boolean deleteRuntimeDirectory() {
     File rtd = runtimeDirectory(true);
     if (rtd.exists()) {
       rtd.delete();
@@ -338,7 +338,7 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
    * @return the runtime directory, or null if it could not be created
    * @since 0.0.18
    */
-  public static File runtimeDirectory(boolean create) {
+  public File runtimeDirectory(boolean create) {
     String rtd = runtimeDirectory();
     return runtimeDirectory(create, rtd);
   }
@@ -350,7 +350,7 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
    *     found
    * @since 0.0.18
    */
-  public static String runtimeDirectory() {
+  public String runtimeDirectory() {
     // get the I2P_BROWSER_DIR environment variable
     String rtd = System.getenv("I2P_BROWSER_DIR");
     // if it is not null and not empty
@@ -366,7 +366,7 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
   }
 
   public Process launchAndDetatch(boolean privateWindow, String[] url) {
-    validateUserDir();
+    validateUserDirectory();
     if (waitForProxy()) {
       ProcessBuilder pb;
       if (privateWindow) {
@@ -404,8 +404,26 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
       }
     }
   }
+  /**
+   * Stop all running processes managed by the browser manager.
+   *
+   * @return true if successful, false if not
+   */
+  public boolean stop() {
+    if (p != null) {
+      p.destroy();
+      return true;
+    }
+    return false;
+  }
 
-  private static String ValidURL(String inUrl) {
+  public boolean running() {
+    if (p != null)
+      return p.isAlive();
+    return false;
+  }
+
+  private String ValidURL(String inUrl) {
     String[] schemes = {"http", "https"};
     for (String scheme : schemes) {
       if (inUrl.startsWith(scheme)) {
@@ -416,29 +434,28 @@ public class I2PGenericUnsafeBrowser extends I2PCommonBrowser {
     return "";
   }
 
-  //
   public static void main(String[] args) {
-    validateUserDir();
+    I2PGenericUnsafeBrowser i2pBrowser = new I2PGenericUnsafeBrowser();
+    i2pBrowser.validateUserDirectory();
     boolean privateBrowsing = false;
-    logger.info("checking for private browsing");
+    i2pBrowser.logger.info("checking for private browsing");
     ArrayList<String> visitURL = new ArrayList<String>();
     if (args != null) {
       if (args.length > 0) {
         for (String arg : args) {
           if (arg.equals("-private")) {
             privateBrowsing = true;
-            logger.info(
+            i2pBrowser.logger.info(
                 "private browsing is true, profile will be discarded at end of session");
           }
           if (!arg.startsWith("-")) {
             // check if it's a URL
-            visitURL.add(ValidURL(arg));
+            visitURL.add(i2pBrowser.ValidURL(arg));
           }
         }
       }
     }
-    logger.info("I2PGenericUnsafeBrowser");
-    I2PGenericUnsafeBrowser i2pBrowser = new I2PGenericUnsafeBrowser();
+    i2pBrowser.logger.info("I2PGenericUnsafeBrowser");
     i2pBrowser.launch(privateBrowsing,
                       visitURL.toArray(new String[visitURL.size()]));
   }

src/java/net/i2p/i2pfirefox/I2PLibreWolf.java

@@ -0,0 +1,24 @@
+package net.i2p.i2pfirefox;
+
+import java.io.*;
+import javax.script.*;
+
+/**
+ * I2PLibreWolf.java
+ * Copyright (C) 2022 idk <hankhill19580@gmail.com>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the MIT License. See LICENSE.md for details.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * I2PLibreWolf adds the LibreWolf Updater browser extension if the browser
+ * detected by the Firefox variant launcher is LibreWolf specifically.
+ *
+ * @author idk
+ * @since 1.0.6
+ */
+public class I2PLibreWolf {
+  // TODO: provide a librewolf updater here.
+}

src/java/net/i2p/i2pfirefox/I2PPureJavaBrowser.java

@@ -6,7 +6,7 @@ import java.io.File;
 
 public class I2PPureJavaBrowser extends I2PCommonBrowser {
     private final int DEFAULT_TIMEOUT = 200;
-    public static String BROWSER = "";
+    public String BROWSER = "";
 
     //
     public ProcessBuilder baseProcessBuilder(String[] args) {
@@ -18,7 +18,7 @@ public class I2PPureJavaBrowser extends I2PCommonBrowser {
      *
      * @return true if successful, false if not
      */
-    public static boolean deleteRuntimeDirectory() {
+    public boolean deleteRuntimeDirectory() {
       File rtd = runtimeDirectory(true);
       if (rtd.exists()) {
         rtd.delete();
@@ -34,7 +34,7 @@ public class I2PPureJavaBrowser extends I2PCommonBrowser {
      * @return the runtime directory, or null if it could not be created
      * @since 0.0.18
      */
-    public static File runtimeDirectory(boolean create) {
+    public File runtimeDirectory(boolean create) {
       String rtd = runtimeDirectory();
       return runtimeDirectory(create, rtd);
     }
@@ -46,7 +46,7 @@ public class I2PPureJavaBrowser extends I2PCommonBrowser {
      *     found
      * @since 0.0.18
      */
-    public static String runtimeDirectory() {
+    public String runtimeDirectory() {
       // get the I2P_BROWSER_DIR environment variable
       String rtd = System.getenv("I2P_BROWSER_DIR");
       // if it is not null and not empty

src/plugin/net/i2p/i2pfirefox/plugin/plugin/I2PBrowserPlugin.java

@@ -0,0 +1,263 @@
+package net.i2p.i2pfirefox.plugin;
+
+import java.awt.GraphicsEnvironment;
+import java.io.File;
+import net.i2p.I2PAppContext;
+import net.i2p.app.ClientApp;
+import net.i2p.app.ClientAppManager;
+import net.i2p.app.ClientAppState;
+import net.i2p.app.MenuCallback;
+import net.i2p.app.MenuHandle;
+import net.i2p.app.MenuService;
+import net.i2p.desktopgui.ExternalMain;
+import net.i2p.i2pfirefox.I2PBrowser;
+import net.i2p.i2pfirefox.I2PFirefox;
+import net.i2p.util.I2PAppThread;
+import net.i2p.util.Log;
+import net.i2p.util.SystemVersion;
+
+/**
+ * I2PBrowserPlugin.java
+ * Copyright (C) 2022 idk <hankhill19580@gmail.com>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the MIT License. See LICENSE.md for details.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * @description I2PBrowser is a class that is used to open a browser window to
+ * the I2P network. It automatically detects the operating system and available
+ * browsers, and selects the best one to use, with Tor Browser at the top for
+ * Firefox and Brave at the top for Chrome.
+ *
+ * @author idk
+ * @since 0.0.16
+ */
+public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
+  private final I2PAppContext _context;
+  private final Log _log;
+  private final ClientAppManager _mgr;
+  private final String _args[];
+  private static final String PROP_DTG_ENABLED = "desktopgui.enabled";
+  private final File pluginDir;
+  private final File profileDir;
+  private MenuHandle lmhs;
+  private MenuHandle lmhf;
+  /**
+   * @since 1.4.0
+   * @return
+   */
+  public I2PBrowserPlugin() {
+    _context = new I2PAppContext();
+    _mgr = null;
+    _args = new String[] {};
+    _log = _context.logManager().getLog(I2PBrowserPlugin.class);
+    pluginDir = new File(_context.getAppDir(), "plugins/i2pfirefox/");
+    profileDir = new File(pluginDir, "profile/");
+  }
+  /**
+   * @since 1.4.0
+   * @return
+   */
+  public I2PBrowserPlugin(I2PAppContext ctx, ClientAppManager mgr,
+                          String args[]) {
+    _context = ctx;
+    _mgr = mgr;
+    _args = args;
+    _log = ctx.logManager().getLog(I2PBrowserPlugin.class);
+    pluginDir = new File(_context.getAppDir(), "plugins/i2pfirefox/");
+    profileDir = new File(pluginDir, "profile/");
+  }
+
+  /**
+   * @since 1.4.0
+   * @return
+   */
+  public String getDisplayName() { return "I2P Browser"; }
+  /**
+   * @since 1.4.0
+   * @return
+   */
+  public String getName() { return "I2P Browser"; }
+  /**
+   * @since 1.4.0
+   * @return
+   */
+  public ClientAppState getState() { return ClientAppState.STOPPED; }
+  /**
+   * @since 1.4.0
+   * @return
+   */
+  public void shutdown(String[] args) {
+    if (!isSystrayEnabled()) {
+      _log.info("I2P Browser tray manager not supported");
+    } else {
+      _log.info("I2P Browser tray manager shutting down");
+      MenuService dtg = startTrayApp();
+      try {
+        Thread.sleep(1000);
+      } catch (InterruptedException ie) {
+      }
+      if (dtg != null) {
+        dtg.removeMenu(lmhs);
+        dtg.removeMenu(lmhf);
+      }
+    }
+    changeState(ClientAppState.STOPPED);
+  }
+  /**
+   * @since 1.4.0
+   * @return
+   */
+  public void startup() {
+    changeState(ClientAppState.STOPPED);
+    if (!isSystrayEnabled()) {
+      _log.info("I2P Browser tray manager not supported");
+      try {
+        I2PBrowser i2pBrowser = new I2PBrowser(profileDir.getAbsolutePath());
+        String[] args = {"http://proxy.i2p"};
+        i2pBrowser.launchFirefox(0, args);
+      } catch (Exception e) {
+        _log.error("Error starting I2P Browser", e);
+      }
+    } else {
+      try {
+        _log.info(
+            "Starting I2P Browser tray manager by testing http://proxy.i2p");
+        MenuService dtg = startTrayApp();
+        try {
+          Thread.sleep(1000);
+        } catch (InterruptedException ie) {
+        }
+        if (dtg != null) {
+          _log.info("I2P Browser integrating with I2P tray manager");
+          lmhs =
+              dtg.addMenu("Launch I2P Browser (Safe Mode)", new Starter(dtg));
+          dtg.showMenu(lmhs);
+          dtg.enableMenu(lmhs);
+          lmhf = dtg.addMenu("Launch I2P Browser (Flexible Mode)",
+                             new FlexStarter(dtg));
+          dtg.showMenu(lmhf);
+          dtg.enableMenu(lmhf);
+        } else {
+          _log.info("I2P Browser tray manager not found");
+        }
+        I2PBrowser i2pBrowser = new I2PBrowser(profileDir.getAbsolutePath());
+        String[] args = {"http://proxy.i2p"};
+        i2pBrowser.launchFirefox(0, args);
+      } catch (Exception e) {
+        _log.error("Error starting I2P Browser tray manager", e);
+      }
+    }
+  }
+
+  // Copied directly from I2PSnark-standalone
+  /**
+   * @since 1.4.0
+   * @return
+   */
+  private MenuService startTrayApp() {
+    try {
+      if (isSystrayEnabled()) {
+        System.setProperty("java.awt.headless", "false");
+        ExternalMain dtg =
+            new ExternalMain(_context, _context.clientAppManager(), null);
+        dtg.startup();
+        return dtg;
+      }
+    } catch (Throwable t) {
+      t.printStackTrace();
+    }
+    return null;
+  }
+
+  // Copied directly from I2PSnark-standalone where it is used to determine
+  // whether to launchFirefox the tray app Our environment should basically
+  // never be headless, that doesn't make any sense, but something tells me I
+  // should leave that check in.
+  /**
+   * @since 1.4.0
+   * @return
+   */
+  private boolean isSystrayEnabled() {
+    if (GraphicsEnvironment.isHeadless())
+      return false;
+    // default false except on OSX and Windows,
+    // and on Linux KDE and LXDE.
+    // Xubuntu XFCE works but doesn't look very good
+    // Ubuntu Unity was far too buggy to enable
+    // Ubuntu GNOME does not work, SystemTray.isSupported() returns false
+    String xdg = System.getenv("XDG_CURRENT_DESKTOP");
+    boolean dflt = SystemVersion.isWindows() || SystemVersion.isMac() ||
+                   //"XFCE".equals(xdg) ||
+                   "KDE".equals(xdg) || "LXDE".equals(xdg);
+    return _context.getProperty(PROP_DTG_ENABLED, dflt);
+  }
+
+  /**
+   * Callback when Start I2PBrowser is clicked in systray
+   *
+   * @since 1.4.0
+   * @return
+   */
+  public class Starter implements MenuCallback {
+    private final MenuService _ms;
+    public Starter(MenuService ms) { _ms = ms; }
+    public void clicked(MenuHandle menu) {
+      // Thread t = new I2PAppThread(new StarterThread(),
+      //"I2PBrowser-Launcher start", true);
+      // t.start();
+      _log.info("I2P Browser starting up");
+      try {
+        I2PBrowser i2pBrowser = new I2PBrowser(profileDir.getAbsolutePath());
+        String[] args = {"http://proxy.i2p"};
+        i2pBrowser.launchFirefox(0, args);
+      } catch (Exception e) {
+        _log.error("Error starting I2P Browser", e);
+      }
+      _log.info("I2P Browser ran");
+    }
+  }
+
+  /**
+   * @since 1.4.0
+   * @return
+   */
+  public class FlexStarter implements MenuCallback {
+    private final MenuService _ms;
+    public FlexStarter(MenuService ms) { _ms = ms; }
+    public void clicked(MenuHandle menu) {
+      // Thread t = new I2PAppThread(new StarterThread(),
+      //"I2PBrowser-Launcher start", true);
+      // t.start();
+      _log.info("I2P Browser starting up");
+      try {
+        I2PBrowser i2pBrowser = new I2PBrowser(profileDir.getAbsolutePath());
+        i2pBrowser.usability = true;
+        String[] args = {"http://proxy.i2p"};
+        i2pBrowser.launchFirefox(0, args);
+      } catch (Exception e) {
+        _log.error("Error starting I2P Browser", e);
+      }
+      _log.info("I2P Browser ran");
+    }
+  }
+
+  /**
+   * @since 1.4.0
+   * @return
+   */
+  private synchronized void changeState(ClientAppState state) {
+    if (_mgr != null)
+      _mgr.notify(this, state, null, null);
+  }
+  public static void main(String[] args) {
+    I2PBrowserPlugin plugin = new I2PBrowserPlugin();
+    try {
+      plugin.startup();
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+}

src/prefs.js

@@ -63,4 +63,5 @@ user_pref("browser.display.use_system_colors", false);
 user_pref("dom.image-lazy-loading.enabled", false);
 user_pref("extensions.autoDisableScopes", 0);
 user_pref("extensions.enabledScopes", 1);
-user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
+user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
+user_pref("browser.fixup.domainsuffixwhitelist.i2p", true);

src/user-overrides.js

@@ -227,4 +227,5 @@ user_pref("webgl.enable-webgl2", false);
 user_pref("dom.w3c_touch_events.enabled", false);
 user_pref("browser.privatebrowsing.autostart", false);
 user_pref("browser.display.use_system_colors", false);
-user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
+user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
+user_pref("browser.fixup.domainsuffixwhitelist.i2p", true);

style.css

@@ -75,8 +75,6 @@ iframe {
 }
 
 .container {
-    width: 36vw;
-    height: 64vh;
     display: inline-block;
     margin: 0;
     padding: 0;

test/test-all.sh

@@ -0,0 +1,10 @@
+#! /usr/bin/env sh
+
+ant distclean
+ant jar
+
+./test/test.sh
+./test/test-chromium.sh
+./test/test-firefox.sh
+./test/test-torbrowser.sh
+./test/test-unsafe.sh

tor-browser-linux64-11.5.4_en-US.tar.xz.asc

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABCgAGBQJjRyYHAAoJEOU9mJqeLUe/HbIQALBTyEB42g2+Dlufv8fvF2E2
-549sCPbkFHzKaH8ECeKfiZZDuTfLUmNUbnYD1/lxJtaUDj+u56sSF5V6us3HBgYN
-56Mh+miLv4Am9HEZXwCRtE/kRjbE3yuKjSqYpZkviPsK4PT1fBBg+aMtc8fUZk4y
-3BQZsvynie1OH2Qlw4XHMZUbHP7VlEAZCUWZTk8ai+mmqegmjtDc2NMNtZ03BGi7
-Rd5U03+9mmVQNiWcJZqZkzQg8x/tPQD0XmMH04mZ71dCukfsun+DykjVGUAktloj
-9XJ1aq+c3s4r/GXXXJ4sEnDe1QNBPOgEH5SLSiSAwwl531i5Oh2sO1U2ILC/PsnM
-MlZMbypMw2eVGIQgfXrWurWlSvKYw193Y7N4bjvvTQYkxmWWHegKtYj1Jmy5y4+q
-KypLjwD7QxDViRiQp5v8vzFAQ/0pacwT6D+r7ugAIrk9jFnl5dnHBDuBNHTdjPOI
-oyTnSFJkroMjpdzbDnta74FzyLBWMPPMD3L/LepJLW+iYcJDqDYCffTqCPDjJSco
-UgD71EiDSyM77wMKqEFzHzbNdW1Tmd88LoDc/erK9akbX4Xkhve0N/HFr+99c5rH
-5EzI2j/N3Kzwom/FYzT8saS5ljRdGD+APi7VKE9budDzlu0ZqIhK/zMIJ//JHi/O
-rmxTcTn5TaTfAMGhQUi/
-=yI0S
------END PGP SIGNATURE-----

windows-exe.sh

@@ -1,19 +0,0 @@
-#! /usr/bin/env sh
-. ./config.sh
-jpackage \
-    --verbose \
-    --type exe \
-    --win-dir-chooser \
-    --win-help-url "https://geti2p.net" \
-    --win-menu \
-    --win-menu-group "I2P Browser Configurer" \
-    --win-shortcut \
-    --win-shortcut-prompt \
-    --win-per-user-install \
-    --license-file LICENSE.md \
-    --icon src/icon.png \
-    --name i2pbrowser \
-    --app-version "$GITHUB_TAG" \
-    --input src/build \
-    --main-jar i2pfirefox.jar \
-    --main-class net.i2p.i2pfirefox.I2PBrowser

windows-portable.sh

@@ -1,19 +0,0 @@
-#! /usr/bin/env sh
-. ./config.sh
-mkdir -p tmp
-cp -v LICENSE.md tmp/LICENSE.md
-rm -rf i2pbrowser-portable
-jpackage \
-    --verbose \
-    --type app-image \
-    --name i2pbrowser-portable \
-    --app-version "$GITHUB_TAG" \
-    --input src/build \
-    --main-jar i2pfirefox.jar \
-    --resource-dir tmp \
-    --icon src/icon.png \
-    --main-class net.i2p.i2pfirefox.I2PBrowser
-rm -rf tmp
-cp -v LICENSE.md i2pbrowser-portable/LICENSE.md
-rm i2pbrowser-portable.zip -f
-zip -r i2pbrowser-portable-${GITHUB_TAG}.zip i2pbrowser-portable

windows-release.sh

@@ -4,9 +4,7 @@ git pull --all
 . ./config.sh
 . "${HOME}/github-release-config.sh"
 ant distclean jar
-./windows.sh
-./windows-exe.sh
-./windows-portable.sh
+ant windows-msi-release
 msisum=$(sha256sum "i2pbrowser-${GITHUB_TAG}.msi")
 github-release upload --user "${GITHUB_USER}" \
     --repo "${GITHUB_REPO}" \
@@ -16,6 +14,7 @@ github-release upload --user "${GITHUB_USER}" \
     --file "i2pbrowser-${GITHUB_TAG}.msi" \
     --replace
 echo "Uploaded MSI package"
+ant windows-exe-release
 exesum=$(sha256sum "i2pbrowser-${GITHUB_TAG}.exe")
 github-release upload --user "${GITHUB_USER}" \
     --repo "${GITHUB_REPO}" \
@@ -25,6 +24,7 @@ github-release upload --user "${GITHUB_USER}" \
     --file "i2pbrowser-${GITHUB_TAG}.exe" \
     --replace
 echo "Uploaded EXE package"
+ant windows-portable-release
 zipsum=$(sha256sum "i2pbrowser-portable-${GITHUB_TAG}.zip")
 github-release upload --user "${GITHUB_USER}" \
     --repo "${GITHUB_REPO}" \