try pinning the older version of crx3

.github/workflows/ant.yml

@@ -24,7 +24,7 @@ jobs:
           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
+        run: go install github.com/mediabuyerbot/go-crx3/crx3@v1.4.1
       - name: install dzip
         run: go install github.com/delicb/dzip@latest
       - name: install amo-version
@@ -115,7 +115,7 @@ jobs:
           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
+        run: go install github.com/mediabuyerbot/go-crx3/crx3@v1.4.1
       - name: install dzip
         run: go install github.com/delicb/dzip@latest
       - name: install amo-version
@@ -155,7 +155,7 @@ jobs:
           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
+        run: go install github.com/mediabuyerbot/go-crx3/crx3@v1.4.1
       - name: install dzip
         run: go install github.com/delicb/dzip@latest
       - name: install amo-version
@@ -211,7 +211,7 @@ jobs:
           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
+        run: go install github.com/mediabuyerbot/go-crx3/crx3@v1.4.1
       - name: install dzip
         run: go install github.com/delicb/dzip@latest
       - name: install amo-version

CHANGES.md

@@ -1,3 +1,10 @@
+Mon, July 8
+-----------
+
+ - Fix a bug which caused the profile manager to fail to detect Firefox on some systems
+ - Fix a bug which caused the profile manager to use an unwritable directory on some systems
+ - Fix a bug where if user tried to run it from the home directory, the application would make sure that no firefoxes existed in any subdirectory before running
+
 Thu, March 7
 ------------
 

VERSION.md

@@ -6,23 +6,23 @@ Extension Versions
 
 ```md
 i2p-in-private-browsing
-1.48
+2.6.0
-https://addons.mozilla.org/firefox/downloads/file/4123613/i2p_in_private_browsing-1.48.xpi
+https://addons.mozilla.org/firefox/downloads/file/4339795/i2p_in_private_browsing-2.6.0.xpi
 noscript
-11.4.29
+11.4.34
-https://addons.mozilla.org/firefox/downloads/file/4206186/noscript-11.4.29.xpi
+https://addons.mozilla.org/firefox/downloads/file/4333280/noscript-11.4.34.xpi
 localcdn-fork-of-decentraleyes
-2.6.64
+2.6.72
-https://addons.mozilla.org/firefox/downloads/file/4243456/localcdn_fork_of_decentraleyes-2.6.64.xpi
+https://addons.mozilla.org/firefox/downloads/file/4336546/localcdn_fork_of_decentraleyes-2.6.72.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
+0.19
-https://addons.mozilla.org/firefox/downloads/file/4190089/javascript_restrictor-0.17.xpi
+https://addons.mozilla.org/firefox/downloads/file/4339678/javascript_restrictor-0.19.xpi
 ublock-origin
-1.56.0
+1.59.0
-https://addons.mozilla.org/firefox/downloads/file/4237670/ublock_origin-1.56.0.xpi
+https://addons.mozilla.org/firefox/downloads/file/4328681/ublock_origin-1.59.0.xpi
 ```
 
 ## Chromium
@@ -32,15 +32,15 @@ __MSG_extensionName__
 1.29
 https://clients2.google.com/service/update2/crx
 NoScript
-11.4.18
+11.4.33
 https://clients2.google.com/service/update2/crx
 LocalCDN
-2.6.65
+2.6.72
 https://clients2.google.com/service/update2/crx
 uBlock Origin
-1.56.0
+1.59.0
 https://clients2.google.com/service/update2/crx
 __MSG_extensionName__
