clangFmt

.github/workflows/release.yml

@@ -59,7 +59,7 @@ jobs:
           workflow: ant.yml
           if_no_artifact_found: fail
       # remove .zip file extension
-      - run: for f in *.zip; do mv "$f" "${f%.zip}"; done
+      - run: for f in *.zip; do unzip "$f"; rm "$f"; done
       - run: echo "" | tee -a CHANGES.md
       - run: echo "## Checksums" | tee -a CHANGES.md
       - run: echo "" | tee -a CHANGES.md
@@ -67,10 +67,10 @@ jobs:
       - run: sha256sum * | tee -a CHANGES.md
       - run: echo '```' | tee -a CHANGES.md
       - run: echo "" | tee -a CHANGES.md
-      - run: echo '```' | tee -a changelog.txt
-      - run: file * | tee -a changelog.txt
-      - run: echo '```' | tee -a changelog.txt
-      - run: echo "" | tee -a changelog.txt
+      - 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:

CHANGES.html

@@ -55,6 +55,11 @@
                   docs/BUILD
                 </a>
               </li>
+              <li>
+                <a href="docs/I2P-PLUGIN.html">
+                  docs/I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="docs/I2PBrowser.html">
                   docs/I2PBrowser

CHANGES.md

@@ -170,3 +170,43 @@ Saturday, August 6
  - Implemented firefox detection
  - Implemented directory setup
  - Implemented processBuilder generator
+## Checksums
+
+```
+dc8797cfae23640e27ed7b32a3e6ccec232d24411d64cd9e5b107f8c5384a70a  CHANGES.md
+9a36e15def2a95077027cd0db5f95b345a87a8edfe5e89ea7f83aaa3c94f5ebb  i2p.chromium.base.profile.zip
+97ae21d621f813fd2d91f5921fe1eee95ec0d01782bf93db7b3689f959a9f3b8  i2p.chromium.usability.profile.zip
+5cd673bb27827e67796b52f26194b7b1504dddf1630ad9d9084ab6a318c6d20a  i2p.firefox.base.profile.zip
+556fc2df825e64b1463e88ec77a5de46bce61516a475e1136110363d5badabd2  i2p.firefox.usability.profile.zip
+6d3882ac113116b8f40ce07985e779859a68f43f14278b40f1628ea5362acca5  i2pbrowser-1.0.0-1.x86_64.rpm
+aa7185799b17fd7893818fe7728f3e3cb6b4c8022e033fc0f33f6be81e7b2c2f  i2pbrowser-1.0.0.dmg
+c307fb6556821258520a3d522cf7fbe2031aa421161fcac3e409f5ce20a1637a  i2pbrowser-1.0.0.exe
+5eae853ff7f8b9a05c4c7111147882a54aabd1cf581d21396878055a54a3efc7  i2pbrowser-1.0.0.msi
+cda1bb2058048a4303bbc65543a0f340ade1c88881ee60704333e767bae10db6  i2pbrowser-1.0.0.pkg
+183197aa39e891d5763ef5449957b9d9790bdfaaa06760288526f6283b865d97  i2pbrowser-portable.zip
+f017951df66f2e3d2d57886085a95bd2463cc8f7d793683960da30b842b9b17b  i2pbrowser.tar.gz
+4538172d9753967485566e52f064dbc06a5123971044d973766de28051d53eb1  i2pbrowser_1.0.0_amd64.deb
+6b5dd3e4ab1bcb3df4a5a758b5469239453c713bb6266bc5eea8b0d9ec7aa413  i2pfirefox-plugin.jar
+85ce64a3c03c72421947c777a72d42be6fc568c5317070927463accb347b703f  i2pfirefox.jar
+9856613f8229a773ef54a9e7e2a37a6c788755d96393478afce8db7439404e42  plugin.zip
+```
+
+```
+CHANGES.md:                         ASCII text
+i2p.chromium.base.profile.zip:      Zip archive data, at least v2.0 to extract, compression method=store
+i2p.chromium.usability.profile.zip: Zip archive data, at least v2.0 to extract, compression method=store
+i2p.firefox.base.profile.zip:       Zip archive data, at least v2.0 to extract, compression method=store
+i2p.firefox.usability.profile.zip:  Zip archive data, at least v2.0 to extract, compression method=store
+i2pbrowser-1.0.0-1.x86_64.rpm:      RPM v3.0 bin i386/x86_64
+i2pbrowser-1.0.0.dmg:               zlib compressed data
+i2pbrowser-1.0.0.exe:               PE32+ executable (GUI) x86-64, for MS Windows
+i2pbrowser-1.0.0.msi:               Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.2, MSI Installer, Code page: 1252, Title: Installation Database, Subject: i2pbrowser, Author: Unknown, Keywords: Installer, Comments: This installer database contains the logic and data required to install i2pbrowser., Template: x64;1033, Revision Number: {6D1D56D8-CB72-4709-BD0B-0FDBF71C6D32}, Create Time/Date: Sun Mar 10 06:04:32 2024, Last Saved Time/Date: Sun Mar 10 06:04:32 2024, Number of Pages: 200, Number of Words: 10, Name of Creating Application: Windows Installer XML Toolset (3.14.0.8606), Security: 2
+i2pbrowser-1.0.0.pkg:               xar archive compressed TOC: 1244, SHA-1 checksum, contains  zlib compressed data
+i2pbrowser-portable.zip:            Zip archive data, at least v2.0 to extract, compression method=deflate
+i2pbrowser.tar.gz:                  gzip compressed data, from Unix, original size modulo 2^32 725985280
+i2pbrowser_1.0.0_amd64.deb:         Debian binary package (format 2.0), with control.tar.zs, data compression zst
+i2pfirefox-plugin.jar:              Java archive data (JAR)
+i2pfirefox.jar:                     Java archive data (JAR)
+plugin.zip:                         Zip archive data, at least v1.0 to extract, compression method=store
+```
+

