From d41b3017f6448d2abb57c231a7074e0b9eba11b7 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Thu, 23 May 2024 23:44:51 +0000
Subject: [PATCH] Property fixes

---
 .../java/io/xpipe/app/core/AppProperties.java | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/core/AppProperties.java b/app/src/main/java/io/xpipe/app/core/AppProperties.java
index 7251abce2..3ea239df1 100644
--- a/app/src/main/java/io/xpipe/app/core/AppProperties.java
+++ b/app/src/main/java/io/xpipe/app/core/AppProperties.java
@@ -44,11 +44,17 @@ public class AppProperties {
     public AppProperties() {
         var appDir = Path.of(System.getProperty("user.dir")).resolve("app");
         Path propsFile = appDir.resolve("dev.properties");
-        if (!isJUnitTest() && Files.exists(propsFile)) {
+        if (Files.exists(propsFile)) {
             try {
                 Properties props = new Properties();
                 props.load(Files.newInputStream(propsFile));
-                props.forEach((key, value) -> System.setProperty(key.toString(), value.toString()));
+                props.forEach((key, value) -> {
+                    if (System.getProperty(key.toString()) != null) {
+                        return;
+                    }
+
+                    System.setProperty(key.toString(), value.toString());
+                });
             } catch (IOException e) {
                 ErrorEvent.fromThrowable(e).handle();
             }
@@ -99,15 +105,6 @@ public class AppProperties {
                 .orElse(true);
     }
 
-    private static boolean isJUnitTest() {
-        for (StackTraceElement element : Thread.currentThread().getStackTrace()) {
-            if (element.getClassName().startsWith("org.junit.")) {
-                return true;
-            }
-        }
-        return false;
-    }
-
     public static void logSystemProperties() {
         for (var e : System.getProperties().entrySet()) {
             if (List.of("user.dir").contains(e.getKey())) {