From c46eeb04015af43d922b7c0fc21f827ffc89823c Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 15 Jun 2023 10:38:19 +0200
Subject: [PATCH 01/23] first impl draft

---
 .../common/PropertiesPreprocessor.java        | 66 +++++++++++++++++++
 .../org/cryptomator/launcher/Cryptomator.java |  3 +-
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/cryptomator/common/PropertiesPreprocessor.java

diff --git a/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java b/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
new file mode 100644
index 000000000..d28fdd2ed
--- /dev/null
+++ b/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
@@ -0,0 +1,66 @@
+package org.cryptomator.common;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+import java.util.regex.Pattern;
+
+public class PropertiesPreprocessor {
+
+	private static final Logger LOG = LoggerFactory.getLogger(PropertiesPreprocessor.class);
+	private static final Pattern TEMPLATE = Pattern.compile("@\\((.+)\\)");
+	private static final LoggingEnvironment ENV = new LoggingEnvironment(System.getenv(), LOG);
+
+	public static void run() {
+		var properties = System.getProperties();
+		properties.stringPropertyNames().stream() //
+				.filter(s -> s.startsWith("cryptomator.")) //
+				.forEach(key -> {
+					var value = properties.getProperty(key);
+					var newValue = process(value);
+					if(! value.equals(newValue)) {
+						LOG.info("Changed property {} from {} to {}.", key, value, newValue);
+					}
+					properties.setProperty(key, newValue);
+				});
+		LOG.info("Preprocessed cryptomator properties.");
+	}
+
+	private static String process(String value) {
+		return TEMPLATE.matcher(value).replaceAll(match -> //
+				switch (match.group().substring(2, match.group().length() - 1)) {
+					case "appdir" -> ENV.get("APPDIR");
+					case "appdata" -> ENV.get("APPDATA");
+					case "userhome" -> System.getProperty("user.home");
+					default -> {
+						LOG.warn("Found unknown keyword {} in property value {}. Keyword is not replaced.", match.group(), value);
+						yield match.group();
+					}
+				});
+	}
+
+	private static class LoggingEnvironment {
+
+		private final Map<String, String> env;
+		private final Logger logger;
+
+		LoggingEnvironment(Map<String, String> env, Logger logger) {
+			this.env = env;
+			this.logger = logger;
+		}
+
+		String get(String key) {
+			var val = env.get(key);
+			if (val == null) {
+				logger.warn("Variable {} used for substitution not found in environment", key);
+				return "";
+			} else {
+				return val;
+			}
+		}
+
+	}
+
+
+}
diff --git a/src/main/java/org/cryptomator/launcher/Cryptomator.java b/src/main/java/org/cryptomator/launcher/Cryptomator.java
index 2b066c730..f08d70c37 100644
--- a/src/main/java/org/cryptomator/launcher/Cryptomator.java
+++ b/src/main/java/org/cryptomator/launcher/Cryptomator.java
@@ -9,6 +9,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import dagger.Lazy;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
+import org.cryptomator.common.PropertiesPreprocessor;
 import org.cryptomator.common.ShutdownHook;
 import org.cryptomator.ipc.IpcCommunicator;
 import org.cryptomator.logging.DebugMode;
@@ -63,7 +64,7 @@ public class Cryptomator {
 			System.out.printf("Cryptomator version %s (build %s)%n", appVer, buildNumber);
 			return;
 		}
-
+		PropertiesPreprocessor.run();
 		int exitCode = CRYPTOMATOR_COMPONENT.application().run(args);
 		LOG.info("Exit {}", exitCode);
 		System.exit(exitCode); // end remaining non-daemon threads.

From 4065e15aa1f0b099a900b056ae26c5b3d143d03b Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 16 Jun 2023 13:09:41 +0200
Subject: [PATCH 02/23] Apply code suggestion from review

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
---
 .../java/org/cryptomator/common/PropertiesPreprocessor.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java b/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
