Enable systray on XFCE

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
+#Mon Jul 08 17:35:59 EDT 2024
-build.number=720
+build.number=726

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

@@ -590,6 +590,11 @@ 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()) {
@@ -608,11 +613,16 @@ public class I2PCommonBrowser {
   }
 
   public File userHomeDir() {
-    File hd = new File(System.getProperty("user.dir"));
+    File rd = new File(System.getProperty("user.dir"));
-    if (hd == null || !hd.exists()) {
+    File hd = new File(System.getProperty("user.home"));
-      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: " + hd);
+    logger.info("Runtime directory discovered at: " + rd);
-    return hd;
+    return rd;
   }
 }

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);
   }