update plugins. Use user's homedir if we're not running in a jpackage.

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
+2.6.69
-https://addons.mozilla.org/firefox/downloads/file/4243456/localcdn_fork_of_decentraleyes-2.6.64.xpi
+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
+0.18.1
-https://addons.mozilla.org/firefox/downloads/file/4190089/javascript_restrictor-0.17.xpi
+https://addons.mozilla.org/firefox/downloads/file/4310951/javascript_restrictor-0.18.1.xpi
 ublock-origin
-1.56.0
+1.58.0
-https://addons.mozilla.org/firefox/downloads/file/4237670/ublock_origin-1.56.0.xpi
+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.65
+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
 ```

scripts/build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Tue Mar 19 18:47:29 EDT 2024
+#Mon Jul 08 13:00:28 EDT 2024
-build.number=717
+build.number=720

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

@@ -65,7 +65,9 @@ public class I2PCommonBrowser {
    *
    * @return the properties of the object
    */
-  public Properties getProperties() { return prop; }
+  public Properties getProperties() {
+    return prop;
+  }
 
   /**
    * Validates the user directory.
@@ -194,15 +196,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.
@@ -307,8 +311,7 @@ public class I2PCommonBrowser {
   protected String profileDir(String file, String browser, String base,
       boolean app) {
     String appString = app ? ".app" : "";
-    String profileDirName =
+    String profileDirName = String.format("i2p.%s.profile.%s%s", browser, base, appString);
-        String.format("i2p.%s.profile.%s%s", browser, base, appString);
     File profileDir = new File(file, profileDirName);
     return profileDir.getAbsolutePath();
   }
@@ -325,8 +328,7 @@ public class I2PCommonBrowser {
       String base) {
     logger.info("Unpacking base profile to " + profileDirectory);
     try {
-      final InputStream resources =
+      final InputStream resources = this.getClass().getClassLoader().getResourceAsStream(
-          this.getClass().getClassLoader().getResourceAsStream(
           "i2p." + browser + "." + base + ".profile.zip");
       if (resources == null) {
         logger.info("Could not find resources");
@@ -473,7 +475,9 @@ public class I2PCommonBrowser {
    * @return true if the proxy is ready, false if it is not.
    * @since 0.0.1
    */
-  public boolean waitForProxy() { return waitForProxy(CONFIGURED_TIMEOUT); }
+  public boolean waitForProxy() {
+    return waitForProxy(CONFIGURED_TIMEOUT);
+  }
 
   /**
    * Waits for an HTTP proxy on port 4444 to be ready.
@@ -551,7 +555,9 @@ public class I2PCommonBrowser {
    *
    * @param time
    */
-  public void setProxyTimeoutTime(int time) { CONFIGURED_TIMEOUT = time; }
+  public void setProxyTimeoutTime(int time) {
+    CONFIGURED_TIMEOUT = time;
+  }
 
   /**
    * Joins the elements of the given string array into a single string.
@@ -602,4 +608,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");