index d28fdd2ed..342ad3e9d 100644
--- a/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
+++ b/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
@@ -9,7 +9,7 @@ import java.util.regex.Pattern;
 public class PropertiesPreprocessor {
 
 	private static final Logger LOG = LoggerFactory.getLogger(PropertiesPreprocessor.class);
-	private static final Pattern TEMPLATE = Pattern.compile("@\\((.+)\\)");
+	private static final Pattern TEMPLATE = Pattern.compile("@\\{(\\w+)}");
 	private static final LoggingEnvironment ENV = new LoggingEnvironment(System.getenv(), LOG);
 
 	public static void run() {
@@ -29,12 +29,12 @@ public class PropertiesPreprocessor {
 
 	private static String process(String value) {
 		return TEMPLATE.matcher(value).replaceAll(match -> //
-				switch (match.group().substring(2, match.group().length() - 1)) {
+				switch (match.group(1)) {
 					case "appdir" -> ENV.get("APPDIR");
 					case "appdata" -> ENV.get("APPDATA");
 					case "userhome" -> System.getProperty("user.home");
 					default -> {
-						LOG.warn("Found unknown keyword {} in property value {}. Keyword is not replaced.", match.group(), value);
+						LOG.warn("Found unknown variable @{{}} in property value {}.", match.group(), value);
 						yield match.group();
 					}
 				});

From 2c0474ec46f77649adb01fb93f46160ee5e57546 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 20 Jun 2023 12:37:07 +0200
Subject: [PATCH 03/23] add test

---
 .../common/PropertiesPreprocessor.java        |  4 +++-
 .../common/PropertiesPreprocessorTest.java    | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/org/cryptomator/common/PropertiesPreprocessorTest.java

diff --git a/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java b/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
index 342ad3e9d..785b249bf 100644
--- a/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
+++ b/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
@@ -1,5 +1,6 @@
 package org.cryptomator.common;
 
+import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,7 +28,8 @@ public class PropertiesPreprocessor {
 		LOG.info("Preprocessed cryptomator properties.");
 	}
 
-	private static String process(String value) {
+	@VisibleForTesting
+	static String process(String value) {
 		return TEMPLATE.matcher(value).replaceAll(match -> //
 				switch (match.group(1)) {
 					case "appdir" -> ENV.get("APPDIR");
diff --git a/src/test/java/org/cryptomator/common/PropertiesPreprocessorTest.java b/src/test/java/org/cryptomator/common/PropertiesPreprocessorTest.java
new file mode 100644
index 000000000..eee900f9c
--- /dev/null
+++ b/src/test/java/org/cryptomator/common/PropertiesPreprocessorTest.java
@@ -0,0 +1,24 @@
+package org.cryptomator.common;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.mockito.Mockito;
+
+public class PropertiesPreprocessorTest {
+
+	@ParameterizedTest
+	@CsvSource(value = """
+			org.example.@{mytest1}.test, org.example.@{mytest1}.test
+			@{only*word*digits*under_score\\},@{only*words*digits*under_score\\}
+			C:\\Users\\@{appdir}\\dir, C:\\Users\\\\dir
+			@{@{appdir}},@{}
+			Longer @{appdir} text with @{appdir}., Longer  text with .
+			""")
+	public void test(String propertyValue, String expected) {
+		var result = PropertiesPreprocessor.process(propertyValue);
+		Assertions.assertEquals(result, expected);
+	}
+
+}

From ec645a4bb952b2fa5a7d104a748e3081d31ffbba Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 20 Jun 2023 16:37:32 +0200
Subject: [PATCH 04/23] replace ~ by @{userhome} on unix systems

---
 .github/workflows/appimage.yml                | 12 ++--
 .github/workflows/mac-dmg.yml                 | 12 ++--
 .idea/runConfigurations/Cryptomator_Linux.xml |  2 +-
 .../Cryptomator_Linux_Dev.xml                 |  2 +-
 .idea/runConfigurations/Cryptomator_macOS.xml |  2 +-
 .../Cryptomator_macOS_Dev.xml                 |  2 +-
 dist/linux/appimage/build.sh                  | 12 ++--
 dist/linux/debian/rules                       | 12 ++--
 dist/mac/dmg/build.sh                         | 12 ++--
 .../org/cryptomator/common/Environment.java   | 22 ++----
 .../cryptomator/common/EnvironmentTest.java   | 67 -------------------
 11 files changed, 38 insertions(+), 119 deletions(-)

diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
index f966f6b22..44ca02028 100644
--- a/.github/workflows/appimage.yml
+++ b/.github/workflows/appimage.yml
@@ -85,12 +85,12 @@ jobs:
           --java-options "-Xmx256m"
           --java-options "-Dcryptomator.appVersion=\"${{  needs.get-version.outputs.semVerStr }}\""
           --java-options "-Dfile.encoding=\"utf-8\""
-          --java-options "-Dcryptomator.logDir=\"~/.local/share/Cryptomator/logs\""
-          --java-options "-Dcryptomator.pluginDir=\"~/.local/share/Cryptomator/plugins\""
-          --java-options "-Dcryptomator.settingsPath=\"~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json\""
-          --java-options "-Dcryptomator.p12Path=\"~/.config/Cryptomator/key.p12\""
-          --java-options "-Dcryptomator.ipcSocketPath=\"~/.config/Cryptomator/ipc.socket\""
-          --java-options "-Dcryptomator.mountPointsDir=\"~/.local/share/Cryptomator/mnt\""
+          --java-options "-Dcryptomator.logDir=\"@{userhome}/.local/share/Cryptomator/logs\""
+          --java-options "-Dcryptomator.pluginDir=\"@{userhome}/.local/share/Cryptomator/plugins\""
+          --java-options "-Dcryptomator.settingsPath=\"@{userhome}/.config/Cryptomator/settings.json:@{userhome}/.Cryptomator/settings.json\""
+          --java-options "-Dcryptomator.p12Path=\"@{userhome}/.config/Cryptomator/key.p12\""
+          --java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/.config/Cryptomator/ipc.socket\""
+          --java-options "-Dcryptomator.mountPointsDir=\"@{userhome}/.local/share/Cryptomator/mnt\""
           --java-options "-Dcryptomator.showTrayIcon=false"
           --java-options "-Dcryptomator.buildNumber=\"appimage-${{  needs.get-version.outputs.revNum }}\""
           --add-launcher Cryptomator-gtk2=launcher-gtk2.properties
diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml
index bad80138b..1190444d3 100644
--- a/.github/workflows/mac-dmg.yml
+++ b/.github/workflows/mac-dmg.yml
@@ -98,13 +98,13 @@ jobs:
           --java-options "-Dapple.awt.enableTemplateImages=true"
           --java-options "-Dsun.java2d.metal=true"
           --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\""
-          --java-options "-Dcryptomator.logDir=\"~/Library/Logs/Cryptomator\""
-          --java-options "-Dcryptomator.pluginDir=\"~/Library/Application Support/Cryptomator/Plugins\""
-          --java-options "-Dcryptomator.settingsPath=\"~/Library/Application Support/Cryptomator/settings.json\""
-          --java-options "-Dcryptomator.p12Path=\"~/Library/Application Support/Cryptomator/key.p12\""
-          --java-options "-Dcryptomator.ipcSocketPath=\"~/Library/Application Support/Cryptomator/ipc.socket\""
+          --java-options "-Dcryptomator.logDir=\"@{userhome}/Library/Logs/Cryptomator\""
+          --java-options "-Dcryptomator.pluginDir=\"@{userhome}/Library/Application Support/Cryptomator/Plugins\""
+          --java-options "-Dcryptomator.settingsPath=\"@{userhome}/Library/Application Support/Cryptomator/settings.json\""
+          --java-options "-Dcryptomator.p12Path=\"@{userhome}/Library/Application Support/Cryptomator/key.p12\""
+          --java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/Library/Application Support/Cryptomator/ipc.socket\""
           --java-options "-Dcryptomator.integrationsMac.keychainServiceName=\"Cryptomator\""
-          --java-options "-Dcryptomator.mountPointsDir=\"~/Cryptomator\""
+          --java-options "-Dcryptomator.mountPointsDir=\"@{userhome}/Cryptomator\""
           --java-options "-Dcryptomator.showTrayIcon=true"
           --java-options "-Dcryptomator.buildNumber=\"dmg-${{ needs.get-version.outputs.revNum }}\""
           --mac-package-identifier org.cryptomator
diff --git a/.idea/runConfigurations/Cryptomator_Linux.xml b/.idea/runConfigurations/Cryptomator_Linux.xml
index 887a5044e..3206f553a 100644
--- a/.idea/runConfigurations/Cryptomator_Linux.xml
+++ b/.idea/runConfigurations/Cryptomator_Linux.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="Cryptomator Linux" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;~/.config/Cryptomator/settings.json&quot; -Dcryptomator.p12Path=&quot;~/.config/Cryptomator/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;~/.config/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/.local/share/Cryptomator/logs&quot; -Dcryptomator.pluginDir=&quot;~/.local/share/Cryptomator/plugins&quot; -Dcryptomator.mountPointsDir=&quot;~/.local/share/Cryptomator/mnt&quot; -Dcryptomator.showTrayIcon=true -Xss20m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{userhome}/.config/Cryptomator/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/.config/Cryptomator/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/.config/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/.local/share/Cryptomator/logs&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/.local/share/Cryptomator/plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/.local/share/Cryptomator/mnt&quot; -Dcryptomator.showTrayIcon=true -Xss20m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.idea/runConfigurations/Cryptomator_Linux_Dev.xml b/.idea/runConfigurations/Cryptomator_Linux_Dev.xml
index 1bcd27ff3..26977ca51 100644
--- a/.idea/runConfigurations/Cryptomator_Linux_Dev.xml
+++ b/.idea/runConfigurations/Cryptomator_Linux_Dev.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="Cryptomator Linux Dev" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;~/.config/Cryptomator-Dev/settings.json&quot; -Dcryptomator.p12Path=&quot;~/.config/Cryptomator-Dev/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;~/.config/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/.local/share/Cryptomator-Dev/logs&quot; -Dcryptomator.pluginDir=&quot;~/.local/share/Cryptomator-Dev/plugins&quot; -Dcryptomator.mountPointsDir=&quot;~/.local/share/Cryptomator-Dev/mnt&quot; -Dcryptomator.showTrayIcon=true -Dfuse.experimental=&quot;true&quot; -Xss20m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{userhome}/.config/Cryptomator-Dev/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/.config/Cryptomator-Dev/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/.config/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/.local/share/Cryptomator-Dev/logs&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/.local/share/Cryptomator-Dev/plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/.local/share/Cryptomator-Dev/mnt&quot; -Dcryptomator.showTrayIcon=true -Dfuse.experimental=&quot;true&quot; -Xss20m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.idea/runConfigurations/Cryptomator_macOS.xml b/.idea/runConfigurations/Cryptomator_macOS.xml
index 03e231c77..006986c2c 100644
--- a/.idea/runConfigurations/Cryptomator_macOS.xml
+++ b/.idea/runConfigurations/Cryptomator_macOS.xml
@@ -5,7 +5,7 @@
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator/settings.json&quot; -Dcryptomator.p12Path=&quot;~/Library/Application Support/Cryptomator/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;~/Library/Application Support/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;~/Library/Application Support/Cryptomator/Plugins&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Dcryptomator.integrationsMac.keychainServiceName=Cryptomator -Xss2m -Xmx512m -ea --enable-preview --enable-native-access=org.cryptomator.jfuse.mac" />
+    <option name="VM_PARAMETERS" value="-Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;@{userhome}/Library/Application Support/Cryptomator/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/Library/Application Support/Cryptomator/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/Library/Application Support/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/Library/Logs/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/Library/Application Support/Cryptomator/Plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Dcryptomator.integrationsMac.keychainServiceName=Cryptomator -Xss2m -Xmx512m -ea --enable-preview --enable-native-access=org.cryptomator.jfuse.mac" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.idea/runConfigurations/Cryptomator_macOS_Dev.xml b/.idea/runConfigurations/Cryptomator_macOS_Dev.xml
index 4aed7aed5..8b0de0e93 100644
--- a/.idea/runConfigurations/Cryptomator_macOS_Dev.xml
+++ b/.idea/runConfigurations/Cryptomator_macOS_Dev.xml
@@ -5,7 +5,7 @@
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator-Dev/settings.json&quot; -Dcryptomator.p12Path=&quot;~/Library/Application Support/Cryptomator-Dev/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;~/Library/Application Support/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;~/Library/Application Support/Cryptomator-Dev/Plugins&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Dcryptomator.integrationsMac.keychainServiceName=Cryptomator -Xss2m -Xmx512m -ea --enable-preview --enable-native-access=org.cryptomator.jfuse.mac" />
+    <option name="VM_PARAMETERS" value="-Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/Library/Logs/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/Plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Dcryptomator.integrationsMac.keychainServiceName=Cryptomator -Xss2m -Xmx512m -ea --enable-preview --enable-native-access=org.cryptomator.jfuse.mac" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/dist/linux/appimage/build.sh b/dist/linux/appimage/build.sh
index 487a1fee0..aaa28c587 100755
--- a/dist/linux/appimage/build.sh
+++ b/dist/linux/appimage/build.sh
@@ -50,12 +50,12 @@ ${JAVA_HOME}/bin/jpackage \
     --java-options "-Xmx256m" \
     --app-version "${VERSION}.${REVISION_NO}" \
     --java-options "-Dfile.encoding=\"utf-8\"" \
-    --java-options "-Dcryptomator.logDir=\"~/.local/share/Cryptomator/logs\"" \
-    --java-options "-Dcryptomator.pluginDir=\"~/.local/share/Cryptomator/plugins\"" \
-    --java-options "-Dcryptomator.settingsPath=\"~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json\"" \
-    --java-options "-Dcryptomator.p12Path=\"~/.config/Cryptomator/key.p12\"" \
-    --java-options "-Dcryptomator.ipcSocketPath=\"~/.config/Cryptomator/ipc.socket\"" \
-    --java-options "-Dcryptomator.mountPointsDir=\"~/.local/share/Cryptomator/mnt\"" \
+    --java-options "-Dcryptomator.logDir=\"@{userhome}/.local/share/Cryptomator/logs\"" \
+    --java-options "-Dcryptomator.pluginDir=\"@{userhome}/.local/share/Cryptomator/plugins\"" \
+    --java-options "-Dcryptomator.settingsPath=\"@{userhome}/.config/Cryptomator/settings.json:@{userhome}/.Cryptomator/settings.json\"" \
+    --java-options "-Dcryptomator.p12Path=\"@{userhome}/.config/Cryptomator/key.p12\"" \
+    --java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/.config/Cryptomator/ipc.socket\"" \
+    --java-options "-Dcryptomator.mountPointsDir=\"@{userhome}/.local/share/Cryptomator/mnt\"" \
     --java-options "-Dcryptomator.showTrayIcon=false" \
     --java-options "-Dcryptomator.buildNumber=\"appimage-${REVISION_NO}\"" \
     --add-launcher cryptomator-gtk2=launcher-gtk2.properties \
diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules
index e0f077cc9..e1aec8068 100755
--- a/dist/linux/debian/rules
+++ b/dist/linux/debian/rules
@@ -48,12 +48,12 @@ override_dh_auto_build:
 		--java-options "-Xss5m" \
 		--java-options "-Xmx256m" \
 		--java-options "-Dfile.encoding=\"utf-8\"" \
-		--java-options "-Dcryptomator.logDir=\"~/.local/share/Cryptomator/logs\"" \
-		--java-options "-Dcryptomator.pluginDir=\"~/.local/share/Cryptomator/plugins\"" \
-		--java-options "-Dcryptomator.settingsPath=\"~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json\"" \
-		--java-options "-Dcryptomator.p12Path=\"~/.config/Cryptomator/key.p12\"" \
-		--java-options "-Dcryptomator.ipcSocketPath=\"~/.config/Cryptomator/ipc.socket\"" \
-		--java-options "-Dcryptomator.mountPointsDir=\"~/.local/share/Cryptomator/mnt\"" \
+		--java-options "-Dcryptomator.logDir=\"@{userhome}/.local/share/Cryptomator/logs\"" \
+		--java-options "-Dcryptomator.pluginDir=\"@{userhome}/.local/share/Cryptomator/plugins\"" \
+		--java-options "-Dcryptomator.settingsPath=\"@{userhome}/.config/Cryptomator/settings.json:@{userhome}/.Cryptomator/settings.json\"" \
+		--java-options "-Dcryptomator.p12Path=\"@{userhome}/.config/Cryptomator/key.p12\"" \
+		--java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/.config/Cryptomator/ipc.socket\"" \
+		--java-options "-Dcryptomator.mountPointsDir=\"@{userhome}/.local/share/Cryptomator/mnt\"" \
 		--java-options "-Dcryptomator.showTrayIcon=false" \
 		--java-options "-Dcryptomator.buildNumber=\"deb-${REVISION_NUM}\"" \
 		--java-options "-Dcryptomator.appVersion=\"${SEMVER_STR}\"" \
diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh
index 23917f9c5..2807af9c7 100755
--- a/dist/mac/dmg/build.sh
+++ b/dist/mac/dmg/build.sh
@@ -74,13 +74,13 @@ ${JAVA_HOME}/bin/jpackage \
     --java-options "-Dapple.awt.enableTemplateImages=true" \
     --java-options "-Dsun.java2d.metal=true" \
     --java-options "-Dcryptomator.appVersion=\"${VERSION_NO}\"" \
-    --java-options "-Dcryptomator.logDir=\"~/Library/Logs/${APP_NAME}\"" \
-    --java-options "-Dcryptomator.pluginDir=\"~/Library/Application Support/${APP_NAME}/Plugins\"" \
-    --java-options "-Dcryptomator.settingsPath=\"~/Library/Application Support/${APP_NAME}/settings.json\"" \
-    --java-options "-Dcryptomator.ipcSocketPath=\"~/Library/Application Support/${APP_NAME}/ipc.socket\"" \
-    --java-options "-Dcryptomator.p12Path=\"~/Library/Application Support/${APP_NAME}/key.p12\"" \
+    --java-options "-Dcryptomator.logDir=\"@{userhome}/Library/Logs/${APP_NAME}\"" \
+    --java-options "-Dcryptomator.pluginDir=\"@{userhome}/Library/Application Support/${APP_NAME}/Plugins\"" \
+    --java-options "-Dcryptomator.settingsPath=\"@{userhome}/Library/Application Support/${APP_NAME}/settings.json\"" \
+    --java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/Library/Application Support/${APP_NAME}/ipc.socket\"" \
+    --java-options "-Dcryptomator.p12Path=\"@{userhome}/Library/Application Support/${APP_NAME}/key.p12\"" \
     --java-options "-Dcryptomator.integrationsMac.keychainServiceName=\"${APP_NAME}\"" \
-    --java-options "-Dcryptomator.mountPointsDir=\"~/${APP_NAME}\"" \
+    --java-options "-Dcryptomator.mountPointsDir=\"@{userhome}/${APP_NAME}\"" \
     --java-options "-Dcryptomator.showTrayIcon=true" \
     --java-options "-Dcryptomator.buildNumber=\"dmg-${REVISION_NO}\"" \
     --mac-package-identifier ${PACKAGE_IDENTIFIER} \
diff --git a/src/main/java/org/cryptomator/common/Environment.java b/src/main/java/org/cryptomator/common/Environment.java
index 383261119..f1cc6974d 100644
--- a/src/main/java/org/cryptomator/common/Environment.java
+++ b/src/main/java/org/cryptomator/common/Environment.java
@@ -18,7 +18,6 @@ import java.util.stream.StreamSupport;
 public class Environment {
 
 	private static final Logger LOG = LoggerFactory.getLogger(Environment.class);
-	private static final Path RELATIVE_HOME_DIR = Paths.get("~");
 	private static final char PATH_LIST_SEP = ':';
 	private static final int DEFAULT_MIN_PW_LENGTH = 8;
 	private static final String SETTINGS_PATH_PROP_NAME = "cryptomator.settingsPath";
@@ -89,7 +88,7 @@ public class Environment {
 	}
 
 	public Optional<Path> getLogDir() {
-		return getPath(LOG_DIR_PROP_NAME).map(this::replaceHomeDir);
+		return getPath(LOG_DIR_PROP_NAME);
 	}
 
 	public Optional<String> getLoopbackAlias() {
@@ -97,11 +96,11 @@ public class Environment {
 	}
 
 	public Optional<Path> getPluginDir() {
-		return getPath(PLUGIN_DIR_PROP_NAME).map(this::replaceHomeDir);
+		return getPath(PLUGIN_DIR_PROP_NAME);
 	}
 
 	public Optional<Path> getMountPointsDir() {
-		return getPath(MOUNTPOINT_DIR_PROP_NAME).map(this::replaceHomeDir);
+		return getPath(MOUNTPOINT_DIR_PROP_NAME);
 	}
 
 	/**
@@ -130,23 +129,10 @@ public class Environment {
 		return Optional.ofNullable(value).map(Paths::get);
 	}
 
-	// visible for testing
-	public Path getHomeDir() {
-		return getPath("user.home").orElseThrow();
-	}
-
 	// visible for testing
 	public Stream<Path> getPaths(String propertyName) {
 		Stream<String> rawSettingsPaths = getRawList(propertyName, PATH_LIST_SEP);
-		return rawSettingsPaths.filter(Predicate.not(Strings::isNullOrEmpty)).map(Paths::get).map(this::replaceHomeDir);
-	}
-
-	private Path replaceHomeDir(Path path) {
-		if (path.startsWith(RELATIVE_HOME_DIR)) {
-			return getHomeDir().resolve(RELATIVE_HOME_DIR.relativize(path));
-		} else {
-			return path;
-		}
+		return rawSettingsPaths.filter(Predicate.not(Strings::isNullOrEmpty)).map(Path::of);
 	}
 
 	private Stream<String> getRawList(String propertyName, char separator) {
diff --git a/src/test/java/org/cryptomator/common/EnvironmentTest.java b/src/test/java/org/cryptomator/common/EnvironmentTest.java
index 9c048a200..714d603f0 100644
--- a/src/test/java/org/cryptomator/common/EnvironmentTest.java
+++ b/src/test/java/org/cryptomator/common/EnvironmentTest.java
@@ -22,41 +22,7 @@ public class EnvironmentTest {
 	@BeforeEach
 	public void init() {
 		env = Mockito.spy(Environment.getInstance());
-		Mockito.when(env.getHomeDir()).thenReturn(Path.of("/home/testuser"));
 	}
-
-	@Test
-	@DisplayName("cryptomator.settingsPath=~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json")
-	public void testSettingsPath() {
-		System.setProperty("cryptomator.settingsPath", "~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json");
-
-		List<Path> result = env.getSettingsPath().toList();
-		MatcherAssert.assertThat(result, Matchers.hasSize(2));
-		MatcherAssert.assertThat(result, Matchers.contains(Paths.get("/home/testuser/.config/Cryptomator/settings.json"), //
-				Paths.get("/home/testuser/.Cryptomator/settings.json")));
-	}
-
-	@Test
-	@DisplayName("cryptomator.ipcSocketPath=~/.config/Cryptomator/ipc.socket:~/.Cryptomator/ipc.socket")
-	public void testIpcSocketPath() {
-		System.setProperty("cryptomator.ipcSocketPath", "~/.config/Cryptomator/ipc.socket:~/.Cryptomator/ipc.socket");
-
-		List<Path> result = env.ipcSocketPath().toList();
-		MatcherAssert.assertThat(result, Matchers.hasSize(2));
-		MatcherAssert.assertThat(result, Matchers.contains(Paths.get("/home/testuser/.config/Cryptomator/ipc.socket"), //
-				Paths.get("/home/testuser/.Cryptomator/ipc.socket")));
-	}
-
-	@Test
-	@DisplayName("cryptomator.integrationsWin.keychainPaths=~/AppData/Roaming/Cryptomator/keychain.json")
-	public void testKeychainPath() {
-		System.setProperty("cryptomator.integrationsWin.keychainPaths", "~/AppData/Roaming/Cryptomator/keychain.json");
-
-		List<Path> result = env.getKeychainPath().toList();
-		MatcherAssert.assertThat(result, Matchers.hasSize(1));
-		MatcherAssert.assertThat(result, Matchers.contains(Paths.get("/home/testuser/AppData/Roaming/Cryptomator/keychain.json")));
-	}
-
 	@Test
 	@DisplayName("cryptomator.logDir=/foo/bar")
 	public void testAbsoluteLogDir() {
@@ -67,17 +33,6 @@ public class EnvironmentTest {
 		Assertions.assertTrue(logDir.isPresent());
 	}
 
-	@Test
-	@DisplayName("cryptomator.logDir=~/foo/bar")
-	public void testRelativeLogDir() {
-		System.setProperty("cryptomator.logDir", "~/foo/bar");
-
-		Optional<Path> logDir = env.getLogDir();
-
-		Assertions.assertTrue(logDir.isPresent());
-		Assertions.assertEquals(Paths.get("/home/testuser/foo/bar"), logDir.get());
-	}
-
 	@Nested
 	@DisplayName("Path Lists")
 	public class SettingsPath {
@@ -101,28 +56,6 @@ public class EnvironmentTest {
 			MatcherAssert.assertThat(result, Matchers.hasItem(Paths.get("/foo/bar/test")));
 		}
 
-		@Test
-		@DisplayName("test.path.property=~/test")
-		public void testSingleHomeRelativePath() {
-			System.setProperty("test.path.property", "~/test");
-			List<Path> result = env.getPaths("test.path.property").toList();
-
-			MatcherAssert.assertThat(result, Matchers.hasSize(1));
-			MatcherAssert.assertThat(result, Matchers.hasItem(Paths.get("/home/testuser/test")));
-		}
-
-		@Test
-		@DisplayName("test.path.property=~/test:~/test2:/foo/bar/test")
-		public void testMultiplePaths() {
-			System.setProperty("test.path.property", "~/test:~/test2:/foo/bar/test");
-			List<Path> result = env.getPaths("test.path.property").toList();
-
-			MatcherAssert.assertThat(result, Matchers.hasSize(3));
-			MatcherAssert.assertThat(result, Matchers.contains(Paths.get("/home/testuser/test"), //
-					Paths.get("/home/testuser/test2"), //
-					Paths.get("/foo/bar/test")));
-		}
-
 	}
 
 }

From ebea8ef7e52e2dae56c03bad53cd77c991b43a6c Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 20 Jun 2023 17:32:23 +0200
Subject: [PATCH 05/23] adjust windows buildscripts to use appdata instead of
 userhome/hard/coded/path

---
 .github/workflows/win-exe.yml                      | 14 +++++++-------
 .idea/runConfigurations/Cryptomator_Windows.xml    |  2 +-
 .../runConfigurations/Cryptomator_Windows_Dev.xml  |  2 +-
 dist/win/build.ps1                                 | 14 +++++++-------
 .../java/org/cryptomator/common/Environment.java   |  3 ++-
 .../cryptomator/common/PropertiesPreprocessor.java |  1 +
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml
index df67c1dcb..8a66e524b 100644
--- a/.github/workflows/win-exe.yml
+++ b/.github/workflows/win-exe.yml
@@ -112,17 +112,17 @@ jobs:
           --java-options "-Xmx256m"
           --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\""
           --java-options "-Dfile.encoding=\"utf-8\""
-          --java-options "-Dcryptomator.logDir=\"~/AppData/Roaming/Cryptomator\""
-          --java-options "-Dcryptomator.pluginDir=\"~/AppData/Roaming/Cryptomator/Plugins\""
-          --java-options "-Dcryptomator.settingsPath=\"~/AppData/Roaming/Cryptomator/settings.json\""
-          --java-options "-Dcryptomator.p12Path=\"~/AppData/Roaming/Cryptomator/key.p12\""
-          --java-options "-Dcryptomator.ipcSocketPath=\"~/AppData/Roaming/Cryptomator/ipc.socket\""
-          --java-options "-Dcryptomator.mountPointsDir=\"~/Cryptomator\""
+          --java-options "-Dcryptomator.logDir=\"@{localappdata}/Cryptomator\""
+          --java-options "-Dcryptomator.pluginDir=\"@{appdata}/Cryptomator/Plugins\""
+          --java-options "-Dcryptomator.settingsPath=\"@{appdata}/Cryptomator/settings.json;@{userhome}/AppData/Roaming/Cryptomator/settings.json\""
+          --java-options "-Dcryptomator.p12Path=\"@{appdata}/Cryptomator/key.p12;@{userhome}/AppData/Roaming/Cryptomator/key.p12\""
+          --java-options "-Dcryptomator.ipcSocketPath=\"@{localappdata}/Cryptomator/ipc.socket\""
+          --java-options "-Dcryptomator.mountPointsDir=\"@{userhome}/Cryptomator\""
           --java-options "-Dcryptomator.loopbackAlias=\"${{ env.LOOPBACK_ALIAS }}\""
           --java-options "-Dcryptomator.showTrayIcon=true"
           --java-options "-Dcryptomator.buildNumber=\"msi-${{ needs.get-version.outputs.revNum }}\""
           --java-options "-Dcryptomator.integrationsWin.autoStartShellLinkName=\"Cryptomator\""
-          --java-options "-Dcryptomator.integrationsWin.keychainPaths=\"~/AppData/Roaming/Cryptomator/keychain.json\""
+          --java-options "-Dcryptomator.integrationsWin.keychainPaths=\"@{appdata}/Cryptomator/keychain.json;@{userhome}/AppData/Roaming/Cryptomator/keychain.json\""
           --java-options "-Djavafx.verbose=${{ inputs.isDebug }}"
           --resource-dir dist/win/resources
           --icon dist/win/resources/Cryptomator.ico
diff --git a/.idea/runConfigurations/Cryptomator_Windows.xml b/.idea/runConfigurations/Cryptomator_Windows.xml
index 3c4ecc4a3..b1f7c11b3 100644
--- a/.idea/runConfigurations/Cryptomator_Windows.xml
+++ b/.idea/runConfigurations/Cryptomator_Windows.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="Cryptomator Windows" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;~/AppData/Roaming/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;~/AppData/Roaming/Cryptomator/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;~/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.p12Path=&quot;~/AppData/Roaming/Cryptomator/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator/settings.json;@{userhome}/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator/keychain.json;@{userhome}/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator/key.p12;@{userhome}/AppData/Roaming/Cryptomator/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.idea/runConfigurations/Cryptomator_Windows_Dev.xml b/.idea/runConfigurations/Cryptomator_Windows_Dev.xml
index 2093aee5e..425c774be 100644
--- a/.idea/runConfigurations/Cryptomator_Windows_Dev.xml
+++ b/.idea/runConfigurations/Cryptomator_Windows_Dev.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="Cryptomator Windows Dev" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;~/AppData/Roaming/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;~/AppData/Roaming/Cryptomator-Dev/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;~/AppData/Roaming/Cryptomator-Dev/keychain.json&quot; -Dcryptomator.p12Path=&quot;~/AppData/Roaming/Cryptomator-Dev/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator-Dev&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator-Dev/settings.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator-Dev/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator-Dev/keychain.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/keychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator-Dev/key.p12;@{userhome}/AppData/Roaming/Cryptomator-Dev/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator-Dev&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/dist/win/build.ps1 b/dist/win/build.ps1
index 74532a96a..2e3d3b83d 100644
--- a/dist/win/build.ps1
+++ b/dist/win/build.ps1
@@ -82,15 +82,15 @@ if ($clean -and (Test-Path -Path $appPath)) {
 	--java-options "-Dcryptomator.appVersion=`"$semVerNo`"" `
 	--app-version "$semVerNo.$revisionNo" `
 	--java-options "-Dfile.encoding=`"utf-8`"" `
-	--java-options "-Dcryptomator.logDir=`"~/AppData/Roaming/$AppName`"" `
-	--java-options "-Dcryptomator.pluginDir=`"~/AppData/Roaming/$AppName/Plugins`"" `
-	--java-options "-Dcryptomator.settingsPath=`"~/AppData/Roaming/$AppName/settings.json`"" `
-	--java-options "-Dcryptomator.ipcSocketPath=`"~/AppData/Roaming/$AppName/ipc.socket`"" `
-	--java-options "-Dcryptomator.p12Path=`"~/AppData/Roaming/$AppName/key.p12`"" `
-	--java-options "-Dcryptomator.mountPointsDir=`"~/$AppName`"" `
+	--java-options "-Dcryptomator.logDir=`"@{localappdata}/$AppName`"" `
+	--java-options "-Dcryptomator.pluginDir=`"@{appdata}/$AppName/Plugins`"" `
+	--java-options "-Dcryptomator.settingsPath=`"@{appdata}/$AppName/settings.json;@{userhome}/AppData/Roaming/$AppName/settings.json`"" `
+	--java-options "-Dcryptomator.ipcSocketPath=`"@{localappdata}/$AppName/ipc.socket`"" `
+	--java-options "-Dcryptomator.p12Path=`"@{appdata}/$AppName/key.p12;@{userhome}/AppData/Roaming/$AppName/key.p12`"" `
+	--java-options "-Dcryptomator.mountPointsDir=`"@{userhome}/$AppName`"" `
 	--java-options "-Dcryptomator.loopbackAlias=`"$LoopbackAlias`"" `
 	--java-options "-Dcryptomator.integrationsWin.autoStartShellLinkName=`"$AppName`"" `
-	--java-options "-Dcryptomator.integrationsWin.keychainPaths=`"~/AppData/Roaming/$AppName/keychain.json`"" `
+	--java-options "-Dcryptomator.integrationsWin.keychainPaths=`"@{appdata}/$AppName/keychain.json;@{userhome}/AppData/Roaming/$AppName/keychain.json`"" `
 	--java-options "-Dcryptomator.showTrayIcon=true" `
 	--java-options "-Dcryptomator.buildNumber=`"msi-$revisionNo`"" `
 	--resource-dir resources `
diff --git a/src/main/java/org/cryptomator/common/Environment.java b/src/main/java/org/cryptomator/common/Environment.java
index f1cc6974d..d9dec7b89 100644
--- a/src/main/java/org/cryptomator/common/Environment.java
+++ b/src/main/java/org/cryptomator/common/Environment.java
@@ -2,6 +2,7 @@ package org.cryptomator.common;
 
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
+import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,7 +19,7 @@ import java.util.stream.StreamSupport;
 public class Environment {
 
 	private static final Logger LOG = LoggerFactory.getLogger(Environment.class);
-	private static final char PATH_LIST_SEP = ':';
+	private static final char PATH_LIST_SEP = SystemUtils.IS_OS_WINDOWS? ';':':';
 	private static final int DEFAULT_MIN_PW_LENGTH = 8;
 	private static final String SETTINGS_PATH_PROP_NAME = "cryptomator.settingsPath";
 	private static final String IPC_SOCKET_PATH_PROP_NAME = "cryptomator.ipcSocketPath";
diff --git a/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java b/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
index 785b249bf..683b04aa2 100644
--- a/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
+++ b/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
@@ -34,6 +34,7 @@ public class PropertiesPreprocessor {
 				switch (match.group(1)) {
 					case "appdir" -> ENV.get("APPDIR");
 					case "appdata" -> ENV.get("APPDATA");
+					case "localappdata" -> ENV.get("LOCALAPPDATA");
 					case "userhome" -> System.getProperty("user.home");
 					default -> {
 						LOG.warn("Found unknown variable @{{}} in property value {}.", match.group(), value);

From b3d8df0da01dd50a6bc68b98bca53ae8067713d8 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 20 Jun 2023 18:08:31 +0200
Subject: [PATCH 06/23] fix missing logDir path resolution

---
 .../java/org/cryptomator/common/Environment.java     |  5 ++++-
 .../cryptomator/common/PropertiesPreprocessor.java   |  6 +++---
 .../java/org/cryptomator/launcher/Cryptomator.java   | 12 +++++-------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/Environment.java b/src/main/java/org/cryptomator/common/Environment.java
index d9dec7b89..3043c5a92 100644
--- a/src/main/java/org/cryptomator/common/Environment.java
+++ b/src/main/java/org/cryptomator/common/Environment.java
@@ -34,7 +34,10 @@ public class Environment {
 	private static final String PLUGIN_DIR_PROP_NAME = "cryptomator.pluginDir";
 	private static final String TRAY_ICON_PROP_NAME = "cryptomator.showTrayIcon";
 
-	private Environment() {}
+	private Environment() {
+		//hack, needed for logging directory to be setup correctly
+		PropertiesPreprocessor.run();
+	}
 
 	public void log() {
 		LOG.info("user.home: {}", System.getProperty("user.home"));
diff --git a/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java b/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
index 683b04aa2..7dcda19ee 100644
--- a/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
+++ b/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
@@ -33,9 +33,9 @@ public class PropertiesPreprocessor {
 		return TEMPLATE.matcher(value).replaceAll(match -> //
 				switch (match.group(1)) {
 					case "appdir" -> ENV.get("APPDIR");
-					case "appdata" -> ENV.get("APPDATA");
-					case "localappdata" -> ENV.get("LOCALAPPDATA");
-					case "userhome" -> System.getProperty("user.home");
+					case "appdata" -> ENV.get("APPDATA").replace("\\","\\\\");
+					case "localappdata" -> ENV.get("LOCALAPPDATA").replace("\\","\\\\");
+					case "userhome" -> System.getProperty("user.home").replace("\\","\\\\");
 					default -> {
 						LOG.warn("Found unknown variable @{{}} in property value {}.", match.group(), value);
 						yield match.group();
diff --git a/src/main/java/org/cryptomator/launcher/Cryptomator.java b/src/main/java/org/cryptomator/launcher/Cryptomator.java
index f08d70c37..faf88c91a 100644
--- a/src/main/java/org/cryptomator/launcher/Cryptomator.java
+++ b/src/main/java/org/cryptomator/launcher/Cryptomator.java
@@ -29,6 +29,7 @@ import java.util.concurrent.Executors;
 @Singleton
 public class Cryptomator {
 
+	private static final Environment ENV = Environment.getInstance();
 	private static final long STARTUP_TIME = System.currentTimeMillis();
 	// DaggerCryptomatorComponent gets generated by Dagger.
 	// Run Maven and include target/generated-sources/annotations in your IDE.
@@ -37,15 +38,13 @@ public class Cryptomator {
 
 	private final DebugMode debugMode;
 	private final SupportedLanguages supportedLanguages;
-	private final Environment env;
 	private final Lazy<IpcMessageHandler> ipcMessageHandler;
 	private final ShutdownHook shutdownHook;
 
 	@Inject
-	Cryptomator(DebugMode debugMode, SupportedLanguages supportedLanguages, Environment env, Lazy<IpcMessageHandler> ipcMessageHandler, ShutdownHook shutdownHook) {
+	Cryptomator(DebugMode debugMode, SupportedLanguages supportedLanguages, Lazy<IpcMessageHandler> ipcMessageHandler, ShutdownHook shutdownHook) {
 		this.debugMode = debugMode;
 		this.supportedLanguages = supportedLanguages;
-		this.env = env;
 		this.ipcMessageHandler = ipcMessageHandler;
 		this.shutdownHook = shutdownHook;
 	}
@@ -64,7 +63,6 @@ public class Cryptomator {
 			System.out.printf("Cryptomator version %s (build %s)%n", appVer, buildNumber);
 			return;
 		}
-		PropertiesPreprocessor.run();
 		int exitCode = CRYPTOMATOR_COMPONENT.application().run(args);
 		LOG.info("Exit {}", exitCode);
 		System.exit(exitCode); // end remaining non-daemon threads.
@@ -77,9 +75,9 @@ public class Cryptomator {
 	 * @return Nonzero exit code in case of an error.
 	 */
 	private int run(String[] args) {
-		env.log();
+		ENV.log();
 		LOG.debug("Dagger graph initialized after {}ms", System.currentTimeMillis() - STARTUP_TIME);
-		LOG.info("Starting Cryptomator {} on {} {} ({})", env.getAppVersion(), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH);
+		LOG.info("Starting Cryptomator {} on {} {} ({})", ENV.getAppVersion(), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH);
 		debugMode.initialize();
 		supportedLanguages.applyPreferred();
 
@@ -87,7 +85,7 @@ public class Cryptomator {
 		 * Attempts to create an IPC connection to a running Cryptomator instance and sends it the given args.
 		 * If no external process could be reached, the args will be handled by the loopback IPC endpoint.
 		 */
-		try (var communicator = IpcCommunicator.create(env.ipcSocketPath().toList())) {
+		try (var communicator = IpcCommunicator.create(ENV.ipcSocketPath().toList())) {
 			if (communicator.isClient()) {
 				communicator.sendHandleLaunchargs(List.of(args));
 				communicator.sendRevealRunningApp();

From 8417618615a641e50c3d7ab0a07346571bb69198 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 28 Jun 2023 16:04:10 +0200
Subject: [PATCH 07/23] Revert "fix missing logDir path resolution"

This reverts commit b3d8df0da01dd50a6bc68b98bca53ae8067713d8.
---
 .../java/org/cryptomator/common/Environment.java     |  5 +----
 .../cryptomator/common/PropertiesPreprocessor.java   |  6 +++---
 .../java/org/cryptomator/launcher/Cryptomator.java   | 12 +++++++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/Environment.java b/src/main/java/org/cryptomator/common/Environment.java
index 3043c5a92..d9dec7b89 100644
--- a/src/main/java/org/cryptomator/common/Environment.java
+++ b/src/main/java/org/cryptomator/common/Environment.java
@@ -34,10 +34,7 @@ public class Environment {
 	private static final String PLUGIN_DIR_PROP_NAME = "cryptomator.pluginDir";
 	private static final String TRAY_ICON_PROP_NAME = "cryptomator.showTrayIcon";
 
-	private Environment() {
-		//hack, needed for logging directory to be setup correctly
-		PropertiesPreprocessor.run();
-	}
+	private Environment() {}
 
 	public void log() {
 		LOG.info("user.home: {}", System.getProperty("user.home"));
diff --git a/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java b/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
index 7dcda19ee..683b04aa2 100644
--- a/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
+++ b/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
@@ -33,9 +33,9 @@ public class PropertiesPreprocessor {
 		return TEMPLATE.matcher(value).replaceAll(match -> //
 				switch (match.group(1)) {
 					case "appdir" -> ENV.get("APPDIR");
-					case "appdata" -> ENV.get("APPDATA").replace("\\","\\\\");
-					case "localappdata" -> ENV.get("LOCALAPPDATA").replace("\\","\\\\");
-					case "userhome" -> System.getProperty("user.home").replace("\\","\\\\");
+					case "appdata" -> ENV.get("APPDATA");
+					case "localappdata" -> ENV.get("LOCALAPPDATA");
+					case "userhome" -> System.getProperty("user.home");
 					default -> {
 						LOG.warn("Found unknown variable @{{}} in property value {}.", match.group(), value);
 						yield match.group();
diff --git a/src/main/java/org/cryptomator/launcher/Cryptomator.java b/src/main/java/org/cryptomator/launcher/Cryptomator.java
index faf88c91a..f08d70c37 100644
--- a/src/main/java/org/cryptomator/launcher/Cryptomator.java
+++ b/src/main/java/org/cryptomator/launcher/Cryptomator.java
@@ -29,7 +29,6 @@ import java.util.concurrent.Executors;
 @Singleton
 public class Cryptomator {
 
-	private static final Environment ENV = Environment.getInstance();
 	private static final long STARTUP_TIME = System.currentTimeMillis();
 	// DaggerCryptomatorComponent gets generated by Dagger.
 	// Run Maven and include target/generated-sources/annotations in your IDE.
@@ -38,13 +37,15 @@ public class Cryptomator {
 
 	private final DebugMode debugMode;
 	private final SupportedLanguages supportedLanguages;
+	private final Environment env;
 	private final Lazy<IpcMessageHandler> ipcMessageHandler;
 	private final ShutdownHook shutdownHook;
 
 	@Inject
-	Cryptomator(DebugMode debugMode, SupportedLanguages supportedLanguages, Lazy<IpcMessageHandler> ipcMessageHandler, ShutdownHook shutdownHook) {
+	Cryptomator(DebugMode debugMode, SupportedLanguages supportedLanguages, Environment env, Lazy<IpcMessageHandler> ipcMessageHandler, ShutdownHook shutdownHook) {
 		this.debugMode = debugMode;
 		this.supportedLanguages = supportedLanguages;
+		this.env = env;
 		this.ipcMessageHandler = ipcMessageHandler;
 		this.shutdownHook = shutdownHook;
 	}
@@ -63,6 +64,7 @@ public class Cryptomator {
 			System.out.printf("Cryptomator version %s (build %s)%n", appVer, buildNumber);
 			return;
 		}
+		PropertiesPreprocessor.run();
 		int exitCode = CRYPTOMATOR_COMPONENT.application().run(args);
 		LOG.info("Exit {}", exitCode);
 		System.exit(exitCode); // end remaining non-daemon threads.
@@ -75,9 +77,9 @@ public class Cryptomator {
 	 * @return Nonzero exit code in case of an error.
 	 */
 	private int run(String[] args) {
-		ENV.log();
+		env.log();
 		LOG.debug("Dagger graph initialized after {}ms", System.currentTimeMillis() - STARTUP_TIME);
-		LOG.info("Starting Cryptomator {} on {} {} ({})", ENV.getAppVersion(), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH);
+		LOG.info("Starting Cryptomator {} on {} {} ({})", env.getAppVersion(), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH);
 		debugMode.initialize();
 		supportedLanguages.applyPreferred();
 
@@ -85,7 +87,7 @@ public class Cryptomator {
 		 * Attempts to create an IPC connection to a running Cryptomator instance and sends it the given args.
 		 * If no external process could be reached, the args will be handled by the loopback IPC endpoint.
 		 */
-		try (var communicator = IpcCommunicator.create(ENV.ipcSocketPath().toList())) {
+		try (var communicator = IpcCommunicator.create(env.ipcSocketPath().toList())) {
 			if (communicator.isClient()) {
 				communicator.sendHandleLaunchargs(List.of(args));
 				communicator.sendRevealRunningApp();

From 01da51e6e70fc6907e4b747438fd95e954f45d39 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 29 Jun 2023 11:37:35 +0200
Subject: [PATCH 08/23] Refactor properties preprocessing: * decorate
 Properties class * set the system properties to decorator * for logging
 setup, skip enviroment and access props over decorator

---
 .../common/LazyProcessedProperties.java       | 255 ++++++++++++++++++
 .../common/PropertiesPreprocessor.java        |  69 -----
 .../org/cryptomator/launcher/Cryptomator.java |  15 +-
 .../logging/LogbackConfigurator.java          |  10 +-
 ....java => LazyProcessedPropertiesTest.java} |   8 +-
 5 files changed, 277 insertions(+), 80 deletions(-)
 create mode 100644 src/main/java/org/cryptomator/common/LazyProcessedProperties.java
 delete mode 100644 src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
 rename src/test/java/org/cryptomator/common/{PropertiesPreprocessorTest.java => LazyProcessedPropertiesTest.java} (73%)

diff --git a/src/main/java/org/cryptomator/common/LazyProcessedProperties.java b/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
new file mode 100644
index 000000000..97248035a
--- /dev/null
+++ b/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
@@ -0,0 +1,255 @@
+package org.cryptomator.common;
+
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.nio.charset.Charset;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.InvalidPropertiesFormatException;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.regex.Pattern;
+
+public class LazyProcessedProperties extends Properties {
+
+	private static final Logger LOG = LoggerFactory.getLogger(LazyProcessedProperties.class);
+
+	//Template and env _need_ to be instance variables, otherwise they might not be initialized at access time
+	private final Pattern template = Pattern.compile("@\\{(\\w+)}");
+	private final Map<String, String> env = System.getenv();
+	private final Properties delegate;
+
+	public LazyProcessedProperties(Properties props) {
+		this.delegate = props;
+	}
+
+	@Override
+	public String getProperty(String key) {
+		var value = delegate.getProperty(key);
+		if (key.startsWith("cryptomator.") && value != null) {
+			return process(value);
+		} else {
+			return value;
+		}
+	}
+
+	@Override
+	public String getProperty(String key, String defaultValue) {
+		var value = delegate.getProperty(key, defaultValue);
+		if (key.startsWith("cryptomator.") && value != null) {
+			return process(value);
+		} else {
+			return value;
+		}
+	}
+
+	String process(String value) {
+		return template.matcher(value).replaceAll(match -> //
+				switch (match.group(1)) {
+					case "appdir" -> resolveFrom("APPDIR", Source.ENV);
+					case "appdata" -> resolveFrom("APPDATA", Source.ENV);
+					case "localappdata" -> resolveFrom("LOCALAPPDATA", Source.ENV);
+					case "userhome" -> resolveFrom("user.home", Source.PROPS);
+					default -> {
+						LOG.warn("Unknown variable @{{}} in property value {}.", match.group(), value);
+						yield match.group();
+					}
+				});
+	}
+
+	private String resolveFrom(String key, Source src) {
+		var val = switch (src) {
+			case ENV -> env.get(key);
+			case PROPS -> delegate.getProperty(key);
+		};
+		if (val == null) {
+			LOG.warn("Variable {} used for substitution not found in {}. Replaced with empty string.", key, src);
+			return "";
+		} else {
+			return val.replace("\\", "\\\\");
+		}
+	}
+
+	private enum Source {
+		ENV,
+		PROPS;
+	}
+
+	@Override
+	public Object setProperty(String key, String value) {
+		return delegate.setProperty(key, value);
+	}
+
+	//auto generated
+	@Override
+	public void load(Reader reader) throws IOException {delegate.load(reader);}
+
+	@Override
+	public void load(InputStream inStream) throws IOException {delegate.load(inStream);}
+
+	@Override
+	@Deprecated
+	public void save(OutputStream out, String comments) {delegate.save(out, comments);}
+
+	@Override
+	public void store(Writer writer, String comments) throws IOException {delegate.store(writer, comments);}
+
+	@Override
+	public void store(OutputStream out, @Nullable String comments) throws IOException {delegate.store(out, comments);}
+
+	@Override
+	public void loadFromXML(InputStream in) throws IOException, InvalidPropertiesFormatException {delegate.loadFromXML(in);}
+
+	@Override
+	public void storeToXML(OutputStream os, String comment) throws IOException {delegate.storeToXML(os, comment);}
+
+	@Override
+	public void storeToXML(OutputStream os, String comment, String encoding) throws IOException {delegate.storeToXML(os, comment, encoding);}
+
+	@Override
+	public void storeToXML(OutputStream os, String comment, Charset charset) throws IOException {delegate.storeToXML(os, comment, charset);}
+
+	@Override
+	public Enumeration<?> propertyNames() {return delegate.propertyNames();}
+
+	@Override
+	public Set<String> stringPropertyNames() {return delegate.stringPropertyNames();}
+
+	@Override
+	public void list(PrintStream out) {delegate.list(out);}
+
+	@Override
+	public void list(PrintWriter out) {delegate.list(out);}
+
+	@Override
+	public int size() {return delegate.size();}
+
+	@Override
+	public boolean isEmpty() {return delegate.isEmpty();}
+
+	@Override
+	public Enumeration<Object> keys() {return delegate.keys();}
+
+	@Override
+	public Enumeration<Object> elements() {return delegate.elements();}
+
+	@Override
+	public boolean contains(Object value) {return delegate.contains(value);}
+
+	@Override
+	public boolean containsValue(Object value) {return delegate.containsValue(value);}
+
+	@Override
+	public boolean containsKey(Object key) {return delegate.containsKey(key);}
+
+	@Override
+	public Object get(Object key) {return delegate.get(key);}
+
+	@Override
+	public Object put(Object key, Object value) {return delegate.put(key, value);}
+
+	@Override
+	public Object remove(Object key) {return delegate.remove(key);}
+
+	@Override
+	public void putAll(Map<?, ?> t) {delegate.putAll(t);}
+
+	@Override
+	public void clear() {delegate.clear();}
+
+	@Override
+	public String toString() {return delegate.toString();}
+
+	@Override
+	public Set<Object> keySet() {return delegate.keySet();}
+
+	@Override
+	public Collection<Object> values() {return delegate.values();}
+
+	@Override
+	public Set<Map.Entry<Object, Object>> entrySet() {return delegate.entrySet();}
+
+	@Override
+	public boolean equals(Object o) {return delegate.equals(o);}
+
+	@Override
+	public int hashCode() {return delegate.hashCode();}
+
+	@Override
+	public Object getOrDefault(Object key, Object defaultValue) {return delegate.getOrDefault(key, defaultValue);}
+
+	@Override
+	public void forEach(BiConsumer<? super Object, ? super Object> action) {delegate.forEach(action);}
+
+	@Override
+	public void replaceAll(BiFunction<? super Object, ? super Object, ?> function) {delegate.replaceAll(function);}
+
+	@Override
+	public Object putIfAbsent(Object key, Object value) {return delegate.putIfAbsent(key, value);}
+
+	@Override
+	public boolean remove(Object key, Object value) {return delegate.remove(key, value);}
+
+	@Override
+	public boolean replace(Object key, Object oldValue, Object newValue) {return delegate.replace(key, oldValue, newValue);}
+
+	@Override
+	public Object replace(Object key, Object value) {return delegate.replace(key, value);}
+
+	@Override
+	public Object computeIfAbsent(Object key, Function<? super Object, ?> mappingFunction) {return delegate.computeIfAbsent(key, mappingFunction);}
+
+	@Override
+	public Object computeIfPresent(Object key, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.computeIfPresent(key, remappingFunction);}
+
+	@Override
+	public Object compute(Object key, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.compute(key, remappingFunction);}
+
+	@Override
+	public Object merge(Object key, Object value, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.merge(key, value, remappingFunction);}
+
+	@Override
+	public Object clone() {return delegate.clone();}
+
+	public static <K, V> Map<K, V> of() {return Map.of();}
+
+	public static <K, V> Map<K, V> of(K k1, V v1) {return Map.of(k1, v1);}
+
+	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2) {return Map.of(k1, v1, k2, v2);}
+
+	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3) {return Map.of(k1, v1, k2, v2, k3, v3);}
+
+	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4) {return Map.of(k1, v1, k2, v2, k3, v3, k4, v4);}
+
+	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5) {return Map.of(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5);}
+
+	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6) {return Map.of(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5, k6, v6);}
+
+	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7) {return Map.of(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5, k6, v6, k7, v7);}
+
+	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7, K k8, V v8) {return Map.of(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5, k6, v6, k7, v7, k8, v8);}
+
+	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7, K k8, V v8, K k9, V v9) {return Map.of(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5, k6, v6, k7, v7, k8, v8, k9, v9);}
+
+	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7, K k8, V v8, K k9, V v9, K k10, V v10) {return Map.of(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5, k6, v6, k7, v7, k8, v8, k9, v9, k10, v10);}
+
+	@SafeVarargs
+	public static <K, V> Map<K, V> ofEntries(Map.Entry<? extends K, ? extends V>... entries) {return Map.ofEntries(entries);}
+
+	public static <K, V> Map.Entry<K, V> entry(K k, V v) {return Map.entry(k, v);}
+
+	public static <K, V> Map<K, V> copyOf(Map<? extends K, ? extends V> map) {return Map.copyOf(map);}
+}
diff --git a/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java b/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
deleted file mode 100644
index 683b04aa2..000000000
--- a/src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.cryptomator.common;
-
-import org.jetbrains.annotations.VisibleForTesting;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Map;
-import java.util.regex.Pattern;
-
-public class PropertiesPreprocessor {
-
-	private static final Logger LOG = LoggerFactory.getLogger(PropertiesPreprocessor.class);
-	private static final Pattern TEMPLATE = Pattern.compile("@\\{(\\w+)}");
-	private static final LoggingEnvironment ENV = new LoggingEnvironment(System.getenv(), LOG);
-
-	public static void run() {
-		var properties = System.getProperties();
-		properties.stringPropertyNames().stream() //
-				.filter(s -> s.startsWith("cryptomator.")) //
-				.forEach(key -> {
-					var value = properties.getProperty(key);
-					var newValue = process(value);
-					if(! value.equals(newValue)) {
-						LOG.info("Changed property {} from {} to {}.", key, value, newValue);
-					}
-					properties.setProperty(key, newValue);
-				});
-		LOG.info("Preprocessed cryptomator properties.");
-	}
-
-	@VisibleForTesting
-	static String process(String value) {
-		return TEMPLATE.matcher(value).replaceAll(match -> //
-				switch (match.group(1)) {
-					case "appdir" -> ENV.get("APPDIR");
-					case "appdata" -> ENV.get("APPDATA");
-					case "localappdata" -> ENV.get("LOCALAPPDATA");
-					case "userhome" -> System.getProperty("user.home");
-					default -> {
-						LOG.warn("Found unknown variable @{{}} in property value {}.", match.group(), value);
-						yield match.group();
-					}
-				});
-	}
-
-	private static class LoggingEnvironment {
-
-		private final Map<String, String> env;
-		private final Logger logger;
-
-		LoggingEnvironment(Map<String, String> env, Logger logger) {
-			this.env = env;
-			this.logger = logger;
-		}
-
-		String get(String key) {
-			var val = env.get(key);
-			if (val == null) {
-				logger.warn("Variable {} used for substitution not found in environment", key);
-				return "";
-			} else {
-				return val;
-			}
-		}
-
-	}
-
-
-}
diff --git a/src/main/java/org/cryptomator/launcher/Cryptomator.java b/src/main/java/org/cryptomator/launcher/Cryptomator.java
index f08d70c37..0985ee33e 100644
--- a/src/main/java/org/cryptomator/launcher/Cryptomator.java
+++ b/src/main/java/org/cryptomator/launcher/Cryptomator.java
@@ -9,7 +9,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import dagger.Lazy;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
-import org.cryptomator.common.PropertiesPreprocessor;
+import org.cryptomator.common.LazyProcessedProperties;
 import org.cryptomator.common.ShutdownHook;
 import org.cryptomator.ipc.IpcCommunicator;
 import org.cryptomator.logging.DebugMode;
@@ -32,8 +32,16 @@ public class Cryptomator {
 	private static final long STARTUP_TIME = System.currentTimeMillis();
 	// DaggerCryptomatorComponent gets generated by Dagger.
 	// Run Maven and include target/generated-sources/annotations in your IDE.
-	private static final CryptomatorComponent CRYPTOMATOR_COMPONENT = DaggerCryptomatorComponent.factory().create(STARTUP_TIME);
-	private static final Logger LOG = LoggerFactory.getLogger(Cryptomator.class);
+
+	static {
+		var lazyProcessedProps = new LazyProcessedProperties(System.getProperties());
+		System.setProperties(lazyProcessedProps);
+		CRYPTOMATOR_COMPONENT = DaggerCryptomatorComponent.factory().create(STARTUP_TIME);
+		LOG = LoggerFactory.getLogger(Cryptomator.class);
+	}
+
+	private static final CryptomatorComponent CRYPTOMATOR_COMPONENT;
+	private static final Logger LOG;
 
 	private final DebugMode debugMode;
 	private final SupportedLanguages supportedLanguages;
@@ -64,7 +72,6 @@ public class Cryptomator {
 			System.out.printf("Cryptomator version %s (build %s)%n", appVer, buildNumber);
 			return;
 		}
-		PropertiesPreprocessor.run();
 		int exitCode = CRYPTOMATOR_COMPONENT.application().run(args);
 		LOG.info("Exit {}", exitCode);
 		System.exit(exitCode); // end remaining non-daemon threads.
diff --git a/src/main/java/org/cryptomator/logging/LogbackConfigurator.java b/src/main/java/org/cryptomator/logging/LogbackConfigurator.java
index 511599132..41275d073 100644
--- a/src/main/java/org/cryptomator/logging/LogbackConfigurator.java
+++ b/src/main/java/org/cryptomator/logging/LogbackConfigurator.java
@@ -14,10 +14,12 @@ import ch.qos.logback.core.rolling.FixedWindowRollingPolicy;
 import ch.qos.logback.core.rolling.RollingFileAppender;
 import ch.qos.logback.core.spi.ContextAwareBase;
 import ch.qos.logback.core.util.FileSize;
-import org.cryptomator.common.Environment;
+import org.cryptomator.common.LazyProcessedProperties;
 
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
+import java.util.Optional;
 
 public class LogbackConfigurator extends ContextAwareBase implements Configurator {
 
@@ -56,8 +58,10 @@ public class LogbackConfigurator extends ContextAwareBase implements Configurato
 
 	@Override
 	public ExecutionStatus configure(LoggerContext context) {
-		var useCustomCfg = Environment.getInstance().useCustomLogbackConfig();
-		var logDir = Environment.getInstance().getLogDir().orElse(null);
+		//we need to preprocess those, because every other class has a dependency to logging, none are initialized yet
+		var processedProps = new LazyProcessedProperties(System.getProperties());
+		var useCustomCfg = Optional.ofNullable(processedProps.getProperty("logback.configurationFile")).map(s -> Files.exists(Path.of(s))).orElse(false);
+		var logDir = Optional.ofNullable(processedProps.getProperty("cryptomator.logDir")).map(Path::of).orElse(null);
 
 		if (useCustomCfg) {
 			addInfo("Using external logback configuration file.");
diff --git a/src/test/java/org/cryptomator/common/PropertiesPreprocessorTest.java b/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java
similarity index 73%
rename from src/test/java/org/cryptomator/common/PropertiesPreprocessorTest.java
rename to src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java
index eee900f9c..7b7e2948f 100644
--- a/src/test/java/org/cryptomator/common/PropertiesPreprocessorTest.java
+++ b/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java
@@ -1,12 +1,11 @@
 package org.cryptomator.common;
 
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
-import org.mockito.Mockito;
 
-public class PropertiesPreprocessorTest {
+public class LazyProcessedPropertiesTest {
 
 	@ParameterizedTest
 	@CsvSource(value = """
@@ -17,7 +16,8 @@ public class PropertiesPreprocessorTest {
 			Longer @{appdir} text with @{appdir}., Longer  text with .
 			""")
 	public void test(String propertyValue, String expected) {
-		var result = PropertiesPreprocessor.process(propertyValue);
+		LazyProcessedProperties inTest = new LazyProcessedProperties(System.getProperties());
+		var result = inTest.process(propertyValue);
 		Assertions.assertEquals(result, expected);
 	}
 

From ebc60c4fb37421442e6b23fa3f3f38c8204b26a3 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 29 Jun 2023 12:35:59 +0200
Subject: [PATCH 09/23] make process function reliable testable and adjust unit
 test

---
 .../common/LazyProcessedProperties.java         |  6 ++++--
 .../org/cryptomator/launcher/Cryptomator.java   |  6 +++---
 .../logging/LogbackConfigurator.java            |  2 +-
 .../common/LazyProcessedPropertiesTest.java     | 17 ++++++++---------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/LazyProcessedProperties.java b/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
index 97248035a..c4be47f11 100644
--- a/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
+++ b/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
@@ -29,11 +29,12 @@ public class LazyProcessedProperties extends Properties {
 
 	//Template and env _need_ to be instance variables, otherwise they might not be initialized at access time
 	private final Pattern template = Pattern.compile("@\\{(\\w+)}");
-	private final Map<String, String> env = System.getenv();
+	private final Map<String, String> env;
 	private final Properties delegate;
 
-	public LazyProcessedProperties(Properties props) {
+	public LazyProcessedProperties(Properties props, Map<String, String> systemEnvironment) {
 		this.delegate = props;
+		this.env = systemEnvironment;
 	}
 
 	@Override
@@ -56,6 +57,7 @@ public class LazyProcessedProperties extends Properties {
 		}
 	}
 
+	//visible for testing
 	String process(String value) {
 		return template.matcher(value).replaceAll(match -> //
 				switch (match.group(1)) {
diff --git a/src/main/java/org/cryptomator/launcher/Cryptomator.java b/src/main/java/org/cryptomator/launcher/Cryptomator.java
index 0985ee33e..d6bafa489 100644
--- a/src/main/java/org/cryptomator/launcher/Cryptomator.java
+++ b/src/main/java/org/cryptomator/launcher/Cryptomator.java
@@ -30,16 +30,16 @@ import java.util.concurrent.Executors;
 public class Cryptomator {
 
 	private static final long STARTUP_TIME = System.currentTimeMillis();
-	// DaggerCryptomatorComponent gets generated by Dagger.
-	// Run Maven and include target/generated-sources/annotations in your IDE.
 
 	static {
-		var lazyProcessedProps = new LazyProcessedProperties(System.getProperties());
+		var lazyProcessedProps = new LazyProcessedProperties(System.getProperties(), System.getenv());
 		System.setProperties(lazyProcessedProps);
 		CRYPTOMATOR_COMPONENT = DaggerCryptomatorComponent.factory().create(STARTUP_TIME);
 		LOG = LoggerFactory.getLogger(Cryptomator.class);
 	}
 
+	// DaggerCryptomatorComponent gets generated by Dagger.
+	// Run Maven and include target/generated-sources/annotations in your IDE.
 	private static final CryptomatorComponent CRYPTOMATOR_COMPONENT;
 	private static final Logger LOG;
 
diff --git a/src/main/java/org/cryptomator/logging/LogbackConfigurator.java b/src/main/java/org/cryptomator/logging/LogbackConfigurator.java
index 41275d073..c352f52f5 100644
--- a/src/main/java/org/cryptomator/logging/LogbackConfigurator.java
+++ b/src/main/java/org/cryptomator/logging/LogbackConfigurator.java
@@ -59,7 +59,7 @@ public class LogbackConfigurator extends ContextAwareBase implements Configurato
 	@Override
 	public ExecutionStatus configure(LoggerContext context) {
 		//we need to preprocess those, because every other class has a dependency to logging, none are initialized yet
-		var processedProps = new LazyProcessedProperties(System.getProperties());
+		var processedProps = new LazyProcessedProperties(System.getProperties(), System.getenv());
 		var useCustomCfg = Optional.ofNullable(processedProps.getProperty("logback.configurationFile")).map(s -> Files.exists(Path.of(s))).orElse(false);
 		var logDir = Optional.ofNullable(processedProps.getProperty("cryptomator.logDir")).map(Path::of).orElse(null);
 
diff --git a/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java b/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java
index 7b7e2948f..2f5be36fa 100644
--- a/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java
+++ b/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java
@@ -1,22 +1,21 @@
 package org.cryptomator.common;
 
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
+import java.util.Map;
+
 public class LazyProcessedPropertiesTest {
 
 	@ParameterizedTest
-	@CsvSource(value = """
-			org.example.@{mytest1}.test, org.example.@{mytest1}.test
-			@{only*word*digits*under_score\\},@{only*words*digits*under_score\\}
-			C:\\Users\\@{appdir}\\dir, C:\\Users\\\\dir
-			@{@{appdir}},@{}
-			Longer @{appdir} text with @{appdir}., Longer  text with .
-			""")
+	@CsvSource(value = {"org.example.@{mytest1}.test, org.example.@{mytest1}.test", //
+			"@{only*words*digits*under_score\\},@{only*words*digits*under_score\\}", //
+			"C:\\Users\\@{appdir}\\dir, C:\\Users\\foobar\\dir", //
+			"@{@{appdir}},@{foobar}", //
+			"Longer @{appdir} text with @{appdir}., Longer foobar text with foobar."})
 	public void test(String propertyValue, String expected) {
-		LazyProcessedProperties inTest = new LazyProcessedProperties(System.getProperties());
+		LazyProcessedProperties inTest = new LazyProcessedProperties(System.getProperties(), Map.of("APPDIR", "foobar"));
 		var result = inTest.process(propertyValue);
 		Assertions.assertEquals(result, expected);
 	}

From 6c18e3a929a3e81caaf4827b7cd0918a203200c9 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 29 Jun 2023 13:04:00 +0200
Subject: [PATCH 10/23] apply suggestion from sonarCloud

---
 .../common/LazyProcessedProperties.java       | 53 +++++++++----------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/LazyProcessedProperties.java b/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
index c4be47f11..389f81bb1 100644
--- a/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
+++ b/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
@@ -90,21 +90,17 @@ public class LazyProcessedProperties extends Properties {
 		PROPS;
 	}
 
+	//auto generated
 	@Override
-	public Object setProperty(String key, String value) {
+	public synchronized Object setProperty(String key, String value) {
 		return delegate.setProperty(key, value);
 	}
 
-	//auto generated
 	@Override
-	public void load(Reader reader) throws IOException {delegate.load(reader);}
+	public synchronized void load(Reader reader) throws IOException {delegate.load(reader);}
 
 	@Override
-	public void load(InputStream inStream) throws IOException {delegate.load(inStream);}
-
-	@Override
-	@Deprecated
-	public void save(OutputStream out, String comments) {delegate.save(out, comments);}
+	public synchronized void load(InputStream inStream) throws IOException {delegate.load(inStream);}
 
 	@Override
 	public void store(Writer writer, String comments) throws IOException {delegate.store(writer, comments);}
@@ -113,7 +109,7 @@ public class LazyProcessedProperties extends Properties {
 	public void store(OutputStream out, @Nullable String comments) throws IOException {delegate.store(out, comments);}
 
 	@Override
-	public void loadFromXML(InputStream in) throws IOException, InvalidPropertiesFormatException {delegate.loadFromXML(in);}
+	public synchronized void loadFromXML(InputStream in) throws IOException, InvalidPropertiesFormatException {delegate.loadFromXML(in);}
 
 	@Override
 	public void storeToXML(OutputStream os, String comment) throws IOException {delegate.storeToXML(os, comment);}
@@ -161,19 +157,19 @@ public class LazyProcessedProperties extends Properties {
 	public Object get(Object key) {return delegate.get(key);}
 
 	@Override
-	public Object put(Object key, Object value) {return delegate.put(key, value);}
+	public synchronized Object put(Object key, Object value) {return delegate.put(key, value);}
 
 	@Override
-	public Object remove(Object key) {return delegate.remove(key);}
+	public synchronized Object remove(Object key) {return delegate.remove(key);}
 
 	@Override
-	public void putAll(Map<?, ?> t) {delegate.putAll(t);}
+	public synchronized void putAll(Map<?, ?> t) {delegate.putAll(t);}
 
 	@Override
-	public void clear() {delegate.clear();}
+	public synchronized void clear() {delegate.clear();}
 
 	@Override
-	public String toString() {return delegate.toString();}
+	public synchronized String toString() {return delegate.toString();}
 
 	@Override
 	public Set<Object> keySet() {return delegate.keySet();}
@@ -185,46 +181,49 @@ public class LazyProcessedProperties extends Properties {
 	public Set<Map.Entry<Object, Object>> entrySet() {return delegate.entrySet();}
 
 	@Override
-	public boolean equals(Object o) {return delegate.equals(o);}
+	public synchronized boolean equals(Object o) {return delegate.equals(o);}
 
 	@Override
-	public int hashCode() {return delegate.hashCode();}
+	public synchronized int hashCode() {return delegate.hashCode();}
 
 	@Override
 	public Object getOrDefault(Object key, Object defaultValue) {return delegate.getOrDefault(key, defaultValue);}
 
 	@Override
-	public void forEach(BiConsumer<? super Object, ? super Object> action) {delegate.forEach(action);}
+	public synchronized void forEach(BiConsumer<? super Object, ? super Object> action) {delegate.forEach(action);}
 
 	@Override
-	public void replaceAll(BiFunction<? super Object, ? super Object, ?> function) {delegate.replaceAll(function);}
+	public synchronized void replaceAll(BiFunction<? super Object, ? super Object, ?> function) {delegate.replaceAll(function);}
 
 	@Override
-	public Object putIfAbsent(Object key, Object value) {return delegate.putIfAbsent(key, value);}
+	public synchronized Object putIfAbsent(Object key, Object value) {return delegate.putIfAbsent(key, value);}
 
 	@Override
-	public boolean remove(Object key, Object value) {return delegate.remove(key, value);}
+	public synchronized boolean remove(Object key, Object value) {return delegate.remove(key, value);}
 
 	@Override
-	public boolean replace(Object key, Object oldValue, Object newValue) {return delegate.replace(key, oldValue, newValue);}
+	public synchronized boolean replace(Object key, Object oldValue, Object newValue) {return delegate.replace(key, oldValue, newValue);}
 
 	@Override
-	public Object replace(Object key, Object value) {return delegate.replace(key, value);}
+	public synchronized Object replace(Object key, Object value) {return delegate.replace(key, value);}
 
 	@Override
-	public Object computeIfAbsent(Object key, Function<? super Object, ?> mappingFunction) {return delegate.computeIfAbsent(key, mappingFunction);}
+	public synchronized Object computeIfAbsent(Object key, Function<? super Object, ?> mappingFunction) {return delegate.computeIfAbsent(key, mappingFunction);}
 
 	@Override
-	public Object computeIfPresent(Object key, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.computeIfPresent(key, remappingFunction);}
+	public synchronized Object computeIfPresent(Object key, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.computeIfPresent(key, remappingFunction);}
 
 	@Override
-	public Object compute(Object key, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.compute(key, remappingFunction);}
+	public synchronized Object compute(Object key, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.compute(key, remappingFunction);}
 
 	@Override
-	public Object merge(Object key, Object value, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.merge(key, value, remappingFunction);}
+	public synchronized Object merge(Object key, Object value, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.merge(key, value, remappingFunction);}
 
 	@Override
-	public Object clone() {return delegate.clone();}
+	public synchronized Object clone() {
+		var delegateClone = (Properties) delegate.clone();
+		return new LazyProcessedProperties(delegateClone, env);
+	}
 
 	public static <K, V> Map<K, V> of() {return Map.of();}
 

From 3098628db192ff249f581ed180972cdb5e567c0f Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 29 Jun 2023 15:32:15 +0200
Subject: [PATCH 11/23] Fix problem of circular class init

---
 .../common/LazyProcessedProperties.java       | 40 ++-----------------
 .../logging/LogbackConfigurator.java          | 10 ++---
 2 files changed, 7 insertions(+), 43 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/LazyProcessedProperties.java b/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
index 389f81bb1..d12b6c92c 100644
--- a/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
+++ b/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
@@ -1,7 +1,6 @@
 package org.cryptomator.common;
 
 import org.jetbrains.annotations.Nullable;
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
@@ -25,10 +24,8 @@ import java.util.regex.Pattern;
 
 public class LazyProcessedProperties extends Properties {
 
-	private static final Logger LOG = LoggerFactory.getLogger(LazyProcessedProperties.class);
+	private static final Pattern TEMPLATE = Pattern.compile("@\\{(\\w+)}");
 
-	//Template and env _need_ to be instance variables, otherwise they might not be initialized at access time
-	private final Pattern template = Pattern.compile("@\\{(\\w+)}");
 	private final Map<String, String> env;
 	private final Properties delegate;
 
@@ -59,14 +56,14 @@ public class LazyProcessedProperties extends Properties {
 
 	//visible for testing
 	String process(String value) {
-		return template.matcher(value).replaceAll(match -> //
+		return TEMPLATE.matcher(value).replaceAll(match -> //
 				switch (match.group(1)) {
 					case "appdir" -> resolveFrom("APPDIR", Source.ENV);
 					case "appdata" -> resolveFrom("APPDATA", Source.ENV);
 					case "localappdata" -> resolveFrom("LOCALAPPDATA", Source.ENV);
 					case "userhome" -> resolveFrom("user.home", Source.PROPS);
 					default -> {
-						LOG.warn("Unknown variable @{{}} in property value {}.", match.group(), value);
+						LoggerFactory.getLogger(LazyProcessedProperties.class).warn("Unknown variable @{{}} in property value {}.", match.group(), value);
 						yield match.group();
 					}
 				});
@@ -78,7 +75,7 @@ public class LazyProcessedProperties extends Properties {
 			case PROPS -> delegate.getProperty(key);
 		};
 		if (val == null) {
-			LOG.warn("Variable {} used for substitution not found in {}. Replaced with empty string.", key, src);
+			LoggerFactory.getLogger(LazyProcessedProperties.class).warn("Variable {} used for substitution not found in {}. Replaced with empty string.", key, src);
 			return "";
 		} else {
 			return val.replace("\\", "\\\\");
@@ -224,33 +221,4 @@ public class LazyProcessedProperties extends Properties {
 		var delegateClone = (Properties) delegate.clone();
 		return new LazyProcessedProperties(delegateClone, env);
 	}
-
-	public static <K, V> Map<K, V> of() {return Map.of();}
-
-	public static <K, V> Map<K, V> of(K k1, V v1) {return Map.of(k1, v1);}
-
-	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2) {return Map.of(k1, v1, k2, v2);}
-
-	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3) {return Map.of(k1, v1, k2, v2, k3, v3);}
-
-	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4) {return Map.of(k1, v1, k2, v2, k3, v3, k4, v4);}
-
-	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5) {return Map.of(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5);}
-
-	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6) {return Map.of(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5, k6, v6);}
-
-	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7) {return Map.of(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5, k6, v6, k7, v7);}
-
-	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7, K k8, V v8) {return Map.of(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5, k6, v6, k7, v7, k8, v8);}
-
-	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7, K k8, V v8, K k9, V v9) {return Map.of(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5, k6, v6, k7, v7, k8, v8, k9, v9);}
-
-	public static <K, V> Map<K, V> of(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6, K k7, V v7, K k8, V v8, K k9, V v9, K k10, V v10) {return Map.of(k1, v1, k2, v2, k3, v3, k4, v4, k5, v5, k6, v6, k7, v7, k8, v8, k9, v9, k10, v10);}
-
-	@SafeVarargs
-	public static <K, V> Map<K, V> ofEntries(Map.Entry<? extends K, ? extends V>... entries) {return Map.ofEntries(entries);}
-
-	public static <K, V> Map.Entry<K, V> entry(K k, V v) {return Map.entry(k, v);}
-
-	public static <K, V> Map<K, V> copyOf(Map<? extends K, ? extends V> map) {return Map.copyOf(map);}
 }
diff --git a/src/main/java/org/cryptomator/logging/LogbackConfigurator.java b/src/main/java/org/cryptomator/logging/LogbackConfigurator.java
index c352f52f5..511599132 100644
--- a/src/main/java/org/cryptomator/logging/LogbackConfigurator.java
+++ b/src/main/java/org/cryptomator/logging/LogbackConfigurator.java
@@ -14,12 +14,10 @@ import ch.qos.logback.core.rolling.FixedWindowRollingPolicy;
 import ch.qos.logback.core.rolling.RollingFileAppender;
 import ch.qos.logback.core.spi.ContextAwareBase;
 import ch.qos.logback.core.util.FileSize;
-import org.cryptomator.common.LazyProcessedProperties;
+import org.cryptomator.common.Environment;
 
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
-import java.util.Optional;
 
 public class LogbackConfigurator extends ContextAwareBase implements Configurator {
 
@@ -58,10 +56,8 @@ public class LogbackConfigurator extends ContextAwareBase implements Configurato
 
 	@Override
 	public ExecutionStatus configure(LoggerContext context) {
-		//we need to preprocess those, because every other class has a dependency to logging, none are initialized yet
-		var processedProps = new LazyProcessedProperties(System.getProperties(), System.getenv());
-		var useCustomCfg = Optional.ofNullable(processedProps.getProperty("logback.configurationFile")).map(s -> Files.exists(Path.of(s))).orElse(false);
-		var logDir = Optional.ofNullable(processedProps.getProperty("cryptomator.logDir")).map(Path::of).orElse(null);
+		var useCustomCfg = Environment.getInstance().useCustomLogbackConfig();
+		var logDir = Environment.getInstance().getLogDir().orElse(null);
 
 		if (useCustomCfg) {
 			addInfo("Using external logback configuration file.");

From a31d3185dce6dfff0053e826446884cacc602de8 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 29 Jun 2023 15:51:46 +0200
Subject: [PATCH 12/23] move boilerplate code to own class

---
 .../common/LazyProcessedProperties.java       | 155 +---------------
 .../common/PropertiesDecorator.java           | 171 ++++++++++++++++++
 2 files changed, 173 insertions(+), 153 deletions(-)
 create mode 100644 src/main/java/org/cryptomator/common/PropertiesDecorator.java

diff --git a/src/main/java/org/cryptomator/common/LazyProcessedProperties.java b/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
index d12b6c92c..6d882c9f9 100644
--- a/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
+++ b/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
@@ -1,36 +1,19 @@
 package org.cryptomator.common;
 
-import org.jetbrains.annotations.Nullable;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.Writer;
-import java.nio.charset.Charset;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.InvalidPropertiesFormatException;
 import java.util.Map;
 import java.util.Properties;
-import java.util.Set;
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.Function;
 import java.util.regex.Pattern;
 
-public class LazyProcessedProperties extends Properties {
+public class LazyProcessedProperties extends PropertiesDecorator {
 
 	private static final Pattern TEMPLATE = Pattern.compile("@\\{(\\w+)}");
 
 	private final Map<String, String> env;
-	private final Properties delegate;
 
 	public LazyProcessedProperties(Properties props, Map<String, String> systemEnvironment) {
-		this.delegate = props;
+		super(props);
 		this.env = systemEnvironment;
 	}
 
@@ -87,138 +70,4 @@ public class LazyProcessedProperties extends Properties {
 		PROPS;
 	}
 
-	//auto generated
-	@Override
-	public synchronized Object setProperty(String key, String value) {
-		return delegate.setProperty(key, value);
-	}
-
-	@Override
-	public synchronized void load(Reader reader) throws IOException {delegate.load(reader);}
-
-	@Override
-	public synchronized void load(InputStream inStream) throws IOException {delegate.load(inStream);}
-
-	@Override
-	public void store(Writer writer, String comments) throws IOException {delegate.store(writer, comments);}
-
-	@Override
-	public void store(OutputStream out, @Nullable String comments) throws IOException {delegate.store(out, comments);}
-
-	@Override
-	public synchronized void loadFromXML(InputStream in) throws IOException, InvalidPropertiesFormatException {delegate.loadFromXML(in);}
-
-	@Override
-	public void storeToXML(OutputStream os, String comment) throws IOException {delegate.storeToXML(os, comment);}
-
-	@Override
-	public void storeToXML(OutputStream os, String comment, String encoding) throws IOException {delegate.storeToXML(os, comment, encoding);}
-
-	@Override
-	public void storeToXML(OutputStream os, String comment, Charset charset) throws IOException {delegate.storeToXML(os, comment, charset);}
-
-	@Override
-	public Enumeration<?> propertyNames() {return delegate.propertyNames();}
-
-	@Override
-	public Set<String> stringPropertyNames() {return delegate.stringPropertyNames();}
-
-	@Override
-	public void list(PrintStream out) {delegate.list(out);}
-
-	@Override
-	public void list(PrintWriter out) {delegate.list(out);}
-
-	@Override
-	public int size() {return delegate.size();}
-
-	@Override
-	public boolean isEmpty() {return delegate.isEmpty();}
-
-	@Override
-	public Enumeration<Object> keys() {return delegate.keys();}
-
-	@Override
-	public Enumeration<Object> elements() {return delegate.elements();}
-
-	@Override
-	public boolean contains(Object value) {return delegate.contains(value);}
-
-	@Override
-	public boolean containsValue(Object value) {return delegate.containsValue(value);}
-
-	@Override
-	public boolean containsKey(Object key) {return delegate.containsKey(key);}
-
-	@Override
-	public Object get(Object key) {return delegate.get(key);}
-
-	@Override
-	public synchronized Object put(Object key, Object value) {return delegate.put(key, value);}
-
-	@Override
-	public synchronized Object remove(Object key) {return delegate.remove(key);}
-
-	@Override
-	public synchronized void putAll(Map<?, ?> t) {delegate.putAll(t);}
-
-	@Override
-	public synchronized void clear() {delegate.clear();}
-
-	@Override
-	public synchronized String toString() {return delegate.toString();}
-
-	@Override
-	public Set<Object> keySet() {return delegate.keySet();}
-
-	@Override
-	public Collection<Object> values() {return delegate.values();}
-
-	@Override
-	public Set<Map.Entry<Object, Object>> entrySet() {return delegate.entrySet();}
-
-	@Override
-	public synchronized boolean equals(Object o) {return delegate.equals(o);}
-
-	@Override
-	public synchronized int hashCode() {return delegate.hashCode();}
-
-	@Override
-	public Object getOrDefault(Object key, Object defaultValue) {return delegate.getOrDefault(key, defaultValue);}
-
-	@Override
-	public synchronized void forEach(BiConsumer<? super Object, ? super Object> action) {delegate.forEach(action);}
-
-	@Override
-	public synchronized void replaceAll(BiFunction<? super Object, ? super Object, ?> function) {delegate.replaceAll(function);}
-
-	@Override
-	public synchronized Object putIfAbsent(Object key, Object value) {return delegate.putIfAbsent(key, value);}
-
-	@Override
-	public synchronized boolean remove(Object key, Object value) {return delegate.remove(key, value);}
-
-	@Override
-	public synchronized boolean replace(Object key, Object oldValue, Object newValue) {return delegate.replace(key, oldValue, newValue);}
-
-	@Override
-	public synchronized Object replace(Object key, Object value) {return delegate.replace(key, value);}
-
-	@Override
-	public synchronized Object computeIfAbsent(Object key, Function<? super Object, ?> mappingFunction) {return delegate.computeIfAbsent(key, mappingFunction);}
-
-	@Override
-	public synchronized Object computeIfPresent(Object key, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.computeIfPresent(key, remappingFunction);}
-
-	@Override
-	public synchronized Object compute(Object key, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.compute(key, remappingFunction);}
-
-	@Override
-	public synchronized Object merge(Object key, Object value, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.merge(key, value, remappingFunction);}
-
-	@Override
-	public synchronized Object clone() {
-		var delegateClone = (Properties) delegate.clone();
-		return new LazyProcessedProperties(delegateClone, env);
-	}
 }
diff --git a/src/main/java/org/cryptomator/common/PropertiesDecorator.java b/src/main/java/org/cryptomator/common/PropertiesDecorator.java
new file mode 100644
index 000000000..b2700ccae
--- /dev/null
+++ b/src/main/java/org/cryptomator/common/PropertiesDecorator.java
@@ -0,0 +1,171 @@
+package org.cryptomator.common;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.Writer;
+import java.nio.charset.Charset;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.InvalidPropertiesFormatException;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+public class PropertiesDecorator extends Properties {
+
+	protected final Properties delegate;
+
+	PropertiesDecorator(Properties delegate) {
+		this.delegate = delegate;
+	}
+
+	@Override
+	public String getProperty(String key) {return delegate.getProperty(key);}
+
+	@Override
+	public String getProperty(String key, String defaultValue) {return delegate.getProperty(key, defaultValue);}
+
+	@Override
+	public synchronized Object setProperty(String key, String value) {
+		return delegate.setProperty(key, value);
+	}
+
+	@Override
+	public synchronized void load(Reader reader) throws IOException {delegate.load(reader);}
+
+	@Override
+	public synchronized void load(InputStream inStream) throws IOException {delegate.load(inStream);}
+
+	@Override
+	public void store(Writer writer, String comments) throws IOException {delegate.store(writer, comments);}
+
+	@Override
+	public void store(OutputStream out, @Nullable String comments) throws IOException {delegate.store(out, comments);}
+
+	@Override
+	public synchronized void loadFromXML(InputStream in) throws IOException, InvalidPropertiesFormatException {delegate.loadFromXML(in);}
+
+	@Override
+	public void storeToXML(OutputStream os, String comment) throws IOException {delegate.storeToXML(os, comment);}
+
+	@Override
+	public void storeToXML(OutputStream os, String comment, String encoding) throws IOException {delegate.storeToXML(os, comment, encoding);}
+
+	@Override
+	public void storeToXML(OutputStream os, String comment, Charset charset) throws IOException {delegate.storeToXML(os, comment, charset);}
+
+	@Override
+	public Enumeration<?> propertyNames() {return delegate.propertyNames();}
+
+	@Override
+	public Set<String> stringPropertyNames() {return delegate.stringPropertyNames();}
+
+	@Override
+	public void list(PrintStream out) {delegate.list(out);}
+
+	@Override
+	public void list(PrintWriter out) {delegate.list(out);}
+
+	@Override
+	public int size() {return delegate.size();}
+
+	@Override
+	public boolean isEmpty() {return delegate.isEmpty();}
+
+	@Override
+	public Enumeration<Object> keys() {return delegate.keys();}
+
+	@Override
+	public Enumeration<Object> elements() {return delegate.elements();}
+
+	@Override
+	public boolean contains(Object value) {return delegate.contains(value);}
+
+	@Override
+	public boolean containsValue(Object value) {return delegate.containsValue(value);}
+
+	@Override
+	public boolean containsKey(Object key) {return delegate.containsKey(key);}
+
+	@Override
+	public Object get(Object key) {return delegate.get(key);}
+
+	@Override
+	public synchronized Object put(Object key, Object value) {return delegate.put(key, value);}
+
+	@Override
+	public synchronized Object remove(Object key) {return delegate.remove(key);}
+
+	@Override
+	public synchronized void putAll(Map<?, ?> t) {delegate.putAll(t);}
+
+	@Override
+	public synchronized void clear() {delegate.clear();}
+
+	@Override
+	public synchronized String toString() {return delegate.toString();}
+
+	@Override
+	public Set<Object> keySet() {return delegate.keySet();}
+
+	@Override
+	public Collection<Object> values() {return delegate.values();}
+
+	@Override
+	public Set<Map.Entry<Object, Object>> entrySet() {return delegate.entrySet();}
+
+	@Override
+	public synchronized boolean equals(Object o) {return delegate.equals(o);}
+
+	@Override
+	public synchronized int hashCode() {return delegate.hashCode();}
+
+	@Override
+	public Object getOrDefault(Object key, Object defaultValue) {return delegate.getOrDefault(key, defaultValue);}
+
+	@Override
+	public synchronized void forEach(BiConsumer<? super Object, ? super Object> action) {delegate.forEach(action);}
+
+	@Override
+	public synchronized void replaceAll(BiFunction<? super Object, ? super Object, ?> function) {delegate.replaceAll(function);}
+
+	@Override
+	public synchronized Object putIfAbsent(Object key, Object value) {return delegate.putIfAbsent(key, value);}
+
+	@Override
+	public synchronized boolean remove(Object key, Object value) {return delegate.remove(key, value);}
+
+	@Override
+	public synchronized boolean replace(Object key, Object oldValue, Object newValue) {return delegate.replace(key, oldValue, newValue);}
+
+	@Override
+	public synchronized Object replace(Object key, Object value) {return delegate.replace(key, value);}
+
+	@Override
+	public synchronized Object computeIfAbsent(Object key, Function<? super Object, ?> mappingFunction) {return delegate.computeIfAbsent(key, mappingFunction);}
+
+	@Override
+	public synchronized Object computeIfPresent(Object key, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.computeIfPresent(key, remappingFunction);}
+
+	@Override
+	public synchronized Object compute(Object key, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.compute(key, remappingFunction);}
+
+	@Override
+	public synchronized Object merge(Object key, Object value, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.merge(key, value, remappingFunction);}
+
+	@Override
+	public Object clone() {
+		var delegateClone = (Properties) delegate.clone();
+		return new PropertiesDecorator(delegateClone);
+	}
+
+}

From 9383abbdbdf739e4f2a39077f53773e1a5595a8a Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 29 Jun 2023 15:55:07 +0200
Subject: [PATCH 13/23] let child method match parent

---
 src/main/java/org/cryptomator/common/PropertiesDecorator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/cryptomator/common/PropertiesDecorator.java b/src/main/java/org/cryptomator/common/PropertiesDecorator.java
index b2700ccae..12cc55ccd 100644
--- a/src/main/java/org/cryptomator/common/PropertiesDecorator.java
+++ b/src/main/java/org/cryptomator/common/PropertiesDecorator.java
@@ -163,7 +163,7 @@ public class PropertiesDecorator extends Properties {
 	public synchronized Object merge(Object key, Object value, BiFunction<? super Object, ? super Object, ?> remappingFunction) {return delegate.merge(key, value, remappingFunction);}
 
 	@Override
-	public Object clone() {
+	public synchronized Object clone() {
 		var delegateClone = (Properties) delegate.clone();
 		return new PropertiesDecorator(delegateClone);
 	}

From ce596698e37a4766beae7de2c74cc7ca2f862952 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 29 Jun 2023 17:58:52 +0200
Subject: [PATCH 14/23] stick to a unified path separator for cryptomator
 properties

---
 .github/workflows/win-exe.yml                         | 6 +++---
 .idea/runConfigurations/Cryptomator_Windows.xml       | 2 +-
 .idea/runConfigurations/Cryptomator_Windows_Dev.xml   | 2 +-
 dist/win/build.ps1                                    | 6 +++---
 src/main/java/org/cryptomator/common/Environment.java | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml
index 8a66e524b..23dcae7c5 100644
--- a/.github/workflows/win-exe.yml
+++ b/.github/workflows/win-exe.yml
@@ -114,15 +114,15 @@ jobs:
           --java-options "-Dfile.encoding=\"utf-8\""
           --java-options "-Dcryptomator.logDir=\"@{localappdata}/Cryptomator\""
           --java-options "-Dcryptomator.pluginDir=\"@{appdata}/Cryptomator/Plugins\""
-          --java-options "-Dcryptomator.settingsPath=\"@{appdata}/Cryptomator/settings.json;@{userhome}/AppData/Roaming/Cryptomator/settings.json\""
-          --java-options "-Dcryptomator.p12Path=\"@{appdata}/Cryptomator/key.p12;@{userhome}/AppData/Roaming/Cryptomator/key.p12\""
+          --java-options "-Dcryptomator.settingsPath=\"@{appdata}/Cryptomator/settings.json:@{userhome}/AppData/Roaming/Cryptomator/settings.json\""
+          --java-options "-Dcryptomator.p12Path=\"@{appdata}/Cryptomator/key.p12:@{userhome}/AppData/Roaming/Cryptomator/key.p12\""
           --java-options "-Dcryptomator.ipcSocketPath=\"@{localappdata}/Cryptomator/ipc.socket\""
           --java-options "-Dcryptomator.mountPointsDir=\"@{userhome}/Cryptomator\""
           --java-options "-Dcryptomator.loopbackAlias=\"${{ env.LOOPBACK_ALIAS }}\""
           --java-options "-Dcryptomator.showTrayIcon=true"
           --java-options "-Dcryptomator.buildNumber=\"msi-${{ needs.get-version.outputs.revNum }}\""
           --java-options "-Dcryptomator.integrationsWin.autoStartShellLinkName=\"Cryptomator\""
-          --java-options "-Dcryptomator.integrationsWin.keychainPaths=\"@{appdata}/Cryptomator/keychain.json;@{userhome}/AppData/Roaming/Cryptomator/keychain.json\""
+          --java-options "-Dcryptomator.integrationsWin.keychainPaths=\"@{appdata}/Cryptomator/keychain.json:@{userhome}/AppData/Roaming/Cryptomator/keychain.json\""
           --java-options "-Djavafx.verbose=${{ inputs.isDebug }}"
           --resource-dir dist/win/resources
           --icon dist/win/resources/Cryptomator.ico
diff --git a/.idea/runConfigurations/Cryptomator_Windows.xml b/.idea/runConfigurations/Cryptomator_Windows.xml
index b1f7c11b3..36d1e4e14 100644
--- a/.idea/runConfigurations/Cryptomator_Windows.xml
+++ b/.idea/runConfigurations/Cryptomator_Windows.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="Cryptomator Windows" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator/settings.json;@{userhome}/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator/keychain.json;@{userhome}/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator/key.p12;@{userhome}/AppData/Roaming/Cryptomator/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator/settings.json:@{userhome}/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator/keychain.json:@{userhome}/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator/key.p12:@{userhome}/AppData/Roaming/Cryptomator/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.idea/runConfigurations/Cryptomator_Windows_Dev.xml b/.idea/runConfigurations/Cryptomator_Windows_Dev.xml
index 425c774be..778043a91 100644
--- a/.idea/runConfigurations/Cryptomator_Windows_Dev.xml
+++ b/.idea/runConfigurations/Cryptomator_Windows_Dev.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="Cryptomator Windows Dev" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator-Dev/settings.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator-Dev/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator-Dev/keychain.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/keychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator-Dev/key.p12;@{userhome}/AppData/Roaming/Cryptomator-Dev/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator-Dev&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator-Dev/settings.json:@{userhome}/AppData/Roaming/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator-Dev/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator-Dev/keychain.json:@{userhome}/AppData/Roaming/Cryptomator-Dev/keychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator-Dev/key.p12:@{userhome}/AppData/Roaming/Cryptomator-Dev/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator-Dev&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/dist/win/build.ps1 b/dist/win/build.ps1
index 2e3d3b83d..b8394bf3f 100644
--- a/dist/win/build.ps1
+++ b/dist/win/build.ps1
@@ -84,13 +84,13 @@ if ($clean -and (Test-Path -Path $appPath)) {
 	--java-options "-Dfile.encoding=`"utf-8`"" `
 	--java-options "-Dcryptomator.logDir=`"@{localappdata}/$AppName`"" `
 	--java-options "-Dcryptomator.pluginDir=`"@{appdata}/$AppName/Plugins`"" `
-	--java-options "-Dcryptomator.settingsPath=`"@{appdata}/$AppName/settings.json;@{userhome}/AppData/Roaming/$AppName/settings.json`"" `
+	--java-options "-Dcryptomator.settingsPath=`"@{appdata}/$AppName/settings.json:@{userhome}/AppData/Roaming/$AppName/settings.json`"" `
 	--java-options "-Dcryptomator.ipcSocketPath=`"@{localappdata}/$AppName/ipc.socket`"" `
-	--java-options "-Dcryptomator.p12Path=`"@{appdata}/$AppName/key.p12;@{userhome}/AppData/Roaming/$AppName/key.p12`"" `
+	--java-options "-Dcryptomator.p12Path=`"@{appdata}/$AppName/key.p12:@{userhome}/AppData/Roaming/$AppName/key.p12`"" `
 	--java-options "-Dcryptomator.mountPointsDir=`"@{userhome}/$AppName`"" `
 	--java-options "-Dcryptomator.loopbackAlias=`"$LoopbackAlias`"" `
 	--java-options "-Dcryptomator.integrationsWin.autoStartShellLinkName=`"$AppName`"" `
-	--java-options "-Dcryptomator.integrationsWin.keychainPaths=`"@{appdata}/$AppName/keychain.json;@{userhome}/AppData/Roaming/$AppName/keychain.json`"" `
+	--java-options "-Dcryptomator.integrationsWin.keychainPaths=`"@{appdata}/$AppName/keychain.json:@{userhome}/AppData/Roaming/$AppName/keychain.json`"" `
 	--java-options "-Dcryptomator.showTrayIcon=true" `
 	--java-options "-Dcryptomator.buildNumber=`"msi-$revisionNo`"" `
 	--resource-dir resources `
diff --git a/src/main/java/org/cryptomator/common/Environment.java b/src/main/java/org/cryptomator/common/Environment.java
index d9dec7b89..adb143fa5 100644
--- a/src/main/java/org/cryptomator/common/Environment.java
+++ b/src/main/java/org/cryptomator/common/Environment.java
@@ -19,7 +19,7 @@ import java.util.stream.StreamSupport;
 public class Environment {
 
 	private static final Logger LOG = LoggerFactory.getLogger(Environment.class);
-	private static final char PATH_LIST_SEP = SystemUtils.IS_OS_WINDOWS? ';':':';
+	private static final char PATH_LIST_SEP = ':';
 	private static final int DEFAULT_MIN_PW_LENGTH = 8;
 	private static final String SETTINGS_PATH_PROP_NAME = "cryptomator.settingsPath";
 	private static final String IPC_SOCKET_PATH_PROP_NAME = "cryptomator.ipcSocketPath";

From 9b0c9401954ca7beb8802f622bca80d41e0a576d Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 29 Jun 2023 18:13:54 +0200
Subject: [PATCH 15/23] readd unit tests for Environment.java

---
 .../org/cryptomator/common/Environment.java   |  5 +-
 .../org/cryptomator/launcher/Cryptomator.java |  2 +-
 .../cryptomator/common/EnvironmentTest.java   | 46 +++++++++++++++++--
 3 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/Environment.java b/src/main/java/org/cryptomator/common/Environment.java
index adb143fa5..66374fc17 100644
--- a/src/main/java/org/cryptomator/common/Environment.java
+++ b/src/main/java/org/cryptomator/common/Environment.java
@@ -2,7 +2,6 @@ package org.cryptomator.common;
 
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
-import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -80,7 +79,7 @@ public class Environment {
 		return getPaths(P12_PATH_PROP_NAME);
 	}
 
-	public Stream<Path> ipcSocketPath() {
+	public Stream<Path> getIpcSocketPath() {
 		return getPaths(IPC_SOCKET_PATH_PROP_NAME);
 	}
 
@@ -131,7 +130,7 @@ public class Environment {
 	}
 
 	// visible for testing
-	public Stream<Path> getPaths(String propertyName) {
+	Stream<Path> getPaths(String propertyName) {
 		Stream<String> rawSettingsPaths = getRawList(propertyName, PATH_LIST_SEP);
 		return rawSettingsPaths.filter(Predicate.not(Strings::isNullOrEmpty)).map(Path::of);
 	}
diff --git a/src/main/java/org/cryptomator/launcher/Cryptomator.java b/src/main/java/org/cryptomator/launcher/Cryptomator.java
index d6bafa489..f395abf52 100644
--- a/src/main/java/org/cryptomator/launcher/Cryptomator.java
+++ b/src/main/java/org/cryptomator/launcher/Cryptomator.java
@@ -94,7 +94,7 @@ public class Cryptomator {
 		 * Attempts to create an IPC connection to a running Cryptomator instance and sends it the given args.
 		 * If no external process could be reached, the args will be handled by the loopback IPC endpoint.
 		 */
-		try (var communicator = IpcCommunicator.create(env.ipcSocketPath().toList())) {
+		try (var communicator = IpcCommunicator.create(env.getIpcSocketPath().toList())) {
 			if (communicator.isClient()) {
 				communicator.sendHandleLaunchargs(List.of(args));
 				communicator.sendRevealRunningApp();
diff --git a/src/test/java/org/cryptomator/common/EnvironmentTest.java b/src/test/java/org/cryptomator/common/EnvironmentTest.java
index 714d603f0..d0dc3ec44 100644
--- a/src/test/java/org/cryptomator/common/EnvironmentTest.java
+++ b/src/test/java/org/cryptomator/common/EnvironmentTest.java
@@ -13,6 +13,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 @DisplayName("Environment Variables Test")
 public class EnvironmentTest {
@@ -34,8 +35,8 @@ public class EnvironmentTest {
 	}
 
 	@Nested
-	@DisplayName("Path Lists")
-	public class SettingsPath {
+	@DisplayName("Testing parsing path lists")
+	public class PathLists {
 
 		@Test
 		@DisplayName("test.path.property=")
@@ -48,7 +49,7 @@ public class EnvironmentTest {
 
 		@Test
 		@DisplayName("test.path.property=/foo/bar/test")
-		public void testSingleAbsolutePath() {
+		public void testSinglePath() {
 			System.setProperty("test.path.property", "/foo/bar/test");
 			List<Path> result = env.getPaths("test.path.property").toList();
 
@@ -56,6 +57,45 @@ public class EnvironmentTest {
 			MatcherAssert.assertThat(result, Matchers.hasItem(Paths.get("/foo/bar/test")));
 		}
 
+		@Test
+		@DisplayName("test.path.property=/foo/bar/test:/bar/nez/tost")
+		public void testTwoPaths() {
+			System.setProperty("test.path.property", "/foo/bar/test:bar/nez/tost");
+			List<Path> result = env.getPaths("test.path.property").toList();
+
+			MatcherAssert.assertThat(result, Matchers.hasSize(2));
+			MatcherAssert.assertThat(result, Matchers.hasItems(Path.of("/foo/bar/test"), Path.of("bar/nez/tost")));
+		}
+
+	}
+
+	@Nested
+	public class VariablesContainingPathLists {
+
+		@Test
+		public void testSettingsPath() {
+			Mockito.doReturn(Stream.of()).when(env).getPaths(Mockito.anyString());
+			env.getSettingsPath();
+			Mockito.verify(env).getPaths("cryptomator.settingsPath");
+		}
+		@Test
+		public void testP12Path() {
+			Mockito.doReturn(Stream.of()).when(env).getPaths(Mockito.anyString());
+			env.getP12Path();
+			Mockito.verify(env).getPaths("cryptomator.p12Path");
+		}
+		@Test
+		public void testIpcSocketPath() {
+			Mockito.doReturn(Stream.of()).when(env).getPaths(Mockito.anyString());
+			env.getIpcSocketPath();
+			Mockito.verify(env).getPaths("cryptomator.ipcSocketPath");
+		}
+		@Test
+		public void testKeychainPath() {
+			Mockito.doReturn(Stream.of()).when(env).getPaths(Mockito.anyString());
+			env.getKeychainPath();
+			Mockito.verify(env).getPaths("cryptomator.integrationsWin.keychainPaths");
+		}
 	}
 
 }

From 24fc2888efb340e46e26c2658ec00df3007d1535 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 29 Jun 2023 18:20:25 +0200
Subject: [PATCH 16/23] more unit tests

---
 .../common/LazyProcessedPropertiesTest.java   | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java b/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java
index 2f5be36fa..00a1c49b8 100644
--- a/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java
+++ b/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java
@@ -1,6 +1,8 @@
 package org.cryptomator.common;
 
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -8,8 +10,10 @@ import java.util.Map;
 
 public class LazyProcessedPropertiesTest {
 
+	LazyProcessedProperties inTest;
 	@ParameterizedTest
-	@CsvSource(value = {"org.example.@{mytest1}.test, org.example.@{mytest1}.test", //
+	@DisplayName("Test template replacement")
+	@CsvSource(value = {"unknown.@{testToken}.test, unknown.@{testToken}.test", //
 			"@{only*words*digits*under_score\\},@{only*words*digits*under_score\\}", //
 			"C:\\Users\\@{appdir}\\dir, C:\\Users\\foobar\\dir", //
 			"@{@{appdir}},@{foobar}", //
@@ -20,4 +24,25 @@ public class LazyProcessedPropertiesTest {
 		Assertions.assertEquals(result, expected);
 	}
 
+	@Test
+	@DisplayName("@{userhome} is replaced with the user home directory")
+	public void testUserhome(){
+		var expected = System.getProperty("user.home");
+
+		inTest = new LazyProcessedProperties(System.getProperties(), Map.of());
+		var result = inTest.process("@{userhome}");
+		Assertions.assertEquals(result, expected);
+	}
+
+	@DisplayName("Other keywords are replaced accordingly")
+	@ParameterizedTest(name = "Token \"{0}\" replaced with content of {1}")
+	@CsvSource(value = {"appdir, APPDIR, foobar",
+						"appdata, APPDATA, bazbaz",
+						"localappdata, LOCALAPPDATA, boboAlice"})
+	public void testAppDir(String token, String envName, String expected){
+		inTest = new LazyProcessedProperties(System.getProperties(), Map.of(envName, expected));
+		var result = inTest.process("@{"+token+"}");
+		Assertions.assertEquals(result, expected);
+	}
+
 }

From 12e990a8b39f8ccdb6a1e3047732708e65f2c008 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 29 Jun 2023 18:24:48 +0200
Subject: [PATCH 17/23] cleanup

---
 .../java/org/cryptomator/common/LazyProcessedProperties.java    | 2 +-
 src/main/java/org/cryptomator/common/PropertiesDecorator.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/LazyProcessedProperties.java b/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
index 6d882c9f9..3e2e60f94 100644
--- a/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
+++ b/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
@@ -46,7 +46,7 @@ public class LazyProcessedProperties extends PropertiesDecorator {
 					case "localappdata" -> resolveFrom("LOCALAPPDATA", Source.ENV);
 					case "userhome" -> resolveFrom("user.home", Source.PROPS);
 					default -> {
-						LoggerFactory.getLogger(LazyProcessedProperties.class).warn("Unknown variable @{{}} in property value {}.", match.group(), value);
+						LoggerFactory.getLogger(LazyProcessedProperties.class).warn("Unknown variable {} in property value {}.", match.group(), value);
 						yield match.group();
 					}
 				});
diff --git a/src/main/java/org/cryptomator/common/PropertiesDecorator.java b/src/main/java/org/cryptomator/common/PropertiesDecorator.java
index 12cc55ccd..5235d50b5 100644
--- a/src/main/java/org/cryptomator/common/PropertiesDecorator.java
+++ b/src/main/java/org/cryptomator/common/PropertiesDecorator.java
@@ -20,7 +20,7 @@ import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 
-public class PropertiesDecorator extends Properties {
+class PropertiesDecorator extends Properties {
 
 	protected final Properties delegate;
 

From cee0486d71037233b30672d0b5341b7e6417b3cb Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 29 Jun 2023 18:55:49 +0200
Subject: [PATCH 18/23] adding unit tests for getProperty

---
 .../common/LazyProcessedPropertiesTest.java   | 105 +++++++++++++-----
 1 file changed, 77 insertions(+), 28 deletions(-)

diff --git a/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java b/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java
index 00a1c49b8..b55e3bda4 100644
--- a/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java
+++ b/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java
@@ -2,47 +2,96 @@ package org.cryptomator.common;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.Mockito;
 
 import java.util.Map;
+import java.util.Properties;
 
 public class LazyProcessedPropertiesTest {
 
 	LazyProcessedProperties inTest;
-	@ParameterizedTest
-	@DisplayName("Test template replacement")
-	@CsvSource(value = {"unknown.@{testToken}.test, unknown.@{testToken}.test", //
-			"@{only*words*digits*under_score\\},@{only*words*digits*under_score\\}", //
-			"C:\\Users\\@{appdir}\\dir, C:\\Users\\foobar\\dir", //
-			"@{@{appdir}},@{foobar}", //
-			"Longer @{appdir} text with @{appdir}., Longer foobar text with foobar."})
-	public void test(String propertyValue, String expected) {
-		LazyProcessedProperties inTest = new LazyProcessedProperties(System.getProperties(), Map.of("APPDIR", "foobar"));
-		var result = inTest.process(propertyValue);
-		Assertions.assertEquals(result, expected);
+
+	@Nested
+	public class Processing {
+
+		@ParameterizedTest
+		@DisplayName("Test template replacement")
+		@CsvSource(value = {"unknown.@{testToken}.test, unknown.@{testToken}.test", //
+				"@{only*words*digits*under_score\\},@{only*words*digits*under_score\\}", //
+				"C:\\Users\\@{appdir}\\dir, C:\\Users\\foobar\\dir", //
+				"@{@{appdir}},@{foobar}", //
+				"Longer @{appdir} text with @{appdir}., Longer foobar text with foobar."})
+		public void test(String propertyValue, String expected) {
+			LazyProcessedProperties inTest = new LazyProcessedProperties(new Properties(), Map.of("APPDIR", "foobar"));
+			var result = inTest.process(propertyValue);
+			Assertions.assertEquals(result, expected);
+		}
+
+		@Test
+		@DisplayName("@{userhome} is replaced with the user home directory")
+		public void testPropSubstitutions() {
+			var props = new Properties();
+			props.setProperty("user.home", "OneUponABit");
+
+			inTest = new LazyProcessedProperties(props, Map.of());
+			var result = inTest.process("@{userhome}");
+			Assertions.assertEquals(result, "OneUponABit");
+		}
+
+		@DisplayName("Other keywords are replaced accordingly")
+		@ParameterizedTest(name = "Token \"{0}\" replaced with content of {1}")
+		@CsvSource(value = {"appdir, APPDIR, foobar", "appdata, APPDATA, bazbaz", "localappdata, LOCALAPPDATA, boboAlice"})
+		public void testEnvSubstitutions(String token, String envName, String expected) {
+			inTest = new LazyProcessedProperties(new Properties(), Map.of(envName, expected));
+			var result = inTest.process("@{" + token + "}");
+			Assertions.assertEquals(result, expected);
+		}
+
 	}
 
-	@Test
-	@DisplayName("@{userhome} is replaced with the user home directory")
-	public void testUserhome(){
-		var expected = System.getProperty("user.home");
 
-		inTest = new LazyProcessedProperties(System.getProperties(), Map.of());
-		var result = inTest.process("@{userhome}");
-		Assertions.assertEquals(result, expected);
-	}
+	@Nested
+	public class GetProperty {
 
-	@DisplayName("Other keywords are replaced accordingly")
-	@ParameterizedTest(name = "Token \"{0}\" replaced with content of {1}")
-	@CsvSource(value = {"appdir, APPDIR, foobar",
-						"appdata, APPDATA, bazbaz",
-						"localappdata, LOCALAPPDATA, boboAlice"})
-	public void testAppDir(String token, String envName, String expected){
-		inTest = new LazyProcessedProperties(System.getProperties(), Map.of(envName, expected));
-		var result = inTest.process("@{"+token+"}");
-		Assertions.assertEquals(result, expected);
+		@Test
+		@DisplayName("Undefined properties are not processed")
+		public void testNoProcessingOnNull() {
+			inTest = Mockito.spy(new LazyProcessedProperties(new Properties(), Map.of()));
+
+			var result = inTest.getProperty("some.prop");
+			Assertions.assertNull(result);
+			Mockito.verify(inTest, Mockito.never()).process(Mockito.anyString());
+		}
+
+		@ParameterizedTest
+		@DisplayName("Properties not starting with \"cryptomator.\" are not processed")
+		@ValueSource(strings = {"example.foo","cryptomatorSomething.foo","org.cryptomator.foo","cryPtoMAtor.foo"})
+		public void testNoProcessingOnNotCryptomator(String propKey) {
+			var props = new Properties();
+			props.setProperty(propKey, "someValue");
+			inTest = Mockito.spy(new LazyProcessedProperties(props, Map.of()));
+
+			var result = inTest.getProperty("some.prop");
+			Assertions.assertNull(result);
+			Mockito.verify(inTest, Mockito.never()).process(Mockito.anyString());
+		}
+
+		@Test
+		@DisplayName("Non-null property starting with \"cryptomator.\" is processed")
+		public void testProcessing() {
+			var props = new Properties();
+			props.setProperty("cryptomator.prop", "someValue");
+			inTest = Mockito.spy(new LazyProcessedProperties(props, Map.of()));
+			Mockito.doReturn("someValue").when(inTest).process(Mockito.anyString());
+
+			inTest.getProperty("cryptomator.prop");
+			Mockito.verify(inTest).process("someValue");
+		}
 	}
 
 }

From 79eea4814ec361745fc8dfe3ddfc307e705b38f9 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 29 Jun 2023 18:56:32 +0200
Subject: [PATCH 19/23] renamed class

---
 ...operties.java => SubstitutingProperties.java} |  8 ++++----
 .../org/cryptomator/launcher/Cryptomator.java    |  4 ++--
 ...Test.java => SubstitutingPropertiesTest.java} | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)
 rename src/main/java/org/cryptomator/common/{LazyProcessedProperties.java => SubstitutingProperties.java} (77%)
 rename src/test/java/org/cryptomator/common/{LazyProcessedPropertiesTest.java => SubstitutingPropertiesTest.java} (84%)

diff --git a/src/main/java/org/cryptomator/common/LazyProcessedProperties.java b/src/main/java/org/cryptomator/common/SubstitutingProperties.java
similarity index 77%
rename from src/main/java/org/cryptomator/common/LazyProcessedProperties.java
rename to src/main/java/org/cryptomator/common/SubstitutingProperties.java
index 3e2e60f94..bf98c25f4 100644
--- a/src/main/java/org/cryptomator/common/LazyProcessedProperties.java
+++ b/src/main/java/org/cryptomator/common/SubstitutingProperties.java
@@ -6,13 +6,13 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.regex.Pattern;
 
-public class LazyProcessedProperties extends PropertiesDecorator {
+public class SubstitutingProperties extends PropertiesDecorator {
 
 	private static final Pattern TEMPLATE = Pattern.compile("@\\{(\\w+)}");
 
 	private final Map<String, String> env;
 
-	public LazyProcessedProperties(Properties props, Map<String, String> systemEnvironment) {
+	public SubstitutingProperties(Properties props, Map<String, String> systemEnvironment) {
 		super(props);
 		this.env = systemEnvironment;
 	}
@@ -46,7 +46,7 @@ public class LazyProcessedProperties extends PropertiesDecorator {
 					case "localappdata" -> resolveFrom("LOCALAPPDATA", Source.ENV);
 					case "userhome" -> resolveFrom("user.home", Source.PROPS);
 					default -> {
-						LoggerFactory.getLogger(LazyProcessedProperties.class).warn("Unknown variable {} in property value {}.", match.group(), value);
+						LoggerFactory.getLogger(SubstitutingProperties.class).warn("Unknown variable {} in property value {}.", match.group(), value);
 						yield match.group();
 					}
 				});
@@ -58,7 +58,7 @@ public class LazyProcessedProperties extends PropertiesDecorator {
 			case PROPS -> delegate.getProperty(key);
 		};
 		if (val == null) {
-			LoggerFactory.getLogger(LazyProcessedProperties.class).warn("Variable {} used for substitution not found in {}. Replaced with empty string.", key, src);
+			LoggerFactory.getLogger(SubstitutingProperties.class).warn("Variable {} used for substitution not found in {}. Replaced with empty string.", key, src);
 			return "";
 		} else {
 			return val.replace("\\", "\\\\");
diff --git a/src/main/java/org/cryptomator/launcher/Cryptomator.java b/src/main/java/org/cryptomator/launcher/Cryptomator.java
index f395abf52..a8d38c312 100644
--- a/src/main/java/org/cryptomator/launcher/Cryptomator.java
+++ b/src/main/java/org/cryptomator/launcher/Cryptomator.java
@@ -9,7 +9,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import dagger.Lazy;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
-import org.cryptomator.common.LazyProcessedProperties;
+import org.cryptomator.common.SubstitutingProperties;
 import org.cryptomator.common.ShutdownHook;
 import org.cryptomator.ipc.IpcCommunicator;
 import org.cryptomator.logging.DebugMode;
@@ -32,7 +32,7 @@ public class Cryptomator {
 	private static final long STARTUP_TIME = System.currentTimeMillis();
 
 	static {
-		var lazyProcessedProps = new LazyProcessedProperties(System.getProperties(), System.getenv());
+		var lazyProcessedProps = new SubstitutingProperties(System.getProperties(), System.getenv());
 		System.setProperties(lazyProcessedProps);
 		CRYPTOMATOR_COMPONENT = DaggerCryptomatorComponent.factory().create(STARTUP_TIME);
 		LOG = LoggerFactory.getLogger(Cryptomator.class);
diff --git a/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java b/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java
similarity index 84%
rename from src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java
rename to src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java
index b55e3bda4..964ae7188 100644
--- a/src/test/java/org/cryptomator/common/LazyProcessedPropertiesTest.java
+++ b/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java
@@ -12,9 +12,9 @@ import org.mockito.Mockito;
 import java.util.Map;
 import java.util.Properties;
 
-public class LazyProcessedPropertiesTest {
+public class SubstitutingPropertiesTest {
 
-	LazyProcessedProperties inTest;
+	SubstitutingProperties inTest;
 
 	@Nested
 	public class Processing {
@@ -27,7 +27,7 @@ public class LazyProcessedPropertiesTest {
 				"@{@{appdir}},@{foobar}", //
 				"Longer @{appdir} text with @{appdir}., Longer foobar text with foobar."})
 		public void test(String propertyValue, String expected) {
-			LazyProcessedProperties inTest = new LazyProcessedProperties(new Properties(), Map.of("APPDIR", "foobar"));
+			SubstitutingProperties inTest = new SubstitutingProperties(new Properties(), Map.of("APPDIR", "foobar"));
 			var result = inTest.process(propertyValue);
 			Assertions.assertEquals(result, expected);
 		}
@@ -38,7 +38,7 @@ public class LazyProcessedPropertiesTest {
 			var props = new Properties();
 			props.setProperty("user.home", "OneUponABit");
 
-			inTest = new LazyProcessedProperties(props, Map.of());
+			inTest = new SubstitutingProperties(props, Map.of());
 			var result = inTest.process("@{userhome}");
 			Assertions.assertEquals(result, "OneUponABit");
 		}
@@ -47,7 +47,7 @@ public class LazyProcessedPropertiesTest {
 		@ParameterizedTest(name = "Token \"{0}\" replaced with content of {1}")
 		@CsvSource(value = {"appdir, APPDIR, foobar", "appdata, APPDATA, bazbaz", "localappdata, LOCALAPPDATA, boboAlice"})
 		public void testEnvSubstitutions(String token, String envName, String expected) {
-			inTest = new LazyProcessedProperties(new Properties(), Map.of(envName, expected));
+			inTest = new SubstitutingProperties(new Properties(), Map.of(envName, expected));
 			var result = inTest.process("@{" + token + "}");
 			Assertions.assertEquals(result, expected);
 		}
@@ -61,7 +61,7 @@ public class LazyProcessedPropertiesTest {
 		@Test
 		@DisplayName("Undefined properties are not processed")
 		public void testNoProcessingOnNull() {
-			inTest = Mockito.spy(new LazyProcessedProperties(new Properties(), Map.of()));
+			inTest = Mockito.spy(new SubstitutingProperties(new Properties(), Map.of()));
 
 			var result = inTest.getProperty("some.prop");
 			Assertions.assertNull(result);
@@ -74,7 +74,7 @@ public class LazyProcessedPropertiesTest {
 		public void testNoProcessingOnNotCryptomator(String propKey) {
 			var props = new Properties();
 			props.setProperty(propKey, "someValue");
-			inTest = Mockito.spy(new LazyProcessedProperties(props, Map.of()));
+			inTest = Mockito.spy(new SubstitutingProperties(props, Map.of()));
 
 			var result = inTest.getProperty("some.prop");
 			Assertions.assertNull(result);
@@ -86,7 +86,7 @@ public class LazyProcessedPropertiesTest {
 		public void testProcessing() {
 			var props = new Properties();
 			props.setProperty("cryptomator.prop", "someValue");
-			inTest = Mockito.spy(new LazyProcessedProperties(props, Map.of()));
+			inTest = Mockito.spy(new SubstitutingProperties(props, Map.of()));
 			Mockito.doReturn("someValue").when(inTest).process(Mockito.anyString());
 
 			inTest.getProperty("cryptomator.prop");

From ab048508a8313d1eb8d69f088d3ed990f0703637 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 30 Jun 2023 10:57:12 +0200
Subject: [PATCH 20/23] change getProperty(key, default) and add unit test

---
 .../common/SubstitutingProperties.java            |  8 ++------
 .../common/SubstitutingPropertiesTest.java        | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/SubstitutingProperties.java b/src/main/java/org/cryptomator/common/SubstitutingProperties.java
index bf98c25f4..bafab051e 100644
--- a/src/main/java/org/cryptomator/common/SubstitutingProperties.java
+++ b/src/main/java/org/cryptomator/common/SubstitutingProperties.java
@@ -29,12 +29,8 @@ public class SubstitutingProperties extends PropertiesDecorator {
 
 	@Override
 	public String getProperty(String key, String defaultValue) {
-		var value = delegate.getProperty(key, defaultValue);
-		if (key.startsWith("cryptomator.") && value != null) {
-			return process(value);
-		} else {
-			return value;
-		}
+		var result = getProperty(key);
+		return result != null ? result : defaultValue;
 	}
 
 	//visible for testing
diff --git a/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java b/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java
index 964ae7188..e849080df 100644
--- a/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java
+++ b/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java
@@ -70,7 +70,7 @@ public class SubstitutingPropertiesTest {
 
 		@ParameterizedTest
 		@DisplayName("Properties not starting with \"cryptomator.\" are not processed")
-		@ValueSource(strings = {"example.foo","cryptomatorSomething.foo","org.cryptomator.foo","cryPtoMAtor.foo"})
+		@ValueSource(strings = {"example.foo", "cryptomatorSomething.foo", "org.cryptomator.foo", "cryPtoMAtor.foo"})
 		public void testNoProcessingOnNotCryptomator(String propKey) {
 			var props = new Properties();
 			props.setProperty(propKey, "someValue");
@@ -92,6 +92,19 @@ public class SubstitutingPropertiesTest {
 			inTest.getProperty("cryptomator.prop");
 			Mockito.verify(inTest).process("someValue");
 		}
+
+		@Test
+		@DisplayName("Default value is not processed")
+		public void testNoProcessingDefault() {
+			var props = Mockito.mock(Properties.class);
+			Mockito.when(props.getProperty("cryptomator.prop")).thenReturn(null);
+			inTest = Mockito.spy(new SubstitutingProperties(props, Map.of()));
+			Mockito.doReturn("someValue").when(inTest).process(Mockito.anyString());
+
+			var result = inTest.getProperty("cryptomator.prop", "a default");
+			Assertions.assertEquals("a default", result);
+			Mockito.verify(inTest, Mockito.never()).process(Mockito.any());
+		}
 	}
 
 }

From ee82965ef5d7e069ba00f691508e267930850a8d Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 30 Jun 2023 11:20:07 +0200
Subject: [PATCH 21/23] adding "integration tests"

---
 .../common/SubstitutingPropertiesTest.java    | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java b/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java
index e849080df..ab53f8d86 100644
--- a/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java
+++ b/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java
@@ -107,4 +107,44 @@ public class SubstitutingPropertiesTest {
 		}
 	}
 
+	@ParameterizedTest(name = "{0}={1} -> {0}={2}")
+	@DisplayName("Replace @{userhome} during getProperty()")
+	@CsvSource(quoteCharacter = '"', textBlock = """
+			cryptomator.settingsPath, "@{userhome}/.config/Cryptomator/settings.json:@{userhome}/.Cryptomator/settings.json", "/home/.config/Cryptomator/settings.json:/home/.Cryptomator/settings.json"
+			cryptomator.ipcSocketPath, "@{userhome}/.config/Cryptomator/ipc.socket:@{userhome}/.Cryptomator/ipc.socket", "/home/.config/Cryptomator/ipc.socket:/home/.Cryptomator/ipc.socket"
+			not.cryptomator.not.substituted, "@{userhome}/foo", "@{userhome}/foo"
+			cryptomator.no.placeholder.found, "foo/bar", "foo/bar"
+			""")
+	public void testEndToEndPropsSource(String key, String raw, String substituted) {
+		var delegate = Mockito.mock(Properties.class);
+		Mockito.doReturn("/home").when(delegate).getProperty("user.home");
+		Mockito.doReturn(raw).when(delegate).getProperty(key);
+		var inTest = new SubstitutingProperties(delegate, Map.of());
+
+		var result = inTest.getProperty(key);
+
+		Assertions.assertEquals(substituted, result);
+	}
+
+	@ParameterizedTest(name = "{0}={1} -> {0}={2}")
+	@DisplayName("Replace appdata,localappdata or appdir during getProperty()")
+	@CsvSource(quoteCharacter = '"', textBlock = """
+			cryptomator.settingsPath, "@{appdata}/Cryptomator/settings.json", "C:\\Users\\JimFang\\AppData\\Roaming/Cryptomator/settings.json"
+			cryptomator.ipcSocketPath, "@{localappdata}/Cryptomator/ipc.socket", "C:\\Users\\JimFang\\AppData\\Local/Cryptomator/ipc.socket"
+			cryptomator.integrationsLinux.trayIconsDir, "@{appdir}/hicolor", "/squashfs1337/usr/hicolor"
+			not.cryptomator.not.substituted, "@{appdir}/foo", "@{appdir}/foo"
+			cryptomator.no.placeholder.found, "foo/bar", "foo/bar"
+			""")
+	public void testEndToEndEnvSource(String key, String raw, String substituted) {
+		var delegate = Mockito.mock(Properties.class);
+		Mockito.doReturn(raw).when(delegate).getProperty(key);
+		var env = Map.of("APPDATA", "C:\\Users\\JimFang\\AppData\\Roaming", //
+				"LOCALAPPDATA", "C:\\Users\\JimFang\\AppData\\Local", //
+				"APPDIR", "/squashfs1337/usr");
+		var inTest = new SubstitutingProperties(delegate, env);
+
+		var result = inTest.getProperty(key);
+
+		Assertions.assertEquals(substituted, result);
+	}
 }

From 8c3ede0d2abe0ad0ccf610477d4de86e77136889 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 30 Jun 2023 11:20:28 +0200
Subject: [PATCH 22/23] clean up

---
 .../common/SubstitutingPropertiesTest.java          | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java b/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java
index ab53f8d86..723e01bcf 100644
--- a/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java
+++ b/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java
@@ -21,13 +21,14 @@ public class SubstitutingPropertiesTest {
 
 		@ParameterizedTest
 		@DisplayName("Test template replacement")
-		@CsvSource(value = {"unknown.@{testToken}.test, unknown.@{testToken}.test", //
-				"@{only*words*digits*under_score\\},@{only*words*digits*under_score\\}", //
-				"C:\\Users\\@{appdir}\\dir, C:\\Users\\foobar\\dir", //
-				"@{@{appdir}},@{foobar}", //
-				"Longer @{appdir} text with @{appdir}., Longer foobar text with foobar."})
+		@CsvSource(textBlock = """
+				unknown.@{testToken}.test, unknown.@{testToken}.test
+				@{only*words*digits*under_score},@{only*words*digits*under_score}
+				C:\\Users\\@{appdir}\\dir, C:\\Users\\foobar\\dir
+				@{@{appdir}},@{foobar}
+				Replacing several @{appdir} with @{appdir}., Replacing several foobar with foobar.""")
 		public void test(String propertyValue, String expected) {
-			SubstitutingProperties inTest = new SubstitutingProperties(new Properties(), Map.of("APPDIR", "foobar"));
+			SubstitutingProperties inTest = new SubstitutingProperties(Mockito.mock(Properties.class), Map.of("APPDIR", "foobar"));
 			var result = inTest.process(propertyValue);
 			Assertions.assertEquals(result, expected);
 		}

From 29d63a0a83b7399ba65bd07ff57bf28e5a770ffd Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 30 Jun 2023 11:57:09 +0200
Subject: [PATCH 23/23] final clean up

---
 .../java/org/cryptomator/common/SubstitutingProperties.java | 3 ++-
 .../org/cryptomator/common/SubstitutingPropertiesTest.java  | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/SubstitutingProperties.java b/src/main/java/org/cryptomator/common/SubstitutingProperties.java
index bafab051e..8ba98a2b6 100644
--- a/src/main/java/org/cryptomator/common/SubstitutingProperties.java
+++ b/src/main/java/org/cryptomator/common/SubstitutingProperties.java
@@ -1,5 +1,6 @@
 package org.cryptomator.common;
 
+import org.jetbrains.annotations.VisibleForTesting;
 import org.slf4j.LoggerFactory;
 
 import java.util.Map;
@@ -33,7 +34,7 @@ public class SubstitutingProperties extends PropertiesDecorator {
 		return result != null ? result : defaultValue;
 	}
 
-	//visible for testing
+	@VisibleForTesting
 	String process(String value) {
 		return TEMPLATE.matcher(value).replaceAll(match -> //
 				switch (match.group(1)) {
diff --git a/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java b/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java
index 723e01bcf..febffb020 100644
--- a/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java
+++ b/src/test/java/org/cryptomator/common/SubstitutingPropertiesTest.java
@@ -30,7 +30,7 @@ public class SubstitutingPropertiesTest {
 		public void test(String propertyValue, String expected) {
 			SubstitutingProperties inTest = new SubstitutingProperties(Mockito.mock(Properties.class), Map.of("APPDIR", "foobar"));
 			var result = inTest.process(propertyValue);
-			Assertions.assertEquals(result, expected);
+			Assertions.assertEquals(expected, result);
 		}
 
 		@Test
@@ -41,7 +41,7 @@ public class SubstitutingPropertiesTest {
 
 			inTest = new SubstitutingProperties(props, Map.of());
 			var result = inTest.process("@{userhome}");
-			Assertions.assertEquals(result, "OneUponABit");
+			Assertions.assertEquals("OneUponABit", result);
 		}
 
 		@DisplayName("Other keywords are replaced accordingly")
@@ -50,7 +50,7 @@ public class SubstitutingPropertiesTest {
 		public void testEnvSubstitutions(String token, String envName, String expected) {
 			inTest = new SubstitutingProperties(new Properties(), Map.of(envName, expected));
 			var result = inTest.process("@{" + token + "}");
-			Assertions.assertEquals(result, expected);
+			Assertions.assertEquals(expected, result);
 		}
 
 	}