LICENSE.html

@@ -55,6 +55,11 @@
                   docs/BUILD
                 </a>
               </li>
+              <li>
+                <a href="docs/I2P-PLUGIN.html">
+                  docs/I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="docs/I2PBrowser.html">
                   docs/I2PBrowser

README.md

@@ -11,6 +11,28 @@ trackers, and jerks using off-the-shelf techniques and exploits. It is fundament
 to make changes which un-trust your browser vendor, your OS, your package manager or any
 other system that exists underneath it. **It is just a profile manager.**
 
+**What is this?**
+
+This is a browser profile manager which pre-configures a browser on the host system, usually
+Firefox or Tor Browser, for browsing I2P. When acting as an I2P Plugin, it adds GUI elements to
+I2P for launching the browser in a highly restricted "Safe" mode(the default) or a more permissive
+"Usability" mode.
+
+This package expresses functionality that has existed in many places at many times, sometimes
+bundled with other software. As it has developed here, the border of where the Easy-Install
+ends and Firefox Profile Manager begins has become clearer. This repository contains the profile
+manager and it's buildsystem, the whole profile manager, and nothing but the profile manager.
+It can be used independently of other software, provided an I2P proxy on the host system somewhere.
+
+However, in practice, most people probably get it alongside an I2P router, through the **I2P Easy-Install Bundle for Windows**.
+
+**What version numbers should I pay attention to?**
+When I decided to port the `.bat` launcher scripts from the Easy-Install bundle to Java, this project
+was created and started using it's own version numbers. This was the practice up until version 1.5.0,
+which was the last version to use a different version number than I2P itself. Starting in April 2024,
+`i2p.plugins.firefox` will follow along with the Java I2P major and minor version numbers. Incremental
+changes may become differing point releases.
+
 **All packages require a running I2P router.**
 
 **[Windows users should see the Easy-Install Bundle](https://i2pgit.org/i2p-hackers/i2p.firefox)**
@@ -47,6 +69,7 @@ directory for Firefox, and the `src/i2p.chromium.*.profile/extensions/*.js/*` di
 
 For platform specific instructions, see
 
+- [I2P-PLUGIN.md](docs/I2P-PLUGIN.md)/[I2P-PLUGIN.html](docs/I2P-PLUGIN.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)

VERSION.html

@@ -55,6 +55,11 @@
                   docs/BUILD
                 </a>
               </li>
+              <li>
+                <a href="docs/I2P-PLUGIN.html">
+                  docs/I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="docs/I2PBrowser.html">
                   docs/I2PBrowser
@@ -181,7 +186,7 @@ NoScript
 11.4.18
 https://clients2.google.com/service/update2/crx
 LocalCDN
-2.6.64
+2.6.65
 https://clients2.google.com/service/update2/crx
 uBlock Origin
 1.56.0

VERSION.md

@@ -12,17 +12,17 @@ noscript
 11.4.29
 https://addons.mozilla.org/firefox/downloads/file/4206186/noscript-11.4.29.xpi
 localcdn-fork-of-decentraleyes
-2.6.64
-https://addons.mozilla.org/firefox/downloads/file/4243456/localcdn_fork_of_decentraleyes-2.6.64.xpi
+2.6.69
+https://addons.mozilla.org/firefox/downloads/file/4303757/localcdn_fork_of_decentraleyes-2.6.69.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.17
-https://addons.mozilla.org/firefox/downloads/file/4190089/javascript_restrictor-0.17.xpi
+0.18.1
+https://addons.mozilla.org/firefox/downloads/file/4310951/javascript_restrictor-0.18.1.xpi
 ublock-origin
-1.56.0
-https://addons.mozilla.org/firefox/downloads/file/4237670/ublock_origin-1.56.0.xpi
+1.58.0
+https://addons.mozilla.org/firefox/downloads/file/4290466/ublock_origin-1.58.0.xpi
 ```
 
 ## Chromium
@@ -32,15 +32,15 @@ __MSG_extensionName__
 1.29
 https://clients2.google.com/service/update2/crx
 NoScript
-11.4.18
+11.4.30
 https://clients2.google.com/service/update2/crx
 LocalCDN
-2.6.64
+2.6.67
 https://clients2.google.com/service/update2/crx
 uBlock Origin
-1.56.0
+1.58.0
 https://clients2.google.com/service/update2/crx
 __MSG_extensionName__
-0.17
+0.18.1
 https://clients2.google.com/service/update2/crx
 ```

build.xml

@@ -328,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.3.0" />
+        <property name="release.number" value="1.4.991" />
         <exec executable="echo" osfamily="unix">
             <arg value="${release.number}-${build.number}" />
         </exec>

config.sh

@@ -3,4 +3,4 @@ export GITHUB_USER=eyedeekay
 export GITHUB_REPO=i2p.plugins.firefox
 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.4.0
+export GITHUB_TAG=$(git describe --tags --abbrev=0)

docs/BUILD.html

@@ -55,6 +55,11 @@
                   BUILD
                 </a>
               </li>
+              <li>
+                <a href="I2P-PLUGIN.html">
+                  I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="I2PBrowser.html">
                   I2PBrowser
@@ -152,6 +157,42 @@
       <h2>
         Build Dependencies
       </h2>
+      <p>
+        <strong>
+          SHORTCUT:
+        </strong>
+        All the build artifacts can be produced by the description in the
+        <code>
+          .yaml
+        </code>
+        files in
+        <code>
+          .github/workflows
+        </code>
+        .
+        These can be run on Github&rsquo;s infrastructure, or on a local PC using
+        <a href="https://github.com/nektos/act">
+          https://github.com/nektos/act
+        </a>
+        .
+        Windows targets will require a Windows PC!
+        Doing things this way deals with all the dependency issues that Windows doesn&rsquo;t really give you a good way to deal with automatically.
+        It also guarantees that the same base container and environment gets used for every build no matter what machine it runs on.
+        I highly recommend you use either Github CI or
+        <code>
+          nektos/act
+        </code>
+        for dev builds of this software, as it
+        <strong>
+          automates literally every one of the steps
+        </strong>
+        .
+        CI-based builds follow the
+        <code>
+          WSL
+        </code>
+        version of the instructions.
+      </p>
       <p>
         You will need
         <code>

docs/BUILD.md

@@ -2,6 +2,14 @@
 
 ## Build Dependencies
 
+**SHORTCUT:** All the build artifacts can be produced by the description in the `.yaml` files in `.github/workflows`.
+These can be run on Github's infrastructure, or on a local PC using https://github.com/nektos/act.
+Windows targets will require a Windows PC!
+Doing things this way deals with all the dependency issues that Windows doesn't really give you a good way to deal with automatically.
+It also guarantees that the same base container and environment gets used for every build no matter what machine it runs on.
+I highly recommend you use either Github CI or `nektos/act` for dev builds of this software, as it **automates literally every one of the steps**.
+CI-based builds follow the `WSL` version of the instructions.
+
 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:

docs/I2P-PLUGIN.md

@@ -0,0 +1,23 @@
+### I2P Plugin Support
+
+Since version `1.5.0`, this package has had basic plugin support in Java I2P.
+This means it can be integrated with your I2P installation or portable package, with
+the benefit of reduced size requirements, automatic updates, and integration with the I2P UI.
+Installation in this way is **platform-independent**, the same package is used for Linux, Windows, and OSX.
+In this type of installation, the profile manager install is entirely managed by I2P.
+Uninstalling I2P will also uninstall the profile manager.
+
+#### Downloading the Plugin
+
+Right now, the best way to download the plugin is from the Github releases page.
+First, download the `i2pfirefox.su3` file from [the latest release](https://github.com/eyedeekay/i2p.plugins.firefox/releases).
+Versions ending in `0` will always have a plugin release, starting with `1.5.0`.
+Dev builds will not have a reliable plugin release.
+
+#### Install the plugin "From File"
+
+Once you have downloaded the `i2pfirefox.su3` file, open [`http://127.0.0.1:7657/configplugins`](http://127.0.0.1:7657/configplugins) and scroll to the bottom of the page.
+Under the heading **Installation from File**, click the "Browse" button.
+In the window that appears, select the `i2pfirefox.su3` file you just downloaded.
+Finally, click the "Install plugin from File" button.
+The plugin will install and start shortly.

docs/I2PBrowser.html

@@ -55,6 +55,11 @@
                   BUILD
                 </a>
               </li>
+              <li>
+                <a href="I2P-PLUGIN.html">
+                  I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="I2PBrowser.html">
                   I2PBrowser

docs/I2PChromium.html

@@ -55,6 +55,11 @@
                   BUILD
                 </a>
               </li>
+              <li>
+                <a href="I2P-PLUGIN.html">
+                  I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="I2PBrowser.html">
                   I2PBrowser

docs/I2PChromiumProfileBuilder.html

@@ -55,6 +55,11 @@
                   BUILD
                 </a>
               </li>
+              <li>
+                <a href="I2P-PLUGIN.html">
+                  I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="I2PBrowser.html">
                   I2PBrowser

docs/I2PChromiumProfileChecker.html

@@ -55,6 +55,11 @@
                   BUILD
                 </a>
               </li>
+              <li>
+                <a href="I2P-PLUGIN.html">
+                  I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="I2PBrowser.html">
                   I2PBrowser

docs/I2PChromiumProfileUnpacker.html

@@ -55,6 +55,11 @@
                   BUILD
                 </a>
               </li>
+              <li>
+                <a href="I2P-PLUGIN.html">
+                  I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="I2PBrowser.html">
                   I2PBrowser

docs/I2PCommonBrowser.html

@@ -55,6 +55,11 @@
                   BUILD
                 </a>
               </li>
+              <li>
+                <a href="I2P-PLUGIN.html">
+                  I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="I2PBrowser.html">
                   I2PBrowser

docs/I2PFirefox.html

@@ -55,6 +55,11 @@
                   BUILD
                 </a>
               </li>
+              <li>
+                <a href="I2P-PLUGIN.html">
+                  I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="I2PBrowser.html">
                   I2PBrowser

docs/I2PFirefoxProfileBuilder.html

@@ -55,6 +55,11 @@
                   BUILD
                 </a>
               </li>
+              <li>
+                <a href="I2P-PLUGIN.html">
+                  I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="I2PBrowser.html">
                   I2PBrowser

docs/I2PFirefoxProfileChecker.html

@@ -55,6 +55,11 @@
                   BUILD
                 </a>
               </li>
+              <li>
+                <a href="I2P-PLUGIN.html">
+                  I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="I2PBrowser.html">
                   I2PBrowser

docs/I2PFirefoxProfileUnpacker.html

@@ -55,6 +55,11 @@
                   BUILD
                 </a>
               </li>
+              <li>
+                <a href="I2P-PLUGIN.html">
+                  I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="I2PBrowser.html">
                   I2PBrowser

docs/I2PGenericUnsafeBrowser.html

@@ -55,6 +55,11 @@
                   BUILD
                 </a>
               </li>
+              <li>
+                <a href="I2P-PLUGIN.html">
+                  I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="I2PBrowser.html">
                   I2PBrowser

docs/LINUX.html

@@ -55,6 +55,11 @@
                   BUILD
                 </a>
               </li>
+              <li>
+                <a href="I2P-PLUGIN.html">
+                  I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="I2PBrowser.html">
                   I2PBrowser

docs/OSX.html

@@ -55,6 +55,11 @@
                   BUILD
                 </a>
               </li>
+              <li>
+                <a href="I2P-PLUGIN.html">
+                  I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="I2PBrowser.html">
                   I2PBrowser

docs/WINDOWS.html

@@ -55,6 +55,11 @@
                   BUILD
                 </a>
               </li>
+              <li>
+                <a href="I2P-PLUGIN.html">
+                  I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="I2PBrowser.html">
                   I2PBrowser
@@ -163,7 +168,7 @@
       </h4>
       <p>
         <strong>
-          (Not Recommended! This functionality is already included in the Easy-Install Bundle for Windows)
+          (Recommended for advanced users ONLY. Most people should be using Easy-Install Bundle for Windows)
         </strong>
       </p>
       <ol>

docs/WINDOWS.md

@@ -7,7 +7,7 @@ an unbundled I2P router with an external JVM.
 
 #### Windows Jpackage: `.zip`
 
-**(Not Recommended! This functionality is already included in the Easy-Install Bundle for Windows)**
+**(Recommended for advanced users ONLY. Most people should be using Easy-Install Bundle for Windows)**
 
 1. Start your I2P Router
 2. Download the latest release `.zip` from [Github](https://github.com/eyedeekay/i2p.plugins.firefox/releases) and verify it's hash.

index.html

@@ -55,6 +55,11 @@
                   docs/BUILD
                 </a>
               </li>
+              <li>
+                <a href="docs/I2P-PLUGIN.html">
+                  docs/I2P-PLUGIN
+                </a>
+              </li>
               <li>
                 <a href="docs/I2PBrowser.html">
                   docs/I2PBrowser
@@ -172,6 +177,48 @@
           It is just a profile manager.
         </strong>
       </p>
+      <p>
+        <strong>
+          What is this?
+        </strong>
+      </p>
+      <p>
+        This is a browser profile manager which pre-configures a browser on the host system, usually
+        Firefox or Tor Browser, for browsing I2P. When acting as an I2P Plugin, it adds GUI elements to
+        I2P for launching the browser in a highly restricted &ldquo;Safe&rdquo; mode(the default) or a more permissive
+        &ldquo;Usability&rdquo; mode.
+      </p>
+      <p>
+        This package expresses functionality that has existed in many places at many times, sometimes
+        bundled with other software. As it has developed here, the border of where the Easy-Install
+        ends and Firefox Profile Manager begins has become clearer. This repository contains the profile
+        manager and it&rsquo;s buildsystem, the whole profile manager, and nothing but the profile manager.
+        It can be used independently of other software, provided an I2P proxy on the host system somewhere.
+      </p>
+      <p>
+        However, in practice, most people probably get it alongside an I2P router, through the
+        <strong>
+          I2P Easy-Install Bundle for Windows
+        </strong>
+        .
+      </p>
+      <p>
+        <strong>
+          What version numbers should I pay attention to?
+        </strong>
+        When I decided to port the
+        <code>
+          .bat
+        </code>
+        launcher scripts from the Easy-Install bundle to Java, this project
+        was created and started using it&rsquo;s own version numbers. This was the practice up until version 1.5.0,
+        which was the last version to use a different version number than I2P itself. Starting in April 2024,
+        <code>
+          i2p.plugins.firefox
+        </code>
+        will follow along with the Java I2P major and minor version numbers. Incremental
+        changes may become differing point releases.
+      </p>
       <p>
         <strong>
           All packages require a running I2P router.
@@ -269,6 +316,15 @@
         For platform specific instructions, see
       </p>
       <ul>
+        <li>
+          <a href="docs/I2P-PLUGIN.md">
+            I2P-PLUGIN.md
+          </a>
+          /
+          <a href="docs/I2P-PLUGIN.html">
+            I2P-PLUGIN.html
+          </a>
+        </li>
         <li>
           <a href="docs/LINUX.md">
             LINUX.md

plugin-upload.sh

@@ -0,0 +1,30 @@
+#! /usr/bin/env sh
+
+. ./config.sh
+NUMLINE=`grep release.number build.xml | head -n 1`
+sed -i "s|${NUMLINE}|        <property name=\"release.number\" value=\"$GITHUB_TAG\" />|g" build.xml
+ant distclean versionMd jar plugin
+
+github-release release --user "${GITHUB_USER}" \
+    --repo "${GITHUB_REPO}" \
+    --name "${GITHUB_NAME}" \
+    --description "${GITHUB_DESCRIPTION}" \
+    --tag "${GITHUB_TAG}"; true
+sleep 2s
+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"

scripts/build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Thu Mar 07 15:18:16 EST 2024
-build.number=709
+#Mon Jul 08 13:00:28 EDT 2024
+build.number=720

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

@@ -1,27 +1,6 @@
 package net.i2p.i2pfirefox;
 
-/*import java.awt.AWTException;
-import java.awt.Component;
-import java.awt.Image;
-import java.awt.Menu;
-import java.awt.MenuItem;
-import java.awt.PopupMenu;
-import java.awt.SystemTray;
-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;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.ArrayList;
-import java.util.Arrays;
 
 /**
  * I2PBrowser.java

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

@@ -295,7 +295,7 @@ public class I2PChromium extends I2PChromiumProfileUnpacker {
     }
     // now, do the same thing, but with user.dir instead of plugin
     // list the directories in the user.dir directory
-    File userDir = new File(System.getProperty("user.dir"));
+    File userDir = userHomeDir();
     if (userDir.exists()) {
       if (isWindows()) {
         File searchResult = searchFile(userDir, "ungoogled-chromium.exe");

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

@@ -9,11 +9,9 @@ import java.io.OutputStream;
 import java.net.Socket;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
-import java.util.Arrays;
 import java.util.Properties;
 import java.util.logging.FileHandler;
 import java.util.logging.Logger;
-import java.util.logging.SimpleFormatter;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -36,6 +34,7 @@ public class I2PCommonBrowser {
   private Properties prop = new Properties();
   public Logger logger = Logger.getLogger("browserlauncher");
   private FileHandler fh;
+  private boolean validated = false;
   int CONFIGURED_TIMEOUT = 200;
 
   public I2PCommonBrowser() {
@@ -75,6 +74,8 @@ public class I2PCommonBrowser {
    * @return None No return value.
    */
   public void validateUserDirectory() {
+    if (validated)
+      return;
     logger.info("Validating user directory");
     String userDir = System.getProperty("user.dir");
     String userHome = System.getProperty("user.home");
@@ -123,6 +124,7 @@ public class I2PCommonBrowser {
       logger.info(defaultPathFile.getAbsolutePath());
     }
     System.setProperty("user.dir", defaultPathFile.getAbsolutePath());
+    validated = true;
   }
 
   /**
@@ -192,15 +194,17 @@ public class I2PCommonBrowser {
    *
    * @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");
-  }*/
+  /*
+   * 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.
@@ -223,7 +227,7 @@ public class I2PCommonBrowser {
    * Returns the runtime directory path based on the given override parameter.
    *
    * @param override the name of the environment variable to override the
-   *     runtime
+   *                 runtime
    *                 directory
    * @return the runtime directory path as a string
    */
@@ -586,6 +590,8 @@ public class I2PCommonBrowser {
    * @return the found file or null if not found
    */
   public File searchFile(File directory, String search) {
+    if (directory == null || !directory.exists() || !directory.canRead())
+      return null;
     if (directory.isDirectory()) {
       File[] files = directory.listFiles();
       for (File file : files) {
@@ -600,4 +606,13 @@ public class I2PCommonBrowser {
     }
     return null;
   }
+
+  public File userHomeDir() {
+    File hd = new File(System.getProperty("user.dir"));
+    if (hd == null || !hd.exists()) {
+      hd = new File(System.getProperty("user.home"));
+    }
+    logger.info("Runtime directory discovered at: " + hd);
+    return hd;
+  }
 }

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

@@ -292,7 +292,7 @@ public class I2PFirefox extends I2PFirefoxProfileUnpacker {
     }
     // now, do the same thing, but with user.dir instead of plugin
     // list the directories in the user.dir directory
-    File userDir = new File(System.getProperty("user.dir"));
+    File userDir = userHomeDir();
     if (userDir.exists()) {
       if (isWindows()) {
         File searchResult = searchFile(userDir, "firefox-esr.exe");

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

@@ -4,7 +4,6 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.net.Socket;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

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

@@ -1,8 +1,5 @@
 package net.i2p.i2pfirefox;
 
-import java.io.*;
-import javax.script.*;
-
 /**
  * I2PLibreWolf.java
  * Copyright (C) 2022 idk <hankhill19580@gmail.com>

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

@@ -127,7 +127,7 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
             "Starting I2P Browser tray manager by testing http://proxy.i2p");
         MenuService dtg = startTrayApp();
         try {
-          Thread.sleep(1000);
+          Thread.sleep(5000);
         } catch (InterruptedException ie) {
         }
         if (dtg != null) {