clangFmt

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.65
-https://addons.mozilla.org/firefox/downloads/file/4251866/localcdn_fork_of_decentraleyes-2.6.65.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.57.0
-https://addons.mozilla.org/firefox/downloads/file/4257361/ublock_origin-1.57.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.65
+2.6.67
 https://clients2.google.com/service/update2/crx
 uBlock Origin
-1.57.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.5.0" />
+        <property name="release.number" value="1.4.991" />
         <exec executable="echo" osfamily="unix">
             <arg value="${release.number}-${build.number}" />
         </exec>

scripts/build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Thu Apr 04 12:21:54 EDT 2024
-build.number=722
+#Mon Jul 08 13:00:28 EDT 2024
+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

@@ -194,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.
@@ -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,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) {
@@ -602,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/plugin/net/i2p/i2pfirefox/plugin/plugin/I2PBrowserPlugin.java

@@ -42,13 +42,8 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
   private static final String PROP_DTG_ENABLED = "desktopgui.enabled";
   private final File pluginDir;
   private final File profileDir;
-  private MenuHandle SafeHandleLauncher;
-  private MenuHandle FlexibleHandleLauncher;
-  // MenuHandles for app-mode launchers
-  private MenuHandle ConsoleHandleLauncher;
-  private MenuHandle SnarkHandleLauncher;
-  private MenuHandle SusimailHandleLauncher;
-  private MenuHandle TunnelHanleLauncher;
+  private MenuHandle lmhs;
+  private MenuHandle lmhf;
   /**
    * @since 1.4.0
    * @return
@@ -105,8 +100,8 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
       } catch (InterruptedException ie) {
       }
       if (dtg != null) {
-        dtg.removeMenu(SafeHandleLauncher);
-        dtg.removeMenu(FlexibleHandleLauncher);
+        dtg.removeMenu(lmhs);
+        dtg.removeMenu(lmhf);
       }
     }
     changeState(ClientAppState.STOPPED);
@@ -137,14 +132,14 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
         }
         if (dtg != null) {
           _log.info("I2P Browser integrating with I2P tray manager");
-          SafeHandleLauncher =
+          lmhs =
               dtg.addMenu("Launch I2P Browser (Safe Mode)", new Starter(dtg));
-          dtg.showMenu(SafeHandleLauncher);
-          dtg.enableMenu(SafeHandleLauncher);
-          FlexibleHandleLauncher = dtg.addMenu("Launch I2P Browser (Flexible Mode)",
+          dtg.showMenu(lmhs);
+          dtg.enableMenu(lmhs);
+          lmhf = dtg.addMenu("Launch I2P Browser (Flexible Mode)",
                              new FlexStarter(dtg));
-          dtg.showMenu(FlexibleHandleLauncher);
-          dtg.enableMenu(FlexibleHandleLauncher);
+          dtg.showMenu(lmhf);
+          dtg.enableMenu(lmhf);
         } else {
           _log.info("I2P Browser tray manager not found");
         }
@@ -157,26 +152,6 @@ public class I2PBrowserPlugin extends I2PBrowser implements ClientApp {
     }
   }
 
-  public MenuHandle addMenuHandle(String launchMessage){
-    try {
-      _log.info(
-          "Starting I2P Browser tray manager by testing http://proxy.i2p");
-      MenuService dtg = startTrayApp();
-      if (dtg != null) {
-        _log.info("I2P Browser integrating with I2P tray manager");
-        MenuHandle handle =
-            dtg.addMenu(launchMesssage, new Starter(dtg));
-        dtg.showMenu(SafeHandleLauncher);
-        dtg.enableMenu(SafeHandleLauncher);
-        return handle;
-      } else {
-        _log.info("I2P Browser tray manager not found");
-      }
-    } catch (Exception e) {
-      _log.error("Error starting I2P Browser tray manager", e);
-    }
-  }
-
   // Copied directly from I2PSnark-standalone
   /**
    * @since 1.4.0