-0.17
+0.19
 https://clients2.google.com/service/update2/crx
 ```

build.xml

@@ -522,6 +522,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <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"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
         <exec executable="rm" failonerror="true" osfamily="windows">
             <arg value="-rf" />
@@ -557,6 +558,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <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="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
         </exec>
@@ -574,6 +576,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <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="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
             <arg value="--main-jar"/> <arg value="i2pfirefox.jar"/>
             <arg value="--main-class"/> <arg value="net.i2p.i2pfirefox.I2PBrowser"/>
         </exec>
@@ -592,6 +595,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <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"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="fedora-release" depends="jar">
@@ -608,6 +612,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <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"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="windows" depends="jar">
@@ -628,6 +633,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <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"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="windows-release" depends="jar">
@@ -648,6 +654,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <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"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="windows-msi" depends="jar">
@@ -668,6 +675,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <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"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="windows-msi-release" depends="jar">
@@ -688,6 +696,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <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"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="windows-portable" depends="jar">
@@ -700,6 +709,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <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"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
         <copy file="LICENSE.md" todir="i2pbrowser-portable" overwrite="true"/>
         <delete file="i2pbrowser-portable.zip"/>
@@ -719,6 +729,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <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"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
         <copy file="LICENSE.md" todir="i2pbrowser-portable" overwrite="true"/>
         <delete file="i2pbrowser-portable.zip"/>
@@ -742,6 +753,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <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"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="macos-release" depends="jar">
@@ -757,6 +769,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <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"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="macos-pkg" depends="jar">
@@ -772,6 +785,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <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"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
     <target name="macos-pkg-release" depends="jar">
@@ -787,6 +801,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
             <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"/>
+            <arg value="--add-launcher"/> <arg value="i2pbrowser-usability=src/usability.properties"/>
         </exec>
     </target>
 

scripts/build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Tue Mar 19 18:47:29 EDT 2024
+#Tue Aug 20 20:53:41 EDT 2024
-build.number=717
+build.number=731

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

@@ -253,6 +253,8 @@ public class I2PBrowser extends I2PGenericUnsafeBrowser {
           }
         }
       }
+      if (!this.chromium)
+        this.firefox = true;
     }
     return visitURL;
   }

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

@@ -194,15 +194,17 @@ public class I2PCommonBrowser {
    *
    * @return the log file for the browser launcher
    */
-  /*private File logFile() {
+  /*
-    // validateUserDirectory();
+   * private File logFile() {
-    String userDirectory = System.getProperty("user.dir");
+   * // validateUserDirectory();
-    File logDirectory = new File(userDirectory, "logs");
+   * String userDirectory = System.getProperty("user.dir");
-    if (!logDirectory.exists()) {
+   * File logDirectory = new File(userDirectory, "logs");
-      logDirectory.mkdirs();
+   * if (!logDirectory.exists()) {
-    }
+   * logDirectory.mkdirs();
-    return new File(logDirectory, "browserlauncher.log");
+   * }
-  }*/
+   * return new File(logDirectory, "browserlauncher.log");
+   * }
+   */
 
   /**
    * Get the runtime directory, creating it if create=true.
@@ -225,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
    */
@@ -588,6 +590,13 @@ public class I2PCommonBrowser {
    * @return the found file or null if not found
    */
   public File searchFile(File directory, String search) {
+    File hd = new File(System.getProperty("user.home"));
+    if (hd != null) {
+      if (directory.getAbsolutePath().equals(hd.getAbsolutePath()))
+        return null;
+    }
+    if (directory == null || !directory.exists() || !directory.canRead())
+      return null;
     if (directory.isDirectory()) {
       File[] files = directory.listFiles();
       for (File file : files) {
@@ -602,4 +611,18 @@ public class I2PCommonBrowser {
     }
     return null;
   }
+
+  public File userHomeDir() {
+    File rd = new File(System.getProperty("user.dir"));
+    File hd = new File(System.getProperty("user.home"));
+    if (rd == null || !rd.exists()) {
+      if (hd == null || !hd.exists()) {
+        if (rd.getAbsolutePath().equals(hd.getAbsolutePath()))
+          return null;
+      }
+      return rd;
+    }
+    logger.info("Runtime directory discovered at: " + rd);
+    return rd;
+  }
 }

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/plugin/net/i2p/i2pfirefox/plugin/plugin/I2PBrowserPlugin.java

@@ -190,7 +190,7 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
     // 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) ||
+                   "XFCE".equals(xdg) ||
                    "KDE".equals(xdg) || "LXDE".equals(xdg);
     return _context.getProperty(PROP_DTG_ENABLED, dflt);
   }

src/usability.properties

@@ -0,0 +1,2 @@
+main-class=net.i2p.i2pfirefox.I2PBrowser
+arguments=-usability