Don't search the whole home directory for usable Firefoxes

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
 ------------
 

scripts/build.number

@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Mon Jul 08 13:00:28 EDT 2024
-build.number=720
+#Mon Jul 08 16:57:36 EDT 2024
+build.number=724

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/I2PCommonBrowser.java

@@ -65,9 +65,7 @@ public class I2PCommonBrowser {
    *
    * @return the properties of the object
    */
-  public Properties getProperties() {
-    return prop;
-  }
+  public Properties getProperties() { return prop; }
 
   /**
    * Validates the user directory.
@@ -311,7 +309,8 @@ public class I2PCommonBrowser {
   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);
+    String profileDirName =
+        String.format("i2p.%s.profile.%s%s", browser, base, appString);
     File profileDir = new File(file, profileDirName);
     return profileDir.getAbsolutePath();
   }
@@ -328,7 +327,8 @@ public class I2PCommonBrowser {
                                   String base) {
     logger.info("Unpacking base profile to " + profileDirectory);
     try {
-      final InputStream resources = this.getClass().getClassLoader().getResourceAsStream(
+      final InputStream resources =
+          this.getClass().getClassLoader().getResourceAsStream(
               "i2p." + browser + "." + base + ".profile.zip");
       if (resources == null) {
         logger.info("Could not find resources");
@@ -475,9 +475,7 @@ 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.
@@ -555,9 +553,7 @@ 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.
@@ -594,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) {
@@ -610,11 +608,16 @@ public class I2PCommonBrowser {
   }
 
   public File userHomeDir() {
-    File hd = new File(System.getProperty("user.dir"));
+    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()) {
-      hd = new File(System.getProperty("user.home"));
+        if (rd.getAbsolutePath().equals(hd.getAbsolutePath()))
+          return null;
       }
-    logger.info("Runtime directory discovered at: "+ hd);
-    return hd;
+      return rd;
+    }
+    logger.info("Runtime directory discovered at: " + rd);
+    return rd;
   }
 }