From b10523ea6c5ac9bb1b5241b86fa3433ba040c66a Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Tue, 9 May 2023 09:00:56 +0200
Subject: [PATCH 01/61] init commit

---
 .../cryptomator/ui/error/ErrorController.java | 184 +++++++++++++++++-
 .../cryptomator/ui/error/ErrorDiscussion.java |  31 +++
 src/main/resources/fxml/error.fxml            |  14 +-
 src/main/resources/i18n/strings.properties    |   3 +
 4 files changed, 226 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java

diff --git a/src/main/java/org/cryptomator/ui/error/ErrorController.java b/src/main/java/org/cryptomator/ui/error/ErrorController.java
index 422a44157..d3ac0f60f 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorController.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorController.java
@@ -1,10 +1,14 @@
 package org.cryptomator.ui.error;
 
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.ErrorCode;
 import org.cryptomator.common.Nullable;
 import org.cryptomator.ui.common.FxController;
 
+import java.lang.reflect.Type;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javafx.application.Application;
@@ -16,13 +20,33 @@ import javafx.scene.Scene;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import javafx.stage.Stage;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
 import java.net.URLEncoder;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
+import com.google.gson.JsonParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStreamReader;
+import java.util.Set;
+
 public class ErrorController implements FxController {
 
+	private static final Logger LOG = LoggerFactory.getLogger(ErrorController.class);
+	private static final String ERROR_CODES_URL = "https://gist.githubusercontent.com/cryptobot/accba9fb9555e7192271b85606f97230/raw/errorcodes.json";
 	private static final String SEARCH_URL_FORMAT = "https://github.com/cryptomator/cryptomator/discussions/categories/errors?discussions_q=category:Errors+%s";
 	private static final String REPORT_URL_FORMAT = "https://github.com/cryptomator/cryptomator/discussions/new?category=Errors&title=Error+%s&body=%s";
 	private static final String SEARCH_ERRORCODE_DELIM = " OR ";
@@ -47,6 +71,10 @@ public class ErrorController implements FxController {
 	private final Environment environment;
 
 	private BooleanProperty copiedDetails = new SimpleBooleanProperty();
+	private BooleanProperty lookUpSolutionVisibility = new SimpleBooleanProperty();
+	private final HttpClient httpClient;
+
+	List<ErrorDiscussion> errorDiscussionList;
 
 	@Inject
 	ErrorController(Application application, @Named("stackTrace") String stackTrace, ErrorCode errorCode, @Nullable Scene previousScene, Stage window, Environment environment) {
@@ -56,6 +84,86 @@ public class ErrorController implements FxController {
 		this.previousScene = previousScene;
 		this.window = window;
 		this.environment = environment;
+		this.httpClient = HttpClient.newBuilder().version(HttpClient.Version.HTTP_1_1).build();
+
+
+
+		HttpClient httpClient = HttpClient.newHttpClient();
+		HttpRequest httpRequest = HttpRequest.newBuilder()
+				.uri(URI.create(ERROR_CODES_URL))
+				.build();
+
+		CompletableFuture<HttpResponse<String>> future = httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofString());
+
+		future.thenAcceptAsync(response -> {
+			int statusCode = response.statusCode();
+			if (statusCode == 200) {
+				String jsonString = response.body();
+				//LOG.debug("jpkED - jsonString : " + jsonString);
+				//System.out.println(jsonString);
+
+				//JsonObject jsonObject = (JsonObject)new JsonParser().parse(jsonString);
+
+				jsonString = "[{\"id\":\"D_kwDOAPryk84ASwC1\",\"upvoteCount\":4,\"title\":\"Error GH1B:GH1B:NJFJ\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2710\",\"answer\":{\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2710#discussioncomment-5191708\",\"upvoteCount\":3},\"comments\":8},{\"id\":\"D_kwDOAPryk84ASw_I\",\"upvoteCount\":1,\"title\":\"Error GH1B:GH1B:NJFJ\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2716\",\"answer\":null,\"comments\":2},{\"id\":\"D_kwDOAPryk84ASxAg\",\"upvoteCount\":1,\"title\":\"Error GH1B:GH1B:NJFJ\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2717\",\"answer\":{\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2717#discussioncomment-5181996\",\"upvoteCount\":2},\"comments\":3},{\"id\":\"D_kwDOAPryk84ASxDK\",\"upvoteCount\":1,\"title\":\"Error GH1B:GH1B:NJFJ\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2718\",\"answer\":null,\"comments\":0},{\"id\":\"D_kwDOAPryk84ATj-U\",\"upvoteCount\":1,\"title\":\"ErrorCode N05M:GEAO:GEAO\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2877\",\"answer\":null,\"comments\":1},{\"id\":\"D_kwDOAPryk84ATl2o\",\"upvoteCount\":1,\"title\":\"Error GH1B:GH1B:NJFJ\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2883\",\"answer\":{\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2883#discussioncomment-5769879\",\"upvoteCount\":1},\"comments\":1},{\"id\":\"D_kwDOAPryk84ATqCM\",\"upvoteCount\":1,\"title\":\"Error Code 4VHF:1S9S:5EOP\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2887\",\"answer\":null,\"comments\":0},{\"id\":\"D_kwDOAPryk84ATqDF\",\"upvoteCount\":1,\"title\":\"Error H1VR:OTAS:OTAS\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2888\",\"answer\":null,\"comments\":0},{\"id\":\"D_kwDOAPryk84ATrPD\",\"upvoteCount\":1,\"title\":\"Error S4DB:IV2H:I3UI\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2891\",\"answer\":{\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2891#discussioncomment-5797329\",\"upvoteCount\":1},\"comments\":1},{\"id\":\"D_kwDOAPryk84ATtJZ\",\"upvoteCount\":1,\"title\":\"Error 3MAT:BDUS:BDUS\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2894\",\"answer\":null,\"comments\":0},{\"id\":\"D_kwDOAPryk84ATuDc\",\"upvoteCount\":1,\"title\":\"Error QPDR:AFGD:AFGD\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2895\",\"answer\":null,\"comments\":0}]";
+
+				Gson gson = new Gson();
+				Type listType = new TypeToken<List<ErrorDiscussion>>(){}.getType();
+				errorDiscussionList = gson.fromJson(jsonString,listType);
+
+
+
+				loadJsonToErrorDiscussionList();
+
+
+
+
+				LOG.debug("jpkED - errorDiscussionList loaded | amount:"+errorDiscussionList.size()+"");
+
+				//find exact matching
+				List<ErrorDiscussion> newErrorDiscussionList = new ArrayList<>();
+				newErrorDiscussionList.addAll(errorDiscussionList);
+				newErrorDiscussionList.removeIf(errorDiscussion -> !errorDiscussion.getErrorCode().contains(getErrorCode()));
+				if(newErrorDiscussionList.size()>0){
+					errorDiscussionList.clear();
+					errorDiscussionList.addAll(newErrorDiscussionList);
+					LOG.debug("jpkED - exact match | amount:"+errorDiscussionList.size()+"");
+
+					lookUpSolutionVisibility.set(true);
+				}
+				else{
+					//find method code matching
+					newErrorDiscussionList.clear();
+					newErrorDiscussionList.addAll(errorDiscussionList);
+					newErrorDiscussionList.removeIf(errorDiscussion -> !errorDiscussion.getErrorCode().contains(getErrorCodeMethodCode()));
+					if(newErrorDiscussionList.size()>0){
+						errorDiscussionList.clear();
+						errorDiscussionList.addAll(newErrorDiscussionList);
+						LOG.debug("jpkED - method match | amount:"+errorDiscussionList.size()+"");
+					}
+					else{
+						errorDiscussionList.clear();
+						LOG.debug("jpkED - nothing found");
+
+					}
+				}
+
+				if(errorDiscussionList.size()!=0){
+					//answered
+					newErrorDiscussionList.clear();
+					newErrorDiscussionList.addAll(errorDiscussionList);
+					newErrorDiscussionList.removeIf(errorDiscussion -> errorDiscussion.answer == null);
+					if(newErrorDiscussionList.size()>0){
+						errorDiscussionList.clear();
+						errorDiscussionList.addAll(newErrorDiscussionList);
+						LOG.debug("jpkED - answered | amount:"+errorDiscussionList.size()+"");
+					}
+					Collections.sort(errorDiscussionList, this::errorDiscussionComparator);
+					LOG.debug("jpkED - most upvote | id: " + errorDiscussionList.get(0).id + " | title: " + errorDiscussionList.get(0).title + " | upvoteCount:" + errorDiscussionList.get(0).upvoteCount);
+				}
+			}
+		}).join();
+
+
 	}
 
 	@FXML
@@ -70,6 +178,13 @@ public class ErrorController implements FxController {
 		window.close();
 	}
 
+	@FXML
+	public void showSolution() {
+		if(errorDiscussionList.size()!=0) {
+			application.getHostServices().showDocument(errorDiscussionList.get(0).url);
+		}
+	}
+
 	@FXML
 	public void searchError() {
 		var searchTerm = URLEncoder.encode(getErrorCode().replace(ErrorCode.DELIM, SEARCH_ERRORCODE_DELIM), StandardCharsets.UTF_8);
@@ -111,7 +226,11 @@ public class ErrorController implements FxController {
 	}
 
 	public String getErrorCode() {
-		return errorCode.toString();
+		//return "GH1B:GH1B:NJFJ";  // 31 exact match - 4 answered
+		//return "GIJU:E215:E215";   // 1 exact match - 0 answered
+		//return "6PHE:UG0C:UG0C";   // 0 exact match - 8 method match - 3 answered
+		//return "0000:0000:0000";   // 0 match
+		return errorCode.toString(); // 0 exact match - 8 method match - 3 answered
 	}
 
 	public String getDetailText() {
@@ -125,4 +244,65 @@ public class ErrorController implements FxController {
 	public boolean getCopiedDetails() {
 		return copiedDetails.get();
 	}
-}
+
+	public BooleanProperty lookUpSolutionVisibilityProperty() {
+		return lookUpSolutionVisibility;
+	}
+
+	public boolean getLookUpSolutionVisibility() {
+		return lookUpSolutionVisibility.get();
+	}
+
+	public String getDetailTexts() {
+		return "```\nError Code " + getErrorCode() + "\n" + getStackTrace() + "\n```";
+	}
+
+	private void filterListByMethodCode(){
+		List<ErrorDiscussion> newErrorDiscussionList = new ArrayList<>();
+		for (int i = 0; i < errorDiscussionList.size(); i++) {
+			ErrorDiscussion errorDiscussion = errorDiscussionList.get(i);
+			if(errorDiscussion.getMethodCode().equals(getErrorCodeMethodCode())){
+				newErrorDiscussionList.add(errorDiscussion);
+			}
+		}
+		if(newErrorDiscussionList.size()!=0){
+			errorDiscussionList = newErrorDiscussionList;
+			lookUpSolutionVisibility.set(true);
+			LOG.debug("jpkED - found matching method code | amount:"+errorDiscussionList.size()+"");
+		}
+		else{
+			errorDiscussionList = newErrorDiscussionList; // to clear results
+			LOG.debug("jpkED - no matching method code found");
+		}
+	}
+
+	private int errorDiscussionComparator(ErrorDiscussion t, ErrorDiscussion t1) {
+		return Integer.compare(t1.upvoteCount, t.upvoteCount);
+	}
+
+	private String getErrorCodeMethodCode(){
+		return getErrorCode().substring(0,4);
+	}
+
+	private void loadJsonToErrorDiscussionList(){
+		String errorCodesUrl = "https://gist.githubusercontent.com/cryptobot/accba9fb9555e7192271b85606f97230/raw/errorcodes.json";
+		try (InputStream is = new URL(errorCodesUrl).openStream()) { //TODO: HttpClient(){  async request
+
+			JsonObject jsonObject = (JsonObject)new JsonParser().parse(new InputStreamReader(is,"UTF-8"));
+
+			LOG.debug("jpkED - jsonObject | "+jsonObject.toString());
+
+			Set<String> keys = jsonObject.keySet();
+			errorDiscussionList = new ArrayList<>();
+			for (int i = 0; i < jsonObject.size(); i++) {
+				errorDiscussionList.add(new Gson().fromJson(jsonObject.get(keys.stream().toList().get(i)),ErrorDiscussion.class));
+			}
+			LOG.debug("jpkED - errorDiscussionList loaded | amount:"+errorDiscussionList.size()+"");
+		} catch (MalformedURLException e) {
+			throw new RuntimeException(e);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java b/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
new file mode 100644
index 000000000..c6f568d70
--- /dev/null
+++ b/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
@@ -0,0 +1,31 @@
+package org.cryptomator.ui.error;
+
+public class ErrorDiscussion {
+
+	String id;
+	int upvoteCount;
+	String title;
+	String url;
+	int comments;
+	Answer answer;
+
+	String getUpvoteCount(){return  upvoteCount+"";}
+
+	String getErrorCode(){return title.substring(6);}
+	String getMethodCode(){
+		return title.substring(6,10);
+	}
+	String getRootCauseCode(){
+		return title.substring(11,15);
+	}
+
+	String getThrowableCode(){
+		return title.substring(16,20);
+	}
+
+	class Answer{
+		private String url;
+		private int upvoteCount;
+	}
+
+}
diff --git a/src/main/resources/fxml/error.fxml b/src/main/resources/fxml/error.fxml
index ca0966a0a..857e6478d 100644
--- a/src/main/resources/fxml/error.fxml
+++ b/src/main/resources/fxml/error.fxml
@@ -31,13 +31,19 @@
 			</StackPane>
 			<VBox spacing="6" HBox.hgrow="ALWAYS">
 				<FormattedLabel styleClass="label-extra-large" format="%error.message" arg1="${controller.errorCode}"/>
-				<Label text="%error.description" wrapText="true"/>
-				<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.lookup" onAction="#searchError" contentDisplay="LEFT">
+				<Label text="%error.existingSolutionDescription" wrapText="true" visible="${controller.lookUpSolutionVisibility}" managed="${controller.lookUpSolutionVisibility}"/>
+				<Label text="%error.description" wrapText="true" visible="${!controller.lookUpSolutionVisibility}" managed="${!controller.lookUpSolutionVisibility}"/>
+				<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.solution" onAction="#showSolution" contentDisplay="LEFT" visible="${controller.lookUpSolutionVisibility}" managed="${controller.lookUpSolutionVisibility}">
 					<graphic>
 						<FontAwesome5IconView glyph="LINK" glyphSize="12"/>
 					</graphic>
 				</Hyperlink>
-				<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.report" onAction="#reportError" contentDisplay="LEFT">
+				<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.lookup" onAction="#searchError" contentDisplay="LEFT" visible="${!controller.lookUpSolutionVisibility}" managed="${!controller.lookUpSolutionVisibility}">
+					<graphic>
+						<FontAwesome5IconView glyph="LINK" glyphSize="12"/>
+					</graphic>
+				</Hyperlink>
+				<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.report" onAction="#reportError" contentDisplay="LEFT" visible="${!controller.lookUpSolutionVisibility}" managed="${!controller.lookUpSolutionVisibility}">
 					<graphic>
 						<FontAwesome5IconView glyph="LINK" glyphSize="12"/>
 					</graphic>
@@ -60,7 +66,7 @@
 					</graphic>
 				</Hyperlink>
 			</HBox>
-			<TextArea VBox.vgrow="ALWAYS" text="${controller.detailText}" prefRowCount="5" editable="false"/>
+			<TextArea VBox.vgrow="ALWAYS" text="${controller.detailTexts}" prefRowCount="5" editable="false"/>
 		</VBox>
 
 		<ButtonBar buttonMinWidth="120" buttonOrder="B+C">
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index 43060b7c1..d38d542ee 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -21,6 +21,9 @@ error.description=Cryptomator didn't expect this to happen. You can look up exis
 error.hyperlink.lookup=Look up this error
 error.hyperlink.report=Report this error
 error.technicalDetails=Details:
+error.existingSolutionDescription=Cryptomator didn't expect this to happen. But we found an existing solution for this error. Please take a look at the following link.
+error.hyperlink.solution=Look up the solution
+
 
 # Defaults
 defaults.vault.vaultName=Vault

From d82d11feb77eca91b6f654514d6dca899b591110 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Tue, 30 May 2023 12:03:56 +0200
Subject: [PATCH 02/61] optimized implementation

---
 .../org/cryptomator/common/ErrorCode.java     |   7 +-
 .../org/cryptomator/ui/common/HttpHelper.java |  19 ++
 .../cryptomator/ui/error/ErrorController.java | 244 +++++++-----------
 .../cryptomator/ui/error/ErrorDiscussion.java |  16 --
 src/main/resources/fxml/error.fxml            |  41 +--
 5 files changed, 133 insertions(+), 194 deletions(-)
 create mode 100644 src/main/java/org/cryptomator/ui/common/HttpHelper.java

diff --git a/src/main/java/org/cryptomator/common/ErrorCode.java b/src/main/java/org/cryptomator/common/ErrorCode.java
index 7def1287b..80cea8e00 100644
--- a/src/main/java/org/cryptomator/common/ErrorCode.java
+++ b/src/main/java/org/cryptomator/common/ErrorCode.java
@@ -32,17 +32,14 @@ public class ErrorCode {
 		this.rootCauseSpecificFrames = rootCauseSpecificFrames;
 	}
 
-	// visible for testing
-	String methodCode() {
+	public String methodCode() {
 		return format(traceCode(rootCause, LATEST_FRAME));
 	}
 
-	// visible for testing
-	String rootCauseCode() {
+	public String rootCauseCode() {
 		return format(traceCode(rootCause, rootCauseSpecificFrames));
 	}
 
-	// visible for testing
 	String throwableCode() {
 		return format(traceCode(throwable, ALL_FRAMES));
 	}
diff --git a/src/main/java/org/cryptomator/ui/common/HttpHelper.java b/src/main/java/org/cryptomator/ui/common/HttpHelper.java
new file mode 100644
index 000000000..5ee63098b
--- /dev/null
+++ b/src/main/java/org/cryptomator/ui/common/HttpHelper.java
@@ -0,0 +1,19 @@
+package org.cryptomator.ui.common;
+
+import com.google.common.io.CharStreams;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
+
+public class HttpHelper {
+
+	public static String readBody(HttpResponse<InputStream> response) throws IOException {
+		try (var in = response.body(); var reader = new InputStreamReader(in, StandardCharsets.UTF_8)) {
+			return CharStreams.toString(reader);
+		}
+	}
+
+}
diff --git a/src/main/java/org/cryptomator/ui/error/ErrorController.java b/src/main/java/org/cryptomator/ui/error/ErrorController.java
index d3ac0f60f..00704f852 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorController.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorController.java
@@ -2,13 +2,11 @@ package org.cryptomator.ui.error;
 
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
-import com.google.gson.JsonObject;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.ErrorCode;
 import org.cryptomator.common.Nullable;
 import org.cryptomator.ui.common.FxController;
 
-import java.lang.reflect.Type;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javafx.application.Application;
@@ -20,32 +18,22 @@ import javafx.scene.Scene;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import javafx.stage.Stage;
-import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
+import java.io.InputStreamReader;
 import java.net.URI;
-import java.net.URL;
 import java.net.URLEncoder;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.Comparator;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import com.google.gson.JsonParser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.InputStreamReader;
-import java.util.Set;
-
 public class ErrorController implements FxController {
 
-	private static final Logger LOG = LoggerFactory.getLogger(ErrorController.class);
 	private static final String ERROR_CODES_URL = "https://gist.githubusercontent.com/cryptobot/accba9fb9555e7192271b85606f97230/raw/errorcodes.json";
 	private static final String SEARCH_URL_FORMAT = "https://github.com/cryptomator/cryptomator/discussions/categories/errors?discussions_q=category:Errors+%s";
 	private static final String REPORT_URL_FORMAT = "https://github.com/cryptomator/cryptomator/discussions/new?category=Errors&title=Error+%s&body=%s";
@@ -70,100 +58,28 @@ public class ErrorController implements FxController {
 	private final Stage window;
 	private final Environment environment;
 
-	private BooleanProperty copiedDetails = new SimpleBooleanProperty();
-	private BooleanProperty lookUpSolutionVisibility = new SimpleBooleanProperty();
-	private final HttpClient httpClient;
-
-	List<ErrorDiscussion> errorDiscussionList;
+	private final BooleanProperty copiedDetails = new SimpleBooleanProperty();
+	private final BooleanProperty lookUpSolutionVisibility = new SimpleBooleanProperty();
+	private final BooleanProperty isLoadingHttpResponse = new SimpleBooleanProperty();
+	private	ErrorDiscussion matchingErrorDiscussion;
 
 	@Inject
-	ErrorController(Application application, @Named("stackTrace") String stackTrace, ErrorCode errorCode, @Nullable Scene previousScene, Stage window, Environment environment) {
+	ErrorController(Application application, @Named("stackTrace") String stackTrace, ErrorCode errorCode, @Nullable Scene previousScene, Stage window, Environment environment, ExecutorService executorService) {
 		this.application = application;
 		this.stackTrace = stackTrace;
 		this.errorCode = errorCode;
 		this.previousScene = previousScene;
 		this.window = window;
 		this.environment = environment;
-		this.httpClient = HttpClient.newBuilder().version(HttpClient.Version.HTTP_1_1).build();
 
-
-
-		HttpClient httpClient = HttpClient.newHttpClient();
+		isLoadingHttpResponse.set(true);
+		HttpClient httpClient = HttpClient.newBuilder().version(HttpClient.Version.HTTP_1_1).build();
 		HttpRequest httpRequest = HttpRequest.newBuilder()
 				.uri(URI.create(ERROR_CODES_URL))
 				.build();
-
-		CompletableFuture<HttpResponse<String>> future = httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofString());
-
-		future.thenAcceptAsync(response -> {
-			int statusCode = response.statusCode();
-			if (statusCode == 200) {
-				String jsonString = response.body();
-				//LOG.debug("jpkED - jsonString : " + jsonString);
-				//System.out.println(jsonString);
-
-				//JsonObject jsonObject = (JsonObject)new JsonParser().parse(jsonString);
-
-				jsonString = "[{\"id\":\"D_kwDOAPryk84ASwC1\",\"upvoteCount\":4,\"title\":\"Error GH1B:GH1B:NJFJ\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2710\",\"answer\":{\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2710#discussioncomment-5191708\",\"upvoteCount\":3},\"comments\":8},{\"id\":\"D_kwDOAPryk84ASw_I\",\"upvoteCount\":1,\"title\":\"Error GH1B:GH1B:NJFJ\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2716\",\"answer\":null,\"comments\":2},{\"id\":\"D_kwDOAPryk84ASxAg\",\"upvoteCount\":1,\"title\":\"Error GH1B:GH1B:NJFJ\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2717\",\"answer\":{\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2717#discussioncomment-5181996\",\"upvoteCount\":2},\"comments\":3},{\"id\":\"D_kwDOAPryk84ASxDK\",\"upvoteCount\":1,\"title\":\"Error GH1B:GH1B:NJFJ\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2718\",\"answer\":null,\"comments\":0},{\"id\":\"D_kwDOAPryk84ATj-U\",\"upvoteCount\":1,\"title\":\"ErrorCode N05M:GEAO:GEAO\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2877\",\"answer\":null,\"comments\":1},{\"id\":\"D_kwDOAPryk84ATl2o\",\"upvoteCount\":1,\"title\":\"Error GH1B:GH1B:NJFJ\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2883\",\"answer\":{\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2883#discussioncomment-5769879\",\"upvoteCount\":1},\"comments\":1},{\"id\":\"D_kwDOAPryk84ATqCM\",\"upvoteCount\":1,\"title\":\"Error Code 4VHF:1S9S:5EOP\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2887\",\"answer\":null,\"comments\":0},{\"id\":\"D_kwDOAPryk84ATqDF\",\"upvoteCount\":1,\"title\":\"Error H1VR:OTAS:OTAS\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2888\",\"answer\":null,\"comments\":0},{\"id\":\"D_kwDOAPryk84ATrPD\",\"upvoteCount\":1,\"title\":\"Error S4DB:IV2H:I3UI\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2891\",\"answer\":{\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2891#discussioncomment-5797329\",\"upvoteCount\":1},\"comments\":1},{\"id\":\"D_kwDOAPryk84ATtJZ\",\"upvoteCount\":1,\"title\":\"Error 3MAT:BDUS:BDUS\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2894\",\"answer\":null,\"comments\":0},{\"id\":\"D_kwDOAPryk84ATuDc\",\"upvoteCount\":1,\"title\":\"Error QPDR:AFGD:AFGD\",\"url\":\"https://github.com/cryptomator/cryptomator/discussions/2895\",\"answer\":null,\"comments\":0}]";
-
-				Gson gson = new Gson();
-				Type listType = new TypeToken<List<ErrorDiscussion>>(){}.getType();
-				errorDiscussionList = gson.fromJson(jsonString,listType);
-
-
-
-				loadJsonToErrorDiscussionList();
-
-
-
-
-				LOG.debug("jpkED - errorDiscussionList loaded | amount:"+errorDiscussionList.size()+"");
-
-				//find exact matching
-				List<ErrorDiscussion> newErrorDiscussionList = new ArrayList<>();
-				newErrorDiscussionList.addAll(errorDiscussionList);
-				newErrorDiscussionList.removeIf(errorDiscussion -> !errorDiscussion.getErrorCode().contains(getErrorCode()));
-				if(newErrorDiscussionList.size()>0){
-					errorDiscussionList.clear();
-					errorDiscussionList.addAll(newErrorDiscussionList);
-					LOG.debug("jpkED - exact match | amount:"+errorDiscussionList.size()+"");
-
-					lookUpSolutionVisibility.set(true);
-				}
-				else{
-					//find method code matching
-					newErrorDiscussionList.clear();
-					newErrorDiscussionList.addAll(errorDiscussionList);
-					newErrorDiscussionList.removeIf(errorDiscussion -> !errorDiscussion.getErrorCode().contains(getErrorCodeMethodCode()));
-					if(newErrorDiscussionList.size()>0){
-						errorDiscussionList.clear();
-						errorDiscussionList.addAll(newErrorDiscussionList);
-						LOG.debug("jpkED - method match | amount:"+errorDiscussionList.size()+"");
-					}
-					else{
-						errorDiscussionList.clear();
-						LOG.debug("jpkED - nothing found");
-
-					}
-				}
-
-				if(errorDiscussionList.size()!=0){
-					//answered
-					newErrorDiscussionList.clear();
-					newErrorDiscussionList.addAll(errorDiscussionList);
-					newErrorDiscussionList.removeIf(errorDiscussion -> errorDiscussion.answer == null);
-					if(newErrorDiscussionList.size()>0){
-						errorDiscussionList.clear();
-						errorDiscussionList.addAll(newErrorDiscussionList);
-						LOG.debug("jpkED - answered | amount:"+errorDiscussionList.size()+"");
-					}
-					Collections.sort(errorDiscussionList, this::errorDiscussionComparator);
-					LOG.debug("jpkED - most upvote | id: " + errorDiscussionList.get(0).id + " | title: " + errorDiscussionList.get(0).title + " | upvoteCount:" + errorDiscussionList.get(0).upvoteCount);
-				}
-			}
-		}).join();
-
-
+		httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofInputStream())
+				.thenAcceptAsync(this::loadHttpResponse, executorService)
+				.whenCompleteAsync((r,e) -> isLoadingHttpResponse.set(false), Platform::runLater);
 	}
 
 	@FXML
@@ -180,8 +96,9 @@ public class ErrorController implements FxController {
 
 	@FXML
 	public void showSolution() {
-		if(errorDiscussionList.size()!=0) {
-			application.getHostServices().showDocument(errorDiscussionList.get(0).url);
+		if(matchingErrorDiscussion != null){
+			//TODO: errorDiscussion.url or errorDiscussion.answer.url
+			application.getHostServices().showDocument(matchingErrorDiscussion.url);
 		}
 	}
 
@@ -215,8 +132,75 @@ public class ErrorController implements FxController {
 		});
 	}
 
-	/* Getter/Setter */
+	private void loadHttpResponse(HttpResponse<InputStream> response){
+		if (response.statusCode() == 200) {
+			Map<String,ErrorDiscussion> map = new Gson().fromJson(
+					new InputStreamReader(response.body(),StandardCharsets.UTF_8),
+					new TypeToken<Map<String,ErrorDiscussion>>(){}.getType());
 
+			if(!map.values().stream().filter(this::isPartialMatchFilter).findFirst().isEmpty()) {
+				lookUpSolutionVisibility.set(true);
+				Comparator<ErrorDiscussion> comp = this::compareExactMatch;
+				matchingErrorDiscussion = map.values().stream().sorted(comp
+						.thenComparing(this::compareSecondLevelMatch)
+						.thenComparing(this::compareThirdLevelMatch)
+						.thenComparing(this::compareIsAnswered)
+						.thenComparing(this::compareUpvoteCount)
+				).findFirst().get();
+			}
+		}
+	}
+
+	private boolean isPartialMatchFilter(ErrorDiscussion errorDiscussion) {
+		return errorDiscussion.title.contains(" " +errorCode.methodCode());
+	}
+
+	public int compareUpvoteCount(ErrorDiscussion ed1, ErrorDiscussion ed2) {
+		return Integer.compare(ed2.upvoteCount, ed1.upvoteCount);
+	}
+
+	public int compareIsAnswered(ErrorDiscussion ed1, ErrorDiscussion ed2) {
+		if (ed1.answer!=null && ed2.answer==null) {
+			return -1;
+		} else if (ed1.answer==null && ed2.answer!=null) {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+	public int compareExactMatch(ErrorDiscussion ed1, ErrorDiscussion ed2) {
+		if (ed1.title.contains(getErrorCode()) && !ed2.title.contains(getErrorCode())) {
+			return -1;
+		} else if (!ed1.title.contains(getErrorCode()) && ed2.title.contains(getErrorCode())) {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+
+	public int compareSecondLevelMatch(ErrorDiscussion ed1, ErrorDiscussion ed2) {
+		String value = " " + errorCode.methodCode() + ErrorCode.DELIM + errorCode.rootCauseCode();
+		if (ed1.title.contains(value) && !ed2.title.contains(value)) {
+			return -1;
+		} else if (!ed1.title.contains(value) && ed2.title.contains(value)) {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+
+	public int compareThirdLevelMatch(ErrorDiscussion ed1, ErrorDiscussion ed2) {
+		String value = " " + errorCode.methodCode();
+		if (ed1.title.contains(value) && !ed2.title.contains(value)) {
+			return -1;
+		} else if (!ed1.title.contains(value) && ed2.title.contains(value)) {
+			return 1;
+		} else {
+			return 0;
+		}
+	}
+
+	/* Getter/Setter */
 	public boolean isPreviousScenePresent() {
 		return previousScene != null;
 	}
@@ -226,11 +210,7 @@ public class ErrorController implements FxController {
 	}
 
 	public String getErrorCode() {
-		//return "GH1B:GH1B:NJFJ";  // 31 exact match - 4 answered
-		//return "GIJU:E215:E215";   // 1 exact match - 0 answered
-		//return "6PHE:UG0C:UG0C";   // 0 exact match - 8 method match - 3 answered
-		//return "0000:0000:0000";   // 0 match
-		return errorCode.toString(); // 0 exact match - 8 method match - 3 answered
+		return errorCode.toString();
 	}
 
 	public String getDetailText() {
@@ -253,56 +233,12 @@ public class ErrorController implements FxController {
 		return lookUpSolutionVisibility.get();
 	}
 
-	public String getDetailTexts() {
-		return "```\nError Code " + getErrorCode() + "\n" + getStackTrace() + "\n```";
+	public BooleanProperty isLoadingHttpResponseProperty() {
+		return isLoadingHttpResponse;
 	}
 
-	private void filterListByMethodCode(){
-		List<ErrorDiscussion> newErrorDiscussionList = new ArrayList<>();
-		for (int i = 0; i < errorDiscussionList.size(); i++) {
-			ErrorDiscussion errorDiscussion = errorDiscussionList.get(i);
-			if(errorDiscussion.getMethodCode().equals(getErrorCodeMethodCode())){
-				newErrorDiscussionList.add(errorDiscussion);
-			}
-		}
-		if(newErrorDiscussionList.size()!=0){
-			errorDiscussionList = newErrorDiscussionList;
-			lookUpSolutionVisibility.set(true);
-			LOG.debug("jpkED - found matching method code | amount:"+errorDiscussionList.size()+"");
-		}
-		else{
-			errorDiscussionList = newErrorDiscussionList; // to clear results
-			LOG.debug("jpkED - no matching method code found");
-		}
+	public boolean getIsLoadingHttpResponse() {
+		return isLoadingHttpResponse.get();
 	}
 
-	private int errorDiscussionComparator(ErrorDiscussion t, ErrorDiscussion t1) {
-		return Integer.compare(t1.upvoteCount, t.upvoteCount);
-	}
-
-	private String getErrorCodeMethodCode(){
-		return getErrorCode().substring(0,4);
-	}
-
-	private void loadJsonToErrorDiscussionList(){
-		String errorCodesUrl = "https://gist.githubusercontent.com/cryptobot/accba9fb9555e7192271b85606f97230/raw/errorcodes.json";
-		try (InputStream is = new URL(errorCodesUrl).openStream()) { //TODO: HttpClient(){  async request
-
-			JsonObject jsonObject = (JsonObject)new JsonParser().parse(new InputStreamReader(is,"UTF-8"));
-
-			LOG.debug("jpkED - jsonObject | "+jsonObject.toString());
-
-			Set<String> keys = jsonObject.keySet();
-			errorDiscussionList = new ArrayList<>();
-			for (int i = 0; i < jsonObject.size(); i++) {
-				errorDiscussionList.add(new Gson().fromJson(jsonObject.get(keys.stream().toList().get(i)),ErrorDiscussion.class));
-			}
-			LOG.debug("jpkED - errorDiscussionList loaded | amount:"+errorDiscussionList.size()+"");
-		} catch (MalformedURLException e) {
-			throw new RuntimeException(e);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-
-	}
 }
\ No newline at end of file
diff --git a/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java b/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
index c6f568d70..31e271b82 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
@@ -2,27 +2,11 @@ package org.cryptomator.ui.error;
 
 public class ErrorDiscussion {
 
-	String id;
 	int upvoteCount;
 	String title;
 	String url;
-	int comments;
 	Answer answer;
 
-	String getUpvoteCount(){return  upvoteCount+"";}
-
-	String getErrorCode(){return title.substring(6);}
-	String getMethodCode(){
-		return title.substring(6,10);
-	}
-	String getRootCauseCode(){
-		return title.substring(11,15);
-	}
-
-	String getThrowableCode(){
-		return title.substring(16,20);
-	}
-
 	class Answer{
 		private String url;
 		private int upvoteCount;
diff --git a/src/main/resources/fxml/error.fxml b/src/main/resources/fxml/error.fxml
index 857e6478d..ffac5e639 100644
--- a/src/main/resources/fxml/error.fxml
+++ b/src/main/resources/fxml/error.fxml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import org.cryptomator.ui.controls.FontAwesome5Spinner?>
 <?import org.cryptomator.ui.controls.FormattedLabel?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
@@ -31,26 +32,28 @@
 			</StackPane>
 			<VBox spacing="6" HBox.hgrow="ALWAYS">
 				<FormattedLabel styleClass="label-extra-large" format="%error.message" arg1="${controller.errorCode}"/>
-				<Label text="%error.existingSolutionDescription" wrapText="true" visible="${controller.lookUpSolutionVisibility}" managed="${controller.lookUpSolutionVisibility}"/>
-				<Label text="%error.description" wrapText="true" visible="${!controller.lookUpSolutionVisibility}" managed="${!controller.lookUpSolutionVisibility}"/>
-				<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.solution" onAction="#showSolution" contentDisplay="LEFT" visible="${controller.lookUpSolutionVisibility}" managed="${controller.lookUpSolutionVisibility}">
-					<graphic>
-						<FontAwesome5IconView glyph="LINK" glyphSize="12"/>
-					</graphic>
-				</Hyperlink>
-				<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.lookup" onAction="#searchError" contentDisplay="LEFT" visible="${!controller.lookUpSolutionVisibility}" managed="${!controller.lookUpSolutionVisibility}">
-					<graphic>
-						<FontAwesome5IconView glyph="LINK" glyphSize="12"/>
-					</graphic>
-				</Hyperlink>
-				<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.report" onAction="#reportError" contentDisplay="LEFT" visible="${!controller.lookUpSolutionVisibility}" managed="${!controller.lookUpSolutionVisibility}">
-					<graphic>
-						<FontAwesome5IconView glyph="LINK" glyphSize="12"/>
-					</graphic>
-				</Hyperlink>
+				<FontAwesome5Spinner glyphSize="24" visible="${controller.isLoadingHttpResponse}" managed="${controller.isLoadingHttpResponse}"/>
+				<VBox visible="${!controller.isLoadingHttpResponse}" managed="${!controller.isLoadingHttpResponse}">
+					<Label text="%error.existingSolutionDescription" wrapText="true" visible="${controller.lookUpSolutionVisibility}" managed="${controller.lookUpSolutionVisibility}"/>
+					<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.solution" onAction="#showSolution" contentDisplay="LEFT" visible="${controller.lookUpSolutionVisibility}" managed="${controller.lookUpSolutionVisibility}">
+						<graphic>
+							<FontAwesome5IconView glyph="LINK" glyphSize="12"/>
+						</graphic>
+					</Hyperlink>
+					<Label text="%error.description" wrapText="true" visible="${!controller.lookUpSolutionVisibility}" managed="${!controller.lookUpSolutionVisibility}"/>
+					<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.lookup" onAction="#searchError" contentDisplay="LEFT" visible="${!controller.lookUpSolutionVisibility}" managed="${!controller.lookUpSolutionVisibility}">
+						<graphic>
+							<FontAwesome5IconView glyph="LINK" glyphSize="12"/>
+						</graphic>
+					</Hyperlink>
+					<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.report" onAction="#reportError" contentDisplay="LEFT" visible="${!controller.lookUpSolutionVisibility}" managed="${!controller.lookUpSolutionVisibility}">
+						<graphic>
+							<FontAwesome5IconView glyph="LINK" glyphSize="12"/>
+						</graphic>
+					</Hyperlink>
+				</VBox>
 			</VBox>
 		</HBox>
-
 		<VBox spacing="6" VBox.vgrow="ALWAYS">
 			<HBox>
 				<Label text="%error.technicalDetails"/>
@@ -66,7 +69,7 @@
 					</graphic>
 				</Hyperlink>
 			</HBox>
-			<TextArea VBox.vgrow="ALWAYS" text="${controller.detailTexts}" prefRowCount="5" editable="false"/>
+			<TextArea VBox.vgrow="ALWAYS" text="${controller.detailText}" prefRowCount="5" editable="false"/>
 		</VBox>
 
 		<ButtonBar buttonMinWidth="120" buttonOrder="B+C">

From be1c5da54e0e197662ec0e81a3300a8e1126858a Mon Sep 17 00:00:00 2001
From: Cryptobot <cryptobot@users.noreply.github.com>
Date: Wed, 7 Jun 2023 11:08:14 +0200
Subject: [PATCH 03/61] New Crowdin updates (#2931)

New translations strings.properties

Filipino; Finnish; Hungarian; Slovak;

[ci skip]
---
 src/main/resources/i18n/strings_fi.properties | 79 +++++++++++++++++
 .../resources/i18n/strings_fil.properties     | 15 ++++
 src/main/resources/i18n/strings_hu.properties | 87 ++++++++++++++++++-
 src/main/resources/i18n/strings_sk.properties |  5 ++
 4 files changed, 185 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/i18n/strings_fi.properties b/src/main/resources/i18n/strings_fi.properties
index c4fff332c..b4d92497a 100644
--- a/src/main/resources/i18n/strings_fi.properties
+++ b/src/main/resources/i18n/strings_fi.properties
@@ -74,40 +74,112 @@ addvault.new.readme.storageLocation.5=• liitä kaikki tiedostot salaukseen tä
 addvault.new.readme.storageLocation.6=Jos haluat salata tiedostoja ja tarkastella Vaultin sisältöä, tee seuraavat toimet:
 addvault.new.readme.storageLocation.7=1. Lisää tämä Vault Cryptomatoriin.
 addvault.new.readme.storageLocation.8=2. Avaa Vault Cryptomatorissa.
+addvault.new.readme.storageLocation.9=3. Avaa tallennuskansiosi klikkaamalla "Näytä" -painiketta.
+addvault.new.readme.storageLocation.10=Mikäli tarvitset apua, konsultoi Cryptomatorin dokumentaatiota: %s
+addvault.new.readme.accessLocation.fileName=TERVETULOA.rtf
+addvault.new.readme.accessLocation.1=🔐️  SALATTU VOLYYMI  🔐️
+addvault.new.readme.accessLocation.2=Tämä on salatun holvisi tallennuskansio.
+addvault.new.readme.accessLocation.3=Cryptomator salaa kaikki tänne siirtämäsi tiedostot. Voit työskennellä tässä kansiossa aivan samalla tavalla kuin muutenkin. Tämä on ainoastaan näkymä jossa salaus on purettu. Todellisuudessa kaikki tiedostot pysyvät salattuina aina.
+addvault.new.readme.accessLocation.4=Voit halutessasi poistaa tämän tiedoston. Poistaminen ei vaikuta Cryptomatorin toimintaan.
 ## Existing
+addvaultwizard.existing.instruction=Valitse olemassa olevan Cryptomator holvin "vault.cryptomator" -tiedosto. Mikäli "vault.cryptomator" -tiedostoa ei ole, valitse "masterkey.cryptomator" -tiedosto.
 addvaultwizard.existing.chooseBtn=Valitse…
+addvaultwizard.existing.filePickerTitle=Valitse Holvi -tiedosto
+addvaultwizard.existing.filePickerMimeDesc=Cryptomator Holvi
 ## Success
+addvaultwizard.success.nextStepsInstructions=Holvi "%s" on lisätty.\nSinun täytyy avata kyseinen holvi tarkastellaksesi sen sisältöä. Vaihtoehtoisesti voit avata sen myöhemmin koska tahansa.
+addvaultwizard.success.unlockNow=Avaa Nyt
 
 # Remove Vault
+removeVault.title=Poista "%s"
+removeVault.message=Poistetaanko holvi?
+removeVault.description=Tämä toiminto ainoastaan poistaa valitun holvin Cryptomatorin näkymästä. Salattuja tiedostoja tai holvia itsessään ei poisteta.
+removeVault.confirmBtn=Poista Holvi
 
 # Change Password
+changepassword.title=Vaihda salasana
+changepassword.enterOldPassword=Syötä "%s": n nykyinen salasana
+changepassword.finalConfirmation=Ymmärrän, että tiedostojani ei voi palauttaa, mikäli unohdan salasanani.
 
 # Forget Password
+forgetPassword.title=Unohda Salasana
+forgetPassword.message=Unohda tallennetut salasanat?
+forgetPassword.description=Tämä poistaa valitun holvin tallennetun salasanan järjestelmäsi avainrenkaasta.
+forgetPassword.confirmBtn=Unohda Salasana
 
 # Unlock
+unlock.title=Avaa "%s"
+unlock.passwordPrompt=Syötä salasana "%s":lle
+unlock.savePassword=Muista salasana
 unlock.unlockBtn=Avaa
 ## Select
+unlock.chooseMasterkey.message=Masterkey -tiedostoa ei löydy
+unlock.chooseMasterkey.description=Cryptomator ei paikantanut masterkey -tiedostoa holville "%s". Ole hyvä ja valitse tiedosto manuaalisesti.
+unlock.chooseMasterkey.filePickerTitle=Valitse Masterkey -tiedosto
+unlock.chooseMasterkey.filePickerMimeDesc=Cryptomator Masterkey
 ## Success
+unlock.success.message=Lukituksen purku onnistui
+unlock.success.description="%s" holvin sisältö on nyt saatavilla sen hallinnointikohteessa.
+unlock.success.rememberChoice=Muista valintani. Älä kysy uudelleen.
+unlock.success.revealBtn=Paljasta Asema
 ## Failure
+unlock.error.customPath.message=Holvia ei pystytty yhdistämään valittuun polkuun
+unlock.error.customPath.description.notSupported=Mikäli haluat jatkaa mukautetun polun käyttöä, ole hyvä ja mene Asetuksiin ja valitse volyymityyppi mikä tukee sitä. Muussa tapauksessa avaa holvin asetukset ja valitse tuettu mukautettu polku.
+unlock.error.customPath.description.notExists=Valitsemaasi mukautettua polkua ei ole olemassa. Voit joko luoda uuden polun tai muuttaa polkua holvisi asetuksissa.
+unlock.error.customPath.description.generic=Olet valinnut mukautetun polun holvillesi, mutta sen kanssa ilmeni ongelma: %s
 ## Hub
+hub.noKeychain.message=Laitteen avainta ei löytynyt
+hub.noKeychain.description=Hub-holvien purkamiseksi tarvitaan laiteavain joka on suojattu avainrenkaalla. Jatkaaksesi, kytke “%s” päälle ja valitse avainrengas asetuksista.
+hub.noKeychain.openBtn=Avaa asetukset
 ### Waiting
 hub.auth.message=Odotetaan todennusta…
 hub.auth.description=Pitäisi ohjata sinut automaattisesti uudelleen kirjautumissivulle.
+hub.auth.loginLink=Uudelleenohjaus epäonnistui? Avaa tästä manuaalisesti.
 ### Receive Key
+hub.receive.message=Odotetaan vastausta…
+hub.receive.description=Cryptomator yhdistää Hub:iin. Ole hyvä ja odota.
 ### Register Device
+hub.register.message=Laitteen nimi vaaditaan
+hub.register.description=Et ole ilmeisesti ennen yhdistänyt Hub:iin tältä laitteelta. Jotta pääsyoikeus voidaan todentaa, sinun täytyy nimetä tämä laite.
+hub.register.nameLabel=Laitteen Nimi
+hub.register.occupiedMsg=Tämä nimi on jo käytössä
+hub.register.registerBtn=Vahvista
 ### Registration Success
+hub.registerSuccess.message=Laite nimetty onnistuneesti
+hub.registerSuccess.description=Käyttääksesi holvia, holvin omistajan on valtuutettava laitteesi.
 ### Registration Failed
+hub.registerFailed.message=Laitteen nimeäminen epäonnistui
+hub.registerFailed.description=Nimeämisprosessissa tapahtui virhe. Löydät lisää tietoja lokitiedostoista.
 ### Unauthorized
+hub.unauthorized.message=Pääsy estetty
+hub.unauthorized.description=Laitteellasi ei ole pääsyvaltuutusta tähän holviin. Pyydä holvin omistajaa lisäämän valtuutus laitteellesi.
 ### License Exceeded
+hub.invalidLicense.message=Hub-lisenssi ei ole voimassa
+hub.invalidLicense.description=Cryptomator Hub:illasi ei ole voimassa olevaa lisenssiä. Ole hyvä ja ilmoita Hubin järjestelmänvalvojalle lisenssin päivittämiseksi tai sen uusimiseksi.
 
 # Lock
 ## Force
+lock.forced.message=Lukitus epäonnistui
+lock.forced.description="%s":n lukitus epäonnistui, koska sinulla on avoimia tiedostoja tai niihin liittyviä päivityksiä vireillä. Voit halutessasi pakottaa lukituksen, mutta tämä saattaa johtaa tallentamattomien tiedostojen katoamiseen.
+lock.forced.retryBtn=Yritä uudestaan
+lock.forced.forceBtn=Pakota Lukitus
 ## Failure
+lock.fail.message=Holvin lukitseminen epäonnistui
+lock.fail.description="%s" holvia ei voitu lukita. Varmista, että avoinna olevat tiedostot tallennetaan turvalliseen paikkaan ja että tiedostot eivät ole avoinna tai käytössä. Lukitaksesi holvin, pakota Cryptomator -prosessin lopetus manuaalisesti.
 
 # Migration
+migration.title=Päivitä Holvi
 ## Start
+migration.start.header=Päivitä Holvi
+migration.start.text="%s" holvi tulee päivittää uuteen versioon, jotta voit avata sen Cryptomatorissa. Ennen kuin jatkat, varmista että ymmärrät seuraavan:
+migration.start.remarkUndone=Päivitystä ei voi peruuttaa.
+migration.start.remarkVersions=Cryptomatorin vanhemmat versiot eivät voi avata päivitettyä holvia.
+migration.start.remarkCanRun=Sinun tulee varmistaa, että kaikki laitteet joilla haluat käyttää tätä holvia on päivitetty Cryptomatorin uusimpaan versioon.
+migration.start.remarkSynced=Sinun tulee varmistaa, että holvisi on täysin ajantasalla tällä laitteella ja muilla laitteillasi, ennen kuin aloitat päivitysprosessin.
+migration.start.confirm=Olen lukenut ja ymmärtänyt yllä ilmoitetut ohjeet
 ## Run
 ## Success
+migration.success.unlockNow=Avaa Nyt
 ## Missing file system capabilities
 ## Impossible
 
@@ -142,14 +214,19 @@ main.closeBtn.tooltip=Sulje
 main.preferencesBtn.tooltip=Asetukset
 ## Vault List
 main.vaultlist.contextMenu.lock=Lukitse
+main.vaultlist.contextMenu.unlockNow=Avaa Nyt
+main.vaultlist.contextMenu.reveal=Paljasta Asema
 main.vaultlist.addVaultBtn=Lisää Vault
 ## Vault Detail
 ### Welcome
 ### Locked
+main.vaultDetail.unlockNowBtn=Avaa Nyt
 ### Unlocked
+main.vaultDetail.revealBtn=Paljasta Asema
 main.vaultDetail.lockBtn=Lukitse
 ### Missing
 ### Needs Migration
+main.vaultDetail.migrateButton=Päivitä Holvi
 ### Error
 
 # Wrong File Alert
@@ -157,10 +234,12 @@ main.vaultDetail.lockBtn=Lukitse
 # Vault Options
 ## General
 vaultOptions.general.vaultName=Vault Nimi
+vaultOptions.general.actionAfterUnlock.reveal=Paljasta Asema
 
 ## Mount
 vaultOptions.mount.mountPoint.directoryPickerButton=Valitse…
 ## Master Key
+vaultOptions.masterkey.changePasswordBtn=Vaihda salasana
 ## Hub
 
 # Recovery Key
diff --git a/src/main/resources/i18n/strings_fil.properties b/src/main/resources/i18n/strings_fil.properties
index 28ae24a2f..893997d59 100644
--- a/src/main/resources/i18n/strings_fil.properties
+++ b/src/main/resources/i18n/strings_fil.properties
@@ -50,26 +50,41 @@ addvaultwizard.new.directoryPickerLabel=Custom Location
 addvaultwizard.new.directoryPickerButton=Mamili…
 addvaultwizard.new.directoryPickerTitle=Pumili ng Direktoryo
 ### Password
+addvaultwizard.new.createVaultBtn=Gumawa ng bagong Vault
 ### Information
+addvault.new.readme.storageLocation.2=Ito ang lokasyon ng iyong vault na imbakan.
+addvault.new.readme.storageLocation.3=HUWAG
+addvault.new.readme.storageLocation.6=Kung gusto mo i-encrypt ang mga files at makita nang nilalaman ng vault, gawin ang nakasabi:
+addvault.new.readme.storageLocation.7=1. Idagdag ang vault na ito sa Cryptomator.
+addvault.new.readme.accessLocation.2=Ito ang lokasyon ng iyong vault.
 ## Existing
 addvaultwizard.existing.chooseBtn=Mamili…
 ## Success
 
 # Remove Vault
+removeVault.title=Tanggalin %s
+removeVault.message=Itangal ang vault?
+removeVault.confirmBtn=Itangal ang vault
 
 # Change Password
 
 # Forget Password
 
 # Unlock
+unlock.savePassword=Maalala ang password
 unlock.unlockBtn=I-unlock
 ## Select
+unlock.chooseMasterkey.filePickerTitle=Piliin ang masterkey file
+unlock.chooseMasterkey.filePickerMimeDesc=Cryptomator Masterkey
 ## Success
+unlock.success.rememberChoice=Paalala ang pinili ko, huwag mag tanong ulit
 ## Failure
 ## Hub
 ### Waiting
 ### Receive Key
 ### Register Device
+hub.register.occupiedMsg=Ang pangalan ay nagamit na
+hub.register.registerBtn=Kumpirmahin
 ### Registration Success
 ### Registration Failed
 ### Unauthorized
diff --git a/src/main/resources/i18n/strings_hu.properties b/src/main/resources/i18n/strings_hu.properties
index f892bfa32..6759296da 100644
--- a/src/main/resources/i18n/strings_hu.properties
+++ b/src/main/resources/i18n/strings_hu.properties
@@ -56,6 +56,9 @@ addvaultwizard.new.locationIsOk=Megfelelő hely a trezornak
 addvaultwizard.new.invalidName=Érvénytelen vault név
 addvaultwizard.new.validName=Érvényes vault név
 addvaultwizard.new.validCharacters.message=A vault neve a következő karaktereket tartalmazhatja:
+addvaultwizard.new.validCharacters.chars=Szókarakterek (pl. a, ж vagy 수)
+addvaultwizard.new.validCharacters.numbers=Számok
+addvaultwizard.new.validCharacters.dashes=Kötőjel (%s) vagy alulvonás (%s)
 ### Password
 addvaultwizard.new.createVaultBtn=Új széf létrehozása
 addvaultwizard.new.generateRecoveryKeyChoice=Nem fog tudni hozzáférni az adataihoz a jelszó nélkül. Akar egy visszaállítási kulcsot arra az esetre, ha elveszíti a jelszavát?
@@ -110,28 +113,49 @@ unlock.passwordPrompt=Írja be a jelszavát a következő széfhez "%s":
 unlock.savePassword=Jelszó megjegyzése
 unlock.unlockBtn=Feloldás
 ## Select
+unlock.chooseMasterkey.message=Mesterkulcs fájl nem található
 unlock.chooseMasterkey.description=Nem található a tároló kulcsfájlja a várt helyen. Kérjük válassza ki a kulcsfájlt manuálisan.
 unlock.chooseMasterkey.filePickerTitle=Mesterkulcs fájl kiválasztása
+unlock.chooseMasterkey.filePickerMimeDesc=Cryptomator Mesterkulcs
 ## Success
 unlock.success.message=Sikeres feloldás
 unlock.success.description="%s" sikreresen feloldásra került! Mostmár hozzáférhet a virtuális trezorhoz.
 unlock.success.rememberChoice=Jegyezze meg a választást és ne mutassa többet
 unlock.success.revealBtn=Széf megjelenítése
 ## Failure
+unlock.error.customPath.message=Nem lehet csatolni a széfet az egyéni útvonalhoz
+unlock.error.customPath.description.notSupported=Ha szeretné továbbra is az egyéni útvonalat használni, kérem, menjen a beállításokba és válasszon egy kötet típust, amely támogatja azt. Máskülönben, menjen a széf opciókhoz és válasszon egy támogatott csatoláspontot.
+unlock.error.customPath.description.notExists=Az egyéni csatolás útvonal nem létezik. Hozza létre a helyi fájlrendszerében vagy változtassa meg a széf opciókban.
+unlock.error.customPath.description.generic=Egyéni csatolási útvonalat választott ehhez a széfhez, de használatakor ez a hibaüzenet érkezett: %s
 ## Hub
+hub.noKeychain.message=Nem lehet az eszközkulcshoz hozzáférni
+hub.noKeychain.description=Hogy feloldja a Hub széfeket, egy eszközkulcs szükséges, mely egy kulcslánccal van biztosítva. A folytatáshoz engedélyezze a következőt: “%s” és válasszon egy kulcsláncot a beállításokban.
 hub.noKeychain.openBtn=Beállítások megnyitása
 ### Waiting
+hub.auth.message=Várakozás a hitelesítésre…
+hub.auth.description=Automatikusan átirányítjuk a bejelentkezési oldalra.
+hub.auth.loginLink=Nem sikerült az átirányítás? Kattintson ide a megnyitáshoz.
 ### Receive Key
 hub.receive.message=Válasz feldolgozása…
+hub.receive.description=Cryptomator fogadja és feldolgozza a Hub válaszát. Kérem, várjon.
 ### Register Device
+hub.register.message=Eszköznév szükséges
+hub.register.description=Úgy tűnik, ez az első Hub-hozzáférés erről az eszközről. A hozzáférési jogosultság azonosításához el kell neveznie ezt az eszközt.
 hub.register.nameLabel=Készülék neve
 hub.register.occupiedMsg=Ez a név már használatban van
 hub.register.registerBtn=Megerősítés
 ### Registration Success
+hub.registerSuccess.message=Eszköz elnevezve
+hub.registerSuccess.description=A széf hozzáféréséhez a széf tulajdonosának hitelesítenie kell az eszközét.
 ### Registration Failed
 hub.registerFailed.message=Az eszköz elnevezése sikertelen volt
+hub.registerFailed.description=Hiba állt fel az elnevezési folyamatban. További részletekért tekintse meg az alkalmazásnaplót.
 ### Unauthorized
+hub.unauthorized.message=Hozzáférés megtagadva
+hub.unauthorized.description=Eszköze még nem kapott engedélyt ehhez a széfhez. Kérje a széf tulajdonosát, hogy engedélyezze a hozzáférést.
 ### License Exceeded
+hub.invalidLicense.message=Érvénytelen Hub licenc
+hub.invalidLicense.description=Az Ön Cryptomator Hub példánya érvénytelen licenccel rendelkezik. Kérem, értesítsen egy Hub rendszergazdát hogy frissítse vagy újítsa meg a licencet.
 
 # Lock
 ## Force
@@ -147,7 +171,11 @@ lock.fail.description=A "%s" tárolót nem lehetett zárolni. Győződjön meg a
 migration.title=Széf frissítése
 ## Start
 migration.start.header=Széf frissítése
+migration.start.text=Hogy megnyissa a "%s" nevű széfét a Cryptomator ezen új verziójában, a széfet frissíteni kell egy újabb formátumra. Mielőtt ezt megteszi, az alábbiakat érdemes figyelembe vennie:
 migration.start.remarkUndone=Ezt a módosítást nem lehet visszafordítani.
+migration.start.remarkVersions=A Cryptomator régebbi verziói nem fogják tudni megnyitni a frissített széfet.
+migration.start.remarkCanRun=Meg kell győződnie arról, hogy minden eszköz, amelyről eléri ezt a széfet képes futtatni a Cryptomator ezen verzióját.
+migration.start.remarkSynced=Meg kell győződnie arról, hogy a széfe teljesen szinkronizálva van ezen és az összes többi eszközön a frissítés előtt.
 migration.start.confirm=Elolvastam és megértettem a fenti információkat
 ## Run
 migration.run.enterPassword=Írja be a jelszót a következőhöz Enter the password for "%s"
@@ -205,10 +233,16 @@ health.result.severityFilter.good=Rendben
 health.result.severityFilter.info=Infó
 health.result.severityFilter.warn=Figyelmeztetés
 health.result.severityFilter.crit=Kritikus
+health.result.severityTip.good=Súlyosság: Jó\nNormális séf struktúra.
+health.result.severityTip.info=Súlyosság: Info\nA széf struktúrája ép, javítás ajánlott.
+health.result.severityTip.warn=Súlyosság: Figyelmeztetés\nA széf struktúrája sérült, javítás erősen ajánlott.
+health.result.severityTip.crit=Súlyosság: Kritikus\nA széf struktúrája sérült, adatvesztés áll fönt.
+health.result.fixStateFilter.all=Javítás státusz - Mind
 health.result.fixStateFilter.fixable=Javítható
 health.result.fixStateFilter.notFixable=Nem javítható
 health.result.fixStateFilter.fixing=Javítás alatt…
 health.result.fixStateFilter.fixed=Kijavított
+health.result.fixStateFilter.fixFailed=Sikertelen javítás
 ## Fix Application
 health.fix.fixBtn=Javítás
 health.fix.successTip=Javítás sikeres
@@ -219,6 +253,7 @@ preferences.title=Beállítások
 ## General
 preferences.general=Általános
 preferences.general.startHidden=Az ablak elrejtése a Cryptomator indítása után
+preferences.general.autoCloseVaults=A széfek automatikus lezárása az alkalmazás bezárásakor
 preferences.general.debugLogging=Hibakeresési naplózás engedélyezése
 preferences.general.debugDirectory=Naplófájlok megjelenítése
 preferences.general.autoStart=Cryptomator indítása a rendszerrel együtt
@@ -239,7 +274,17 @@ preferences.interface.showMinimizeButton=Kicsinyítés ikon megjelenítése
 preferences.interface.showTrayIcon=Tálca ikon megjelenítése (újraindítás szükséges)
 ## Volume
 preferences.volume=Virtuális meghajtó
+preferences.volume.type=Kötet Típusa
 preferences.volume.type.automatic=Automatikus
+preferences.volume.docsTooltip=További információért a kötet típusokról kattintson ide, hogy megnyissa a dokumentációt.
+preferences.volume.fuseRestartRequired=A változtatások alkalmazásához újra kell indítania a Cryptomatort.
+preferences.volume.tcp.port=TCP Port
+preferences.volume.supportedFeatures=A kiválaszott kötet típus az alábbi funkciókat támogatja:
+preferences.volume.feature.mountAuto=Automatikus csatlakozási pont választás
+preferences.volume.feature.mountToDir=Egyéni mappa csatlakozási pontként
+preferences.volume.feature.mountToDriveLetter=Meghajtó betűjel csatolási pontként
+preferences.volume.feature.mountFlags=Egyéni csatolási opciók
+preferences.volume.feature.readOnly=Csak olvasható csatolás
 ## Updates
 preferences.updates=Frissítések
 preferences.updates.currentVersion=Jelenlegi verzió: %s
@@ -262,26 +307,34 @@ stats.title=Statisztika ehhez %s
 stats.cacheHitRate=Gyorsítótár találati arány
 ## Read
 stats.read.throughput.idle=Olvasás: tétlen
+stats.read.throughput.kibs=Olvasás: %.2f KiB/s
 stats.read.throughput.mibs=Olvasás: %.2f MiB/s
 stats.read.total.data.none=Olvasott adat: -
+stats.read.total.data.kib=Adat beolvasva: %.1f KiB
 stats.read.total.data.mib=Olvasott adat: %.1f MiB
 stats.read.total.data.gib=Olvasott adat: %.1f GiB
 stats.decr.total.data.none=Dekódolt adat: -
+stats.decr.total.data.kib=Adat visszafejtve: %.1f KiB
 stats.decr.total.data.mib=Dekódolt adat: %.1f MiB
 stats.decr.total.data.gib=Dekódolt adat: %.1f GiB
 stats.read.accessCount=Összes olvasás: %d
 ## Write
 stats.write.throughput.idle=Írás: tétlen
+stats.write.throughput.kibs=Írás: %.2f KiB/s
 stats.write.throughput.mibs=Írás: %.2f MiB/s
 stats.write.total.data.none=Írva: -
+stats.write.total.data.kib=Írt adatok: %.1f KiB
 stats.write.total.data.mib=Írott adat: %.1f MiB
 stats.write.total.data.gib=Írott adat: %.1f GiB
 stats.encr.total.data.none=Titkosított adat: -
+stats.encr.total.data.kib=Titkosított adatok: %.1f KiB
 stats.encr.total.data.mib=Titkosított adat: %.1f MiB
 stats.encr.total.data.gib=Titkosított adat: %.1f GiB
 stats.write.accessCount=Összes írás: %d
 
 ## Accesses
+stats.access.current=Hozzáférések: %d
+stats.access.total=Összes hozzáférés: %d
 
 
 # Main Window
@@ -312,12 +365,18 @@ main.vaultDetail.passwordSavedInKeychain=Jelszó mentve
 main.vaultDetail.unlockedStatus=FELOLDVA
 main.vaultDetail.accessLocation=A széf tartalma itt érhető el:
 main.vaultDetail.revealBtn=Széf megjelenítése
+main.vaultDetail.copyUri=URI másolása
 main.vaultDetail.lockBtn=Zárolás
 main.vaultDetail.bytesPerSecondRead=Olvasás:
 main.vaultDetail.bytesPerSecondWritten=Írás:
 main.vaultDetail.throughput.idle=tétlen
+main.vaultDetail.throughput.kbps=%.1f KiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 main.vaultDetail.stats=Széf statisztika
+main.vaultDetail.locateEncryptedFileBtn=Titkosított fájl megkeresése
+main.vaultDetail.locateEncryptedFileBtn.tooltip=Válasszon a széfből egy fájlt a titkosított megfelelőjének megkereséséhez
+main.vaultDetail.encryptedPathsCopied=Az útvonal a vágólapra került!
+main.vaultDetail.filePickerTitle=Fájl választása a széfben
 ### Missing
 main.vaultDetail.missing.info=A Cryptomator nem talált széfet ezen az útvonalon.
 main.vaultDetail.missing.recheck=Ellenőrizze újra
@@ -356,36 +415,56 @@ vaultOptions.general.startHealthCheckBtn=Épség-ellenőrzés indítása
 
 ## Mount
 vaultOptions.mount=Felcsatolás
+vaultOptions.mount.info=Az opciók a kiválasztott kötet típustól függőek.
+vaultOptions.mount.linkToPreferences=Virtuális meghajtó opciók megnyitása
 vaultOptions.mount.readonly=Csak-olvasható
 vaultOptions.mount.customMountFlags=Egyedi csatolási paraméterek
 vaultOptions.mount.winDriveLetterOccupied=foglalt
 vaultOptions.mount.mountPoint=Csatolási pont
 vaultOptions.mount.mountPoint.auto=Válasszon egy megfelelő helyet automatikusan
 vaultOptions.mount.mountPoint.driveLetter=Használja a kiválasztott meghajtó betűjelét
+vaultOptions.mount.mountPoint.custom=Egyéni könyvtár használata
 vaultOptions.mount.mountPoint.directoryPickerButton=Kiválaszt…
+vaultOptions.mount.mountPoint.directoryPickerTitle=Válasszon könyvtárat
 ## Master Key
 vaultOptions.masterkey=Jelszó
 vaultOptions.masterkey.changePasswordBtn=Jelszó megváltoztatása
 vaultOptions.masterkey.forgetSavedPasswordBtn=Mentett jelszó törlése
 vaultOptions.masterkey.recoveryKeyExplanation=A helyreállítási kulcs az egyetlen módja annak, hogy visszaállítsa a széfhez való hozzáférést, ha elveíti a jelszavát.
 vaultOptions.masterkey.showRecoveryKeyBtn=Visszaállítási kulcs megjelenítése
+vaultOptions.masterkey.recoverPasswordBtn=Jelszó visszaállítása
 ## Hub
+vaultOptions.hub=Helyreállítás
+vaultOptions.hub.convertInfo=Ezen visszaállítási kulcs segítségével átváltoztathatja ezt a Hub széfet egy jelszó-alapú széffé vészhelyzet esetén.
+vaultOptions.hub.convertBtn=Jelszó-alapú széffé alakítás
 
 # Recovery Key
 ## Display Recovery Key
+recoveryKey.display.title=Visszaállítási kulcs mutatása
+recoveryKey.create.message=Jelszó szükséges
 recoveryKey.create.description=Írja be a jelszavát a "%s" visszaállítási kulcsának megjelenítéséhez:
 recoveryKey.display.description=A következő helyreállítási kulcs használható a "%s" hozzáférésének visszaállítására:
 recoveryKey.display.StorageHints=Tartsa nagyon biztonságos helyen. pl.:\n •Tárolja egy jelszókezelővel\n •Mentse el egy USB meghajtóra\n •Nyomtassa egy papírra
 ## Reset Password
 ### Enter Recovery Key
+recoveryKey.recover.title=Jelszó visszaállítása
+recoveryKey.recover.prompt=Írja be a visszaállítási kulcsot a következőhöz "%s":
 recoveryKey.recover.correctKey=Ez a visszaállítási kulcs érvényes
 recoveryKey.recover.wrongKey=Ez a visszaállítási kulcs egy másik széfhez tartozik
 recoveryKey.recover.invalidKey=Ez a visszaállítási kulcs nem érvényes
 recoveryKey.printout.heading=Cryptomator visszaállítási kulcs\n"%s"\n
 ### Reset Password
+recoveryKey.recover.resetBtn=Visszaállítás
 ### Recovery Key Password Reset Success
+recoveryKey.recover.resetSuccess.message=A jelszó alaphelyzetbe állítása sikeresen megtörtént
+recoveryKey.recover.resetSuccess.description=Feloldhatja a széfet az új jelszóval.
 
 # Convert Vault
+convertVault.title=Széf átalakítása
+convertVault.convert.convertBtn.before=Átalakítás
+convertVault.convert.convertBtn.processing=Átalakítás…
+convertVault.success.message=Sikeres átalakítás
+convertVault.hubToPassword.success.description=Feloldhatja a széfet a kiválasztott jelszóval Hub hozzáférés nélkül.
 
 # New Password
 newPassword.promptText=Adjon meg egy új jelszót
@@ -400,6 +479,12 @@ passwordStrength.messageLabel.3=Erős
 passwordStrength.messageLabel.4=Nagyon erős
 
 # Quit
+quit.title=Alkalmazás bezárása
+quit.message=Vannak feloldott széfek
+quit.description=Kérem, erősítse meg a kilépési szándékát. A Cryptomator lezárja az összes feloldott széfet az adatvesztés elkerülése érdekében.
 quit.lockAndQuitBtn=Zárolás és kilépés
 
-# Forced Quit
\ No newline at end of file
+# Forced Quit
+quit.forced.message=Egyes széfeket nem lehetett lezárni
+quit.forced.description=A széfek zárolását függőbben lévő műveletek vagy megnyitott fájlok blokkolták. Kényszerítheti a maradék széfek zárolását, de az I/O megszakítása nem mentett adatok elvesztéséhez vezethet.
+quit.forced.forceAndQuitBtn=Kényszerítés és Kilépés
\ No newline at end of file
diff --git a/src/main/resources/i18n/strings_sk.properties b/src/main/resources/i18n/strings_sk.properties
index 9e3147d6b..6ac327f75 100644
--- a/src/main/resources/i18n/strings_sk.properties
+++ b/src/main/resources/i18n/strings_sk.properties
@@ -432,6 +432,7 @@ vaultOptions.masterkey.recoveryKeyExplanation=Kľúč pre obnovu je Vašou jedin
 vaultOptions.masterkey.showRecoveryKeyBtn=Ukázať klúč obnovy
 vaultOptions.masterkey.recoverPasswordBtn=Resetovanie hesla
 ## Hub
+vaultOptions.hub=Obnova
 
 # Recovery Key
 ## Display Recovery Key
@@ -454,6 +455,10 @@ recoveryKey.recover.resetSuccess.message=Heslo úspešne zresetované
 recoveryKey.recover.resetSuccess.description=Môžte odomknúť trezor s novým heslom.
 
 # Convert Vault
+convertVault.title=Konvertovať trezor
+convertVault.convert.convertBtn.before=Konvertovať
+convertVault.convert.convertBtn.processing=Konvertujem…
+convertVault.success.message=Konverzia úspešná
 
 # New Password
 newPassword.promptText=Zadajte nové heslo

From ff49094f35c68c258b2611cfd58e93d431f884b4 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 7 Jun 2023 12:50:09 +0200
Subject: [PATCH 04/61] fixes #2936

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e01bda573..0502b6dc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
 		<nonModularGroupIds>org.ow2.asm,org.apache.jackrabbit,org.apache.httpcomponents,de.swiesend,org.purejava,com.github.hypfvieh</nonModularGroupIds>
 
 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>2.6.4</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>2.6.5</cryptomator.cryptofs.version>
 		<cryptomator.integrations.version>1.2.0</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>1.2.0</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>1.2.0</cryptomator.integrations.mac.version>

From da0eeb2e45c7565003b7962cfd11636dc5fd7131 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 7 Jun 2023 12:50:24 +0200
Subject: [PATCH 05/61] bump dependency-check

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0502b6dc6..ed08a3d18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
 
 		<!-- build-time dependencies -->
 		<jetbrains.annotations.version>23.0.0</jetbrains.annotations.version>
-		<dependency-check.version>8.1.0</dependency-check.version>
+		<dependency-check.version>8.1.2</dependency-check.version>
 		<jacoco.version>0.8.9</jacoco.version>
 	</properties>
 

From e5e0d4076a952ff9ba7fde1f06263ff3a0419aa8 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 7 Jun 2023 12:52:42 +0200
Subject: [PATCH 06/61] prepare 1.9.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ed08a3d18..38c917a77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>cryptomator</artifactId>
-	<version>1.10.0-SNAPSHOT</version>
+	<version>1.9.1</version>
 	<name>Cryptomator Desktop App</name>
 
 	<organization>

From b296dc775c78157ee8bb25ed48c8938ca2ed6887 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 7 Jun 2023 12:55:28 +0200
Subject: [PATCH 07/61] finalize 1.9.1

---
 dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml
index 036798650..3df3691bc 100644
--- a/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml
+++ b/dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml
@@ -66,6 +66,7 @@
 	</content_rating>
 
 	<releases>
+		<release date="2023-06-07" version="1.9.1"/>
 		<release date="2023-05-30" version="1.9.0"/>
 		<release date="2023-04-25" version="1.8.0"/>
 		<release date="2023-04-07" version="1.7.5"/>

From 8f3f23939ceda918891cd68b7bfccc2d140d0402 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Mon, 12 Jun 2023 13:50:43 +0200
Subject: [PATCH 08/61] created some tests for ErrorController

---
 .../org/cryptomator/common/ErrorCode.java     |   2 +-
 .../cryptomator/ui/error/ErrorController.java |   4 +-
 .../cryptomator/ui/error/ErrorDiscussion.java |   3 +-
 .../ui/error/ErrorControllerTest.java         | 253 ++++++++++++++++++
 4 files changed, 258 insertions(+), 4 deletions(-)
 create mode 100644 src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java

diff --git a/src/main/java/org/cryptomator/common/ErrorCode.java b/src/main/java/org/cryptomator/common/ErrorCode.java
index 80cea8e00..7363e2278 100644
--- a/src/main/java/org/cryptomator/common/ErrorCode.java
+++ b/src/main/java/org/cryptomator/common/ErrorCode.java
@@ -40,7 +40,7 @@ public class ErrorCode {
 		return format(traceCode(rootCause, rootCauseSpecificFrames));
 	}
 
-	String throwableCode() {
+	public String throwableCode() {
 		return format(traceCode(throwable, ALL_FRAMES));
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/error/ErrorController.java b/src/main/java/org/cryptomator/ui/error/ErrorController.java
index 00704f852..12a03fff8 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorController.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorController.java
@@ -151,8 +151,8 @@ public class ErrorController implements FxController {
 		}
 	}
 
-	private boolean isPartialMatchFilter(ErrorDiscussion errorDiscussion) {
-		return errorDiscussion.title.contains(" " +errorCode.methodCode());
+	public boolean isPartialMatchFilter(ErrorDiscussion errorDiscussion) {
+		return errorDiscussion.title.contains(" " + errorCode.methodCode());
 	}
 
 	public int compareUpvoteCount(ErrorDiscussion ed1, ErrorDiscussion ed2) {
diff --git a/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java b/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
index 31e271b82..7f949de4d 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
@@ -7,7 +7,8 @@ public class ErrorDiscussion {
 	String url;
 	Answer answer;
 
-	class Answer{
+
+	static class Answer{
 		private String url;
 		private int upvoteCount;
 	}
diff --git a/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java b/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
new file mode 100644
index 000000000..d915c9618
--- /dev/null
+++ b/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
@@ -0,0 +1,253 @@
+package org.cryptomator.ui.error;
+
+import org.cryptomator.common.Environment;
+import org.cryptomator.common.ErrorCode;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+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.ValueSource;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+
+import javafx.application.Application;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import java.util.concurrent.ExecutorService;
+
+class ErrorControllerTest {
+	Application application;
+	String stackTrace;
+	ErrorCode errorCode;
+	Scene previousScene;
+	Stage window;
+	Environment environment;
+	ExecutorService executorService;
+	ErrorController errorController;
+
+	@BeforeEach
+	public void beforeEach() {
+		application = Mockito.mock(Application.class);
+		stackTrace = "This is a stackTrace mock";
+		errorCode = Mockito.mock(ErrorCode.class);
+		previousScene = Mockito.mock(Scene.class);
+		window = Mockito.mock(Stage.class);
+		environment = Mockito.mock(Environment.class);
+		executorService = Mockito.mock(ExecutorService.class);
+		errorController = new ErrorController(
+				application,
+				stackTrace,
+				errorCode,
+				previousScene,
+				window,
+				environment,
+				executorService);
+	}
+
+	private ErrorDiscussion createErrorDiscussion(String title, int upvoteCount, ErrorDiscussion.Answer answer){
+		ErrorDiscussion ed = new ErrorDiscussion();
+		ed.title =title;
+		ed.upvoteCount = upvoteCount;
+		ed.answer = answer;
+		return ed;
+	}
+
+	@Test
+	@DisplayName("If the upvoteCounts of both ErrorDiscussions are equal, it returns 0")
+	void testCompareUpvoteCount1() {
+		ErrorDiscussion ed1 = createErrorDiscussion("",10,null);
+		ErrorDiscussion ed2 = createErrorDiscussion("",10,null);
+		int result = errorController.compareUpvoteCount(ed1, ed2);
+		Assertions.assertEquals(0, result);
+	}
+
+
+	@Test
+	@DisplayName("If the upvoteCount of the first ErrorDiscussion is greater than the second, it returns < 0.")
+	void testCompareUpvoteCount2() {
+		ErrorDiscussion ed1 = createErrorDiscussion("",10,null);
+		ErrorDiscussion ed2 = createErrorDiscussion("",5,null);
+		int result = errorController.compareUpvoteCount(ed1, ed2);
+		Assertions.assertTrue(result < 0);
+	}
+
+	@Test
+	@DisplayName("If the upvoteCount of the second ErrorDiscussion is greater than the first, it returns > 0.")
+	void testCompareUpvoteCount3() {
+		ErrorDiscussion ed1 = createErrorDiscussion("",8,null);
+		ErrorDiscussion ed2 = createErrorDiscussion("",15,null);
+		int result = errorController.compareUpvoteCount(ed1, ed2);
+		Assertions.assertTrue(result > 0);
+	}
+
+	@Test
+	@DisplayName("If both ErrorDiscussions has an answer, it returns 0.")
+	void testCompareIsAnswered1() {
+		ErrorDiscussion ed1 = createErrorDiscussion("",0, new ErrorDiscussion.Answer());
+		ErrorDiscussion ed2 = createErrorDiscussion("",0, new ErrorDiscussion.Answer());
+		int result = errorController.compareIsAnswered(ed1,ed2);
+		Assertions.assertEquals( 0, result);
+	}
+
+	@Test
+	@DisplayName("If both ErrorDiscussions doesn't have an answer, it returns 0.")
+	void testCompareIsAnswered2() {
+		ErrorDiscussion ed1 = createErrorDiscussion("",0, null);
+		ErrorDiscussion ed2 = createErrorDiscussion("",0, null);
+		int result = errorController.compareIsAnswered(ed1,ed2);
+		Assertions.assertEquals(result, 0);
+	}
+
+	@Test
+	@DisplayName("If the first ErrorDiscussion has an answer and the second doesn't, it returns < 0.")
+	void testCompareIsAnswered3() {
+		ErrorDiscussion ed1 = createErrorDiscussion("",0, new ErrorDiscussion.Answer());
+		ErrorDiscussion ed2 = createErrorDiscussion("",0,null);
+		int result = errorController.compareIsAnswered(ed1,ed2);
+		Assertions.assertTrue(result < 0);
+	}
+
+	@Test
+	@DisplayName("If the second ErrorDiscussion has an answer and the first doesn't, it returns > 0.")
+	void testCompareIsAnswered4() {
+		ErrorDiscussion ed1 = createErrorDiscussion("",0, null);
+		ErrorDiscussion ed2 = createErrorDiscussion("",0, new ErrorDiscussion.Answer());
+		int result = errorController.compareIsAnswered(ed1,ed2);
+		Assertions.assertTrue(result > 0);
+	}
+
+	@ParameterizedTest
+	@ValueSource(strings={"0000:0000:0000","6HU1:12H1:HU7J"})
+	@DisplayName("If both ErrorDiscussions has a title that contains the full ErrorCode or both doesn't, it returns 0.")
+	void testCompareExactMatch1(String errorCodeParameter) {
+		Mockito.when(errorCode.toString()).thenReturn(errorCodeParameter);
+		ErrorDiscussion ed1 = createErrorDiscussion("Error 0000:0000:0000",0, null);
+		ErrorDiscussion ed2 = createErrorDiscussion("Error 0000:0000:0000",0, null);
+		int result = errorController.compareExactMatch(ed1,ed2);
+		Assertions.assertEquals(0, result);
+	}
+
+	@Test
+	@DisplayName("If the first ErrorDiscussion has a title that contains the full ErrorCode and the second doesn't, it returns < 0.")
+	void testCompareExactMatch2() {
+		Mockito.when(errorCode.toString()).thenReturn("6HU1:12H1:HU7J");
+		ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:12H1:HU7J",0, null);
+		ErrorDiscussion ed2 = createErrorDiscussion("Error 0000:0000:0000",0, null);
+		int result = errorController.compareExactMatch(ed1,ed2);
+		Assertions.assertTrue(result < 0);
+	}
+	@Test
+	@DisplayName("If the second ErrorDiscussion has a title that contains the full ErrorCode and the first doesn't, it returns > 0.")
+	void testCompareExactMatch3() {
+		Mockito.when(errorController.getErrorCode()).thenReturn("6HU1:12H1:HU7J");
+		ErrorDiscussion ed1 = createErrorDiscussion("Error 0000:0000:0000",0, null);
+		ErrorDiscussion ed2 = createErrorDiscussion("Error 6HU1:12H1:HU7J",0, null);
+		int result = errorController.compareExactMatch(ed1,ed2);
+		Assertions.assertTrue(result > 0);
+	}
+
+	@Nested
+	public class CompareSecondLevelMatch{
+		@BeforeEach
+		void beforeEach(){
+			Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
+			Mockito.when(errorCode.rootCauseCode()).thenReturn("12H1");
+		}
+
+		@Test
+		@DisplayName("If both ErrorDiscussions has a title that contains the first two blocks of the ErrorCode, it returns 0.")
+		void testCompareSecondLevelMatch1() {
+			ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
+			ErrorDiscussion ed2 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
+			int result = errorController.compareSecondLevelMatch(ed1,ed2);
+			Assertions.assertEquals(0, result);
+		}
+
+		@Test
+		@DisplayName("If both ErrorDiscussions doesn't have a title that contains the first two blocks of the ErrorCode, it returns 0.")
+		void testCompareSecondLevelMatch2() {
+			ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU3:12H1:0000",0, null);
+			ErrorDiscussion ed2 = createErrorDiscussion("Error 6HU1:1221:0000",0, null);
+			int result = errorController.compareSecondLevelMatch(ed1,ed2);
+			Assertions.assertEquals(0, result);
+		}
+
+		@Test
+		@DisplayName("If the first ErrorDiscussion has a title that contains the first two blocks of the ErrorCode and the second doesn't, it returns < 0.")
+		void testCompareSecondLevelMatch3() {
+			ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
+			ErrorDiscussion ed2 = createErrorDiscussion("Error 6HU1:1221:0000",0, null);
+			int result = errorController.compareSecondLevelMatch(ed1,ed2);
+			Assertions.assertTrue(result < 0);
+		}
+		@Test
+		@DisplayName("If the second ErrorDiscussion has a title that contains the first two blocks of the ErrorCode and the first doesn't, it returns > 0.")
+		void testCompareSecondLevelMatch4() {
+			ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:1211:0000",0, null);
+			ErrorDiscussion ed2 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
+			int result = errorController.compareSecondLevelMatch(ed1,ed2);
+			Assertions.assertTrue(result > 0);
+		}
+	}
+
+	@Test
+	@DisplayName("If both ErrorDiscussions has a title that contains the first block of the ErrorCode, it returns 0.")
+	void testCompareThirdLevelMatch1() {
+		Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
+		ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
+		ErrorDiscussion ed2 = createErrorDiscussion("Error 6HU1:1211:0000",0, null);
+		int result = errorController.compareThirdLevelMatch(ed1,ed2);
+		Assertions.assertEquals(0, result);
+	}
+
+	@Test
+	@DisplayName("If both ErrorDiscussions doesn't have a title that contains the first block of the ErrorCode, it returns 0.")
+	void testCompareThirdLevelMatch2() {
+		Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
+		ErrorDiscussion ed1 = createErrorDiscussion("Error 6HUB:12H1:0000",0, null);
+		ErrorDiscussion ed2 = createErrorDiscussion("Error 6HUA:1211:0000",0, null);
+		int result = errorController.compareThirdLevelMatch(ed1,ed2);
+		Assertions.assertEquals(0, result);
+	}
+
+	@Test
+	@DisplayName("If the first ErrorDiscussion has a title that contains the first block of the ErrorCode and the second doesn't, it returns < 0.")
+	void testCompareThirdLevelMatch3() {
+		Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
+		ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
+		ErrorDiscussion ed2 = createErrorDiscussion("Error 6HUA:1211:0000",0, null);
+		int result = errorController.compareThirdLevelMatch(ed1,ed2);
+		Assertions.assertTrue(result < 0);
+	}
+
+	@Test
+	@DisplayName("If the second ErrorDiscussion has a title that contains the first block of the ErrorCode and the first doesn't, it returns > 0.")
+	void testCompareThirdLevelMatch4() {
+		Mockito.when(errorCode.methodCode()).thenReturn("6HUA");
+		ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
+		ErrorDiscussion ed2 = createErrorDiscussion("Error 6HUA:1211:0000",0, null);
+		int result = errorController.compareThirdLevelMatch(ed1,ed2);
+		Assertions.assertTrue(result > 0);
+	}
+
+	@Test
+	@DisplayName("If the title of the ErrorDiscussion contains the first block of the ErrorCode, it returns true.")
+	void testIsPartialMatchFilter1(){
+		Mockito.when(errorCode.methodCode()).thenReturn("6HUA");
+		ErrorDiscussion ed1 = createErrorDiscussion("Error 6HUA:12H1:0000",0, null);
+		boolean result = errorController.isPartialMatchFilter(ed1);
+		Assertions.assertTrue(result);
+	}
+
+	@Test
+	@DisplayName("If the title of the ErrorDiscussion doesn't contains the first block of the ErrorCode, it returns false.")
+	void testIsPartialMatchFilter2(){
+		Mockito.when(errorCode.methodCode()).thenReturn("6HUA");
+		ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
+		boolean result = errorController.isPartialMatchFilter(ed1);
+		Assertions.assertFalse(result);
+	}
+}
\ No newline at end of file

From 3c623b7ed15c3aa1457eeef34124fe83da3e1670 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Mon, 12 Jun 2023 21:04:54 +0200
Subject: [PATCH 09/61] cleaned up code

---
 src/main/java/org/cryptomator/ui/error/ErrorController.java    | 3 +--
 src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java    | 1 -
 .../java/org/cryptomator/ui/error/ErrorControllerTest.java     | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/error/ErrorController.java b/src/main/java/org/cryptomator/ui/error/ErrorController.java
index 12a03fff8..a513c57dc 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorController.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorController.java
@@ -97,7 +97,6 @@ public class ErrorController implements FxController {
 	@FXML
 	public void showSolution() {
 		if(matchingErrorDiscussion != null){
-			//TODO: errorDiscussion.url or errorDiscussion.answer.url
 			application.getHostServices().showDocument(matchingErrorDiscussion.url);
 		}
 	}
@@ -139,7 +138,6 @@ public class ErrorController implements FxController {
 					new TypeToken<Map<String,ErrorDiscussion>>(){}.getType());
 
 			if(!map.values().stream().filter(this::isPartialMatchFilter).findFirst().isEmpty()) {
-				lookUpSolutionVisibility.set(true);
 				Comparator<ErrorDiscussion> comp = this::compareExactMatch;
 				matchingErrorDiscussion = map.values().stream().sorted(comp
 						.thenComparing(this::compareSecondLevelMatch)
@@ -147,6 +145,7 @@ public class ErrorController implements FxController {
 						.thenComparing(this::compareIsAnswered)
 						.thenComparing(this::compareUpvoteCount)
 				).findFirst().get();
+				lookUpSolutionVisibility.set(true);
 			}
 		}
 	}
diff --git a/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java b/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
index 7f949de4d..603450d43 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
@@ -7,7 +7,6 @@ public class ErrorDiscussion {
 	String url;
 	Answer answer;
 
-
 	static class Answer{
 		private String url;
 		private int upvoteCount;
diff --git a/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java b/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
index d915c9618..f5b274ef6 100644
--- a/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
+++ b/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
@@ -9,7 +9,6 @@ import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 
 import javafx.application.Application;

From 3120751d3ec2d93c8686e4fedb04c6c0b963d6c4 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Tue, 13 Jun 2023 12:48:35 +0200
Subject: [PATCH 10/61] resolved sonarclouds mentioned issues

---
 .../org/cryptomator/ui/common/HttpHelper.java  |  3 +++
 .../cryptomator/ui/error/ErrorController.java  | 18 ++++++++++--------
 .../cryptomator/ui/error/ErrorDiscussion.java  |  3 ---
 .../ui/error/ErrorControllerTest.java          |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/common/HttpHelper.java b/src/main/java/org/cryptomator/ui/common/HttpHelper.java
index 5ee63098b..32b44b64a 100644
--- a/src/main/java/org/cryptomator/ui/common/HttpHelper.java
+++ b/src/main/java/org/cryptomator/ui/common/HttpHelper.java
@@ -10,6 +10,9 @@ import java.nio.charset.StandardCharsets;
 
 public class HttpHelper {
 
+	private HttpHelper(){
+		throw new IllegalStateException("Utility class");
+	}
 	public static String readBody(HttpResponse<InputStream> response) throws IOException {
 		try (var in = response.body(); var reader = new InputStreamReader(in, StandardCharsets.UTF_8)) {
 			return CharStreams.toString(reader);
diff --git a/src/main/java/org/cryptomator/ui/error/ErrorController.java b/src/main/java/org/cryptomator/ui/error/ErrorController.java
index a513c57dc..5503cc595 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorController.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorController.java
@@ -28,6 +28,7 @@ import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.Comparator;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -126,9 +127,7 @@ public class ErrorController implements FxController {
 		Clipboard.getSystemClipboard().setContent(clipboardContent);
 
 		copiedDetails.set(true);
-		CompletableFuture.delayedExecutor(2, TimeUnit.SECONDS, Platform::runLater).execute(() -> {
-			copiedDetails.set(false);
-		});
+		CompletableFuture.delayedExecutor(2, TimeUnit.SECONDS, Platform::runLater).execute(() -> copiedDetails.set(false));
 	}
 
 	private void loadHttpResponse(HttpResponse<InputStream> response){
@@ -137,15 +136,18 @@ public class ErrorController implements FxController {
 					new InputStreamReader(response.body(),StandardCharsets.UTF_8),
 					new TypeToken<Map<String,ErrorDiscussion>>(){}.getType());
 
-			if(!map.values().stream().filter(this::isPartialMatchFilter).findFirst().isEmpty()) {
+			if(map.values().stream().anyMatch(this::isPartialMatchFilter)) {
 				Comparator<ErrorDiscussion> comp = this::compareExactMatch;
-				matchingErrorDiscussion = map.values().stream().sorted(comp
+				Optional<ErrorDiscussion> value = map.values().stream().min(comp
 						.thenComparing(this::compareSecondLevelMatch)
 						.thenComparing(this::compareThirdLevelMatch)
 						.thenComparing(this::compareIsAnswered)
-						.thenComparing(this::compareUpvoteCount)
-				).findFirst().get();
-				lookUpSolutionVisibility.set(true);
+						.thenComparing(this::compareUpvoteCount));
+
+				if(value.isPresent()){
+					matchingErrorDiscussion = value.get();
+					lookUpSolutionVisibility.set(true);
+				}
 			}
 		}
 	}
diff --git a/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java b/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
index 603450d43..cea9d3b9e 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
@@ -8,8 +8,5 @@ public class ErrorDiscussion {
 	Answer answer;
 
 	static class Answer{
-		private String url;
-		private int upvoteCount;
 	}
-
 }
diff --git a/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java b/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
index f5b274ef6..24936d4d3 100644
--- a/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
+++ b/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
@@ -97,7 +97,7 @@ class ErrorControllerTest {
 		ErrorDiscussion ed1 = createErrorDiscussion("",0, null);
 		ErrorDiscussion ed2 = createErrorDiscussion("",0, null);
 		int result = errorController.compareIsAnswered(ed1,ed2);
-		Assertions.assertEquals(result, 0);
+		Assertions.assertEquals(0, result);
 	}
 
 	@Test

From d680c5812dd29be2f5d92de29fc9ce1608694582 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Wed, 14 Jun 2023 16:10:11 +0200
Subject: [PATCH 11/61] cleaned up code and using parameterized tests

---
 .../org/cryptomator/ui/common/HttpHelper.java |  22 --
 .../cryptomator/ui/error/ErrorController.java |  69 ++++-
 src/main/resources/fxml/error.fxml            |  10 +-
 .../ui/error/ErrorControllerTest.java         | 262 ++++++------------
 4 files changed, 144 insertions(+), 219 deletions(-)
 delete mode 100644 src/main/java/org/cryptomator/ui/common/HttpHelper.java

diff --git a/src/main/java/org/cryptomator/ui/common/HttpHelper.java b/src/main/java/org/cryptomator/ui/common/HttpHelper.java
deleted file mode 100644
index 32b44b64a..000000000
--- a/src/main/java/org/cryptomator/ui/common/HttpHelper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.cryptomator.ui.common;
-
-import com.google.common.io.CharStreams;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-
-public class HttpHelper {
-
-	private HttpHelper(){
-		throw new IllegalStateException("Utility class");
-	}
-	public static String readBody(HttpResponse<InputStream> response) throws IOException {
-		try (var in = response.body(); var reader = new InputStreamReader(in, StandardCharsets.UTF_8)) {
-			return CharStreams.toString(reader);
-		}
-	}
-
-}
diff --git a/src/main/java/org/cryptomator/ui/error/ErrorController.java b/src/main/java/org/cryptomator/ui/error/ErrorController.java
index 5503cc595..fde9790d2 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorController.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorController.java
@@ -60,7 +60,7 @@ public class ErrorController implements FxController {
 	private final Environment environment;
 
 	private final BooleanProperty copiedDetails = new SimpleBooleanProperty();
-	private final BooleanProperty lookUpSolutionVisibility = new SimpleBooleanProperty();
+	private final BooleanProperty errorSolutionFound = new SimpleBooleanProperty();
 	private final BooleanProperty isLoadingHttpResponse = new SimpleBooleanProperty();
 	private	ErrorDiscussion matchingErrorDiscussion;
 
@@ -132,13 +132,13 @@ public class ErrorController implements FxController {
 
 	private void loadHttpResponse(HttpResponse<InputStream> response){
 		if (response.statusCode() == 200) {
-			Map<String,ErrorDiscussion> map = new Gson().fromJson(
+			Map<String,ErrorDiscussion> errorDiscussionMap = new Gson().fromJson(
 					new InputStreamReader(response.body(),StandardCharsets.UTF_8),
 					new TypeToken<Map<String,ErrorDiscussion>>(){}.getType());
 
-			if(map.values().stream().anyMatch(this::isPartialMatchFilter)) {
+			if(errorDiscussionMap.values().stream().anyMatch(this::isPartialMatchFilter)) {
 				Comparator<ErrorDiscussion> comp = this::compareExactMatch;
-				Optional<ErrorDiscussion> value = map.values().stream().min(comp
+				Optional<ErrorDiscussion> value = errorDiscussionMap.values().stream().min(comp
 						.thenComparing(this::compareSecondLevelMatch)
 						.thenComparing(this::compareThirdLevelMatch)
 						.thenComparing(this::compareIsAnswered)
@@ -146,7 +146,7 @@ public class ErrorController implements FxController {
 
 				if(value.isPresent()){
 					matchingErrorDiscussion = value.get();
-					lookUpSolutionVisibility.set(true);
+					errorSolutionFound.set(true);
 				}
 			}
 		}
@@ -156,10 +156,30 @@ public class ErrorController implements FxController {
 		return errorDiscussion.title.contains(" " + errorCode.methodCode());
 	}
 
+	/**
+	 * Compares two ErrorDiscussion objects based on their upvote counts and returns the result.
+	 *
+	 * @param ed1 The first ErrorDiscussion object.
+	 * @param ed2 The second ErrorDiscussion object.
+	 * @return An integer indicating which ErrorDiscussion object has a higher upvote count:
+	 *         - A positive value if ed2 has a higher upvote count than ed1,
+	 *         - A negative value if ed1 has a higher upvote count than ed2,
+	 *         - Or 0 if both upvote counts are equal.
+	 */
 	public int compareUpvoteCount(ErrorDiscussion ed1, ErrorDiscussion ed2) {
 		return Integer.compare(ed2.upvoteCount, ed1.upvoteCount);
 	}
 
+	/**
+	 * Compares two ErrorDiscussion objects based on their answered status and returns the result.
+	 *
+	 * @param ed1 The first ErrorDiscussion object.
+	 * @param ed2 The second ErrorDiscussion object.
+	 * @return An integer indicating the answered status of the ErrorDiscussion objects:
+	 *         - A negative value (-1) if ed1 is considered answered and ed2 is considered unanswered,
+	 *         - A positive value (1) if ed1 is considered unanswered and ed2 is considered answered,
+	 *         - Or 0 if both ErrorDiscussion objects are considered answered or unanswered.
+	 */
 	public int compareIsAnswered(ErrorDiscussion ed1, ErrorDiscussion ed2) {
 		if (ed1.answer!=null && ed2.answer==null) {
 			return -1;
@@ -169,6 +189,17 @@ public class ErrorController implements FxController {
 			return 0;
 		}
 	}
+
+	/**
+	 * Compares two ErrorDiscussion objects based on the presence of an exact match with the error code in their titles and returns the result.
+	 *
+	 * @param ed1 The first ErrorDiscussion object.
+	 * @param ed2 The second ErrorDiscussion object.
+	 * @return An integer indicating the comparison result based on the presence of an exact match with the error code in the titles:
+	 *         - A negative value (-1) if ed1 has an exact match with the error code in the title and ed2 does not have a match,
+	 *         - A positive value (1) if ed1 does not have a match and ed2 has an exact match with the error code in the title,
+	 *         - Or 0 if both ErrorDiscussion objects either have an exact match or do not have a match with the error code in the titles.
+	 */
 	public int compareExactMatch(ErrorDiscussion ed1, ErrorDiscussion ed2) {
 		if (ed1.title.contains(getErrorCode()) && !ed2.title.contains(getErrorCode())) {
 			return -1;
@@ -179,6 +210,16 @@ public class ErrorController implements FxController {
 		}
 	}
 
+	/**
+	 * Compares two ErrorDiscussion objects based on the presence of a second-level match with the error code in their titles and returns the result.
+	 *
+	 * @param ed1 The first ErrorDiscussion object.
+	 * @param ed2 The second ErrorDiscussion object.
+	 * @return An integer indicating the comparison result based on the presence of a second-level match with the error code in the titles:
+	 *         - A negative value (-1) if ed1 has a second-level match with the error code in the title and ed2 does not have a match,
+	 *         - A positive value (1) if ed1 does not have a match and ed2 has a second-level match with the error code in the title,
+	 *         - Or 0 if both ErrorDiscussion objects either have a second-level match or do not have a match with the error code in the titles.
+	 */
 	public int compareSecondLevelMatch(ErrorDiscussion ed1, ErrorDiscussion ed2) {
 		String value = " " + errorCode.methodCode() + ErrorCode.DELIM + errorCode.rootCauseCode();
 		if (ed1.title.contains(value) && !ed2.title.contains(value)) {
@@ -190,6 +231,16 @@ public class ErrorController implements FxController {
 		}
 	}
 
+	/**
+	 * Compares two ErrorDiscussion objects based on the presence of a third-level match with the error code in their titles and returns the result.
+	 *
+	 * @param ed1 The first ErrorDiscussion object.
+	 * @param ed2 The second ErrorDiscussion object.
+	 * @return An integer indicating the comparison result based on the presence of a third-level match with the error code in the titles:
+	 *         - A negative value (-1) if ed1 has a third-level match with the error code in the title and ed2 does not have a match,
+	 *         - A positive value (1) if ed1 does not have a match and ed2 has a third-level match with the error code in the title,
+	 *         - Or 0 if both ErrorDiscussion objects either have a third-level match or do not have a match with the error code in the titles.
+	 */
 	public int compareThirdLevelMatch(ErrorDiscussion ed1, ErrorDiscussion ed2) {
 		String value = " " + errorCode.methodCode();
 		if (ed1.title.contains(value) && !ed2.title.contains(value)) {
@@ -226,12 +277,12 @@ public class ErrorController implements FxController {
 		return copiedDetails.get();
 	}
 
-	public BooleanProperty lookUpSolutionVisibilityProperty() {
-		return lookUpSolutionVisibility;
+	public BooleanProperty errorSolutionFoundProperty() {
+		return errorSolutionFound;
 	}
 
-	public boolean getLookUpSolutionVisibility() {
-		return lookUpSolutionVisibility.get();
+	public boolean getErrorSolutionFound() {
+		return errorSolutionFound.get();
 	}
 
 	public BooleanProperty isLoadingHttpResponseProperty() {
diff --git a/src/main/resources/fxml/error.fxml b/src/main/resources/fxml/error.fxml
index ffac5e639..cc11db58a 100644
--- a/src/main/resources/fxml/error.fxml
+++ b/src/main/resources/fxml/error.fxml
@@ -34,19 +34,19 @@
 				<FormattedLabel styleClass="label-extra-large" format="%error.message" arg1="${controller.errorCode}"/>
 				<FontAwesome5Spinner glyphSize="24" visible="${controller.isLoadingHttpResponse}" managed="${controller.isLoadingHttpResponse}"/>
 				<VBox visible="${!controller.isLoadingHttpResponse}" managed="${!controller.isLoadingHttpResponse}">
-					<Label text="%error.existingSolutionDescription" wrapText="true" visible="${controller.lookUpSolutionVisibility}" managed="${controller.lookUpSolutionVisibility}"/>
-					<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.solution" onAction="#showSolution" contentDisplay="LEFT" visible="${controller.lookUpSolutionVisibility}" managed="${controller.lookUpSolutionVisibility}">
+					<Label text="%error.existingSolutionDescription" wrapText="true" visible="${controller.errorSolutionFound}" managed="${controller.errorSolutionFound}"/>
+					<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.solution" onAction="#showSolution" contentDisplay="LEFT" visible="${controller.errorSolutionFound}" managed="${controller.errorSolutionFound}">
 						<graphic>
 							<FontAwesome5IconView glyph="LINK" glyphSize="12"/>
 						</graphic>
 					</Hyperlink>
-					<Label text="%error.description" wrapText="true" visible="${!controller.lookUpSolutionVisibility}" managed="${!controller.lookUpSolutionVisibility}"/>
-					<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.lookup" onAction="#searchError" contentDisplay="LEFT" visible="${!controller.lookUpSolutionVisibility}" managed="${!controller.lookUpSolutionVisibility}">
+					<Label text="%error.description" wrapText="true" visible="${!controller.errorSolutionFound}" managed="${!controller.errorSolutionFound}"/>
+					<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.lookup" onAction="#searchError" contentDisplay="LEFT" visible="${!controller.errorSolutionFound}" managed="${!controller.errorSolutionFound}">
 						<graphic>
 							<FontAwesome5IconView glyph="LINK" glyphSize="12"/>
 						</graphic>
 					</Hyperlink>
-					<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.report" onAction="#reportError" contentDisplay="LEFT" visible="${!controller.lookUpSolutionVisibility}" managed="${!controller.lookUpSolutionVisibility}">
+					<Hyperlink styleClass="hyperlink-underline" text="%error.hyperlink.report" onAction="#reportError" contentDisplay="LEFT" visible="${!controller.errorSolutionFound}" managed="${!controller.errorSolutionFound}">
 						<graphic>
 							<FontAwesome5IconView glyph="LINK" glyphSize="12"/>
 						</graphic>
diff --git a/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java b/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
index 24936d4d3..2fe3d93f7 100644
--- a/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
+++ b/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
@@ -4,11 +4,8 @@ import org.cryptomator.common.Environment;
 import org.cryptomator.common.ErrorCode;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
-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.ValueSource;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.mockito.Mockito;
 
 import javafx.application.Application;
@@ -54,199 +51,98 @@ class ErrorControllerTest {
 		return ed;
 	}
 
-	@Test
-	@DisplayName("If the upvoteCounts of both ErrorDiscussions are equal, it returns 0")
-	void testCompareUpvoteCount1() {
-		ErrorDiscussion ed1 = createErrorDiscussion("",10,null);
-		ErrorDiscussion ed2 = createErrorDiscussion("",10,null);
-		int result = errorController.compareUpvoteCount(ed1, ed2);
-		Assertions.assertEquals(0, result);
-	}
-
-
-	@Test
-	@DisplayName("If the upvoteCount of the first ErrorDiscussion is greater than the second, it returns < 0.")
-	void testCompareUpvoteCount2() {
-		ErrorDiscussion ed1 = createErrorDiscussion("",10,null);
-		ErrorDiscussion ed2 = createErrorDiscussion("",5,null);
-		int result = errorController.compareUpvoteCount(ed1, ed2);
-		Assertions.assertTrue(result < 0);
-	}
-
-	@Test
-	@DisplayName("If the upvoteCount of the second ErrorDiscussion is greater than the first, it returns > 0.")
-	void testCompareUpvoteCount3() {
-		ErrorDiscussion ed1 = createErrorDiscussion("",8,null);
-		ErrorDiscussion ed2 = createErrorDiscussion("",15,null);
-		int result = errorController.compareUpvoteCount(ed1, ed2);
-		Assertions.assertTrue(result > 0);
-	}
-
-	@Test
-	@DisplayName("If both ErrorDiscussions has an answer, it returns 0.")
-	void testCompareIsAnswered1() {
-		ErrorDiscussion ed1 = createErrorDiscussion("",0, new ErrorDiscussion.Answer());
-		ErrorDiscussion ed2 = createErrorDiscussion("",0, new ErrorDiscussion.Answer());
-		int result = errorController.compareIsAnswered(ed1,ed2);
-		Assertions.assertEquals( 0, result);
-	}
-
-	@Test
-	@DisplayName("If both ErrorDiscussions doesn't have an answer, it returns 0.")
-	void testCompareIsAnswered2() {
-		ErrorDiscussion ed1 = createErrorDiscussion("",0, null);
-		ErrorDiscussion ed2 = createErrorDiscussion("",0, null);
-		int result = errorController.compareIsAnswered(ed1,ed2);
-		Assertions.assertEquals(0, result);
-	}
-
-	@Test
-	@DisplayName("If the first ErrorDiscussion has an answer and the second doesn't, it returns < 0.")
-	void testCompareIsAnswered3() {
-		ErrorDiscussion ed1 = createErrorDiscussion("",0, new ErrorDiscussion.Answer());
-		ErrorDiscussion ed2 = createErrorDiscussion("",0,null);
-		int result = errorController.compareIsAnswered(ed1,ed2);
-		Assertions.assertTrue(result < 0);
-	}
-
-	@Test
-	@DisplayName("If the second ErrorDiscussion has an answer and the first doesn't, it returns > 0.")
-	void testCompareIsAnswered4() {
-		ErrorDiscussion ed1 = createErrorDiscussion("",0, null);
-		ErrorDiscussion ed2 = createErrorDiscussion("",0, new ErrorDiscussion.Answer());
-		int result = errorController.compareIsAnswered(ed1,ed2);
-		Assertions.assertTrue(result > 0);
+	@ParameterizedTest
+	@CsvSource(textBlock = """
+		10, 5, -1 
+		8, 15, 1 
+		""")
+	public void testCompareUpvoteCount1(int leftUpvoteCount, int rightUpvoteCount, int expectedResult) {
+		var left = createErrorDiscussion("", leftUpvoteCount, null);
+		var right = createErrorDiscussion("", rightUpvoteCount, null);
+		int result = errorController.compareUpvoteCount(left, right);
+		Assertions.assertTrue(result*expectedResult>0);
 	}
 
 	@ParameterizedTest
-	@ValueSource(strings={"0000:0000:0000","6HU1:12H1:HU7J"})
-	@DisplayName("If both ErrorDiscussions has a title that contains the full ErrorCode or both doesn't, it returns 0.")
-	void testCompareExactMatch1(String errorCodeParameter) {
-		Mockito.when(errorCode.toString()).thenReturn(errorCodeParameter);
-		ErrorDiscussion ed1 = createErrorDiscussion("Error 0000:0000:0000",0, null);
-		ErrorDiscussion ed2 = createErrorDiscussion("Error 0000:0000:0000",0, null);
-		int result = errorController.compareExactMatch(ed1,ed2);
-		Assertions.assertEquals(0, result);
+	@CsvSource(textBlock = """
+		10, 10 
+		""")
+	public void testCompareUpvoteCount2(int leftUpvoteCount, int rightUpvoteCount) {
+		var left = createErrorDiscussion("", leftUpvoteCount, null);
+		var right = createErrorDiscussion("", rightUpvoteCount, null);
+		int result = errorController.compareUpvoteCount(left, right);
+		Assertions.assertEquals(0,result);
 	}
 
-	@Test
-	@DisplayName("If the first ErrorDiscussion has a title that contains the full ErrorCode and the second doesn't, it returns < 0.")
-	void testCompareExactMatch2() {
+	@ParameterizedTest
+	@CsvSource(textBlock = """
+		false, false, 0
+		true, true, 0 
+		true, false, -1 
+		false, true, 1 
+		""")
+	public void testCompareIsAnswered(boolean leftIsAnswered, boolean rightIsAnswered, int expectedResult) {
+		var answer = new ErrorDiscussion.Answer();
+		var left = createErrorDiscussion("", 0, leftIsAnswered ? answer : null);
+		var right = createErrorDiscussion("", 0, rightIsAnswered ? answer : null);
+		int result = errorController.compareIsAnswered(left, right);
+		Assertions.assertEquals(expectedResult, result);
+	}
+
+	@ParameterizedTest
+	@CsvSource(textBlock = """
+		Error 0000:0000:0000, Error 0000:0000:0000, 0
+		Error 6HU1:12H1:HU7J, Error 0000:0000:0000, -1
+		Error 0000:0000:0000, Error 6HU1:12H1:HU7J, 1
+		""")
+	public void testCompareExactMatch(String leftTitle, String rightTitle, int expectedResult) {
 		Mockito.when(errorCode.toString()).thenReturn("6HU1:12H1:HU7J");
-		ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:12H1:HU7J",0, null);
-		ErrorDiscussion ed2 = createErrorDiscussion("Error 0000:0000:0000",0, null);
-		int result = errorController.compareExactMatch(ed1,ed2);
-		Assertions.assertTrue(result < 0);
-	}
-	@Test
-	@DisplayName("If the second ErrorDiscussion has a title that contains the full ErrorCode and the first doesn't, it returns > 0.")
-	void testCompareExactMatch3() {
-		Mockito.when(errorController.getErrorCode()).thenReturn("6HU1:12H1:HU7J");
-		ErrorDiscussion ed1 = createErrorDiscussion("Error 0000:0000:0000",0, null);
-		ErrorDiscussion ed2 = createErrorDiscussion("Error 6HU1:12H1:HU7J",0, null);
-		int result = errorController.compareExactMatch(ed1,ed2);
-		Assertions.assertTrue(result > 0);
+		var left = createErrorDiscussion(leftTitle, 0, null);
+		var right = createErrorDiscussion(rightTitle, 0,null);
+		int result = errorController.compareExactMatch(left,right);
+		Assertions.assertEquals(expectedResult, result);
 	}
 
-	@Nested
-	public class CompareSecondLevelMatch{
-		@BeforeEach
-		void beforeEach(){
-			Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
-			Mockito.when(errorCode.rootCauseCode()).thenReturn("12H1");
-		}
-
-		@Test
-		@DisplayName("If both ErrorDiscussions has a title that contains the first two blocks of the ErrorCode, it returns 0.")
-		void testCompareSecondLevelMatch1() {
-			ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
-			ErrorDiscussion ed2 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
-			int result = errorController.compareSecondLevelMatch(ed1,ed2);
-			Assertions.assertEquals(0, result);
-		}
-
-		@Test
-		@DisplayName("If both ErrorDiscussions doesn't have a title that contains the first two blocks of the ErrorCode, it returns 0.")
-		void testCompareSecondLevelMatch2() {
-			ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU3:12H1:0000",0, null);
-			ErrorDiscussion ed2 = createErrorDiscussion("Error 6HU1:1221:0000",0, null);
-			int result = errorController.compareSecondLevelMatch(ed1,ed2);
-			Assertions.assertEquals(0, result);
-		}
-
-		@Test
-		@DisplayName("If the first ErrorDiscussion has a title that contains the first two blocks of the ErrorCode and the second doesn't, it returns < 0.")
-		void testCompareSecondLevelMatch3() {
-			ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
-			ErrorDiscussion ed2 = createErrorDiscussion("Error 6HU1:1221:0000",0, null);
-			int result = errorController.compareSecondLevelMatch(ed1,ed2);
-			Assertions.assertTrue(result < 0);
-		}
-		@Test
-		@DisplayName("If the second ErrorDiscussion has a title that contains the first two blocks of the ErrorCode and the first doesn't, it returns > 0.")
-		void testCompareSecondLevelMatch4() {
-			ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:1211:0000",0, null);
-			ErrorDiscussion ed2 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
-			int result = errorController.compareSecondLevelMatch(ed1,ed2);
-			Assertions.assertTrue(result > 0);
-		}
-	}
-
-	@Test
-	@DisplayName("If both ErrorDiscussions has a title that contains the first block of the ErrorCode, it returns 0.")
-	void testCompareThirdLevelMatch1() {
+	@ParameterizedTest
+	@CsvSource(textBlock = """
+		Error 6HU1:12H1:0000, Error 6HU1:12H1:0000, 0
+		Error 0000:0000:0000, Error 0000:0000:0000, 0
+		Error 6HU1:12H1:0000, Error 0000:0000:0000, -1
+		Error 0000:0000:0000, Error 6HU1:12H1:0000, 1
+		""")
+	public void testCompareSecondLevelMatch(String leftTitle, String rightTitle, int expectedResult) {
 		Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
-		ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
-		ErrorDiscussion ed2 = createErrorDiscussion("Error 6HU1:1211:0000",0, null);
-		int result = errorController.compareThirdLevelMatch(ed1,ed2);
-		Assertions.assertEquals(0, result);
+		Mockito.when(errorCode.rootCauseCode()).thenReturn("12H1");
+		var left = createErrorDiscussion(leftTitle, 0, null);
+		var right = createErrorDiscussion(rightTitle, 0,null);
+		int result = errorController.compareSecondLevelMatch(left,right);
+		Assertions.assertEquals(expectedResult, result);
 	}
 
-	@Test
-	@DisplayName("If both ErrorDiscussions doesn't have a title that contains the first block of the ErrorCode, it returns 0.")
-	void testCompareThirdLevelMatch2() {
+	@ParameterizedTest
+	@CsvSource(textBlock = """
+		Error 6HU1:0000:0000, Error 6HU1:0000:0000, 0
+		Error 0000:0000:0000, Error 0000:0000:0000, 0
+		Error 6HU1:0000:0000, Error 0000:0000:0000, -1
+		Error 0000:0000:0000, Error 6HU1:0000:0000, 1
+		""")
+	public void testCompareThirdLevelMatch(String leftTitle, String rightTitle, int expectedResult) {
 		Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
-		ErrorDiscussion ed1 = createErrorDiscussion("Error 6HUB:12H1:0000",0, null);
-		ErrorDiscussion ed2 = createErrorDiscussion("Error 6HUA:1211:0000",0, null);
-		int result = errorController.compareThirdLevelMatch(ed1,ed2);
-		Assertions.assertEquals(0, result);
+		var left = createErrorDiscussion(leftTitle, 0, null);
+		var right = createErrorDiscussion(rightTitle, 0,null);
+		int result = errorController.compareThirdLevelMatch(left,right);
+		Assertions.assertEquals(expectedResult, result);
 	}
 
-	@Test
-	@DisplayName("If the first ErrorDiscussion has a title that contains the first block of the ErrorCode and the second doesn't, it returns < 0.")
-	void testCompareThirdLevelMatch3() {
+	@ParameterizedTest
+	@CsvSource(textBlock = """
+		Error 6HU1:0000:0000, true
+		Error 0000:0000:0000, false
+		""")
+	public void testIsPartialMatchFilter(String title, boolean expectedResult) {
 		Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
-		ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
-		ErrorDiscussion ed2 = createErrorDiscussion("Error 6HUA:1211:0000",0, null);
-		int result = errorController.compareThirdLevelMatch(ed1,ed2);
-		Assertions.assertTrue(result < 0);
-	}
-
-	@Test
-	@DisplayName("If the second ErrorDiscussion has a title that contains the first block of the ErrorCode and the first doesn't, it returns > 0.")
-	void testCompareThirdLevelMatch4() {
-		Mockito.when(errorCode.methodCode()).thenReturn("6HUA");
-		ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
-		ErrorDiscussion ed2 = createErrorDiscussion("Error 6HUA:1211:0000",0, null);
-		int result = errorController.compareThirdLevelMatch(ed1,ed2);
-		Assertions.assertTrue(result > 0);
-	}
-
-	@Test
-	@DisplayName("If the title of the ErrorDiscussion contains the first block of the ErrorCode, it returns true.")
-	void testIsPartialMatchFilter1(){
-		Mockito.when(errorCode.methodCode()).thenReturn("6HUA");
-		ErrorDiscussion ed1 = createErrorDiscussion("Error 6HUA:12H1:0000",0, null);
-		boolean result = errorController.isPartialMatchFilter(ed1);
-		Assertions.assertTrue(result);
-	}
-
-	@Test
-	@DisplayName("If the title of the ErrorDiscussion doesn't contains the first block of the ErrorCode, it returns false.")
-	void testIsPartialMatchFilter2(){
-		Mockito.when(errorCode.methodCode()).thenReturn("6HUA");
-		ErrorDiscussion ed1 = createErrorDiscussion("Error 6HU1:12H1:0000",0, null);
-		boolean result = errorController.isPartialMatchFilter(ed1);
-		Assertions.assertFalse(result);
+		var ed = createErrorDiscussion(title, 0, null);
+		boolean result = errorController.isPartialMatchFilter(ed);
+		Assertions.assertEquals(expectedResult, result);
 	}
 }
\ No newline at end of file

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 12/61] 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 f054a1af03bec7b190d2b9ea58bf795c09ca1456 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Thu, 15 Jun 2023 10:54:44 +0200
Subject: [PATCH 13/61] optimized tests and some code docu

---
 .../cryptomator/ui/error/ErrorController.java    |  8 ++++++++
 .../ui/error/ErrorControllerTest.java            | 16 +++-------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/error/ErrorController.java b/src/main/java/org/cryptomator/ui/error/ErrorController.java
index fde9790d2..cc6ccf82f 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorController.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorController.java
@@ -152,6 +152,14 @@ public class ErrorController implements FxController {
 		}
 	}
 
+	/**
+	 * Checks if an ErrorDiscussion object is a partial match based on the presence of the error code's method code in its title.
+	 *
+	 * @param errorDiscussion The ErrorDiscussion object to be checked.
+	 * @return A boolean value indicating if the ErrorDiscussion object is a partial match:
+	 *         - true if the object's title contains the error code's method code,
+	 *         - false otherwise.
+	 */
 	public boolean isPartialMatchFilter(ErrorDiscussion errorDiscussion) {
 		return errorDiscussion.title.contains(" " + errorCode.methodCode());
 	}
diff --git a/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java b/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
index 2fe3d93f7..0321a8493 100644
--- a/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
+++ b/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
@@ -55,23 +55,13 @@ class ErrorControllerTest {
 	@CsvSource(textBlock = """
 		10, 5, -1 
 		8, 15, 1 
+		10, 10, 0
 		""")
-	public void testCompareUpvoteCount1(int leftUpvoteCount, int rightUpvoteCount, int expectedResult) {
+	public void testCompareUpvoteCount(int leftUpvoteCount, int rightUpvoteCount, int expectedResult) {
 		var left = createErrorDiscussion("", leftUpvoteCount, null);
 		var right = createErrorDiscussion("", rightUpvoteCount, null);
 		int result = errorController.compareUpvoteCount(left, right);
-		Assertions.assertTrue(result*expectedResult>0);
-	}
-
-	@ParameterizedTest
-	@CsvSource(textBlock = """
-		10, 10 
-		""")
-	public void testCompareUpvoteCount2(int leftUpvoteCount, int rightUpvoteCount) {
-		var left = createErrorDiscussion("", leftUpvoteCount, null);
-		var right = createErrorDiscussion("", rightUpvoteCount, null);
-		int result = errorController.compareUpvoteCount(left, right);
-		Assertions.assertEquals(0,result);
+		Assertions.assertEquals(expectedResult,Integer.signum(result));
 	}
 
 	@ParameterizedTest

From f92c4363395b40ae8f20a620660b17c93bed1e57 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Thu, 15 Jun 2023 13:12:10 +0200
Subject: [PATCH 14/61] reformat code and optimize imports

---
 .../cryptomator/ui/error/ErrorController.java | 81 ++++++++++---------
 .../cryptomator/ui/error/ErrorDiscussion.java |  3 +-
 .../ui/error/ErrorControllerTest.java         | 81 +++++++++----------
 3 files changed, 80 insertions(+), 85 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/error/ErrorController.java b/src/main/java/org/cryptomator/ui/error/ErrorController.java
index cc6ccf82f..ae006caee 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorController.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorController.java
@@ -42,13 +42,13 @@ public class ErrorController implements FxController {
 	private static final String REPORT_BODY_TEMPLATE = """
 			OS: %s / %s
 			App: %s / %s
-			
+						
 			<!-- ✏ Please describe what happened as accurately as possible. -->
-			
+						
 			<!-- 📋 Please also copy and paste the detail text from the error window. -->
-			
+						
 			<!-- ℹ Text enclosed like this (chevrons, exclamation mark, two dashes) is not visible to others! -->
-			
+						
 			<!-- ❗ If the description or the detail text is missing, the discussion will be deleted. -->
 			""";
 
@@ -62,7 +62,7 @@ public class ErrorController implements FxController {
 	private final BooleanProperty copiedDetails = new SimpleBooleanProperty();
 	private final BooleanProperty errorSolutionFound = new SimpleBooleanProperty();
 	private final BooleanProperty isLoadingHttpResponse = new SimpleBooleanProperty();
-	private	ErrorDiscussion matchingErrorDiscussion;
+	private ErrorDiscussion matchingErrorDiscussion;
 
 	@Inject
 	ErrorController(Application application, @Named("stackTrace") String stackTrace, ErrorCode errorCode, @Nullable Scene previousScene, Stage window, Environment environment, ExecutorService executorService) {
@@ -75,12 +75,12 @@ public class ErrorController implements FxController {
 
 		isLoadingHttpResponse.set(true);
 		HttpClient httpClient = HttpClient.newBuilder().version(HttpClient.Version.HTTP_1_1).build();
-		HttpRequest httpRequest = HttpRequest.newBuilder()
-				.uri(URI.create(ERROR_CODES_URL))
+		HttpRequest httpRequest = HttpRequest.newBuilder()//
+				.uri(URI.create(ERROR_CODES_URL))//
 				.build();
-		httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofInputStream())
-				.thenAcceptAsync(this::loadHttpResponse, executorService)
-				.whenCompleteAsync((r,e) -> isLoadingHttpResponse.set(false), Platform::runLater);
+		httpClient.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofInputStream())//
+				.thenAcceptAsync(this::loadHttpResponse, executorService)//
+				.whenCompleteAsync((r, e) -> isLoadingHttpResponse.set(false), Platform::runLater);
 	}
 
 	@FXML
@@ -97,7 +97,7 @@ public class ErrorController implements FxController {
 
 	@FXML
 	public void showSolution() {
-		if(matchingErrorDiscussion != null){
+		if (matchingErrorDiscussion != null) {
 			application.getHostServices().showDocument(matchingErrorDiscussion.url);
 		}
 	}
@@ -130,21 +130,22 @@ public class ErrorController implements FxController {
 		CompletableFuture.delayedExecutor(2, TimeUnit.SECONDS, Platform::runLater).execute(() -> copiedDetails.set(false));
 	}
 
-	private void loadHttpResponse(HttpResponse<InputStream> response){
+	private void loadHttpResponse(HttpResponse<InputStream> response) {
 		if (response.statusCode() == 200) {
-			Map<String,ErrorDiscussion> errorDiscussionMap = new Gson().fromJson(
-					new InputStreamReader(response.body(),StandardCharsets.UTF_8),
-					new TypeToken<Map<String,ErrorDiscussion>>(){}.getType());
+			Map<String, ErrorDiscussion> errorDiscussionMap = new Gson().fromJson(//
+					new InputStreamReader(response.body(), StandardCharsets.UTF_8),//
+					new TypeToken<Map<String, ErrorDiscussion>>() {
+					}.getType());
 
-			if(errorDiscussionMap.values().stream().anyMatch(this::isPartialMatchFilter)) {
+			if (errorDiscussionMap.values().stream().anyMatch(this::isPartialMatchFilter)) {
 				Comparator<ErrorDiscussion> comp = this::compareExactMatch;
-				Optional<ErrorDiscussion> value = errorDiscussionMap.values().stream().min(comp
-						.thenComparing(this::compareSecondLevelMatch)
-						.thenComparing(this::compareThirdLevelMatch)
-						.thenComparing(this::compareIsAnswered)
+				Optional<ErrorDiscussion> value = errorDiscussionMap.values().stream().min(comp//
+						.thenComparing(this::compareSecondLevelMatch)//
+						.thenComparing(this::compareThirdLevelMatch)//
+						.thenComparing(this::compareIsAnswered)//
 						.thenComparing(this::compareUpvoteCount));
 
-				if(value.isPresent()){
+				if (value.isPresent()) {
 					matchingErrorDiscussion = value.get();
 					errorSolutionFound.set(true);
 				}
@@ -157,8 +158,8 @@ public class ErrorController implements FxController {
 	 *
 	 * @param errorDiscussion The ErrorDiscussion object to be checked.
 	 * @return A boolean value indicating if the ErrorDiscussion object is a partial match:
-	 *         - true if the object's title contains the error code's method code,
-	 *         - false otherwise.
+	 * - true if the object's title contains the error code's method code,
+	 * - false otherwise.
 	 */
 	public boolean isPartialMatchFilter(ErrorDiscussion errorDiscussion) {
 		return errorDiscussion.title.contains(" " + errorCode.methodCode());
@@ -170,9 +171,9 @@ public class ErrorController implements FxController {
 	 * @param ed1 The first ErrorDiscussion object.
 	 * @param ed2 The second ErrorDiscussion object.
 	 * @return An integer indicating which ErrorDiscussion object has a higher upvote count:
-	 *         - A positive value if ed2 has a higher upvote count than ed1,
-	 *         - A negative value if ed1 has a higher upvote count than ed2,
-	 *         - Or 0 if both upvote counts are equal.
+	 * - A positive value if ed2 has a higher upvote count than ed1,
+	 * - A negative value if ed1 has a higher upvote count than ed2,
+	 * - Or 0 if both upvote counts are equal.
 	 */
 	public int compareUpvoteCount(ErrorDiscussion ed1, ErrorDiscussion ed2) {
 		return Integer.compare(ed2.upvoteCount, ed1.upvoteCount);
@@ -184,14 +185,14 @@ public class ErrorController implements FxController {
 	 * @param ed1 The first ErrorDiscussion object.
 	 * @param ed2 The second ErrorDiscussion object.
 	 * @return An integer indicating the answered status of the ErrorDiscussion objects:
-	 *         - A negative value (-1) if ed1 is considered answered and ed2 is considered unanswered,
-	 *         - A positive value (1) if ed1 is considered unanswered and ed2 is considered answered,
-	 *         - Or 0 if both ErrorDiscussion objects are considered answered or unanswered.
+	 * - A negative value (-1) if ed1 is considered answered and ed2 is considered unanswered,
+	 * - A positive value (1) if ed1 is considered unanswered and ed2 is considered answered,
+	 * - Or 0 if both ErrorDiscussion objects are considered answered or unanswered.
 	 */
 	public int compareIsAnswered(ErrorDiscussion ed1, ErrorDiscussion ed2) {
-		if (ed1.answer!=null && ed2.answer==null) {
+		if (ed1.answer != null && ed2.answer == null) {
 			return -1;
-		} else if (ed1.answer==null && ed2.answer!=null) {
+		} else if (ed1.answer == null && ed2.answer != null) {
 			return 1;
 		} else {
 			return 0;
@@ -204,9 +205,9 @@ public class ErrorController implements FxController {
 	 * @param ed1 The first ErrorDiscussion object.
 	 * @param ed2 The second ErrorDiscussion object.
 	 * @return An integer indicating the comparison result based on the presence of an exact match with the error code in the titles:
-	 *         - A negative value (-1) if ed1 has an exact match with the error code in the title and ed2 does not have a match,
-	 *         - A positive value (1) if ed1 does not have a match and ed2 has an exact match with the error code in the title,
-	 *         - Or 0 if both ErrorDiscussion objects either have an exact match or do not have a match with the error code in the titles.
+	 * - A negative value (-1) if ed1 has an exact match with the error code in the title and ed2 does not have a match,
+	 * - A positive value (1) if ed1 does not have a match and ed2 has an exact match with the error code in the title,
+	 * - Or 0 if both ErrorDiscussion objects either have an exact match or do not have a match with the error code in the titles.
 	 */
 	public int compareExactMatch(ErrorDiscussion ed1, ErrorDiscussion ed2) {
 		if (ed1.title.contains(getErrorCode()) && !ed2.title.contains(getErrorCode())) {
@@ -224,9 +225,9 @@ public class ErrorController implements FxController {
 	 * @param ed1 The first ErrorDiscussion object.
 	 * @param ed2 The second ErrorDiscussion object.
 	 * @return An integer indicating the comparison result based on the presence of a second-level match with the error code in the titles:
-	 *         - A negative value (-1) if ed1 has a second-level match with the error code in the title and ed2 does not have a match,
-	 *         - A positive value (1) if ed1 does not have a match and ed2 has a second-level match with the error code in the title,
-	 *         - Or 0 if both ErrorDiscussion objects either have a second-level match or do not have a match with the error code in the titles.
+	 * - A negative value (-1) if ed1 has a second-level match with the error code in the title and ed2 does not have a match,
+	 * - A positive value (1) if ed1 does not have a match and ed2 has a second-level match with the error code in the title,
+	 * - Or 0 if both ErrorDiscussion objects either have a second-level match or do not have a match with the error code in the titles.
 	 */
 	public int compareSecondLevelMatch(ErrorDiscussion ed1, ErrorDiscussion ed2) {
 		String value = " " + errorCode.methodCode() + ErrorCode.DELIM + errorCode.rootCauseCode();
@@ -245,9 +246,9 @@ public class ErrorController implements FxController {
 	 * @param ed1 The first ErrorDiscussion object.
 	 * @param ed2 The second ErrorDiscussion object.
 	 * @return An integer indicating the comparison result based on the presence of a third-level match with the error code in the titles:
-	 *         - A negative value (-1) if ed1 has a third-level match with the error code in the title and ed2 does not have a match,
-	 *         - A positive value (1) if ed1 does not have a match and ed2 has a third-level match with the error code in the title,
-	 *         - Or 0 if both ErrorDiscussion objects either have a third-level match or do not have a match with the error code in the titles.
+	 * - A negative value (-1) if ed1 has a third-level match with the error code in the title and ed2 does not have a match,
+	 * - A positive value (1) if ed1 does not have a match and ed2 has a third-level match with the error code in the title,
+	 * - Or 0 if both ErrorDiscussion objects either have a third-level match or do not have a match with the error code in the titles.
 	 */
 	public int compareThirdLevelMatch(ErrorDiscussion ed1, ErrorDiscussion ed2) {
 		String value = " " + errorCode.methodCode();
diff --git a/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java b/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
index cea9d3b9e..bc1663f6f 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
@@ -7,6 +7,7 @@ public class ErrorDiscussion {
 	String url;
 	Answer answer;
 
-	static class Answer{
+	static class Answer {
+
 	}
 }
diff --git a/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java b/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
index 0321a8493..6c4acb789 100644
--- a/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
+++ b/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
@@ -11,10 +11,10 @@ import org.mockito.Mockito;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-
 import java.util.concurrent.ExecutorService;
 
 class ErrorControllerTest {
+
 	Application application;
 	String stackTrace;
 	ErrorCode errorCode;
@@ -33,19 +33,12 @@ class ErrorControllerTest {
 		window = Mockito.mock(Stage.class);
 		environment = Mockito.mock(Environment.class);
 		executorService = Mockito.mock(ExecutorService.class);
-		errorController = new ErrorController(
-				application,
-				stackTrace,
-				errorCode,
-				previousScene,
-				window,
-				environment,
-				executorService);
+		errorController = new ErrorController(application, stackTrace, errorCode, previousScene, window, environment, executorService);
 	}
 
-	private ErrorDiscussion createErrorDiscussion(String title, int upvoteCount, ErrorDiscussion.Answer answer){
+	private ErrorDiscussion createErrorDiscussion(String title, int upvoteCount, ErrorDiscussion.Answer answer) {
 		ErrorDiscussion ed = new ErrorDiscussion();
-		ed.title =title;
+		ed.title = title;
 		ed.upvoteCount = upvoteCount;
 		ed.answer = answer;
 		return ed;
@@ -53,24 +46,24 @@ class ErrorControllerTest {
 
 	@ParameterizedTest
 	@CsvSource(textBlock = """
-		10, 5, -1 
-		8, 15, 1 
-		10, 10, 0
-		""")
+			10, 5, -1 
+			8, 15, 1 
+			10, 10, 0
+			""")
 	public void testCompareUpvoteCount(int leftUpvoteCount, int rightUpvoteCount, int expectedResult) {
 		var left = createErrorDiscussion("", leftUpvoteCount, null);
 		var right = createErrorDiscussion("", rightUpvoteCount, null);
 		int result = errorController.compareUpvoteCount(left, right);
-		Assertions.assertEquals(expectedResult,Integer.signum(result));
+		Assertions.assertEquals(expectedResult, Integer.signum(result));
 	}
 
 	@ParameterizedTest
 	@CsvSource(textBlock = """
-		false, false, 0
-		true, true, 0 
-		true, false, -1 
-		false, true, 1 
-		""")
+			false, false, 0
+			true, true, 0 
+			true, false, -1 
+			false, true, 1 
+			""")
 	public void testCompareIsAnswered(boolean leftIsAnswered, boolean rightIsAnswered, int expectedResult) {
 		var answer = new ErrorDiscussion.Answer();
 		var left = createErrorDiscussion("", 0, leftIsAnswered ? answer : null);
@@ -81,54 +74,54 @@ class ErrorControllerTest {
 
 	@ParameterizedTest
 	@CsvSource(textBlock = """
-		Error 0000:0000:0000, Error 0000:0000:0000, 0
-		Error 6HU1:12H1:HU7J, Error 0000:0000:0000, -1
-		Error 0000:0000:0000, Error 6HU1:12H1:HU7J, 1
-		""")
+			Error 0000:0000:0000, Error 0000:0000:0000, 0
+			Error 6HU1:12H1:HU7J, Error 0000:0000:0000, -1
+			Error 0000:0000:0000, Error 6HU1:12H1:HU7J, 1
+			""")
 	public void testCompareExactMatch(String leftTitle, String rightTitle, int expectedResult) {
 		Mockito.when(errorCode.toString()).thenReturn("6HU1:12H1:HU7J");
 		var left = createErrorDiscussion(leftTitle, 0, null);
-		var right = createErrorDiscussion(rightTitle, 0,null);
-		int result = errorController.compareExactMatch(left,right);
+		var right = createErrorDiscussion(rightTitle, 0, null);
+		int result = errorController.compareExactMatch(left, right);
 		Assertions.assertEquals(expectedResult, result);
 	}
 
 	@ParameterizedTest
 	@CsvSource(textBlock = """
-		Error 6HU1:12H1:0000, Error 6HU1:12H1:0000, 0
-		Error 0000:0000:0000, Error 0000:0000:0000, 0
-		Error 6HU1:12H1:0000, Error 0000:0000:0000, -1
-		Error 0000:0000:0000, Error 6HU1:12H1:0000, 1
-		""")
+			Error 6HU1:12H1:0000, Error 6HU1:12H1:0000, 0
+			Error 0000:0000:0000, Error 0000:0000:0000, 0
+			Error 6HU1:12H1:0000, Error 0000:0000:0000, -1
+			Error 0000:0000:0000, Error 6HU1:12H1:0000, 1
+			""")
 	public void testCompareSecondLevelMatch(String leftTitle, String rightTitle, int expectedResult) {
 		Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
 		Mockito.when(errorCode.rootCauseCode()).thenReturn("12H1");
 		var left = createErrorDiscussion(leftTitle, 0, null);
-		var right = createErrorDiscussion(rightTitle, 0,null);
-		int result = errorController.compareSecondLevelMatch(left,right);
+		var right = createErrorDiscussion(rightTitle, 0, null);
+		int result = errorController.compareSecondLevelMatch(left, right);
 		Assertions.assertEquals(expectedResult, result);
 	}
 
 	@ParameterizedTest
 	@CsvSource(textBlock = """
-		Error 6HU1:0000:0000, Error 6HU1:0000:0000, 0
-		Error 0000:0000:0000, Error 0000:0000:0000, 0
-		Error 6HU1:0000:0000, Error 0000:0000:0000, -1
-		Error 0000:0000:0000, Error 6HU1:0000:0000, 1
-		""")
+			Error 6HU1:0000:0000, Error 6HU1:0000:0000, 0
+			Error 0000:0000:0000, Error 0000:0000:0000, 0
+			Error 6HU1:0000:0000, Error 0000:0000:0000, -1
+			Error 0000:0000:0000, Error 6HU1:0000:0000, 1
+			""")
 	public void testCompareThirdLevelMatch(String leftTitle, String rightTitle, int expectedResult) {
 		Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
 		var left = createErrorDiscussion(leftTitle, 0, null);
-		var right = createErrorDiscussion(rightTitle, 0,null);
-		int result = errorController.compareThirdLevelMatch(left,right);
+		var right = createErrorDiscussion(rightTitle, 0, null);
+		int result = errorController.compareThirdLevelMatch(left, right);
 		Assertions.assertEquals(expectedResult, result);
 	}
 
 	@ParameterizedTest
 	@CsvSource(textBlock = """
-		Error 6HU1:0000:0000, true
-		Error 0000:0000:0000, false
-		""")
+			Error 6HU1:0000:0000, true
+			Error 0000:0000:0000, false
+			""")
 	public void testIsPartialMatchFilter(String title, boolean expectedResult) {
 		Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
 		var ed = createErrorDiscussion(title, 0, null);

From 3bf4473f9dfcbd70e09df706ecb3c3ab80fb9a87 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Fri, 16 Jun 2023 11:13:24 +0200
Subject: [PATCH 15/61] implemented changes mentioned by overheadhunter

---
 .../cryptomator/ui/error/ErrorController.java | 84 +++++++-----------
 .../ui/error/ErrorControllerTest.java         | 88 +++++++++++--------
 2 files changed, 84 insertions(+), 88 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/error/ErrorController.java b/src/main/java/org/cryptomator/ui/error/ErrorController.java
index ae006caee..1fcc1e829 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorController.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorController.java
@@ -11,8 +11,11 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javafx.application.Application;
 import javafx.application.Platform;
+import javafx.beans.binding.BooleanExpression;
 import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.fxml.FXML;
 import javafx.scene.Scene;
 import javafx.scene.input.Clipboard;
@@ -60,9 +63,9 @@ public class ErrorController implements FxController {
 	private final Environment environment;
 
 	private final BooleanProperty copiedDetails = new SimpleBooleanProperty();
-	private final BooleanProperty errorSolutionFound = new SimpleBooleanProperty();
+	private final ObjectProperty matchingErrorDiscussion = new SimpleObjectProperty();
+	private final BooleanExpression errorSolutionFound = matchingErrorDiscussion.isNotNull();
 	private final BooleanProperty isLoadingHttpResponse = new SimpleBooleanProperty();
-	private ErrorDiscussion matchingErrorDiscussion;
 
 	@Inject
 	ErrorController(Application application, @Named("stackTrace") String stackTrace, ErrorCode errorCode, @Nullable Scene previousScene, Stage window, Environment environment, ExecutorService executorService) {
@@ -97,8 +100,9 @@ public class ErrorController implements FxController {
 
 	@FXML
 	public void showSolution() {
-		if (matchingErrorDiscussion != null) {
-			application.getHostServices().showDocument(matchingErrorDiscussion.url);
+		if (matchingErrorDiscussion.isNotNull().get()) {
+			ErrorDiscussion ed = (ErrorDiscussion) matchingErrorDiscussion.get();
+			application.getHostServices().showDocument(ed.url);
 		}
 	}
 
@@ -137,31 +141,30 @@ public class ErrorController implements FxController {
 					new TypeToken<Map<String, ErrorDiscussion>>() {
 					}.getType());
 
-			if (errorDiscussionMap.values().stream().anyMatch(this::isPartialMatchFilter)) {
-				Comparator<ErrorDiscussion> comp = this::compareExactMatch;
-				Optional<ErrorDiscussion> value = errorDiscussionMap.values().stream().min(comp//
-						.thenComparing(this::compareSecondLevelMatch)//
-						.thenComparing(this::compareThirdLevelMatch)//
-						.thenComparing(this::compareIsAnswered)//
-						.thenComparing(this::compareUpvoteCount));
+			if (errorDiscussionMap.values().stream().anyMatch(this::containsMethodCode)) {
+				Comparator<ErrorDiscussion> comp = this::compareByFullErrorCode;
+				Optional<ErrorDiscussion> value = errorDiscussionMap.values().stream().filter(this::containsMethodCode)//
+						.min(comp//
+								.thenComparing(this::compareByRootCauseCode)//
+								.thenComparing(this::compareIsAnswered)//
+								.thenComparing(this::compareUpvoteCount));
 
 				if (value.isPresent()) {
-					matchingErrorDiscussion = value.get();
-					errorSolutionFound.set(true);
+					matchingErrorDiscussion.set(value.get());
 				}
 			}
 		}
 	}
 
 	/**
-	 * Checks if an ErrorDiscussion object is a partial match based on the presence of the error code's method code in its title.
+	 * Checks if an ErrorDiscussion object's title contains the error code's method code.
 	 *
 	 * @param errorDiscussion The ErrorDiscussion object to be checked.
-	 * @return A boolean value indicating if the ErrorDiscussion object is a partial match:
-	 * - true if the object's title contains the error code's method code,
+	 * @return A boolean value indicating if the ErrorDiscussion object's title contains the error code's method code:
+	 * - true if the title contains the method code,
 	 * - false otherwise.
 	 */
-	public boolean isPartialMatchFilter(ErrorDiscussion errorDiscussion) {
+	public boolean containsMethodCode(ErrorDiscussion errorDiscussion) {
 		return errorDiscussion.title.contains(" " + errorCode.methodCode());
 	}
 
@@ -200,16 +203,16 @@ public class ErrorController implements FxController {
 	}
 
 	/**
-	 * Compares two ErrorDiscussion objects based on the presence of an exact match with the error code in their titles and returns the result.
+	 * Compares two ErrorDiscussion objects based on the presence of the full error code in their titles and returns the result.
 	 *
 	 * @param ed1 The first ErrorDiscussion object.
 	 * @param ed2 The second ErrorDiscussion object.
-	 * @return An integer indicating the comparison result based on the presence of an exact match with the error code in the titles:
-	 * - A negative value (-1) if ed1 has an exact match with the error code in the title and ed2 does not have a match,
-	 * - A positive value (1) if ed1 does not have a match and ed2 has an exact match with the error code in the title,
-	 * - Or 0 if both ErrorDiscussion objects either have an exact match or do not have a match with the error code in the titles.
+	 * @return An integer indicating the comparison result based on the presence of the full error code in the titles:
+	 * - A negative value (-1) if ed1 contains the full error code in the title and ed2 does not have a match,
+	 * - A positive value (1) if ed1 does not have a match and ed2 contains the full error code in the title,
+	 * - Or 0 if both ErrorDiscussion objects either contain the full error code or do not have a match in the titles.
 	 */
-	public int compareExactMatch(ErrorDiscussion ed1, ErrorDiscussion ed2) {
+	public int compareByFullErrorCode(ErrorDiscussion ed1, ErrorDiscussion ed2) {
 		if (ed1.title.contains(getErrorCode()) && !ed2.title.contains(getErrorCode())) {
 			return -1;
 		} else if (!ed1.title.contains(getErrorCode()) && ed2.title.contains(getErrorCode())) {
@@ -220,16 +223,16 @@ public class ErrorController implements FxController {
 	}
 
 	/**
-	 * Compares two ErrorDiscussion objects based on the presence of a second-level match with the error code in their titles and returns the result.
+	 * Compares two ErrorDiscussion objects based on the presence of the root cause code in their titles and returns the result.
 	 *
 	 * @param ed1 The first ErrorDiscussion object.
 	 * @param ed2 The second ErrorDiscussion object.
-	 * @return An integer indicating the comparison result based on the presence of a second-level match with the error code in the titles:
-	 * - A negative value (-1) if ed1 has a second-level match with the error code in the title and ed2 does not have a match,
-	 * - A positive value (1) if ed1 does not have a match and ed2 has a second-level match with the error code in the title,
-	 * - Or 0 if both ErrorDiscussion objects either have a second-level match or do not have a match with the error code in the titles.
+	 * @return An integer indicating the comparison result based on the presence of the root cause code in the titles:
+	 * - A negative value (-1) if ed1 contains the root cause code in the title and ed2 does not have a match,
+	 * - A positive value (1) if ed1 does not have a match and ed2 contains the root cause code in the title,
+	 * - Or 0 if both ErrorDiscussion objects either contain the root cause code or do not have a match in the titles.
 	 */
-	public int compareSecondLevelMatch(ErrorDiscussion ed1, ErrorDiscussion ed2) {
+	public int compareByRootCauseCode(ErrorDiscussion ed1, ErrorDiscussion ed2) {
 		String value = " " + errorCode.methodCode() + ErrorCode.DELIM + errorCode.rootCauseCode();
 		if (ed1.title.contains(value) && !ed2.title.contains(value)) {
 			return -1;
@@ -240,27 +243,6 @@ public class ErrorController implements FxController {
 		}
 	}
 
-	/**
-	 * Compares two ErrorDiscussion objects based on the presence of a third-level match with the error code in their titles and returns the result.
-	 *
-	 * @param ed1 The first ErrorDiscussion object.
-	 * @param ed2 The second ErrorDiscussion object.
-	 * @return An integer indicating the comparison result based on the presence of a third-level match with the error code in the titles:
-	 * - A negative value (-1) if ed1 has a third-level match with the error code in the title and ed2 does not have a match,
-	 * - A positive value (1) if ed1 does not have a match and ed2 has a third-level match with the error code in the title,
-	 * - Or 0 if both ErrorDiscussion objects either have a third-level match or do not have a match with the error code in the titles.
-	 */
-	public int compareThirdLevelMatch(ErrorDiscussion ed1, ErrorDiscussion ed2) {
-		String value = " " + errorCode.methodCode();
-		if (ed1.title.contains(value) && !ed2.title.contains(value)) {
-			return -1;
-		} else if (!ed1.title.contains(value) && ed2.title.contains(value)) {
-			return 1;
-		} else {
-			return 0;
-		}
-	}
-
 	/* Getter/Setter */
 	public boolean isPreviousScenePresent() {
 		return previousScene != null;
@@ -286,7 +268,7 @@ public class ErrorController implements FxController {
 		return copiedDetails.get();
 	}
 
-	public BooleanProperty errorSolutionFoundProperty() {
+	public BooleanExpression errorSolutionFoundProperty() {
 		return errorSolutionFound;
 	}
 
diff --git a/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java b/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
index 6c4acb789..ae15d5d59 100644
--- a/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
+++ b/src/test/java/org/cryptomator/ui/error/ErrorControllerTest.java
@@ -4,6 +4,7 @@ import org.cryptomator.common.Environment;
 import org.cryptomator.common.ErrorCode;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 import org.mockito.Mockito;
@@ -44,88 +45,101 @@ class ErrorControllerTest {
 		return ed;
 	}
 
+	@DisplayName("compare error discussions by upvote count")
 	@ParameterizedTest
 	@CsvSource(textBlock = """
-			10, 5, -1 
-			8, 15, 1 
-			10, 10, 0
+			10, <, 5 
+			8, >, 15 
+			10, =, 10
 			""")
-	public void testCompareUpvoteCount(int leftUpvoteCount, int rightUpvoteCount, int expectedResult) {
+	public void testCompareUpvoteCount(int leftUpvoteCount, char expected, int rightUpvoteCount) {
+		int expectedResult = switch (expected) {
+			case '<' -> -1;
+			case '>' -> +1;
+			default -> 0;
+		};
 		var left = createErrorDiscussion("", leftUpvoteCount, null);
 		var right = createErrorDiscussion("", rightUpvoteCount, null);
 		int result = errorController.compareUpvoteCount(left, right);
 		Assertions.assertEquals(expectedResult, Integer.signum(result));
 	}
 
+	@DisplayName("compare error discussions by existence of an answer")
 	@ParameterizedTest
 	@CsvSource(textBlock = """
-			false, false, 0
-			true, true, 0 
-			true, false, -1 
-			false, true, 1 
+			false, =, false
+			true, =, true
+			true, <, false
+			false, >, true
 			""")
-	public void testCompareIsAnswered(boolean leftIsAnswered, boolean rightIsAnswered, int expectedResult) {
+	public void testCompareIsAnswered(boolean leftIsAnswered, char expected, boolean rightIsAnswered) {
 		var answer = new ErrorDiscussion.Answer();
+		int expectedResult = switch (expected) {
+			case '<' -> -1;
+			case '>' -> +1;
+			default -> 0;
+		};
 		var left = createErrorDiscussion("", 0, leftIsAnswered ? answer : null);
 		var right = createErrorDiscussion("", 0, rightIsAnswered ? answer : null);
 		int result = errorController.compareIsAnswered(left, right);
 		Assertions.assertEquals(expectedResult, result);
 	}
 
+	@DisplayName("compare error codes by full error code")
 	@ParameterizedTest
 	@CsvSource(textBlock = """
-			Error 0000:0000:0000, Error 0000:0000:0000, 0
-			Error 6HU1:12H1:HU7J, Error 0000:0000:0000, -1
-			Error 0000:0000:0000, Error 6HU1:12H1:HU7J, 1
+			Error 0000:0000:0000, =, Error 0000:0000:0000
+			Error 6HU1:12H1:HU7J, <, Error 0000:0000:0000
+			Error 0000:0000:0000, >, Error 6HU1:12H1:HU7J
 			""")
-	public void testCompareExactMatch(String leftTitle, String rightTitle, int expectedResult) {
+	public void testCompareByFullErrorCode(String leftTitle, char expected, String rightTitle) {
 		Mockito.when(errorCode.toString()).thenReturn("6HU1:12H1:HU7J");
+		int expectedResult = switch (expected) {
+			case '<' -> -1;
+			case '>' -> +1;
+			default -> 0;
+		};
 		var left = createErrorDiscussion(leftTitle, 0, null);
 		var right = createErrorDiscussion(rightTitle, 0, null);
-		int result = errorController.compareExactMatch(left, right);
+		int result = errorController.compareByFullErrorCode(left, right);
 		Assertions.assertEquals(expectedResult, result);
 	}
 
+	@DisplayName("compare error codes by root cause")
 	@ParameterizedTest
 	@CsvSource(textBlock = """
-			Error 6HU1:12H1:0000, Error 6HU1:12H1:0000, 0
-			Error 0000:0000:0000, Error 0000:0000:0000, 0
-			Error 6HU1:12H1:0000, Error 0000:0000:0000, -1
-			Error 0000:0000:0000, Error 6HU1:12H1:0000, 1
+			Error 6HU1:12H1:0000, =, Error 6HU1:12H1:0000
+			Error 6HU1:12H1:0007, =, Error 6HU1:12H1:0042
+			Error 0000:0000:0000, =, Error 0000:0000:0000
+			Error 6HU1:12H1:0000, <, Error 0000:0000:0000
+			Error 6HU1:12H1:0000, <, Error 6HU1:0000:0000
+			Error 0000:0000:0000, >, Error 6HU1:12H1:0000
+			Error 6HU1:0000:0000, >, Error 6HU1:12H1:0000
 			""")
-	public void testCompareSecondLevelMatch(String leftTitle, String rightTitle, int expectedResult) {
+	public void testCompareByRootCauseCode(String leftTitle, char expected, String rightTitle) {
 		Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
 		Mockito.when(errorCode.rootCauseCode()).thenReturn("12H1");
+		int expectedResult = switch (expected) {
+			case '<' -> -1;
+			case '>' -> +1;
+			default -> 0;
+		};
 		var left = createErrorDiscussion(leftTitle, 0, null);
 		var right = createErrorDiscussion(rightTitle, 0, null);
-		int result = errorController.compareSecondLevelMatch(left, right);
-		Assertions.assertEquals(expectedResult, result);
-	}
-
-	@ParameterizedTest
-	@CsvSource(textBlock = """
-			Error 6HU1:0000:0000, Error 6HU1:0000:0000, 0
-			Error 0000:0000:0000, Error 0000:0000:0000, 0
-			Error 6HU1:0000:0000, Error 0000:0000:0000, -1
-			Error 0000:0000:0000, Error 6HU1:0000:0000, 1
-			""")
-	public void testCompareThirdLevelMatch(String leftTitle, String rightTitle, int expectedResult) {
-		Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
-		var left = createErrorDiscussion(leftTitle, 0, null);
-		var right = createErrorDiscussion(rightTitle, 0, null);
-		int result = errorController.compareThirdLevelMatch(left, right);
+		int result = errorController.compareByRootCauseCode(left, right);
 		Assertions.assertEquals(expectedResult, result);
 	}
 
+	@DisplayName("check if the error code contains the method code")
 	@ParameterizedTest
 	@CsvSource(textBlock = """
 			Error 6HU1:0000:0000, true
 			Error 0000:0000:0000, false
 			""")
-	public void testIsPartialMatchFilter(String title, boolean expectedResult) {
+	public void testContainsMethodCode(String title, boolean expectedResult) {
 		Mockito.when(errorCode.methodCode()).thenReturn("6HU1");
 		var ed = createErrorDiscussion(title, 0, null);
-		boolean result = errorController.isPartialMatchFilter(ed);
+		boolean result = errorController.containsMethodCode(ed);
 		Assertions.assertEquals(expectedResult, result);
 	}
 }
\ No newline at end of file

From 19c41a3cca127568fcc409b3584a44016e5ad896 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias.hagemann@skymatic.de>
Date: Fri, 16 Jun 2023 11:20:26 +0200
Subject: [PATCH 16/61] Update SECURITY.md

[ci skip]
---
 .github/SECURITY.md | 136 +++++++-------------------------------------
 1 file changed, 19 insertions(+), 117 deletions(-)

diff --git a/.github/SECURITY.md b/.github/SECURITY.md
index 7cc13ff3c..79e61c7fa 100644
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -2,123 +2,25 @@
 
 ## Reporting a Vulnerability
 
-For reporting security-related vulnerabilities or exploits that [haven't been reported yet](https://github.com/cryptomator/cryptomator/labels/type%3Asecurity-issue), contact us at: security@cryptomator.org
+We take security seriously at Cryptomator. We appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions.
 
-<details>
-<summary>PGP Key</summary>
+To report a security vulnerability, please use the GitHub Security Advisory feature. This feature allows you to privately discuss, fix, and publish information about security vulnerabilities.
 
-```
------BEGIN PGP PUBLIC KEY BLOCK-----
-Comment: GPGTools - https://gpgtools.org
+If you prefer to report the vulnerability via email, please send an email to security@cryptomator.org.
 
-mQINBFbgeicBEADM9AcU6DTgM5KZnBaJc6x9DBLr+TCMHntTt7YM9GLTlO2Z43Jt
-oYoyqdRWAY28veqpLEFgRvvVD3fdBj/KUOxF1cr2JsErwXqbjwaLq0o/0KIXz7UK
-a6pQSemZKfpOtJrfacofOTwvG6AuG9uakBYNMyxuojyOkoh3xsYS1KZ7TwPgCdET
-t8/zva41Pa5kh5+GeSZJdCuygG6ynPBJEpmK5V7Qizvics5fziXecF+QaFZijafv
-YahfxokvF9pXCQTmV4m57NQma9uK0w83U9nJCPjEd+x3wK0Hxrc1ojy8ZFTA1YND
-AQg/MTABgHbQQkXDQhjS/TloOObqtbMBqNSbcSXpaR4teaCWKBl1MSq00nJLj8db
-vPJGqfg7UbXhlALggp029/kskYlR5SmbxWquLbl0Xre3fDHuHEiWcJL6MS3454Wt
-Mno13/4UhOlRFh5g0pLmPz7seOTJjDqc9abn/RXOLq0+3qX0gC0bDm5aCE5dQ2MV
-FMbrrlw/dZESNLZvtB3gOsramSry1R3HVZ0QJ2vMaF2cxewebqcYbuecUNj6bxpv
-5LEhEmqz6dG1meLLWDsvQLPEUWEIJnfpBiDSm342yxJq4pXnVF+aqAQsCL3FpmvZ
-2j0FgFOs7iXOcFUJIiR0xUmWPk1NWYcUowqmRW8pMM9nFUzFF99iggPznwARAQAB
-tC1DcnlwdG9tYXRvciBTdXBwb3J0IDxzdXBwb3J0QGNyeXB0b21hdG9yLm9yZz6J
-AkAEEwEKACoCGwMFCQcrKAAFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAleu2cQC
-GQEACgkQI7Xb75TU2B3+7A/7BKRWdo5/moCCEbBzYQ7vRMLFdwmjFFlSZ7aGC0fP
-YHdeUwxPbO0cATwmNpGMma7rBn1FDg3Vto6/wottGxm+XIRwlyY84CD1VZAihZ/e
-WvjOO28/7VgRy6PGKzlhpDSoT8GwFOgO69e7bEff1Zj562RZe7nXc4tDivILMB++
-KgmmSgtddygmNQCS3RD3KssGo+l+cSjsg09F5WAJ6nQe8Jq2hICq+o/P6UXPI5lX
-bhvWYDn4/8sRHsIlGpQYYDDe0fz7IQKuSLAHpF5upNDxj6dYb05F8PPVrk6MW6nL
-/kf1fZ27DlLN5/NFvhhBRuwxxoAFqPS7Iel3z7L0JkRUYmGLVB5m9Cqiw6FK8JRv
-OtvakdDoKb5lVAoN5NeBfNBSqEcXVF/EdfTfIyyo7hZRA6xFMEVbmYbzt0sj0djV
-ZOey2TOFrTCpkHfUUDgKvk5sn+F3u8mmPIbqquEzlFJSFjcyiYYDv22rg1In+zKV
-Xmw4BFZRDS6IVSQRGlskRGJBixCaGyDYxHXXT2cg4Rk9uiCX11+0E9qlAsg6xPe6
-rnaYDT8dU0AFyVpDpshflXH3kVQSpiqZS3jkAk1/54ODO8pE80Zrnd5m5AMuNcmX
-+9MkZKE+h0882UskDs1dyt26GU2hoy4lAeRUaut7zIK/WO6nnuLaTvGWT95RDz+q
-kD2JAiIEEwEKAAwFAleu2iYFgweGH4AACgkQZnuGbqgkCgnmCA//U22uhyEC/Tp3
-Cbt5lctQmqbgMbjRBaHQyW52tPFMaq8vXMbo/5TTtVC6xsp2PJT84cxAd8KX8hWq
-cPtF4wWCJGng/AzyxQ5dWfGvA/ll32ygjtJN3P/AvA9KlhG+6XYmS8cPkBkJBi6B
-2yCdZT1cXc/TPAFzjgAwz7K9g3awG0OeOc/CXymH0DD/snkiwKQoucStolYywZGc
-GszjMQgeT4zOc1wtEz24uL3dMNDlDcQMAh56YvK2oB0iMYmAFyX/IS+f2bM9paXi
-HX+mg/z53iwgf5ZXbslNDbMTJ5GNksjEGjCFfDHAdNdgT+lcW4l2U7q4PYUaN4LA
-DE9j2OlOlQ9qjucOgoCStirnTP7XHd4p31lgdz8+THOQowB5Ji95OkiNQAFCfxBt
-mcA/bWnJZQDm7L8RVzHovBpAaK6vUjxEvR+DXdESSzyZwkpsZwGZcyqGRT26R1/L
-JE5WvjKufNc5v3Cat320MjyrLZwVGRgvEpDMoCw3nTWl9AtOj5vgaakEWr7AnqET
-xk7UFbYmdTlQqkWuLKubz9Rx/FbrBmvd6vwTHy1Dfl6QyMWNCClatgN00Hxped/6
-CErg+R/RXd8apGxnOuWDqoujPn5LOHzgJolp1Ox16nTiZe2G+LbDr3hqRFi1wW6w
-ioMB4KpkdA03uyxJSWmDEMiR1l3Oxom0KUNyeXB0b21hdG9yIFByZXNzIDxwcmVz
-c0BjcnlwdG9tYXRvci5vcmc+iQI9BBMBCgAnBQJXrtnDAhsDBQkHKygABQsJCAcD
-BRUKCQgLBRYCAwEAAh4BAheAAAoJECO12++U1NgdQYMQAKCIzNJF8rURQcFLSv3J
-sPBjRy2HCzCWm21MuhU+bsaZx7U9M9dgEjzLfxN9s19VsBH3WKLgok2FgiYSGka3
-6Oy/P8VFLFmHs7dS9i2fro2eF7i4zj/ZD/9t0jM4ZIgLpbzr5sTBld292nsfXGob
-xOJeOx3oWYyR2FO9VQxXjC3JvJyZkFgoy0tauS4Mvii4cF56wJGcxDTbe1s7UaRC
-a/fh4zgISZSBE3rYhCawkN4mqMDM5RDjrdtjKUPWk345HcjjQ4Wos8xw4YbGbNr9
-Pc7m2URYJJ0jFM4tnoRF6cmA3bT9tm8pcOFg+K/ycVrltVEy+A8Wj8UGjyP1uI1t
-EqWHN3LZpIGfW0w9AGrw7OUI9czXcukfngj/DsOU3WMBDIM8pW9+zBpr75yIS6lz
-C0IqksLXSqX0b/Rby4O+wb6UZ1ZFkaim2GGtAZV+nGXtdnEXSNFiP7ykzjZ02m/1
-7CKyj3VmdAgT56zEIypFSfxm9gOWsJPmfhSyuE8bFyoitgNxpheZk6xZy4upVMPR
-WK3hutScU0yDv2HVCiA3o3Ggy42nmz9HpGF6W2DmBx4bhMaVs6I2VFyKdQzmJD/3
-FCWjwz8PiEgVGHGPnD+WdPFLhrc/44gF4h/VuLjkubtULGuTVvgjeTIJ5LR1Gmwc
-YOk6eD7MAJPzJVj5/PYFtIbKiQIiBBMBCgAMBQJXrtonBYMHhh+AAAoJEGZ7hm6o
-JAoJBh4P/1w88YMTKUHpFTfJEwH2hK36BZN96Bf/k+vP7n1Xxp3NheInJblHFOt/
-ccsup6am+APrk8gGtlIVmtVc3nO8WMsWxfJxGDecyRsNbessnODv/llyg3tzVU/H
-tLk7gLiK0TcIsOLfeNXGTxRRSKWjVFsNfuixNCzzHa7tFq6ddVn9VRZ8fqJB2p21
-OogWSDqUo9q9Wfb4RkYHguDx+8Jzoo/MxR1TSt8gUO2xDvEbqgeQiMCLF8R0lO3Y
-zz0FrpyOsFU1CxVp+wo55bWv1UdwgQKQt4o0m5/zDJ2RAtscXpd4YcTE+XxKeK+4
-qhihhkhLGpKsxzK5m9/qwMbodHwoBCBzfalkUR9xOq9yQIeEoC8XYL62NqB3BCSU
-KfWFIHxUkE9WH5zHWaV+bhrlNgk7nz3xBfPf1P2mNIc1VUHoNqOZOmWwz2VaKLSW
-f3GIqx9wGythFbLdXmUoC3W//DDYgQnvImvkncMqQ5nRHPf8uHcLQK5WZyIxpgWT
-eKon5G/cj0BTptcBhapMwSIyfaC5FV7so0/CkOA6R9Fyq2VpGoHy7XPhFS+6ieLi
-KUWhCvbuf2deWbSaJ0peMdzy1p72UXwrsEM0M3Fz+Jd8zvCaFzf5Fx27+pAAdlfg
-4bT3/2gSf7S+cU3+DnYOH0NeRt2Z2mjEKg9OwttTO/oDboQHdZlrtDRDcnlwdG9t
-YXRvciBTZWN1cml0eS1UZWFtIDxzZWN1cml0eUBjcnlwdG9tYXRvci5vcmc+iQI9
-BBMBCgAnBQJXrtnWAhsDBQkHKygABQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJ
-ECO12++U1NgddzoQAI78+Nvm6VvNuptXJjEmrpHRyKCnHF9wH5kxvF8WZCgpOkJ4
-vONmyS+9ZlepnT83MpGm/MzdIMCnDJmDmqmA5ISBRcD7k9Gjzz5rPKwE2zDyo0M0
-wF1L2UEUqAlcvE0e4twZcP2DGoNqdSf6IaWsXhQMb1a/rTMsoGZLuTB8kCbv6Ntl
-ULahcRToTB2shsbZjzE896P6X5hDCfGWl0Jhcbf53pnXX1dOsEw3et9AGru1IUMs
-UGM+wpgTwagRj+XB/WY1x9IznKtiHTq83Fvt+3bkg0+NIcV3GDqXDIUtqIwy8gDd
-4KgBU+LkyxXFDa4OxLc53n6b+Iy1nDosM+SiqSzdCCgEs/dY1tQBn/7P1GT18dEe
-tFgeH/c6wLvEpDIc9urAsYXf8H+1uy7glWpWTq8DE0yhCr4adjCqlIsVHQQO4UUW
-NfqMGEFpJ+3HjSSwnvDGY78lLQh5d4vqWV435aNaMqZg0gJIA0FtiP1fRtmT73BG
-N/tBNiBxretFR4B+x/TWqPd5iJV7/MAn/pa1WSOcaxzJrVUsjXdgLQCqcHWd4/w1
-f4DU9cJjl3sxZlMdAlg8Q1bF+pmjQQ4WKZkqMtwpoUilfVXmL42ay1LBCgW68/uJ
-OTyGfp8ntUsbbm5raGsny3TLqnacyG9hxcPGNTzD1+MrbUvfsc7+4U0dCZTuiQIi
-BBMBCgAMBQJXrtonBYMHhh+AAAoJEGZ7hm6oJAoJ1DQP/R+1drZiZQU45ChMbfTb
-XQjJRsUOGZp3PTWtx4KrVFvE8ea0PF+DZX5gLJYIU+iZmPXRpzFu6dKPbcZ7RfRt
-5RRH102zDZzijt2CQd7YLO8wxUFoWX9X7DGgxXEcNjl9kFVmnyHgiTwTzuZ0Zy4y
-PvoiwrhcZmXEYbOeV40gLFie6wuzz5IIcs01e30xIs+1/1gwmgI5UnG3jveUgmcj
-f/lvg3POKiwrY5Uzw1FSruJx21X06wTpDcfOACID4L7aY9eg2B/qL2Xj8nuhejqG
-+1AVTMk2o6pxkvevHmxYQfEpuWGCw0RCBn9ObWwz6Zn5J9pjGbMrM+b1/M2Ouv3N
-cpoGgCSahKNsRMKO7RMrBG0jtLcasPSgZFYPJSZAAb+YhxKUbpPHzDIwTEjgM7CL
-gKSyRTKyp5IoFK53bpXL/ZIjkAhMvyDult6+BL6vI0+h3BBA9I0FF2Qhe139xLv/
-DS7aDiYAE9vGMGoeCBfxJPwUsDU3hrGe/wgL7fR6nmN7R2QffisBHKHsklORy9t3
-w3YFRd5sBAxv+EOcdkgXEmqKOfVQ8KU9adQcxPDGMAK/esjVwxUxsaf2PF5noxxW
-3zL2ureUO/mMoH5Cwr0BuM3HFb82t1JJd4IXlLEyNvDMFMwD2d7h37bGK7Y5hEsl
-zL7Dm+wQRY8sxg4QOZHbJjQXuQINBFbgeicBEADnkxGSEL1zwACaiVqADKC6/pgO
-MMWjxoENBT6r8Vnp1D5hfNDkEi9iXUpCEO6nzywBf3/4c4Yk1wBOBZ7YWyWXMf4v
-2g1evxELO5z1UlAwna6HSl7G0omIBqzz1Er5IS7C9WEZM8ZggwcuswCrbxfz4+fN
-t7cCL5QyOvuxez+vrn+VIgLQzKm+LV4Wc+OFbHIys+0saQUhItKO0/CsXGc8R314
-jdN5UsZk/MUdPPAs+6OCr8d3PpJvR6IST76TtN8aDjSS9T6em7dwdGFEwCGww3Jc
-xrAkvvUmSlscz+rnvHA5DYQGK6NXLenB40sVQVfch1r1VqwvlzA0u7OovjwM8+7u
-+DaBQ0YejbdnC7yfeE91LmZkG6jRKfvTJkv18tjNsgZsVmM13xzP67fCFIB9M+lN
-t9zEldGKHVwm+06FHIWJsBDRgrquNb9xd1vgHHeIbJvKf+LqZhVrbKVEneG34Km+
-ndtb+mvcGc0fOoMU9lYrFaxAWl8oU9BchC9IyjcPZB445R+AhfTuoHSUViSCo6IO
-TG0hQsJuNoKmDAU8l5sTsiFXuXBOo1wK8gTkRnhZHduZrZIjJXvT7efz1knLQ6eG
-prZHf4CtbgHyAe2XZabetWtCsFcPbOjC7ezNK57UvVH98h2GkckxOM00BESMCTee
-kYy7uG0v0rrajzHY1wARAQABiQIlBBgBCgAPBQJW4HonAhsMBQkHKygAAAoJECO1
-2++U1NgdyAsQAKZUVA6pY225BASkeNiW31L7K4VeRYpAdFkiRex2zQFtj9Vovfi1
-JeTs0fRm35dUsQraf1bkhsjEdPVZ3gD324/baauFO04KX+soyQvK/tUq8KO+5ALt
-Ul5aAljuSwxfJWFpApv+Mbf7gOjm+77jirs7pgG/gCow/mkRlmKTwAmn2DXjkckC
-2EH0mqmh5pdoNWKO7WeTFFbUmESsPcnB2FwTpEjHFvgHll+rmKpXZTgFYN4dDhhm
-HsL/SCf/Nw+YIsuvErQ9TJVdJDLG8ZYatruk7dZZMPtFxvxM1Q36gDIpPEOKPkvm
-dMXg6jHaIdYIaoMpzXFaXsQMdRuMtzbcA+CdwXVY55qGLtfmM/QuEiIJdDeeh7iB
-+VAMyEFOOpi8IFhixaeMoZAmrKDqOkzPcMJVklLYq8N+b9p5JszYNwZEbpyWCACM
-6K+iJzlWzW/OPZttGLJBgYuSYIJIuG80Cx5m5m1e5RAgQ1iT8nbfrS+gYttwP48J
-V7SXQg7QugxG9l1vlK4VjnXiOFulJ7V0e/VyUBpJp3qHcCxFq3RnxVwlIqKZh+jm
-Q1bk0H0Xodd27nQITfDP5ullByGW2Jrjs6SsXeR3jl9+t0XQfInU1L9d/wSOkMjL
-9IMUt06lV4vB/WP2xioqLZiZ4eAi0E+lWkFxjZsgNs2xbOAYRThMB8a5
-=W1Ri
------END PGP PUBLIC KEY BLOCK-----
-```
-</details>
+PGP key fingerprint: `3647 9903 B23A E0A5 9359  9A3E 23B5 DBEF 94D4 D81D` ([public key](https://gist.github.com/cryptobot/864300b6b44ae2d2a15abedfe14bd040))
+
+## Expectations
+
+When reporting a vulnerability, please provide us with a detailed report that includes:
+
+- A description of the vulnerability
+- Steps to reproduce the vulnerability
+- Possible impact of the vulnerability
+- Any additional information that may be helpful
+
+We ask that you do not publicly disclose the vulnerability until we have had a chance to address it.
+
+## Thank You
+
+We appreciate your help in keeping Cryptomator secure. Thank you for your contributions to the security of our project.

From 2e7af0affa5969d94e1a0b53c0e40ad11973c220 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias.hagemann@skymatic.de>
Date: Fri, 16 Jun 2023 11:41:33 +0200
Subject: [PATCH 17/61] Update SECURITY.md

[ci skip]
---
 .github/SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/SECURITY.md b/.github/SECURITY.md
index 79e61c7fa..8c3d2a7d5 100644
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -4,7 +4,7 @@
 
 We take security seriously at Cryptomator. We appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions.
 
-To report a security vulnerability, please use the GitHub Security Advisory feature. This feature allows you to privately discuss, fix, and publish information about security vulnerabilities.
+To report a security vulnerability, please use the [GitHub Security Advisory feature](https://github.com/cryptomator/cryptomator/security/advisories). This feature allows you to privately discuss, fix, and publish information about security vulnerabilities.
 
 If you prefer to report the vulnerability via email, please send an email to security@cryptomator.org.
 

From 638a6d1195cea6fa20df1180047d147a3513317e Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Fri, 16 Jun 2023 12:56:07 +0200
Subject: [PATCH 18/61] optimized code

---
 .../java/org/cryptomator/ui/error/ErrorController.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/error/ErrorController.java b/src/main/java/org/cryptomator/ui/error/ErrorController.java
index 1fcc1e829..7f43f48d0 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorController.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorController.java
@@ -63,7 +63,7 @@ public class ErrorController implements FxController {
 	private final Environment environment;
 
 	private final BooleanProperty copiedDetails = new SimpleBooleanProperty();
-	private final ObjectProperty matchingErrorDiscussion = new SimpleObjectProperty();
+	private final ObjectProperty<ErrorDiscussion> matchingErrorDiscussion = new SimpleObjectProperty<>();
 	private final BooleanExpression errorSolutionFound = matchingErrorDiscussion.isNotNull();
 	private final BooleanProperty isLoadingHttpResponse = new SimpleBooleanProperty();
 
@@ -101,8 +101,10 @@ public class ErrorController implements FxController {
 	@FXML
 	public void showSolution() {
 		if (matchingErrorDiscussion.isNotNull().get()) {
-			ErrorDiscussion ed = (ErrorDiscussion) matchingErrorDiscussion.get();
-			application.getHostServices().showDocument(ed.url);
+			var discussion = matchingErrorDiscussion.get();
+			if (discussion != null) {
+				application.getHostServices().showDocument(matchingErrorDiscussion.get().url);
+			}
 		}
 	}
 

From 6fda206b9e1e48a6710a668298a39ed87daf492e Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Fri, 16 Jun 2023 12:57:21 +0200
Subject: [PATCH 19/61] just one little change

---
 src/main/java/org/cryptomator/ui/error/ErrorController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/cryptomator/ui/error/ErrorController.java b/src/main/java/org/cryptomator/ui/error/ErrorController.java
index 7f43f48d0..c8efdcd5b 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorController.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorController.java
@@ -103,7 +103,7 @@ public class ErrorController implements FxController {
 		if (matchingErrorDiscussion.isNotNull().get()) {
 			var discussion = matchingErrorDiscussion.get();
 			if (discussion != null) {
-				application.getHostServices().showDocument(matchingErrorDiscussion.get().url);
+				application.getHostServices().showDocument(discussion.url);
 			}
 		}
 	}

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 20/61] 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 12b38ad8c83bc5431c21d8a5b9ff1d1b8d835ea3 Mon Sep 17 00:00:00 2001
From: Jan-Peter Klein <jan-peter.klein@skymatic.de>
Date: Fri, 16 Jun 2023 15:25:22 +0200
Subject: [PATCH 21/61] removed extra tabs generated by reformat code

---
 .../java/org/cryptomator/ui/error/ErrorController.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/error/ErrorController.java b/src/main/java/org/cryptomator/ui/error/ErrorController.java
index c8efdcd5b..620a1f730 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorController.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorController.java
@@ -45,13 +45,13 @@ public class ErrorController implements FxController {
 	private static final String REPORT_BODY_TEMPLATE = """
 			OS: %s / %s
 			App: %s / %s
-						
+			
 			<!-- ✏ Please describe what happened as accurately as possible. -->
-						
+			
 			<!-- 📋 Please also copy and paste the detail text from the error window. -->
-						
+			
 			<!-- ℹ Text enclosed like this (chevrons, exclamation mark, two dashes) is not visible to others! -->
-						
+			
 			<!-- ❗ If the description or the detail text is missing, the discussion will be deleted. -->
 			""";
 

From 173b1e83861ec878edc1235a9ac0d2dc9d6d134b Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Fri, 16 Jun 2023 11:38:07 +0200
Subject: [PATCH 22/61] Show a dedicated message when mounting to an occupied
 Windows drive

The error message was restored from 6395f17. Fixes #2309.
---
 .../common/mount/MountPointInUseException.java            | 8 ++++++++
 src/main/java/org/cryptomator/common/mount/Mounter.java   | 6 +++++-
 .../ui/unlock/UnlockInvalidMountPointController.java      | 2 ++
 src/main/resources/i18n/strings.properties                | 1 +
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/cryptomator/common/mount/MountPointInUseException.java

diff --git a/src/main/java/org/cryptomator/common/mount/MountPointInUseException.java b/src/main/java/org/cryptomator/common/mount/MountPointInUseException.java
new file mode 100644
index 000000000..9f7f11174
--- /dev/null
+++ b/src/main/java/org/cryptomator/common/mount/MountPointInUseException.java
@@ -0,0 +1,8 @@
+package org.cryptomator.common.mount;
+
+public class MountPointInUseException extends IllegalMountPointException {
+
+	public MountPointInUseException(String msg) {
+		super(msg);
+	}
+}
diff --git a/src/main/java/org/cryptomator/common/mount/Mounter.java b/src/main/java/org/cryptomator/common/mount/Mounter.java
index 0161268f3..a56f2b01b 100644
--- a/src/main/java/org/cryptomator/common/mount/Mounter.java
+++ b/src/main/java/org/cryptomator/common/mount/Mounter.java
@@ -97,7 +97,11 @@ public class Mounter {
 				}
 			} else {
 				var mpIsDriveLetter = userChosenMountPoint.toString().matches("[A-Z]:\\\\");
-				if (!mpIsDriveLetter && canMountToParent && !canMountToDir) {
+				if (mpIsDriveLetter) {
+					if (driveLetters.getOccupied().contains(userChosenMountPoint)) {
+						throw new MountPointInUseException(userChosenMountPoint.toString());
+					}
+				} else if (canMountToParent && !canMountToDir) {
 					MountWithinParentUtil.prepareParentNoMountPoint(userChosenMountPoint);
 					cleanup = () -> {
 						MountWithinParentUtil.cleanup(userChosenMountPoint);
diff --git a/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java b/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
index 7bc0cbccd..b07e3ffde 100644
--- a/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
+++ b/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.unlock;
 
+import org.cryptomator.common.mount.MountPointInUseException;
 import org.cryptomator.common.mount.MountPointNotExistsException;
 import org.cryptomator.common.mount.MountPointNotSupportedException;
 import org.cryptomator.common.vaults.Vault;
@@ -41,6 +42,7 @@ public class UnlockInvalidMountPointController implements FxController {
 		var translationKey = switch (e) {
 			case MountPointNotSupportedException x -> "unlock.error.customPath.description.notSupported";
 			case MountPointNotExistsException x -> "unlock.error.customPath.description.notExists";
+			case MountPointInUseException x -> "unlock.error.customPath.description.inUse";
 			default -> "unlock.error.customPath.description.generic";
 		};
 		dialogDescription.setFormat(resourceBundle.getString(translationKey));
diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties
index 43060b7c1..0d9d1bfd5 100644
--- a/src/main/resources/i18n/strings.properties
+++ b/src/main/resources/i18n/strings.properties
@@ -127,6 +127,7 @@ unlock.success.revealBtn=Reveal Drive
 unlock.error.customPath.message=Unable to mount vault to custom path
 unlock.error.customPath.description.notSupported=If you wish to keep using the custom path, please go to the preferences and select a volume type that supports it. Otherwise, go to the vault options and choose a supported mount point.
 unlock.error.customPath.description.notExists=The custom mount path does not exist. Either create it in your local filesystem or change it in the vault options.
+unlock.error.customPath.description.inUse=Drive letter "%s" is already in use.
 unlock.error.customPath.description.generic=You have selected a custom mount path for this vault, but using it failed with the message: %s
 ## Hub
 hub.noKeychain.message=Unable to access device key

From 4d09728880b5226ea7f5d03719f176b269389ddb Mon Sep 17 00:00:00 2001
From: Sebastian Schuberth <sschuberth@gmail.com>
Date: Mon, 19 Jun 2023 22:31:50 +0200
Subject: [PATCH 23/61] Suppress a CVE false-positive for jackson-databind
 2.14.2

Also see https://github.com/cryptomator/cryptomator/pull/2961#issuecomment-1597652134.
---
 suppression.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/suppression.xml b/suppression.xml
index e7cc4ea65..36b795480 100644
--- a/suppression.xml
+++ b/suppression.xml
@@ -55,4 +55,12 @@
 		<cve>CVE-2022-45688</cve>
 	</suppress>
 
-</suppressions>
\ No newline at end of file
+	<suppress>
+		<notes><![CDATA[
+		False positive for jackson-databind-2.14.2.jar, see https://github.com/FasterXML/jackson-databind/issues/3972
+   ]]></notes>
+		<packageUrl regex="true">^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$</packageUrl>
+		<cve>CVE-2023-35116</cve>
+	</suppress>
+
+</suppressions>

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 24/61] 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 25/61] 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 26/61] 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 27/61] 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 56ba12fe56980dd6457cd6a444beddc556904d61 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias.hagemann@skymatic.de>
Date: Tue, 27 Jun 2023 09:31:43 +0200
Subject: [PATCH 28/61] fixed location presets of google drive and pcloud on
 macos

---
 .../GoogleDriveLocationPresetsProvider.java   | 26 +++++++++++--------
 .../PCloudLocationPresetsProvider.java        | 17 +++++++++---
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/locationpresets/GoogleDriveLocationPresetsProvider.java b/src/main/java/org/cryptomator/common/locationpresets/GoogleDriveLocationPresetsProvider.java
index f54afe9af..970bea042 100644
--- a/src/main/java/org/cryptomator/common/locationpresets/GoogleDriveLocationPresetsProvider.java
+++ b/src/main/java/org/cryptomator/common/locationpresets/GoogleDriveLocationPresetsProvider.java
@@ -5,6 +5,8 @@ import org.cryptomator.integrations.common.OperatingSystem;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
 import java.util.stream.Stream;
 
 import static org.cryptomator.integrations.common.OperatingSystem.Value.MAC;
@@ -15,23 +17,25 @@ import static org.cryptomator.integrations.common.OperatingSystem.Value.WINDOWS;
 @CheckAvailability
 public final class GoogleDriveLocationPresetsProvider implements LocationPresetsProvider {
 
-	private static final Path LOCATION1 = LocationPresetsProvider.resolveLocation("~/GoogleDrive");
-	private static final Path LOCATION2 = LocationPresetsProvider.resolveLocation("~/GoogleDrive/My Drive");
-
+	private static final List<Path> LOCATIONS = Arrays.asList( //
+			LocationPresetsProvider.resolveLocation("~/GoogleDrive/My Drive"), //
+			LocationPresetsProvider.resolveLocation("~/Google Drive/My Drive"), //
+			LocationPresetsProvider.resolveLocation("~/GoogleDrive"), //
+			LocationPresetsProvider.resolveLocation("~/Google Drive") //
+	);
 
 	@CheckAvailability
 	public static boolean isPresent() {
-		return Files.isDirectory(LOCATION1) || Files.isDirectory(LOCATION2);
+		return LOCATIONS.stream().anyMatch(Files::isDirectory);
 	}
 
 	@Override
 	public Stream<LocationPreset> getLocations() {
-		if(Files.isDirectory(LOCATION1)) {
-			return Stream.of(new LocationPreset("Google Drive", LOCATION1));
-		} else if(Files.isDirectory(LOCATION2)) {
-			return Stream.of(new LocationPreset("Google Drive", LOCATION2));
-		} else {
-			return Stream.of();
-		}
+		return LOCATIONS.stream() //
+				.filter(Files::isDirectory) //
+				.map(location -> new LocationPreset("Google Drive", location)) //
+				.findFirst() //
+				.stream();
 	}
+
 }
diff --git a/src/main/java/org/cryptomator/common/locationpresets/PCloudLocationPresetsProvider.java b/src/main/java/org/cryptomator/common/locationpresets/PCloudLocationPresetsProvider.java
index 05e2867ce..86b5ee5b3 100644
--- a/src/main/java/org/cryptomator/common/locationpresets/PCloudLocationPresetsProvider.java
+++ b/src/main/java/org/cryptomator/common/locationpresets/PCloudLocationPresetsProvider.java
@@ -5,6 +5,8 @@ import org.cryptomator.integrations.common.OperatingSystem;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
 import java.util.stream.Stream;
 
 import static org.cryptomator.integrations.common.OperatingSystem.Value.MAC;
@@ -15,16 +17,23 @@ import static org.cryptomator.integrations.common.OperatingSystem.Value.WINDOWS;
 @CheckAvailability
 public final class PCloudLocationPresetsProvider implements LocationPresetsProvider {
 
-
-	private static final Path LOCATION = LocationPresetsProvider.resolveLocation("~/pCloudDrive");
+	private static final List<Path> LOCATIONS = Arrays.asList( //
+			LocationPresetsProvider.resolveLocation("~/pCloudDrive"), //
+			LocationPresetsProvider.resolveLocation("~/pCloud Drive") //
+	);
 
 	@CheckAvailability
 	public static boolean isPresent() {
-		return Files.isDirectory(LOCATION);
+		return LOCATIONS.stream().anyMatch(Files::isDirectory);
 	}
 
 	@Override
 	public Stream<LocationPreset> getLocations() {
-		return Stream.of(new LocationPreset("pCloud", LOCATION));
+		return LOCATIONS.stream() //
+				.filter(Files::isDirectory) //
+				.map(location -> new LocationPreset("pCloud", location)) //
+				.findFirst() //
+				.stream();
 	}
+
 }

From fe3abcaaa803e2e746113400c8627192663c785d Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias.hagemann@skymatic.de>
Date: Tue, 27 Jun 2023 09:36:14 +0200
Subject: [PATCH 29/61] added leitzcloud location preset

---
 src/main/java/module-info.java                | 14 +++++----
 .../LeitzcloudLocationPresetsProvider.java    | 30 +++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/org/cryptomator/common/locationpresets/LeitzcloudLocationPresetsProvider.java

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 54938a0f0..41105ff15 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -5,6 +5,7 @@ import org.cryptomator.common.locationpresets.DropboxWindowsLocationPresetsProvi
 import org.cryptomator.common.locationpresets.GoogleDriveLocationPresetsProvider;
 import org.cryptomator.common.locationpresets.ICloudMacLocationPresetsProvider;
 import org.cryptomator.common.locationpresets.ICloudWindowsLocationPresetsProvider;
+import org.cryptomator.common.locationpresets.LeitzcloudLocationPresetsProvider;
 import org.cryptomator.common.locationpresets.LocationPresetsProvider;
 import org.cryptomator.common.locationpresets.MegaLocationPresetsProvider;
 import org.cryptomator.common.locationpresets.OneDriveLinuxLocationPresetsProvider;
@@ -53,11 +54,12 @@ open module org.cryptomator.desktop {
 
 	provides TrayMenuController with AwtTrayMenuController;
 	provides Configurator with LogbackConfiguratorFactory;
-	provides LocationPresetsProvider with DropboxMacLocationPresetsProvider, //
-			DropboxWindowsLocationPresetsProvider, DropboxLinuxLocationPresetsProvider, //
-			ICloudMacLocationPresetsProvider, ICloudWindowsLocationPresetsProvider, //
+	provides LocationPresetsProvider with //
+			DropboxWindowsLocationPresetsProvider, DropboxMacLocationPresetsProvider, DropboxLinuxLocationPresetsProvider, //
 			GoogleDriveLocationPresetsProvider, //
-			PCloudLocationPresetsProvider, MegaLocationPresetsProvider, //
-			OneDriveLinuxLocationPresetsProvider, OneDriveWindowsLocationPresetsProvider, //
-			OneDriveMacLocationPresetsProvider;
+			ICloudWindowsLocationPresetsProvider, ICloudMacLocationPresetsProvider, //
+			LeitzcloudLocationPresetsProvider, //
+			MegaLocationPresetsProvider, //
+			OneDriveWindowsLocationPresetsProvider, OneDriveMacLocationPresetsProvider, OneDriveLinuxLocationPresetsProvider, //
+			PCloudLocationPresetsProvider;
 }
\ No newline at end of file
diff --git a/src/main/java/org/cryptomator/common/locationpresets/LeitzcloudLocationPresetsProvider.java b/src/main/java/org/cryptomator/common/locationpresets/LeitzcloudLocationPresetsProvider.java
new file mode 100644
index 000000000..2fb459121
--- /dev/null
+++ b/src/main/java/org/cryptomator/common/locationpresets/LeitzcloudLocationPresetsProvider.java
@@ -0,0 +1,30 @@
+package org.cryptomator.common.locationpresets;
+
+import org.cryptomator.integrations.common.CheckAvailability;
+import org.cryptomator.integrations.common.OperatingSystem;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+import static org.cryptomator.integrations.common.OperatingSystem.Value.MAC;
+import static org.cryptomator.integrations.common.OperatingSystem.Value.WINDOWS;
+
+@OperatingSystem(WINDOWS)
+@OperatingSystem(MAC)
+@CheckAvailability
+public final class LeitzcloudLocationPresetsProvider implements LocationPresetsProvider {
+
+	private static final Path LOCATION = LocationPresetsProvider.resolveLocation("~/leitzcloud");
+
+	@CheckAvailability
+	public static boolean isPresent() {
+		return Files.isDirectory(LOCATION);
+	}
+
+	@Override
+	public Stream<LocationPreset> getLocations() {
+		return Stream.of(new LocationPreset("leitzcloud", LOCATION));
+	}
+
+}

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 30/61] 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 31/61] 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 b2a184bdf079351324b6b102026fc296029eadf1 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 29 Jun 2023 12:02:33 +0200
Subject: [PATCH 32/61] ignore unknown fields during JWT deserialization

---
 pom.xml                                       |  8 +++++++-
 src/main/java/module-info.java                |  3 ++-
 .../ui/keyloading/hub/HubConfig.java          |  3 +++
 .../ui/keyloading/hub/HubConfigTest.java      | 19 +++++++++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/org/cryptomator/ui/keyloading/hub/HubConfigTest.java

diff --git a/pom.xml b/pom.xml
index ed08a3d18..34858f85f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,7 @@
 		<dagger.version>2.45</dagger.version>
 		<easybind.version>2.2</easybind.version>
 		<guava.version>32.0.0-jre</guava.version>
+		<jackson.version>2.15.2</jackson.version>
 		<gson.version>2.10.1</gson.version>
 		<javafx.version>20.0.1</javafx.version>
 		<jwt.version>4.4.0</jwt.version>
@@ -157,6 +158,11 @@
 			<artifactId>nimbus-jose-jwt</artifactId>
 			<version>${nimbus-jose.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson.version}</version>
+		</dependency>
 
 		<!-- EasyBind -->
 		<dependency>
@@ -206,7 +212,7 @@
 			<artifactId>dagger</artifactId>
 			<version>${dagger.version}</version>
 		</dependency>
-		<dependency>
+		<dependency> <!-- TODO replace with jackson -->
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
 			<version>${gson.version}</version>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 41105ff15..2213ff0d9 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -38,7 +38,8 @@ open module org.cryptomator.desktop {
 	requires ch.qos.logback.core;
 	requires com.auth0.jwt;
 	requires com.google.common;
-	requires com.google.gson;
+	requires com.fasterxml.jackson.databind;
+	requires com.google.gson; // TODO replace with jackson?
 	requires com.nimbusds.jose.jwt;
 	requires com.nulabinc.zxcvbn;
 	requires com.tobiasdiez.easybind;
diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/HubConfig.java b/src/main/java/org/cryptomator/ui/keyloading/hub/HubConfig.java
index 7c2bc8be7..5f462b170 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/hub/HubConfig.java
+++ b/src/main/java/org/cryptomator/ui/keyloading/hub/HubConfig.java
@@ -1,6 +1,9 @@
 package org.cryptomator.ui.keyloading.hub;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 // needs to be accessible by JSON decoder
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class HubConfig {
 
 	public String clientId;
diff --git a/src/test/java/org/cryptomator/ui/keyloading/hub/HubConfigTest.java b/src/test/java/org/cryptomator/ui/keyloading/hub/HubConfigTest.java
new file mode 100644
index 000000000..bb39516a0
--- /dev/null
+++ b/src/test/java/org/cryptomator/ui/keyloading/hub/HubConfigTest.java
@@ -0,0 +1,19 @@
+package org.cryptomator.ui.keyloading.hub;
+
+import com.auth0.jwt.JWT;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+public class HubConfigTest {
+
+	@Test
+	@DisplayName("can parse JWT with unknown fields in header claim \"hub\"")
+	public void testParseJWTWithUnknownFields() {
+		var jwt = JWT.decode("eyJraWQiOiIxMjMiLCJ0eXAiOiJqd3QiLCJhbGciOiJIUzI1NiIsImh1YiI6eyJ1bmtub3duRmllbGQiOjQyLCJjbGllbnRJZCI6ImNyeXB0b21hdG9yIn19.eyJqdGkiOiI0NTYifQ.e1CStFf5fdh9ofX_6O8_LfbHfHEJZqUpuYNWz9xZp0I");
+		var claim = jwt.getHeaderClaim("hub");
+		var hubConfig = Assertions.assertDoesNotThrow(() -> claim.as(HubConfig.class));
+		Assertions.assertEquals("cryptomator", hubConfig.clientId);
+	}
+
+}
\ No newline at end of file

From 5f2497de90f6319c270ff8ee442d7ffb2e99f915 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 29 Jun 2023 12:26:45 +0200
Subject: [PATCH 33/61] replace GSON in "hub"

---
 .../ui/keyloading/hub/AuthFlowTask.java       |  7 ++++---
 .../ui/keyloading/hub/CreateDeviceDto.java    |  6 +-----
 .../ui/keyloading/hub/HttpHelper.java         |  4 ----
 .../hub/RegisterDeviceController.java         | 21 ++++++++++++-------
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/AuthFlowTask.java b/src/main/java/org/cryptomator/ui/keyloading/hub/AuthFlowTask.java
index c65256007..0379d4331 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/hub/AuthFlowTask.java
+++ b/src/main/java/org/cryptomator/ui/keyloading/hub/AuthFlowTask.java
@@ -1,6 +1,6 @@
 package org.cryptomator.ui.keyloading.hub;
 
-import com.google.gson.JsonParser;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.github.coffeelibs.tinyoauth2client.AuthFlow;
 import io.github.coffeelibs.tinyoauth2client.TinyOAuth2;
 import io.github.coffeelibs.tinyoauth2client.http.response.Response;
@@ -12,6 +12,8 @@ import java.util.function.Consumer;
 
 class AuthFlowTask extends Task<String> {
 
+	private static final ObjectMapper JSON = new ObjectMapper();
+
 	private final HubConfig hubConfig;
 	private final AuthFlowContext authFlowContext;
 	private final Consumer<URI> redirectUriConsumer;
@@ -39,8 +41,7 @@ class AuthFlowTask extends Task<String> {
 		if (response.statusCode() != 200) {
 			throw new NotOkResponseException("Authorization returned status code " + response.statusCode());
 		}
-		var json = JsonParser.parseString(response.body());
-		return json.getAsJsonObject().get("access_token").getAsString();
+		return JSON.reader().readTree(response.body()).get("access_token").asText();
 	}
 
 	public static class NotOkResponseException extends RuntimeException {
diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/CreateDeviceDto.java b/src/main/java/org/cryptomator/ui/keyloading/hub/CreateDeviceDto.java
index 71377a318..ed10a9257 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/hub/CreateDeviceDto.java
+++ b/src/main/java/org/cryptomator/ui/keyloading/hub/CreateDeviceDto.java
@@ -1,9 +1,5 @@
 package org.cryptomator.ui.keyloading.hub;
 
-class CreateDeviceDto {
-
-	public String id;
-	public String name;
-	public String publicKey;
+record CreateDeviceDto(String id, String name, String publicKey) {
 
 }
diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/HttpHelper.java b/src/main/java/org/cryptomator/ui/keyloading/hub/HttpHelper.java
index 51f3662a7..0077467cc 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/hub/HttpHelper.java
+++ b/src/main/java/org/cryptomator/ui/keyloading/hub/HttpHelper.java
@@ -1,14 +1,10 @@
 package org.cryptomator.ui.keyloading.hub;
 
 import com.google.common.io.CharStreams;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonParser;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.Reader;
 import java.net.http.HttpResponse;
 import java.nio.charset.StandardCharsets;
 
diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java b/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java
index 4cf2d9fa2..6fa6aa424 100644
--- a/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java
+++ b/src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java
@@ -2,9 +2,9 @@ package org.cryptomator.ui.keyloading.hub;
 
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.interfaces.DecodedJWT;
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.io.BaseEncoding;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.nimbusds.jose.JWEObject;
 import dagger.Lazy;
 import org.cryptomator.common.settings.DeviceKey;
@@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicReference;
 public class RegisterDeviceController implements FxController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(RegisterDeviceController.class);
-	private static final Gson GSON = new GsonBuilder().setLenient().create();
+	private static final ObjectMapper JSON = new ObjectMapper().setDefaultLeniency(true);
 	private static final List<Integer> EXPECTED_RESPONSE_CODES = List.of(201, 409);
 
 	private final Stage window;
@@ -101,11 +101,8 @@ public class RegisterDeviceController implements FxController {
 
 		var keyUri = URI.create(hubConfig.devicesResourceUrl + deviceId);
 		var deviceKey = keyPair.getPublic().getEncoded();
-		var dto = new CreateDeviceDto();
-		dto.id = deviceId;
-		dto.name = deviceNameField.getText();
-		dto.publicKey = BaseEncoding.base64Url().omitPadding().encode(deviceKey);
-		var json = GSON.toJson(dto); // TODO: do we want to keep GSON? doesn't support records -.-
+		var dto = new CreateDeviceDto(deviceId, deviceNameField.getText(), BaseEncoding.base64Url().omitPadding().encode(deviceKey));
+		var json = toJson(dto);
 		var request = HttpRequest.newBuilder(keyUri) //
 				.header("Authorization", "Bearer " + bearerToken) //
 				.header("Content-Type", "application/json").PUT(HttpRequest.BodyPublishers.ofString(json, StandardCharsets.UTF_8)) //
@@ -127,6 +124,14 @@ public class RegisterDeviceController implements FxController {
 				}, Platform::runLater);
 	}
 
+	private String toJson(CreateDeviceDto dto) {
+		try {
+			return JSON.writer().writeValueAsString(dto);
+		} catch (JacksonException e) {
+			throw new IllegalStateException("Failed to serialize DTO", e);
+		}
+	}
+
 	private void handleResponse(HttpResponse<Void> voidHttpResponse) {
 		assert EXPECTED_RESPONSE_CODES.contains(voidHttpResponse.statusCode());
 

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 34/61] 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 c6c292b505a081f7971f92a4d66a0fd09ec11303 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 29 Jun 2023 12:39:19 +0200
Subject: [PATCH 35/61] bump google guava to 32.0.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 34858f85f..6c016d277 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
 		<commons-lang3.version>3.12.0</commons-lang3.version>
 		<dagger.version>2.45</dagger.version>
 		<easybind.version>2.2</easybind.version>
-		<guava.version>32.0.0-jre</guava.version>
+		<guava.version>32.0.1-jre</guava.version>
 		<jackson.version>2.15.2</jackson.version>
 		<gson.version>2.10.1</gson.version>
 		<javafx.version>20.0.1</javafx.version>

From 99862869bc1d1f937b59efc815d595358cceb9dd Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 29 Jun 2023 13:03:27 +0200
Subject: [PATCH 36/61] replace GSON from error dialog

---
 .../cryptomator/ui/error/ErrorController.java | 31 ++++++++++++-------
 .../cryptomator/ui/error/ErrorDiscussion.java |  9 ++++++
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/error/ErrorController.java b/src/main/java/org/cryptomator/ui/error/ErrorController.java
index 620a1f730..f4a891c51 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorController.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorController.java
@@ -1,11 +1,13 @@
 package org.cryptomator.ui.error;
 
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.ErrorCode;
 import org.cryptomator.common.Nullable;
 import org.cryptomator.ui.common.FxController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -21,8 +23,8 @@ import javafx.scene.Scene;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import javafx.stage.Stage;
+import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.net.URI;
 import java.net.URLEncoder;
 import java.net.http.HttpClient;
@@ -38,6 +40,8 @@ import java.util.concurrent.TimeUnit;
 
 public class ErrorController implements FxController {
 
+	private static final ObjectMapper JSON = new ObjectMapper();
+	private static final Logger LOG = LoggerFactory.getLogger(ErrorController.class);
 	private static final String ERROR_CODES_URL = "https://gist.githubusercontent.com/cryptobot/accba9fb9555e7192271b85606f97230/raw/errorcodes.json";
 	private static final String SEARCH_URL_FORMAT = "https://github.com/cryptomator/cryptomator/discussions/categories/errors?discussions_q=category:Errors+%s";
 	private static final String REPORT_URL_FORMAT = "https://github.com/cryptomator/cryptomator/discussions/new?category=Errors&title=Error+%s&body=%s";
@@ -45,13 +49,13 @@ public class ErrorController implements FxController {
 	private static final String REPORT_BODY_TEMPLATE = """
 			OS: %s / %s
 			App: %s / %s
-			
+						
 			<!-- ✏ Please describe what happened as accurately as possible. -->
-			
+						
 			<!-- 📋 Please also copy and paste the detail text from the error window. -->
-			
+						
 			<!-- ℹ Text enclosed like this (chevrons, exclamation mark, two dashes) is not visible to others! -->
-			
+						
 			<!-- ❗ If the description or the detail text is missing, the discussion will be deleted. -->
 			""";
 
@@ -137,11 +141,12 @@ public class ErrorController implements FxController {
 	}
 
 	private void loadHttpResponse(HttpResponse<InputStream> response) {
-		if (response.statusCode() == 200) {
-			Map<String, ErrorDiscussion> errorDiscussionMap = new Gson().fromJson(//
-					new InputStreamReader(response.body(), StandardCharsets.UTF_8),//
-					new TypeToken<Map<String, ErrorDiscussion>>() {
-					}.getType());
+		if (response.statusCode() != 200) {
+			LOG.error("Status code {} when trying to load {} ", response.statusCode(), response.uri());
+		}
+		try {
+			var typeRef = new TypeReference<Map<String, ErrorDiscussion>>() {};
+			Map<String, ErrorDiscussion> errorDiscussionMap = JSON.reader().forType(typeRef).readValue(response.body());
 
 			if (errorDiscussionMap.values().stream().anyMatch(this::containsMethodCode)) {
 				Comparator<ErrorDiscussion> comp = this::compareByFullErrorCode;
@@ -155,6 +160,8 @@ public class ErrorController implements FxController {
 					matchingErrorDiscussion.set(value.get());
 				}
 			}
+		} catch (IOException e) {
+			LOG.error("Failed to load or parse JSON from " + response.uri(), e);
 		}
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java b/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
index bc1663f6f..933e713ae 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorDiscussion.java
@@ -1,12 +1,21 @@
 package org.cryptomator.ui.error;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ErrorDiscussion {
 
+	@JsonProperty
 	int upvoteCount;
+	@JsonProperty
 	String title;
+	@JsonProperty
 	String url;
+	@JsonProperty
 	Answer answer;
 
+	@JsonIgnoreProperties(ignoreUnknown = true)
 	static class Answer {
 
 	}

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 37/61] 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 3c53968dd25c4ad6a8a44b29740558e53b999a6f Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 29 Jun 2023 13:20:39 +0200
Subject: [PATCH 38/61] replace GSON from update checker

---
 .../ui/fxapp/UpdateCheckerTask.java           | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java b/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java
index 032148cea..ad16bb6a6 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java
@@ -1,9 +1,9 @@
 package org.cryptomator.ui.fxapp;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.io.ByteStreams;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.reflect.TypeToken;
 import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,20 +11,16 @@ import org.slf4j.LoggerFactory;
 import javafx.concurrent.Task;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.nio.charset.StandardCharsets;
-import java.util.Map;
 
 public class UpdateCheckerTask extends Task<String> {
 
+	private static final ObjectMapper JSON = new ObjectMapper();
 	private static final Logger LOG = LoggerFactory.getLogger(UpdateCheckerTask.class);
 
 	private static final long MAX_RESPONSE_SIZE = 10L * 1024; // 10kb should be sufficient. protect against flooding
-	private static final Gson GSON = new GsonBuilder().setLenient().create();
 
 	private final HttpClient httpClient;
 	private final HttpRequest checkForUpdatesRequest;
@@ -48,16 +44,14 @@ public class UpdateCheckerTask extends Task<String> {
 
 	private String processBody(HttpResponse<InputStream> response) throws IOException {
 		try (InputStream in = response.body(); //
-			 InputStream limitedIn = ByteStreams.limit(in, MAX_RESPONSE_SIZE); //
-			 Reader reader = new InputStreamReader(limitedIn, StandardCharsets.UTF_8)) {
-			Map<String, String> map = GSON.fromJson(reader, new TypeToken<Map<String, String>>() {
-			}.getType());
+			 InputStream limitedIn = ByteStreams.limit(in, MAX_RESPONSE_SIZE)) {
+			var json = JSON.reader().readTree(limitedIn);
 			if (SystemUtils.IS_OS_MAC_OSX) {
-				return map.get("mac");
+				return json.get("mac").asText();
 			} else if (SystemUtils.IS_OS_WINDOWS) {
-				return map.get("win");
+				return json.get("win").asText();
 			} else if (SystemUtils.IS_OS_LINUX) {
-				return map.get("linux");
+				return json.get("linux").asText();
 			} else {
 				throw new IllegalStateException("Unsupported operating system");
 			}

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 39/61] 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 40/61] 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 41/61] 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 42/61] 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 43/61] 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 44/61] 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 45/61] 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 46/61] 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 47/61] 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 b1ff94bdd64f433c281cb691094ff64cfbd49abf Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 29 Jun 2023 22:41:19 +0200
Subject: [PATCH 48/61] replace GSON from settings

---
 .../cryptomator/common/settings/Settings.java | 191 +++++++++++++-----
 .../common/settings/SettingsJson.java         |  86 ++++++++
 .../common/settings/SettingsJsonAdapter.java  | 183 -----------------
 .../common/settings/SettingsProvider.java     |  56 +++--
 .../cryptomator/common/settings/UiTheme.java  |   6 +-
 .../common/settings/VaultSettings.java        |  91 +++++++--
 .../common/settings/VaultSettingsJson.java    |  62 ++++++
 .../settings/VaultSettingsJsonAdapter.java    | 142 -------------
 .../common/settings/WhenUnlocked.java         |   6 +-
 .../launcher/SupportedLanguages.java          |   2 +-
 .../VolumePreferencesController.java          |   4 +-
 .../settings/SettingsJsonAdapterTest.java     |  61 ------
 .../common/settings/SettingsJsonTest.java     |  79 ++++++++
 .../common/settings/SettingsTest.java         |   2 +-
 .../VaultSettingsJsonAdapterTest.java         |  67 ------
 15 files changed, 478 insertions(+), 560 deletions(-)
 create mode 100644 src/main/java/org/cryptomator/common/settings/SettingsJson.java
 delete mode 100644 src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
 create mode 100644 src/main/java/org/cryptomator/common/settings/VaultSettingsJson.java
 delete mode 100644 src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
 delete mode 100644 src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java
 create mode 100644 src/test/java/org/cryptomator/common/settings/SettingsJsonTest.java
 delete mode 100644 src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java

diff --git a/src/main/java/org/cryptomator/common/settings/Settings.java b/src/main/java/org/cryptomator/common/settings/Settings.java
index 46aed5ea0..4100b4714 100644
--- a/src/main/java/org/cryptomator/common/settings/Settings.java
+++ b/src/main/java/org/cryptomator/common/settings/Settings.java
@@ -10,6 +10,8 @@ package org.cryptomator.common.settings;
 
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javafx.beans.Observable;
 import javafx.beans.property.BooleanProperty;
@@ -27,59 +29,85 @@ import java.util.function.Consumer;
 
 public class Settings {
 
-	public static final int MIN_PORT = 1024;
-	public static final int MAX_PORT = 65535;
-	public static final boolean DEFAULT_ASKED_FOR_UPDATE_CHECK = false;
-	public static final boolean DEFAULT_CHECK_FOR_UPDATES = false;
-	public static final boolean DEFAULT_START_HIDDEN = false;
-	public static final boolean DEFAULT_AUTO_CLOSE_VAULTS = false;
-	public static final boolean DEFAULT_USE_KEYCHAIN = true;
-	public static final int DEFAULT_PORT = 42427;
-	public static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3;
-	public static final boolean DEFAULT_DEBUG_MODE = false;
-	public static final UiTheme DEFAULT_THEME = UiTheme.LIGHT;
+	private static final Logger LOG = LoggerFactory.getLogger(Settings.class);
+
+	static final boolean DEFAULT_ASKED_FOR_UPDATE_CHECK = false;
+	static final boolean DEFAULT_CHECK_FOR_UPDATES = false;
+	static final boolean DEFAULT_START_HIDDEN = false;
+	static final boolean DEFAULT_AUTO_CLOSE_VAULTS = false;
+	static final boolean DEFAULT_USE_KEYCHAIN = true;
+	static final int DEFAULT_PORT = 42427;
+	static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3;
+	static final boolean DEFAULT_DEBUG_MODE = false;
+	static final UiTheme DEFAULT_THEME = UiTheme.LIGHT;
 	@Deprecated // to be changed to "whatever is available" eventually
-	public static final String DEFAULT_KEYCHAIN_PROVIDER = SystemUtils.IS_OS_WINDOWS ? "org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess" : SystemUtils.IS_OS_MAC ? "org.cryptomator.macos.keychain.MacSystemKeychainAccess" : "org.cryptomator.linux.keychain.SecretServiceKeychainAccess";
-	public static final NodeOrientation DEFAULT_USER_INTERFACE_ORIENTATION = NodeOrientation.LEFT_TO_RIGHT;
-	public static final String DEFAULT_LICENSE_KEY = "";
-	public static final boolean DEFAULT_SHOW_MINIMIZE_BUTTON = false;
-	public static final String DEFAULT_DISPLAY_CONFIGURATION = "";
-	public static final String DEFAULT_LANGUAGE = null;
+	static final String DEFAULT_KEYCHAIN_PROVIDER = SystemUtils.IS_OS_WINDOWS ? "org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess" : SystemUtils.IS_OS_MAC ? "org.cryptomator.macos.keychain.MacSystemKeychainAccess" : "org.cryptomator.linux.keychain.SecretServiceKeychainAccess";
+	static final String DEFAULT_USER_INTERFACE_ORIENTATION = NodeOrientation.LEFT_TO_RIGHT.name();
+	static final boolean DEFAULT_SHOW_MINIMIZE_BUTTON = false;
 
-
-	private final ObservableList<VaultSettings> directories = FXCollections.observableArrayList(VaultSettings::observables);
-	private final BooleanProperty askedForUpdateCheck = new SimpleBooleanProperty(DEFAULT_ASKED_FOR_UPDATE_CHECK);
-	private final BooleanProperty checkForUpdates = new SimpleBooleanProperty(DEFAULT_CHECK_FOR_UPDATES);
-	private final BooleanProperty startHidden = new SimpleBooleanProperty(DEFAULT_START_HIDDEN);
-	private final BooleanProperty autoCloseVaults = new SimpleBooleanProperty(DEFAULT_AUTO_CLOSE_VAULTS);
-	private final BooleanProperty useKeychain = new SimpleBooleanProperty(DEFAULT_USE_KEYCHAIN);
-	private final IntegerProperty port = new SimpleIntegerProperty(DEFAULT_PORT);
-	private final IntegerProperty numTrayNotifications = new SimpleIntegerProperty(DEFAULT_NUM_TRAY_NOTIFICATIONS);
-	private final BooleanProperty debugMode = new SimpleBooleanProperty(DEFAULT_DEBUG_MODE);
-	private final ObjectProperty<UiTheme> theme = new SimpleObjectProperty<>(DEFAULT_THEME);
-	private final ObjectProperty<String> keychainProvider = new SimpleObjectProperty<>(DEFAULT_KEYCHAIN_PROVIDER);
-	private final ObjectProperty<NodeOrientation> userInterfaceOrientation = new SimpleObjectProperty<>(DEFAULT_USER_INTERFACE_ORIENTATION);
-	private final StringProperty licenseKey = new SimpleStringProperty(DEFAULT_LICENSE_KEY);
-	private final BooleanProperty showMinimizeButton = new SimpleBooleanProperty(DEFAULT_SHOW_MINIMIZE_BUTTON);
+	private final ObservableList<VaultSettings> directories;
+	private final BooleanProperty askedForUpdateCheck;
+	private final BooleanProperty checkForUpdates;
+	private final BooleanProperty startHidden;
+	private final BooleanProperty autoCloseVaults;
+	private final BooleanProperty useKeychain;
+	private final IntegerProperty port;
+	private final IntegerProperty numTrayNotifications;
+	private final BooleanProperty debugMode;
+	private final ObjectProperty<UiTheme> theme;
+	private final StringProperty keychainProvider;
+	private final ObjectProperty<NodeOrientation> userInterfaceOrientation;
+	private final StringProperty licenseKey;
+	private final BooleanProperty showMinimizeButton;
 	private final BooleanProperty showTrayIcon;
-	private final IntegerProperty windowXPosition = new SimpleIntegerProperty();
-	private final IntegerProperty windowYPosition = new SimpleIntegerProperty();
-	private final IntegerProperty windowWidth = new SimpleIntegerProperty();
-	private final IntegerProperty windowHeight = new SimpleIntegerProperty();
-	private final ObjectProperty<String> displayConfiguration = new SimpleObjectProperty<>(DEFAULT_DISPLAY_CONFIGURATION);
-	private final StringProperty language = new SimpleStringProperty(DEFAULT_LANGUAGE);
-
-
-	private final StringProperty mountService = new SimpleStringProperty();
-
+	private final IntegerProperty windowXPosition;
+	private final IntegerProperty windowYPosition;
+	private final IntegerProperty windowWidth;
+	private final IntegerProperty windowHeight;
+	private final StringProperty displayConfiguration;
+	private final StringProperty language;
+	private final StringProperty mountService;
 
 	private Consumer<Settings> saveCmd;
 
+	public static Settings create(Environment env) {
+		var defaults = new SettingsJson();
+		defaults.showTrayIcon = env.showTrayIcon();
+		return new Settings(defaults);
+	}
+
 	/**
-	 * Package-private constructor; use {@link SettingsProvider}.
+	 * Recreate settings from json
+	 *
+	 * @param json The parsed settings.json
 	 */
-	Settings(Environment env) {
-		this.showTrayIcon = new SimpleBooleanProperty(env.showTrayIcon());
+	Settings(SettingsJson json) {
+		this.directories = FXCollections.observableArrayList(VaultSettings::observables);
+		this.askedForUpdateCheck = new SimpleBooleanProperty(this, "askedForUpdateCheck", json.askedForUpdateCheck);
+		this.checkForUpdates = new SimpleBooleanProperty(this, "checkForUpdates", json.checkForUpdatesEnabled);
+		this.startHidden = new SimpleBooleanProperty(this, "startHidden", json.startHidden);
+		this.autoCloseVaults = new SimpleBooleanProperty(this, "autoCloseVaults", json.autoCloseVaults);
+		this.useKeychain = new SimpleBooleanProperty(this, "useKeychain", json.useKeychain);
+		this.port = new SimpleIntegerProperty(this, "webDavPort", json.port);
+		this.numTrayNotifications = new SimpleIntegerProperty(this, "numTrayNotifications", json.numTrayNotifications);
+		this.debugMode = new SimpleBooleanProperty(this, "debugMode", json.debugMode);
+		this.theme = new SimpleObjectProperty<>(this, "theme", json.theme);
+		this.keychainProvider = new SimpleStringProperty(this, "keychainProvider", json.keychainProvider);
+		this.userInterfaceOrientation = new SimpleObjectProperty<>(this, "userInterfaceOrientation", parseEnum(json.uiOrientation, NodeOrientation.class, NodeOrientation.LEFT_TO_RIGHT));
+		this.licenseKey = new SimpleStringProperty(this, "licenseKey", json.licenseKey);
+		this.showMinimizeButton = new SimpleBooleanProperty(this, "showMinimizeButton", json.showMinimizeButton);
+		this.showTrayIcon = new SimpleBooleanProperty(this, "showTrayIcon", json.showTrayIcon);
+		this.windowXPosition = new SimpleIntegerProperty(this, "windowXPosition", json.windowXPosition);
+		this.windowYPosition = new SimpleIntegerProperty(this, "windowYPosition", json.windowYPosition);
+		this.windowWidth = new SimpleIntegerProperty(this, "windowWidth", json.windowWidth);
+		this.windowHeight = new SimpleIntegerProperty(this, "windowHeight", json.windowHeight);
+		this.displayConfiguration = new SimpleStringProperty(this, "displayConfiguration", json.displayConfiguration);
+		this.language = new SimpleStringProperty(this, "language", json.language);
+		this.mountService = new SimpleStringProperty(this, "mountService", json.mountService);
+
+		this.directories.addAll(json.directories.stream().map(VaultSettings::new).toList());
+
+		migrateLegacySettings(json);
 
 		directories.addListener(this::somethingChanged);
 		askedForUpdateCheck.addListener(this::somethingChanged);
@@ -105,6 +133,72 @@ public class Settings {
 		mountService.addListener(this::somethingChanged);
 	}
 
+	@SuppressWarnings("deprecation")
+	private void migrateLegacySettings(SettingsJson json) {
+		// implicit migration of 1.6.x legacy setting "preferredVolumeImpl":
+		if (this.mountService.get() == null && json.preferredVolumeImpl != null) {
+			this.mountService.set(switch (json.preferredVolumeImpl) {
+				case "Dokany" -> "org.cryptomator.frontend.dokany.mount.DokanyMountProvider";
+				case "FUSE" -> {
+					if (SystemUtils.IS_OS_WINDOWS) {
+						yield "org.cryptomator.frontend.fuse.mount.WinFspNetworkMountProvider";
+					} else if (SystemUtils.IS_OS_MAC) {
+						yield "org.cryptomator.frontend.fuse.mount.MacFuseMountProvider";
+					} else {
+						yield "org.cryptomator.frontend.fuse.mount.LinuxFuseMountProvider";
+					}
+				}
+				default -> {
+					if (SystemUtils.IS_OS_WINDOWS) {
+						yield "org.cryptomator.frontend.webdav.mount.WindowsMounter";
+					} else if (SystemUtils.IS_OS_MAC) {
+						yield "org.cryptomator.frontend.webdav.mount.MacAppleScriptMounter";
+					} else {
+						yield "org.cryptomator.frontend.webdav.mount.LinuxGioMounter";
+					}
+				}
+			});
+		}
+	}
+
+	public SettingsJson serialized() {
+		var json = new SettingsJson();
+		json.directories = directories.stream().map(VaultSettings::serialized).toList();
+		json.askedForUpdateCheck = askedForUpdateCheck.get();
+		json.checkForUpdatesEnabled = checkForUpdates.get();
+		json.startHidden = startHidden.get();
+		json.autoCloseVaults = autoCloseVaults.get();
+		json.useKeychain = useKeychain.get();
+		json.port = port.get();
+		json.numTrayNotifications = numTrayNotifications.get();
+		json.debugMode = debugMode.get();
+		json.theme = theme.get();
+		json.keychainProvider = keychainProvider.get();
+		json.uiOrientation = userInterfaceOrientation.get().name();
+		json.licenseKey = licenseKey.get();
+		json.showMinimizeButton = showMinimizeButton.get();
+		json.showTrayIcon = showTrayIcon.get();
+		json.windowXPosition = windowXPosition.get();
+		json.windowYPosition = windowYPosition.get();
+		json.windowWidth = windowWidth.get();
+		json.windowHeight = windowHeight.get();
+		json.displayConfiguration = displayConfiguration.get();
+		json.language = language.get();
+		json.mountService = mountService.get();
+		return json;
+	}
+
+	private <E extends Enum<E>> E parseEnum(String value, Class<E> clazz, E defaultValue) {
+		try {
+			return Enum.valueOf(clazz, value.toUpperCase());
+		} catch (IllegalArgumentException e) {
+			LOG.warn("No value {}.{}. Defaulting to {}.", clazz.getSimpleName(), value, defaultValue);
+			return defaultValue;
+		}
+	}
+
+
+	// TODO rename to setChangeListener
 	void setSaveCmd(Consumer<Settings> saveCmd) {
 		this.saveCmd = saveCmd;
 	}
@@ -120,6 +214,7 @@ public class Settings {
 	}
 
 	/* Getter/Setter */
+	// TODO: remove accessors, make fields public
 
 	public ObservableList<VaultSettings> getDirectories() {
 		return directories;
@@ -141,7 +236,7 @@ public class Settings {
 		return autoCloseVaults;
 	}
 
-	public BooleanProperty useKeychain() { return useKeychain; }
+	public BooleanProperty useKeychain() {return useKeychain;}
 
 	public IntegerProperty port() {
 		return port;
@@ -163,7 +258,7 @@ public class Settings {
 		return theme;
 	}
 
-	public ObjectProperty<String> keychainProvider() {return keychainProvider;}
+	public StringProperty keychainProvider() {return keychainProvider;}
 
 	public ObjectProperty<NodeOrientation> userInterfaceOrientation() {
 		return userInterfaceOrientation;
@@ -197,7 +292,7 @@ public class Settings {
 		return windowHeight;
 	}
 
-	public ObjectProperty<String> displayConfigurationProperty() {
+	public StringProperty displayConfigurationProperty() {
 		return displayConfiguration;
 	}
 
diff --git a/src/main/java/org/cryptomator/common/settings/SettingsJson.java b/src/main/java/org/cryptomator/common/settings/SettingsJson.java
new file mode 100644
index 000000000..4bd23bec7
--- /dev/null
+++ b/src/main/java/org/cryptomator/common/settings/SettingsJson.java
@@ -0,0 +1,86 @@
+package org.cryptomator.common.settings;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+class SettingsJson {
+
+	@JsonProperty("directories")
+	List<VaultSettingsJson> directories = List.of();
+
+	@JsonProperty("writtenByVersion")
+	String writtenByVersion;
+
+	@JsonProperty("askedForUpdateCheck")
+	boolean askedForUpdateCheck = Settings.DEFAULT_ASKED_FOR_UPDATE_CHECK;
+
+	@JsonProperty("autoCloseVaults")
+	boolean autoCloseVaults = Settings.DEFAULT_AUTO_CLOSE_VAULTS;
+
+	@JsonProperty("checkForUpdatesEnabled")
+	boolean checkForUpdatesEnabled = Settings.DEFAULT_CHECK_FOR_UPDATES;
+
+	@JsonProperty("debugMode")
+	boolean debugMode = Settings.DEFAULT_DEBUG_MODE;
+
+	@JsonProperty("theme")
+	UiTheme theme = Settings.DEFAULT_THEME;
+
+	@JsonProperty("displayConfiguration")
+	String displayConfiguration;
+
+	@JsonProperty("keychainProvider")
+	String keychainProvider = Settings.DEFAULT_KEYCHAIN_PROVIDER;
+
+	@JsonProperty("language")
+	String language;
+
+	@JsonProperty("licenseKey")
+	String licenseKey;
+
+	@JsonProperty("mountService")
+	String mountService;
+
+	@JsonProperty("numTrayNotifications")
+	int numTrayNotifications = Settings.DEFAULT_NUM_TRAY_NOTIFICATIONS;
+
+	@JsonProperty("port")
+	int port = Settings.DEFAULT_PORT;
+
+	@JsonProperty("showMinimizeButton")
+	boolean showMinimizeButton = Settings.DEFAULT_SHOW_MINIMIZE_BUTTON;
+
+	@JsonProperty("showTrayIcon")
+	boolean showTrayIcon;
+
+	@JsonProperty("startHidden")
+	boolean startHidden = Settings.DEFAULT_START_HIDDEN;
+
+	@JsonProperty("uiOrientation")
+	String uiOrientation = Settings.DEFAULT_USER_INTERFACE_ORIENTATION;
+
+	@JsonProperty("useKeychain")
+	boolean useKeychain = Settings.DEFAULT_USE_KEYCHAIN;
+
+	@JsonProperty("windowHeight")
+	int windowHeight;
+
+	@JsonProperty("windowWidth")
+	int windowWidth;
+
+	@JsonProperty("windowXPosition")
+	int windowXPosition;
+
+	@JsonProperty("windowYPosition")
+	int windowYPosition;
+
+	@Deprecated(since = "1.7.0")
+	@JsonProperty(value = "preferredVolumeImpl", access = JsonProperty.Access.WRITE_ONLY) // WRITE_ONLY means value is "written" into the java object during deserialization. Upvote this: https://github.com/FasterXML/jackson-annotations/issues/233
+	String preferredVolumeImpl;
+
+}
diff --git a/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java b/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
deleted file mode 100644
index abc6f629f..000000000
--- a/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the accompanying LICENSE file.
- *******************************************************************************/
-package org.cryptomator.common.settings;
-
-import com.google.gson.TypeAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonToken;
-import com.google.gson.stream.JsonWriter;
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.Environment;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javafx.geometry.NodeOrientation;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-@Singleton
-public class SettingsJsonAdapter extends TypeAdapter<Settings> {
-
-	private static final Logger LOG = LoggerFactory.getLogger(SettingsJsonAdapter.class);
-
-	private final VaultSettingsJsonAdapter vaultSettingsJsonAdapter = new VaultSettingsJsonAdapter();
-	private final Environment env;
-
-	@Inject
-	public SettingsJsonAdapter(Environment env) {
-		this.env = env;
-	}
-
-	@Override
-	public void write(JsonWriter out, Settings value) throws IOException {
-		out.beginObject();
-		out.name("writtenByVersion").value(env.getAppVersion() + env.getBuildNumber().map("-"::concat).orElse(""));
-		out.name("directories");
-		writeVaultSettingsArray(out, value.getDirectories());
-		out.name("askedForUpdateCheck").value(value.askedForUpdateCheck().get());
-		out.name("autoCloseVaults").value(value.autoCloseVaults().get());
-		out.name("checkForUpdatesEnabled").value(value.checkForUpdates().get());
-		out.name("debugMode").value(value.debugMode().get());
-		out.name("displayConfiguration").value((value.displayConfigurationProperty().get()));
-		out.name("keychainProvider").value(value.keychainProvider().get());
-		out.name("language").value((value.languageProperty().get()));
-		out.name("licenseKey").value(value.licenseKey().get());
-		out.name("mountService").value(value.mountService().get());
-		out.name("numTrayNotifications").value(value.numTrayNotifications().get());
-		out.name("port").value(value.port().get());
-		out.name("showMinimizeButton").value(value.showMinimizeButton().get());
-		out.name("showTrayIcon").value(value.showTrayIcon().get());
-		out.name("startHidden").value(value.startHidden().get());
-		out.name("theme").value(value.theme().get().name());
-		out.name("uiOrientation").value(value.userInterfaceOrientation().get().name());
-		out.name("useKeychain").value(value.useKeychain().get());
-		out.name("windowHeight").value((value.windowHeightProperty().get()));
-		out.name("windowWidth").value((value.windowWidthProperty().get()));
-		out.name("windowXPosition").value((value.windowXPositionProperty().get()));
-		out.name("windowYPosition").value((value.windowYPositionProperty().get()));
-		out.endObject();
-	}
-
-	private void writeVaultSettingsArray(JsonWriter out, Iterable<VaultSettings> vaultSettings) throws IOException {
-		out.beginArray();
-		for (VaultSettings value : vaultSettings) {
-			vaultSettingsJsonAdapter.write(out, value);
-		}
-		out.endArray();
-	}
-
-	@Override
-	public Settings read(JsonReader in) throws IOException {
-		Settings settings = new Settings(env);
-		//1.6.x legacy
-		String volumeImpl = null;
-		//legacy end
-		in.beginObject();
-		while (in.hasNext()) {
-			String name = in.nextName();
-			switch (name) {
-				case "writtenByVersion" -> in.skipValue(); //noop
-				case "directories" -> settings.getDirectories().addAll(readVaultSettingsArray(in));
-				case "askedForUpdateCheck" -> settings.askedForUpdateCheck().set(in.nextBoolean());
-				case "autoCloseVaults" -> settings.autoCloseVaults().set(in.nextBoolean());
-				case "checkForUpdatesEnabled" -> settings.checkForUpdates().set(in.nextBoolean());
-				case "debugMode" -> settings.debugMode().set(in.nextBoolean());
-				case "displayConfiguration" -> settings.displayConfigurationProperty().set(in.nextString());
-				case "keychainProvider" -> settings.keychainProvider().set(in.nextString());
-				case "language" -> settings.languageProperty().set(in.nextString());
-				case "licenseKey" -> settings.licenseKey().set(in.nextString());
-				case "mountService" -> {
-					var token = in.peek();
-					if (JsonToken.STRING == token) {
-						settings.mountService().set(in.nextString());
-					}
-				}
-				case "numTrayNotifications" -> settings.numTrayNotifications().set(in.nextInt());
-				case "port" -> settings.port().set(in.nextInt());
-				case "showMinimizeButton" -> settings.showMinimizeButton().set(in.nextBoolean());
-				case "showTrayIcon" -> settings.showTrayIcon().set(in.nextBoolean());
-				case "startHidden" -> settings.startHidden().set(in.nextBoolean());
-				case "theme" -> settings.theme().set(parseUiTheme(in.nextString()));
-				case "uiOrientation" -> settings.userInterfaceOrientation().set(parseUiOrientation(in.nextString()));
-				case "useKeychain" -> settings.useKeychain().set(in.nextBoolean());
-				case "windowHeight" -> settings.windowHeightProperty().set(in.nextInt());
-				case "windowWidth" -> settings.windowWidthProperty().set(in.nextInt());
-				case "windowXPosition" -> settings.windowXPositionProperty().set(in.nextInt());
-				case "windowYPosition" -> settings.windowYPositionProperty().set(in.nextInt());
-				//1.6.x legacy
-				case "preferredVolumeImpl" -> volumeImpl = in.nextString();
-				//legacy end
-				default -> {
-					LOG.warn("Unsupported vault setting found in JSON: {}", name);
-					in.skipValue();
-				}
-			}
-
-		}
-		in.endObject();
-
-		//1.6.x legacy
-		if (volumeImpl != null) {
-			settings.mountService().set(convertLegacyVolumeImplToMountService(volumeImpl));
-		}
-		//legacy end
-
-		return settings;
-	}
-
-	private String convertLegacyVolumeImplToMountService(String volumeImpl) {
-		if (volumeImpl.equals("Dokany")) {
-			return "org.cryptomator.frontend.dokany.mount.DokanyMountProvider";
-		} else if (volumeImpl.equals("FUSE")) {
-			if (SystemUtils.IS_OS_WINDOWS) {
-				return "org.cryptomator.frontend.fuse.mount.WinFspNetworkMountProvider";
-			} else if (SystemUtils.IS_OS_MAC) {
-				return "org.cryptomator.frontend.fuse.mount.MacFuseMountProvider";
-			} else {
-				return "org.cryptomator.frontend.fuse.mount.LinuxFuseMountProvider";
-			}
-		} else {
-			if (SystemUtils.IS_OS_WINDOWS) {
-				return "org.cryptomator.frontend.webdav.mount.WindowsMounter";
-			} else if (SystemUtils.IS_OS_MAC) {
-				return "org.cryptomator.frontend.webdav.mount.MacAppleScriptMounter";
-			} else {
-				return "org.cryptomator.frontend.webdav.mount.LinuxGioMounter";
-			}
-		}
-	}
-
-	private UiTheme parseUiTheme(String uiThemeName) {
-		try {
-			return UiTheme.valueOf(uiThemeName.toUpperCase());
-		} catch (IllegalArgumentException e) {
-			LOG.warn("Invalid ui theme {}. Defaulting to {}.", uiThemeName, Settings.DEFAULT_THEME);
-			return Settings.DEFAULT_THEME;
-		}
-	}
-
-	private NodeOrientation parseUiOrientation(String uiOrientationName) {
-		try {
-			return NodeOrientation.valueOf(uiOrientationName.toUpperCase());
-		} catch (IllegalArgumentException e) {
-			LOG.warn("Invalid ui orientation {}. Defaulting to {}.", uiOrientationName, Settings.DEFAULT_USER_INTERFACE_ORIENTATION);
-			return Settings.DEFAULT_USER_INTERFACE_ORIENTATION;
-		}
-	}
-
-	private List<VaultSettings> readVaultSettingsArray(JsonReader in) throws IOException {
-		List<VaultSettings> result = new ArrayList<>();
-		in.beginArray();
-		while (!JsonToken.END_ARRAY.equals(in.peek())) {
-			result.add(vaultSettingsJsonAdapter.read(in));
-		}
-		in.endArray();
-		return result;
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/org/cryptomator/common/settings/SettingsProvider.java b/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
index 594a36e2e..2b07c38eb 100644
--- a/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
+++ b/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
@@ -8,12 +8,10 @@
  *******************************************************************************/
 package org.cryptomator.common.settings;
 
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Suppliers;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
-import com.google.gson.JsonParser;
 import org.cryptomator.common.Environment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,12 +20,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.Writer;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
@@ -44,6 +37,7 @@ import java.util.stream.Stream;
 @Singleton
 public class SettingsProvider implements Supplier<Settings> {
 
+	private static final ObjectMapper JSON = new ObjectMapper().setDefaultLeniency(true);
 	private static final Logger LOG = LoggerFactory.getLogger(SettingsProvider.class);
 	private static final long SAVE_DELAY_MS = 1000;
 
@@ -51,16 +45,16 @@ public class SettingsProvider implements Supplier<Settings> {
 	private final Supplier<Settings> settings = Suppliers.memoize(this::load);
 	private final Environment env;
 	private final ScheduledExecutorService scheduler;
-	private final Gson gson;
+//	private final Gson gson;
 
 	@Inject
-	public SettingsProvider(SettingsJsonAdapter settingsJsonAdapter, Environment env, ScheduledExecutorService scheduler) {
+	public SettingsProvider(Environment env, ScheduledExecutorService scheduler) {
 		this.env = env;
 		this.scheduler = scheduler;
-		this.gson = new GsonBuilder() //
-				.setPrettyPrinting().setLenient().disableHtmlEscaping() //
-				.registerTypeAdapter(Settings.class, settingsJsonAdapter) //
-				.create();
+//		this.gson = new GsonBuilder() //
+//				.setPrettyPrinting().setLenient().disableHtmlEscaping() //
+//				.registerTypeAdapter(Settings.class, settingsJsonAdapter) //
+//				.create();
 	}
 
 	@Override
@@ -69,28 +63,25 @@ public class SettingsProvider implements Supplier<Settings> {
 	}
 
 	private Settings load() {
-		Settings settings = env.getSettingsPath().flatMap(this::tryLoad).findFirst().orElse(new Settings(env));
+		Settings settings = env.getSettingsPath().flatMap(this::tryLoad).findFirst().orElseGet(() -> Settings.create(env));
 		settings.setSaveCmd(this::scheduleSave);
 		return settings;
 	}
 
 	private Stream<Settings> tryLoad(Path path) {
 		LOG.debug("Attempting to load settings from {}", path);
-		try (InputStream in = Files.newInputStream(path, StandardOpenOption.READ); //
-			 Reader reader = new InputStreamReader(in, StandardCharsets.UTF_8)) {
-			JsonElement json = JsonParser.parseReader(reader);
-			if (json.isJsonObject()) {
-				Settings settings = gson.fromJson(json, Settings.class);
-				LOG.info("Settings loaded from {}", path);
-				return Stream.of(settings);
-			} else {
-				LOG.warn("Invalid json file {}", path);
-				return Stream.empty();
-			}
+		try (InputStream in = Files.newInputStream(path, StandardOpenOption.READ)) {
+			var json = JSON.reader().readValue(in, SettingsJson.class);
+			LOG.info("Settings loaded from {}", path);
+			var settings = new Settings(json);
+			return Stream.of(settings);
+		} catch (JacksonException e) {
+			LOG.warn("Failed to parse json file {}", path, e);
+			return Stream.empty();
 		} catch (NoSuchFileException e) {
 			return Stream.empty();
-		} catch (IOException | JsonParseException e) {
-			LOG.warn("Exception while loading settings from " + path, e);
+		} catch (IOException e) {
+			LOG.warn("Failed to load json file {}", path, e);
 			return Stream.empty();
 		}
 	}
@@ -116,9 +107,10 @@ public class SettingsProvider implements Supplier<Settings> {
 		try {
 			Files.createDirectories(settingsPath.getParent());
 			Path tmpPath = settingsPath.resolveSibling(settingsPath.getFileName().toString() + ".tmp");
-			try (OutputStream out = Files.newOutputStream(tmpPath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE); //
-				 Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8)) {
-				gson.toJson(settings, writer);
+			try (OutputStream out = Files.newOutputStream(tmpPath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE)) {
+				var jsonObj = settings.serialized();
+				jsonObj.writtenByVersion = env.getAppVersion() + env.getBuildNumber().map("-"::concat).orElse("");
+				JSON.writerWithDefaultPrettyPrinter().writeValue(out, jsonObj);
 			}
 			Files.move(tmpPath, settingsPath, StandardCopyOption.REPLACE_EXISTING);
 			LOG.info("Settings saved to {}", settingsPath);
diff --git a/src/main/java/org/cryptomator/common/settings/UiTheme.java b/src/main/java/org/cryptomator/common/settings/UiTheme.java
index 24e73dad6..4161ff430 100644
--- a/src/main/java/org/cryptomator/common/settings/UiTheme.java
+++ b/src/main/java/org/cryptomator/common/settings/UiTheme.java
@@ -1,9 +1,13 @@
 package org.cryptomator.common.settings;
 
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.SystemUtils;
 
+@JsonFormat(shape = JsonFormat.Shape.STRING)
 public enum UiTheme {
-	LIGHT("preferences.interface.theme.light"), //
+	@JsonEnumDefaultValue @JsonProperty LIGHT("preferences.interface.theme.light"), //
 	DARK("preferences.interface.theme.dark"), //
 	AUTOMATIC("preferences.interface.theme.automatic");
 
diff --git a/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/src/main/java/org/cryptomator/common/settings/VaultSettings.java
index 3a116b4ce..8989858e1 100644
--- a/src/main/java/org/cryptomator/common/settings/VaultSettings.java
+++ b/src/main/java/org/cryptomator/common/settings/VaultSettings.java
@@ -6,7 +6,9 @@
 package org.cryptomator.common.settings;
 
 import com.google.common.base.CharMatcher;
+import com.google.common.base.Strings;
 import com.google.common.io.BaseEncoding;
+import org.apache.commons.lang3.SystemUtils;
 
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
@@ -20,6 +22,7 @@ import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Objects;
 import java.util.Random;
 
@@ -28,33 +31,45 @@ import java.util.Random;
  */
 public class VaultSettings {
 
-	public static final boolean DEFAULT_UNLOCK_AFTER_STARTUP = false;
-	public static final boolean DEFAULT_REVEAL_AFTER_MOUNT = true;
-	public static final boolean DEFAULT_USES_READONLY_MODE = false;
-	public static final String DEFAULT_MOUNT_FLAGS = "";
-	public static final int DEFAULT_MAX_CLEARTEXT_FILENAME_LENGTH = -1;
-	public static final WhenUnlocked DEFAULT_ACTION_AFTER_UNLOCK = WhenUnlocked.ASK;
-	public static final boolean DEFAULT_AUTOLOCK_WHEN_IDLE = false;
-	public static final int DEFAULT_AUTOLOCK_IDLE_SECONDS = 30 * 60;
+	static final boolean DEFAULT_UNLOCK_AFTER_STARTUP = false;
+	static final boolean DEFAULT_REVEAL_AFTER_MOUNT = true;
+	static final boolean DEFAULT_USES_READONLY_MODE = false;
+	static final String DEFAULT_MOUNT_FLAGS = ""; // TODO: remove empty default mount flags and let this property be null if not used
+	static final int DEFAULT_MAX_CLEARTEXT_FILENAME_LENGTH = -1;
+	static final WhenUnlocked DEFAULT_ACTION_AFTER_UNLOCK = WhenUnlocked.ASK;
+	static final boolean DEFAULT_AUTOLOCK_WHEN_IDLE = false;
+	static final int DEFAULT_AUTOLOCK_IDLE_SECONDS = 30 * 60;
 
 	private static final Random RNG = new Random();
 
 	private final String id;
-	private final ObjectProperty<Path> path = new SimpleObjectProperty<>();
-	private final StringProperty displayName = new SimpleStringProperty();
-	private final BooleanProperty unlockAfterStartup = new SimpleBooleanProperty(DEFAULT_UNLOCK_AFTER_STARTUP);
-	private final BooleanProperty revealAfterMount = new SimpleBooleanProperty(DEFAULT_REVEAL_AFTER_MOUNT);
-	private final BooleanProperty usesReadOnlyMode = new SimpleBooleanProperty(DEFAULT_USES_READONLY_MODE);
-	private final StringProperty mountFlags = new SimpleStringProperty(DEFAULT_MOUNT_FLAGS); //TODO: remove empty default mount flags and let this property be null if not used
-	private final IntegerProperty maxCleartextFilenameLength = new SimpleIntegerProperty(DEFAULT_MAX_CLEARTEXT_FILENAME_LENGTH);
-	private final ObjectProperty<WhenUnlocked> actionAfterUnlock = new SimpleObjectProperty<>(DEFAULT_ACTION_AFTER_UNLOCK);
-	private final BooleanProperty autoLockWhenIdle = new SimpleBooleanProperty(DEFAULT_AUTOLOCK_WHEN_IDLE);
-	private final IntegerProperty autoLockIdleSeconds = new SimpleIntegerProperty(DEFAULT_AUTOLOCK_IDLE_SECONDS);
+	private final ObjectProperty<Path> path;
+	private final StringProperty displayName;
+	private final BooleanProperty unlockAfterStartup;
+	private final BooleanProperty revealAfterMount;
+	private final BooleanProperty usesReadOnlyMode;
+	private final StringProperty mountFlags;
+	private final IntegerProperty maxCleartextFilenameLength;
+	private final ObjectProperty<WhenUnlocked> actionAfterUnlock;
+	private final BooleanProperty autoLockWhenIdle;
+	private final IntegerProperty autoLockIdleSeconds;
+	private final ObjectProperty<Path> mountPoint;
 	private final StringExpression mountName;
-	private final ObjectProperty<Path> mountPoint = new SimpleObjectProperty<>();
 
-	public VaultSettings(String id) {
-		this.id = Objects.requireNonNull(id);
+	VaultSettings(VaultSettingsJson json) {
+		this.id = json.id;
+		this.path = new SimpleObjectProperty<>(this, "path", json.path == null ? null : Paths.get(json.path));
+		this.displayName = new SimpleStringProperty(this, "displayName", json.displayName);
+		this.unlockAfterStartup = new SimpleBooleanProperty(this, "unlockAfterStartup", json.unlockAfterStartup);
+		this.revealAfterMount = new SimpleBooleanProperty(this, "revealAfterMount", json.revealAfterMount);
+		this.usesReadOnlyMode = new SimpleBooleanProperty(this, "usesReadOnlyMode", json.usesReadOnlyMode);
+		this.mountFlags = new SimpleStringProperty(this, "mountFlags", json.mountFlags);
+		this.maxCleartextFilenameLength = new SimpleIntegerProperty(this, "maxCleartextFilenameLength", json.maxCleartextFilenameLength);
+		this.actionAfterUnlock = new SimpleObjectProperty<>(this, "actionAfterUnlock", json.actionAfterUnlock);
+		this.autoLockWhenIdle = new SimpleBooleanProperty(this, "autoLockWhenIdle", json.autoLockWhenIdle);
+		this.autoLockIdleSeconds = new SimpleIntegerProperty(this, "autoLockIdleSeconds", json.autoLockIdleSeconds);
+		this.mountPoint = new SimpleObjectProperty<>(this, "mountPoint", json.mountPoint == null ? null : Path.of(json.mountPoint));
+		// mount name is no longer an explicit setting, see https://github.com/cryptomator/cryptomator/pull/1318
 		this.mountName = StringExpression.stringExpression(Bindings.createStringBinding(() -> {
 			final String name;
 			if (displayName.isEmpty().get()) {
@@ -64,6 +79,18 @@ public class VaultSettings {
 			}
 			return normalizeDisplayName(name);
 		}, displayName, path));
+
+		migrateLegacySettings(json);
+	}
+
+	@SuppressWarnings("deprecation")
+	private void migrateLegacySettings(VaultSettingsJson json) {
+		// implicit migration of 1.6.x legacy setting "customMountPath" / "winDriveLetter":
+		if (json.useCustomMountPath && !Strings.isNullOrEmpty(json.customMountPath)) {
+			this.mountPoint.set(Path.of(json.customMountPath));
+		} else if (!Strings.isNullOrEmpty(json.winDriveLetter)) {
+			this.mountPoint.set(Path.of(json.winDriveLetter + ":\\"));
+		}
 	}
 
 	Observable[] observables() {
@@ -71,7 +98,9 @@ public class VaultSettings {
 	}
 
 	public static VaultSettings withRandomId() {
-		return new VaultSettings(generateId());
+		var defaults = new VaultSettingsJson();
+		defaults.id = generateId();
+		return new VaultSettings(defaults);
 	}
 
 	private static String generateId() {
@@ -80,6 +109,23 @@ public class VaultSettings {
 		return BaseEncoding.base64Url().encode(randomBytes);
 	}
 
+	public VaultSettingsJson serialized() {
+		var json = new VaultSettingsJson();
+		json.id = id;
+		json.path = path.map(Path::toString).getValue();
+		json.displayName = displayName.get();
+		json.unlockAfterStartup = unlockAfterStartup.get();
+		json.revealAfterMount = revealAfterMount.get();
+		json.usesReadOnlyMode = usesReadOnlyMode.get();
+		json.mountFlags = mountFlags.get();
+		json.maxCleartextFilenameLength = maxCleartextFilenameLength.get();
+		json.actionAfterUnlock = actionAfterUnlock.get();
+		json.autoLockWhenIdle = autoLockWhenIdle.get();
+		json.autoLockIdleSeconds = autoLockIdleSeconds.get();
+		json.mountPoint = mountPoint.map(Path::toString).getValue();
+		return json;
+	}
+
 	//visible for testing
 	static String normalizeDisplayName(String original) {
 		if (original.isBlank() || ".".equals(original) || "..".equals(original)) {
@@ -94,6 +140,7 @@ public class VaultSettings {
 	}
 
 	/* Getter/Setter */
+	// TODO: remove accessors, make fields public
 
 	public String getId() {
 		return id;
diff --git a/src/main/java/org/cryptomator/common/settings/VaultSettingsJson.java b/src/main/java/org/cryptomator/common/settings/VaultSettingsJson.java
new file mode 100644
index 000000000..2381203e5
--- /dev/null
+++ b/src/main/java/org/cryptomator/common/settings/VaultSettingsJson.java
@@ -0,0 +1,62 @@
+package org.cryptomator.common.settings;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+class VaultSettingsJson {
+
+	@JsonProperty(value = "id", required = true)
+	String id;
+
+	@JsonProperty(value = "path")
+	String path;
+
+	@JsonProperty("displayName")
+	String displayName;
+
+	@JsonProperty("unlockAfterStartup")
+	boolean unlockAfterStartup = VaultSettings.DEFAULT_UNLOCK_AFTER_STARTUP;
+
+	@JsonProperty("revealAfterMount")
+	boolean revealAfterMount = VaultSettings.DEFAULT_REVEAL_AFTER_MOUNT;
+
+	@JsonProperty("mountPoint")
+	String mountPoint;
+
+	@JsonProperty("usesReadOnlyMode")
+	boolean usesReadOnlyMode = VaultSettings.DEFAULT_USES_READONLY_MODE;
+
+	@JsonProperty("mountFlags")
+	String mountFlags = VaultSettings.DEFAULT_MOUNT_FLAGS;
+
+	@JsonProperty("maxCleartextFilenameLength")
+	int maxCleartextFilenameLength = VaultSettings.DEFAULT_MAX_CLEARTEXT_FILENAME_LENGTH;
+
+	@JsonProperty("actionAfterUnlock")
+	WhenUnlocked actionAfterUnlock = VaultSettings.DEFAULT_ACTION_AFTER_UNLOCK;
+
+	@JsonProperty("autoLockWhenIdle")
+	boolean autoLockWhenIdle = VaultSettings.DEFAULT_AUTOLOCK_WHEN_IDLE;
+
+	@JsonProperty("autoLockIdleSeconds")
+	int autoLockIdleSeconds = VaultSettings.DEFAULT_AUTOLOCK_IDLE_SECONDS;
+
+	@Deprecated(since = "1.7.0")
+	@JsonProperty(value = "winDriveLetter", access = JsonProperty.Access.WRITE_ONLY) // WRITE_ONLY means value is "written" into the java object during deserialization. Upvote this: https://github.com/FasterXML/jackson-annotations/issues/233
+	String winDriveLetter;
+
+	@Deprecated(since = "1.7.0")
+	@JsonProperty(value = "useCustomMountPath", access = JsonProperty.Access.WRITE_ONLY) // WRITE_ONLY means value is "written" into the java object during deserialization. Upvote this: https://github.com/FasterXML/jackson-annotations/issues/233
+	@JsonAlias("usesIndividualMountPath")
+	boolean useCustomMountPath;
+
+	@Deprecated(since = "1.7.0")
+	@JsonProperty(value = "customMountPath", access = JsonProperty.Access.WRITE_ONLY) // WRITE_ONLY means value is "written" into the java object during deserialization. Upvote this: https://github.com/FasterXML/jackson-annotations/issues/233
+	@JsonAlias("individualMountPath")
+	String customMountPath;
+
+}
diff --git a/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java b/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
deleted file mode 100644
index cffeb3aa7..000000000
--- a/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the accompanying LICENSE file.
- *******************************************************************************/
-package org.cryptomator.common.settings;
-
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonToken;
-import com.google.gson.stream.JsonWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.nio.file.InvalidPathException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-class VaultSettingsJsonAdapter {
-
-	private static final Logger LOG = LoggerFactory.getLogger(VaultSettingsJsonAdapter.class);
-
-	public void write(JsonWriter out, VaultSettings value) throws IOException {
-		out.beginObject();
-		out.name("id").value(value.getId());
-		out.name("path").value(value.path().get().toString());
-		out.name("displayName").value(value.displayName().get());
-		out.name("unlockAfterStartup").value(value.unlockAfterStartup().get());
-		out.name("revealAfterMount").value(value.revealAfterMount().get());
-		var mountPoint = value.mountPoint().get();
-		out.name("mountPoint").value(mountPoint != null ? mountPoint.toAbsolutePath().toString() : null);
-		out.name("usesReadOnlyMode").value(value.usesReadOnlyMode().get());
-		out.name("mountFlags").value(value.mountFlags().get());
-		out.name("maxCleartextFilenameLength").value(value.maxCleartextFilenameLength().get());
-		out.name("actionAfterUnlock").value(value.actionAfterUnlock().get().name());
-		out.name("autoLockWhenIdle").value(value.autoLockWhenIdle().get());
-		out.name("autoLockIdleSeconds").value(value.autoLockIdleSeconds().get());
-		out.endObject();
-	}
-
-	public VaultSettings read(JsonReader in) throws IOException {
-		String id = null;
-		String path = null;
-		String mountName = null; //see https://github.com/cryptomator/cryptomator/pull/1318
-		String displayName = null;
-		boolean unlockAfterStartup = VaultSettings.DEFAULT_UNLOCK_AFTER_STARTUP;
-		boolean revealAfterMount = VaultSettings.DEFAULT_REVEAL_AFTER_MOUNT;
-		boolean usesReadOnlyMode = VaultSettings.DEFAULT_USES_READONLY_MODE;
-		String mountFlags = VaultSettings.DEFAULT_MOUNT_FLAGS;
-		Path mountPoint = null;
-		int maxCleartextFilenameLength = VaultSettings.DEFAULT_MAX_CLEARTEXT_FILENAME_LENGTH;
-		WhenUnlocked actionAfterUnlock = VaultSettings.DEFAULT_ACTION_AFTER_UNLOCK;
-		boolean autoLockWhenIdle = VaultSettings.DEFAULT_AUTOLOCK_WHEN_IDLE;
-		int autoLockIdleSeconds = VaultSettings.DEFAULT_AUTOLOCK_IDLE_SECONDS;
-
-		//legacy from 1.6.x
-		boolean useCustomMountPath = false;
-		String customMountPath = "";
-		String winDriveLetter = "";
-		//legacy end
-
-		in.beginObject();
-		while (in.hasNext()) {
-			String name = in.nextName();
-			switch (name) {
-				case "id" -> id = in.nextString();
-				case "path" -> path = in.nextString();
-				case "mountName" -> mountName = in.nextString(); //see https://github.com/cryptomator/cryptomator/pull/1318
-				case "displayName" -> displayName = in.nextString();
-				case "unlockAfterStartup" -> unlockAfterStartup = in.nextBoolean();
-				case "revealAfterMount" -> revealAfterMount = in.nextBoolean();
-				case "usesReadOnlyMode" -> usesReadOnlyMode = in.nextBoolean();
-				case "mountFlags" -> mountFlags = in.nextString();
-				case "mountPoint" -> {
-					if (JsonToken.NULL == in.peek()) {
-						in.nextNull();
-					} else {
-						mountPoint = parseMountPoint(in.nextString());
-					}
-				}
-				case "maxCleartextFilenameLength" -> maxCleartextFilenameLength = in.nextInt();
-				case "actionAfterUnlock" -> actionAfterUnlock = parseActionAfterUnlock(in.nextString());
-				case "autoLockWhenIdle" -> autoLockWhenIdle = in.nextBoolean();
-				case "autoLockIdleSeconds" -> autoLockIdleSeconds = in.nextInt();
-				//legacy from 1.6.x
-				case "winDriveLetter" -> winDriveLetter = in.nextString();
-				case "usesIndividualMountPath", "useCustomMountPath" -> useCustomMountPath = in.nextBoolean();
-				case "individualMountPath", "customMountPath" -> customMountPath = in.nextString();
-				//legacy end
-				default -> {
-					LOG.warn("Unsupported vault setting found in JSON: {}", name);
-					in.skipValue();
-				}
-			}
-		}
-		in.endObject();
-
-		VaultSettings vaultSettings = (id == null) ? VaultSettings.withRandomId() : new VaultSettings(id);
-		if (displayName != null) { //see https://github.com/cryptomator/cryptomator/pull/1318
-			vaultSettings.displayName().set(displayName);
-		} else {
-			vaultSettings.displayName().set(mountName);
-		}
-		vaultSettings.path().set(Paths.get(path));
-		vaultSettings.unlockAfterStartup().set(unlockAfterStartup);
-		vaultSettings.revealAfterMount().set(revealAfterMount);
-		vaultSettings.usesReadOnlyMode().set(usesReadOnlyMode);
-		vaultSettings.mountFlags().set(mountFlags);
-		vaultSettings.maxCleartextFilenameLength().set(maxCleartextFilenameLength);
-		vaultSettings.actionAfterUnlock().set(actionAfterUnlock);
-		vaultSettings.autoLockWhenIdle().set(autoLockWhenIdle);
-		vaultSettings.autoLockIdleSeconds().set(autoLockIdleSeconds);
-		vaultSettings.mountPoint().set(mountPoint);
-		//legacy from 1.6.x
-		if(useCustomMountPath && !customMountPath.isBlank()) {
-			vaultSettings.mountPoint().set(parseMountPoint(customMountPath));
-		} else if(!winDriveLetter.isBlank() ) {
-			vaultSettings.mountPoint().set(parseMountPoint(winDriveLetter+":\\"));
-		}
-		//legacy end
-		return vaultSettings;
-	}
-
-	private Path parseMountPoint(String mountPoint) {
-		try {
-			return Path.of(mountPoint);
-		} catch (InvalidPathException e) {
-			LOG.warn("Invalid string as mount point. Defaulting to null.");
-			return null;
-		}
-	}
-
-	private WhenUnlocked parseActionAfterUnlock(String actionAfterUnlockName) {
-		try {
-			return WhenUnlocked.valueOf(actionAfterUnlockName.toUpperCase());
-		} catch (IllegalArgumentException e) {
-			LOG.warn("Invalid action after unlock {}. Defaulting to {}.", actionAfterUnlockName, VaultSettings.DEFAULT_ACTION_AFTER_UNLOCK);
-			return VaultSettings.DEFAULT_ACTION_AFTER_UNLOCK;
-		}
-	}
-
-}
diff --git a/src/main/java/org/cryptomator/common/settings/WhenUnlocked.java b/src/main/java/org/cryptomator/common/settings/WhenUnlocked.java
index fe023222c..86aed19d5 100644
--- a/src/main/java/org/cryptomator/common/settings/WhenUnlocked.java
+++ b/src/main/java/org/cryptomator/common/settings/WhenUnlocked.java
@@ -1,9 +1,13 @@
 package org.cryptomator.common.settings;
 
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+@JsonFormat(shape = JsonFormat.Shape.STRING)
 public enum WhenUnlocked {
 	IGNORE("vaultOptions.general.actionAfterUnlock.ignore"),
 	REVEAL("vaultOptions.general.actionAfterUnlock.reveal"),
-	ASK("vaultOptions.general.actionAfterUnlock.ask");
+	@JsonEnumDefaultValue ASK("vaultOptions.general.actionAfterUnlock.ask");
 
 	private String displayName;
 
diff --git a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java
index 0838c420e..2aa7c6abd 100644
--- a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java
+++ b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java
@@ -34,7 +34,7 @@ public class SupportedLanguages {
 		var collator = Collator.getInstance(preferredLocale);
 		collator.setStrength(Collator.PRIMARY);
 		var sorted = new ArrayList<String>();
-		sorted.add(0, Settings.DEFAULT_LANGUAGE);
+		sorted.add(0, null);
 		sorted.add(1, ENGLISH);
 		LANGUAGE_TAGS.stream() //
 				.sorted((a, b) -> collator.compare(Locale.forLanguageTag(a).getDisplayName(), Locale.forLanguageTag(b).getDisplayName())) //
diff --git a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
index 6c60e74b7..0df67cb53 100644
--- a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
+++ b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
@@ -27,6 +27,8 @@ import java.util.concurrent.atomic.AtomicReference;
 public class VolumePreferencesController implements FxController {
 
 	private static final String DOCS_MOUNTING_URL = "https://docs.cryptomator.org/en/1.7/desktop/volume-type/";
+	private static final int MIN_PORT = 1024;
+	private static final int MAX_PORT = 65535;
 
 	private final Settings settings;
 	private final ObservableValue<MountService> selectedMountService;
@@ -85,7 +87,7 @@ public class VolumePreferencesController implements FxController {
 		try {
 			int port = Integer.parseInt(loopbackPortField.getText());
 			return port == 0 // choose port automatically
-					|| port >= Settings.MIN_PORT && port <= Settings.MAX_PORT; // port within range
+					|| port >= MIN_PORT && port <= MAX_PORT; // port within range
 		} catch (NumberFormatException e) {
 			return false;
 		}
diff --git a/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java b/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java
deleted file mode 100644
index 2096497ea..000000000
--- a/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the accompanying LICENSE file.
- *******************************************************************************/
-package org.cryptomator.common.settings;
-
-import org.cryptomator.common.Environment;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
-import org.mockito.Mockito;
-
-import java.io.IOException;
-
-public class SettingsJsonAdapterTest {
-
-	private final Environment env = Mockito.mock(Environment.class);
-	private final SettingsJsonAdapter adapter = new SettingsJsonAdapter(env);
-
-	@Test
-	public void testDeserialize() throws IOException {
-		String json = """
-				{
-					"directories": [
-						{"id": "1", "path": "/vault1", "mountName": "vault1", "winDriveLetter": "X"},
-						{"id": "2", "path": "/vault2", "mountName": "vault2", "winDriveLetter": "Y"}
-					],
-					"autoCloseVaults" : true,
-					"checkForUpdatesEnabled": true,
-					"port": 8080,
-					"language": "de-DE",
-					"numTrayNotifications": 42
-				}
-				""";
-
-		Settings settings = adapter.fromJson(json);
-
-		Assertions.assertTrue(settings.checkForUpdates().get());
-		Assertions.assertEquals(2, settings.getDirectories().size());
-		Assertions.assertEquals(8080, settings.port().get());
-		Assertions.assertEquals(true, settings.autoCloseVaults().get());
-		Assertions.assertEquals("de-DE", settings.languageProperty().get());
-		Assertions.assertEquals(42, settings.numTrayNotifications().get());
-	}
-
-	@SuppressWarnings("SpellCheckingInspection")
-	@ParameterizedTest(name = "fromJson() should throw IOException for input: {0}")
-	@ValueSource(strings = { //
-			"", //
-			"<html>", //
-			"{invalidjson}" //
-	})
-	public void testDeserializeMalformed(String input) {
-		Assertions.assertThrows(IOException.class, () -> {
-			adapter.fromJson(input);
-		});
-	}
-
-}
diff --git a/src/test/java/org/cryptomator/common/settings/SettingsJsonTest.java b/src/test/java/org/cryptomator/common/settings/SettingsJsonTest.java
new file mode 100644
index 000000000..da78ee5bc
--- /dev/null
+++ b/src/test/java/org/cryptomator/common/settings/SettingsJsonTest.java
@@ -0,0 +1,79 @@
+package org.cryptomator.common.settings;
+
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.hamcrest.MatcherAssert;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.containsString;
+
+public class SettingsJsonTest {
+
+	@Test
+	public void testDeserialize() throws IOException {
+		String jsonStr = """
+				{
+					"directories": [
+						{"id": "1", "path": "/vault1", "mountName": "vault1", "winDriveLetter": "X", "shouldBeIgnored": true},
+						{"id": "2", "path": "/vault2", "mountName": "vault2", "winDriveLetter": "Y", "mountFlags":"--foo --bar"}
+					],
+					"autoCloseVaults" : true,
+					"checkForUpdatesEnabled": true,
+					"port": 8080,
+					"language": "de-DE",
+					"numTrayNotifications": 42
+				}
+				""";
+
+		var jsonObj = new ObjectMapper().reader().readValue(jsonStr, SettingsJson.class);
+
+		Assertions.assertTrue(jsonObj.checkForUpdatesEnabled);
+		Assertions.assertEquals(2, jsonObj.directories.size());
+		Assertions.assertEquals("/vault1", jsonObj.directories.get(0).path);
+		Assertions.assertEquals("/vault2", jsonObj.directories.get(1).path);
+		Assertions.assertEquals("--foo --bar", jsonObj.directories.get(1).mountFlags);
+		Assertions.assertEquals(8080, jsonObj.port);
+		Assertions.assertTrue(jsonObj.autoCloseVaults);
+		Assertions.assertEquals("de-DE", jsonObj.language);
+		Assertions.assertEquals(42, jsonObj.numTrayNotifications);
+	}
+
+	@SuppressWarnings("SpellCheckingInspection")
+	@ParameterizedTest(name = "throw JacksonException for input: {0}")
+	@ValueSource(strings = { //
+			"", //
+			"<html>", //
+			"{invalidjson}" //
+	})
+	public void testDeserializeMalformed(String input) {
+		var objectMapper = new ObjectMapper().reader();
+
+		Assertions.assertThrows(JacksonException.class, () -> {
+			objectMapper.readValue(input, SettingsJson.class);
+		});
+	}
+
+	@Test
+	public void testSerialize() throws JsonProcessingException {
+		var jsonObj = new SettingsJson();
+		jsonObj.directories = List.of(new VaultSettingsJson(), new VaultSettingsJson());
+		jsonObj.directories.get(0).id = "test";
+		jsonObj.theme = UiTheme.DARK;
+		jsonObj.showTrayIcon = false;
+
+		var jsonStr = new ObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(jsonObj);
+
+		MatcherAssert.assertThat(jsonStr, containsString("\"theme\" : \"DARK\""));
+		MatcherAssert.assertThat(jsonStr, containsString("\"showTrayIcon\" : false"));
+		MatcherAssert.assertThat(jsonStr, containsString("\"useKeychain\" : true"));
+		MatcherAssert.assertThat(jsonStr, containsString("\"actionAfterUnlock\" : \"ASK\""));
+	}
+
+}
\ No newline at end of file
diff --git a/src/test/java/org/cryptomator/common/settings/SettingsTest.java b/src/test/java/org/cryptomator/common/settings/SettingsTest.java
index 7f4c0ee06..4f18ee866 100644
--- a/src/test/java/org/cryptomator/common/settings/SettingsTest.java
+++ b/src/test/java/org/cryptomator/common/settings/SettingsTest.java
@@ -18,7 +18,7 @@ public class SettingsTest {
 		Environment env = Mockito.mock(Environment.class);
 		@SuppressWarnings("unchecked") Consumer<Settings> changeListener = Mockito.mock(Consumer.class);
 
-		Settings settings = new Settings(env);
+		Settings settings = Settings.create(env);
 		settings.setSaveCmd(changeListener);
 		VaultSettings vaultSettings = VaultSettings.withRandomId();
 		Mockito.verify(changeListener, Mockito.times(0)).accept(settings);
diff --git a/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java b/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
deleted file mode 100644
index b7a0dade4..000000000
--- a/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the accompanying LICENSE file.
- *******************************************************************************/
-package org.cryptomator.common.settings;
-
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import org.junit.jupiter.api.Test;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.nio.file.Paths;
-
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-public class VaultSettingsJsonAdapterTest {
-
-	private final VaultSettingsJsonAdapter adapter = new VaultSettingsJsonAdapter();
-
-	@Test
-	public void testDeserialize() throws IOException {
-		String json = "{\"id\": \"foo\", \"path\": \"/foo/bar\", \"displayName\": \"test\", \"winDriveLetter\": \"X\", \"shouldBeIgnored\": true, \"individualMountPath\": \"/home/test/crypto\", \"mountFlags\":\"--foo --bar\"}";
-		JsonReader jsonReader = new JsonReader(new StringReader(json));
-
-		VaultSettings vaultSettings = adapter.read(jsonReader);
-
-		assertAll(
-				() -> assertEquals("foo", vaultSettings.getId()),
-				() -> assertEquals(Paths.get("/foo/bar"), vaultSettings.path().get()),
-				() -> assertEquals("test", vaultSettings.displayName().get()),
-				() -> assertEquals("--foo --bar", vaultSettings.mountFlags().get())
-		);
-	}
-
-	@SuppressWarnings("SpellCheckingInspection")
-	@Test
-	public void testSerialize() throws IOException {
-		VaultSettings vaultSettings = new VaultSettings("test");
-		vaultSettings.path().set(Paths.get("/foo/bar"));
-		vaultSettings.displayName().set("mountyMcMountFace");
-		vaultSettings.mountFlags().set("--foo --bar");
-
-		StringWriter buf = new StringWriter();
-		JsonWriter jsonWriter = new JsonWriter(buf);
-		adapter.write(jsonWriter, vaultSettings);
-		String result = buf.toString();
-
-		assertAll(
-				() -> assertThat(result, containsString("\"id\":\"test\"")),
-				() -> {
-					if (System.getProperty("os.name").contains("Windows")) {
-						assertThat(result, containsString("\"path\":\"\\\\foo\\\\bar\""));
-					} else {
-						assertThat(result, containsString("\"path\":\"/foo/bar\""));
-					}
-				},
-				() -> assertThat(result, containsString("\"displayName\":\"mountyMcMountFace\"")),
-				() -> assertThat(result, containsString("\"mountFlags\":\"--foo --bar\""))
-		);
-	}
-}

From e9bb3195ddc56d49a7a2733036cd54382514ab91 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 29 Jun 2023 22:44:05 +0200
Subject: [PATCH 49/61] cleanup

---
 .../java/org/cryptomator/common/settings/SettingsProvider.java | 3 +--
 src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java  | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/settings/SettingsProvider.java b/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
index 2b07c38eb..f98fc4de7 100644
--- a/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
+++ b/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
@@ -11,7 +11,6 @@ package org.cryptomator.common.settings;
 import com.fasterxml.jackson.core.JacksonException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Suppliers;
-import com.google.gson.JsonParseException;
 import org.cryptomator.common.Environment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -114,7 +113,7 @@ public class SettingsProvider implements Supplier<Settings> {
 			}
 			Files.move(tmpPath, settingsPath, StandardCopyOption.REPLACE_EXISTING);
 			LOG.info("Settings saved to {}", settingsPath);
-		} catch (IOException | JsonParseException e) {
+		} catch (IOException e) {
 			LOG.error("Failed to save settings.", e);
 		}
 	}
diff --git a/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java b/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java
index ad16bb6a6..36ad53331 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java
@@ -2,8 +2,6 @@ package org.cryptomator.ui.fxapp;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.io.ByteStreams;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

From e23c0c23c9e7871b8927586e3e0d528a04a5373f Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 29 Jun 2023 22:44:22 +0200
Subject: [PATCH 50/61] remove GSON from dependencies

---
 pom.xml                        | 6 ------
 src/main/java/module-info.java | 1 -
 2 files changed, 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 34858f85f..6febb2916 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,7 +48,6 @@
 		<easybind.version>2.2</easybind.version>
 		<guava.version>32.0.0-jre</guava.version>
 		<jackson.version>2.15.2</jackson.version>
-		<gson.version>2.10.1</gson.version>
 		<javafx.version>20.0.1</javafx.version>
 		<jwt.version>4.4.0</jwt.version>
 		<nimbus-jose.version>9.31</nimbus-jose.version>
@@ -212,11 +211,6 @@
 			<artifactId>dagger</artifactId>
 			<version>${dagger.version}</version>
 		</dependency>
-		<dependency> <!-- TODO replace with jackson -->
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-			<version>${gson.version}</version>
-		</dependency>
 
 		<!-- JUnit / Mockito / Hamcrest -->
 		<dependency>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 2213ff0d9..b353b7a8a 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -39,7 +39,6 @@ open module org.cryptomator.desktop {
 	requires com.auth0.jwt;
 	requires com.google.common;
 	requires com.fasterxml.jackson.databind;
-	requires com.google.gson; // TODO replace with jackson?
 	requires com.nimbusds.jose.jwt;
 	requires com.nulabinc.zxcvbn;
 	requires com.tobiasdiez.easybind;

From 287584429b0df5b98c5cb180d97ac14ce99478c4 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 29 Jun 2023 22:45:57 +0200
Subject: [PATCH 51/61] update code style

remove line break from `new Object() {}`

[ci skip]
---
 .idea/codeStyles/Project.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index d361191e8..dd49b35b0 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -53,9 +53,10 @@
       <option name="KEEP_LINE_BREAKS" value="false" />
       <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
       <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
-      <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
       <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
       <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+      <option name="IF_BRACE_FORCE" value="3" />
       <option name="ENUM_CONSTANTS_WRAP" value="2" />
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />

From ef22928e0172755b5cbb21db436f2fffa0ff29a0 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 29 Jun 2023 22:53:19 +0200
Subject: [PATCH 52/61] undo formatter-induced changes

[ci skip]
---
 .../java/org/cryptomator/ui/error/ErrorController.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/cryptomator/ui/error/ErrorController.java b/src/main/java/org/cryptomator/ui/error/ErrorController.java
index f4a891c51..d84af9fde 100644
--- a/src/main/java/org/cryptomator/ui/error/ErrorController.java
+++ b/src/main/java/org/cryptomator/ui/error/ErrorController.java
@@ -49,13 +49,13 @@ public class ErrorController implements FxController {
 	private static final String REPORT_BODY_TEMPLATE = """
 			OS: %s / %s
 			App: %s / %s
-						
+			
 			<!-- ✏ Please describe what happened as accurately as possible. -->
-						
+			
 			<!-- 📋 Please also copy and paste the detail text from the error window. -->
-						
+			
 			<!-- ℹ Text enclosed like this (chevrons, exclamation mark, two dashes) is not visible to others! -->
-						
+			
 			<!-- ❗ If the description or the detail text is missing, the discussion will be deleted. -->
 			""";
 

From 47ae271126c5c1d44bed740bed12348ccce37b9f Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 29 Jun 2023 23:00:19 +0200
Subject: [PATCH 53/61] cleanup

[ci skip]
---
 .../org/cryptomator/common/settings/SettingsProvider.java    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/settings/SettingsProvider.java b/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
index f98fc4de7..586708ed1 100644
--- a/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
+++ b/src/main/java/org/cryptomator/common/settings/SettingsProvider.java
@@ -44,16 +44,11 @@ public class SettingsProvider implements Supplier<Settings> {
 	private final Supplier<Settings> settings = Suppliers.memoize(this::load);
 	private final Environment env;
 	private final ScheduledExecutorService scheduler;
-//	private final Gson gson;
 
 	@Inject
 	public SettingsProvider(Environment env, ScheduledExecutorService scheduler) {
 		this.env = env;
 		this.scheduler = scheduler;
-//		this.gson = new GsonBuilder() //
-//				.setPrettyPrinting().setLenient().disableHtmlEscaping() //
-//				.registerTypeAdapter(Settings.class, settingsJsonAdapter) //
-//				.create();
 	}
 
 	@Override

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 54/61] 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 55/61] 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 56/61] 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 57/61] 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);
 		}
 
 	}

From 1a6836dac683ef9f0c69c7f9fd2a89c4798daec1 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 30 Jun 2023 12:39:48 +0200
Subject: [PATCH 58/61] remove unnecessary annotation

[ci skip]
---
 src/main/java/org/cryptomator/common/settings/UiTheme.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/settings/UiTheme.java b/src/main/java/org/cryptomator/common/settings/UiTheme.java
index 4161ff430..9c3153060 100644
--- a/src/main/java/org/cryptomator/common/settings/UiTheme.java
+++ b/src/main/java/org/cryptomator/common/settings/UiTheme.java
@@ -2,12 +2,11 @@ package org.cryptomator.common.settings;
 
 import com.fasterxml.jackson.annotation.JsonEnumDefaultValue;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import org.apache.commons.lang3.SystemUtils;
 
 @JsonFormat(shape = JsonFormat.Shape.STRING)
 public enum UiTheme {
-	@JsonEnumDefaultValue @JsonProperty LIGHT("preferences.interface.theme.light"), //
+	@JsonEnumDefaultValue LIGHT("preferences.interface.theme.light"), //
 	DARK("preferences.interface.theme.dark"), //
 	AUTOMATIC("preferences.interface.theme.automatic");
 

From e382a3bab9951d6740b9e0310811a9561764d0e6 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 30 Jun 2023 13:52:15 +0200
Subject: [PATCH 59/61] make settings' fields public, remove accessor methods

---
 .../org/cryptomator/common/CommonsModule.java |   4 +-
 .../org/cryptomator/common/LicenseHolder.java |   4 +-
 .../common/keychain/KeychainModule.java       |   6 +-
 .../cryptomator/common/mount/MountModule.java |   2 +-
 .../org/cryptomator/common/mount/Mounter.java |  14 +-
 .../cryptomator/common/settings/Settings.java | 131 +++---------------
 .../common/settings/VaultSettings.java        |  89 ++----------
 .../cryptomator/common/vaults/AutoLocker.java |   4 +-
 .../org/cryptomator/common/vaults/Vault.java  |  26 ++--
 .../common/vaults/VaultConfigCache.java       |   2 +-
 .../common/vaults/VaultListManager.java       |  14 +-
 .../launcher/SupportedLanguages.java          |   2 +-
 .../org/cryptomator/logging/DebugMode.java    |   4 +-
 .../ui/common/DefaultSceneFactory.java        |   2 +-
 .../cryptomator/ui/fxapp/AutoUnlocker.java    |   4 +-
 .../cryptomator/ui/fxapp/FxApplication.java   |   4 +-
 .../ui/fxapp/FxApplicationStyle.java          |   4 +-
 .../ui/fxapp/FxApplicationTerminator.java     |   2 +-
 .../cryptomator/ui/fxapp/UpdateChecker.java   |   2 +-
 .../ui/fxapp/UpdateCheckerModule.java         |   2 +-
 .../mainwindow/MainWindowTitleController.java |  14 +-
 .../ui/mainwindow/ResizeController.java       |  24 ++--
 .../VaultDetailMissingVaultController.java    |   2 +-
 .../GeneralPreferencesController.java         |  12 +-
 .../InterfacePreferencesController.java       |  20 +--
 .../SupporterCertificateController.java       |   2 +-
 .../UpdatesPreferencesController.java         |   2 +-
 .../VolumePreferencesController.java          |  12 +-
 .../ui/unlock/UnlockSuccessController.java    |   4 +-
 .../cryptomator/ui/unlock/UnlockWorkflow.java |   2 +-
 .../GeneralVaultOptionsController.java        |  12 +-
 .../vaultoptions/MountOptionsController.java  |  34 ++---
 .../common/settings/SettingsTest.java         |   6 +-
 .../common/vaults/VaultModuleTest.java        |   6 +-
 34 files changed, 162 insertions(+), 312 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/CommonsModule.java b/src/main/java/org/cryptomator/common/CommonsModule.java
index 8ecfa51b6..4ac07495e 100644
--- a/src/main/java/org/cryptomator/common/CommonsModule.java
+++ b/src/main/java/org/cryptomator/common/CommonsModule.java
@@ -139,9 +139,9 @@ public abstract class CommonsModule {
 	@Provides
 	@Singleton
 	static ObservableValue<InetSocketAddress> provideServerSocketAddressBinding(Settings settings) {
-		return settings.port().map(port -> {
+		return settings.port.map(port -> {
 			String host = SystemUtils.IS_OS_WINDOWS ? "127.0.0.1" : "localhost";
-			return InetSocketAddress.createUnresolved(host, settings.port().intValue());
+			return InetSocketAddress.createUnresolved(host, settings.port.intValue());
 		});
 	}
 
diff --git a/src/main/java/org/cryptomator/common/LicenseHolder.java b/src/main/java/org/cryptomator/common/LicenseHolder.java
index be36e6968..bc52966ea 100644
--- a/src/main/java/org/cryptomator/common/LicenseHolder.java
+++ b/src/main/java/org/cryptomator/common/LicenseHolder.java
@@ -30,7 +30,7 @@ public class LicenseHolder {
 		this.licenseSubject = validJwtClaims.map(DecodedJWT::getSubject);
 		this.validLicenseProperty = validJwtClaims.isNotNull();
 
-		Optional<DecodedJWT> claims = licenseChecker.check(settings.licenseKey().get());
+		Optional<DecodedJWT> claims = licenseChecker.check(settings.licenseKey.get());
 		validJwtClaims.set(claims.orElse(null));
 	}
 
@@ -38,7 +38,7 @@ public class LicenseHolder {
 		Optional<DecodedJWT> claims = licenseChecker.check(licenseKey);
 		validJwtClaims.set(claims.orElse(null));
 		if (claims.isPresent()) {
-			settings.licenseKey().set(licenseKey);
+			settings.licenseKey.set(licenseKey);
 			return true;
 		} else {
 			return false;
diff --git a/src/main/java/org/cryptomator/common/keychain/KeychainModule.java b/src/main/java/org/cryptomator/common/keychain/KeychainModule.java
index 604dfb40d..43b24eac3 100644
--- a/src/main/java/org/cryptomator/common/keychain/KeychainModule.java
+++ b/src/main/java/org/cryptomator/common/keychain/KeychainModule.java
@@ -23,14 +23,14 @@ public class KeychainModule {
 	@Singleton
 	static ObjectExpression<KeychainAccessProvider> provideKeychainAccessProvider(Settings settings, List<KeychainAccessProvider> providers) {
 		return Bindings.createObjectBinding(() -> {
-			if (!settings.useKeychain().get()) {
+			if (!settings.useKeychain.get()) {
 				return null;
 			}
-			var selectedProviderClass = settings.keychainProvider().get();
+			var selectedProviderClass = settings.keychainProvider.get();
 			var selectedProvider = providers.stream().filter(provider -> provider.getClass().getName().equals(selectedProviderClass)).findAny();
 			var fallbackProvider = providers.stream().findFirst().orElse(null);
 			return selectedProvider.orElse(fallbackProvider);
-		}, settings.keychainProvider(), settings.useKeychain());
+		}, settings.keychainProvider, settings.useKeychain);
 	}
 
 }
diff --git a/src/main/java/org/cryptomator/common/mount/MountModule.java b/src/main/java/org/cryptomator/common/mount/MountModule.java
index 0978c44db..cbcb23e82 100644
--- a/src/main/java/org/cryptomator/common/mount/MountModule.java
+++ b/src/main/java/org/cryptomator/common/mount/MountModule.java
@@ -37,7 +37,7 @@ public class MountModule {
 	static ObservableValue<ActualMountService> provideMountService(Settings settings, List<MountService> serviceImpls, @Named("FUPFMS") AtomicReference<MountService> fupfms) {
 		var fallbackProvider = serviceImpls.stream().findFirst().orElse(null);
 
-		var observableMountService = ObservableUtil.mapWithDefault(settings.mountService(), //
+		var observableMountService = ObservableUtil.mapWithDefault(settings.mountService, //
 				desiredServiceImpl -> { //
 					var serviceFromSettings = serviceImpls.stream().filter(serviceImpl -> serviceImpl.getClass().getName().equals(desiredServiceImpl)).findAny(); //
 					var targetedService = serviceFromSettings.orElse(fallbackProvider);
diff --git a/src/main/java/org/cryptomator/common/mount/Mounter.java b/src/main/java/org/cryptomator/common/mount/Mounter.java
index a56f2b01b..593cb6666 100644
--- a/src/main/java/org/cryptomator/common/mount/Mounter.java
+++ b/src/main/java/org/cryptomator/common/mount/Mounter.java
@@ -54,19 +54,19 @@ public class Mounter {
 				switch (capability) {
 					case FILE_SYSTEM_NAME -> builder.setFileSystemName("cryptoFs");
 					case LOOPBACK_PORT ->
-							builder.setLoopbackPort(settings.port().get()); //TODO: move port from settings to vaultsettings (see https://github.com/cryptomator/cryptomator/tree/feature/mount-setting-per-vault)
+							builder.setLoopbackPort(settings.port.get()); //TODO: move port from settings to vaultsettings (see https://github.com/cryptomator/cryptomator/tree/feature/mount-setting-per-vault)
 					case LOOPBACK_HOST_NAME -> env.getLoopbackAlias().ifPresent(builder::setLoopbackHostName);
-					case READ_ONLY -> builder.setReadOnly(vaultSettings.usesReadOnlyMode().get());
+					case READ_ONLY -> builder.setReadOnly(vaultSettings.usesReadOnlyMode.get());
 					case MOUNT_FLAGS -> {
-						var mountFlags = vaultSettings.mountFlags().get();
+						var mountFlags = vaultSettings.mountFlags.get();
 						if (mountFlags == null || mountFlags.isBlank()) {
 							builder.setMountFlags(service.getDefaultMountFlags());
 						} else {
 							builder.setMountFlags(mountFlags);
 						}
 					}
-					case VOLUME_ID -> builder.setVolumeId(vaultSettings.getId());
-					case VOLUME_NAME -> builder.setVolumeName(vaultSettings.mountName().get());
+					case VOLUME_ID -> builder.setVolumeId(vaultSettings.id);
+					case VOLUME_NAME -> builder.setVolumeName(vaultSettings.mountName.get());
 				}
 			}
 
@@ -75,7 +75,7 @@ public class Mounter {
 
 		private Runnable prepareMountPoint() throws IOException {
 			Runnable cleanup = () -> {};
-			var userChosenMountPoint = vaultSettings.getMountPoint();
+			var userChosenMountPoint = vaultSettings.mountPoint.get();
 			var defaultMountPointBase = env.getMountPointsDir().orElseThrow();
 			var canMountToDriveLetter = service.hasCapability(MOUNT_AS_DRIVE_LETTER);
 			var canMountToParent = service.hasCapability(MOUNT_WITHIN_EXISTING_PARENT);
@@ -91,7 +91,7 @@ public class Mounter {
 					Files.createDirectories(defaultMountPointBase);
 					builder.setMountpoint(defaultMountPointBase);
 				} else if (canMountToDir) {
-					var mountPoint = defaultMountPointBase.resolve(vaultSettings.mountName().get());
+					var mountPoint = defaultMountPointBase.resolve(vaultSettings.mountName.get());
 					Files.createDirectories(mountPoint);
 					builder.setMountpoint(mountPoint);
 				}
diff --git a/src/main/java/org/cryptomator/common/settings/Settings.java b/src/main/java/org/cryptomator/common/settings/Settings.java
index 4100b4714..d52b104c1 100644
--- a/src/main/java/org/cryptomator/common/settings/Settings.java
+++ b/src/main/java/org/cryptomator/common/settings/Settings.java
@@ -45,28 +45,28 @@ public class Settings {
 	static final String DEFAULT_USER_INTERFACE_ORIENTATION = NodeOrientation.LEFT_TO_RIGHT.name();
 	static final boolean DEFAULT_SHOW_MINIMIZE_BUTTON = false;
 
-	private final ObservableList<VaultSettings> directories;
-	private final BooleanProperty askedForUpdateCheck;
-	private final BooleanProperty checkForUpdates;
-	private final BooleanProperty startHidden;
-	private final BooleanProperty autoCloseVaults;
-	private final BooleanProperty useKeychain;
-	private final IntegerProperty port;
-	private final IntegerProperty numTrayNotifications;
-	private final BooleanProperty debugMode;
-	private final ObjectProperty<UiTheme> theme;
-	private final StringProperty keychainProvider;
-	private final ObjectProperty<NodeOrientation> userInterfaceOrientation;
-	private final StringProperty licenseKey;
-	private final BooleanProperty showMinimizeButton;
-	private final BooleanProperty showTrayIcon;
-	private final IntegerProperty windowXPosition;
-	private final IntegerProperty windowYPosition;
-	private final IntegerProperty windowWidth;
-	private final IntegerProperty windowHeight;
-	private final StringProperty displayConfiguration;
-	private final StringProperty language;
-	private final StringProperty mountService;
+	public final ObservableList<VaultSettings> directories;
+	public final BooleanProperty askedForUpdateCheck;
+	public final BooleanProperty checkForUpdates;
+	public final BooleanProperty startHidden;
+	public final BooleanProperty autoCloseVaults;
+	public final BooleanProperty useKeychain;
+	public final IntegerProperty port;
+	public final IntegerProperty numTrayNotifications;
+	public final BooleanProperty debugMode;
+	public final ObjectProperty<UiTheme> theme;
+	public final StringProperty keychainProvider;
+	public final ObjectProperty<NodeOrientation> userInterfaceOrientation;
+	public final StringProperty licenseKey;
+	public final BooleanProperty showMinimizeButton;
+	public final BooleanProperty showTrayIcon;
+	public final IntegerProperty windowXPosition;
+	public final IntegerProperty windowYPosition;
+	public final IntegerProperty windowWidth;
+	public final IntegerProperty windowHeight;
+	public final StringProperty displayConfiguration;
+	public final StringProperty language;
+	public final StringProperty mountService;
 
 	private Consumer<Settings> saveCmd;
 
@@ -213,91 +213,4 @@ public class Settings {
 		}
 	}
 
-	/* Getter/Setter */
-	// TODO: remove accessors, make fields public
-
-	public ObservableList<VaultSettings> getDirectories() {
-		return directories;
-	}
-
-	public BooleanProperty askedForUpdateCheck() {
-		return askedForUpdateCheck;
-	}
-
-	public BooleanProperty checkForUpdates() {
-		return checkForUpdates;
-	}
-
-	public BooleanProperty startHidden() {
-		return startHidden;
-	}
-
-	public BooleanProperty autoCloseVaults() {
-		return autoCloseVaults;
-	}
-
-	public BooleanProperty useKeychain() {return useKeychain;}
-
-	public IntegerProperty port() {
-		return port;
-	}
-
-	public IntegerProperty numTrayNotifications() {
-		return numTrayNotifications;
-	}
-
-	public BooleanProperty debugMode() {
-		return debugMode;
-	}
-
-	public StringProperty mountService() {
-		return mountService;
-	}
-
-	public ObjectProperty<UiTheme> theme() {
-		return theme;
-	}
-
-	public StringProperty keychainProvider() {return keychainProvider;}
-
-	public ObjectProperty<NodeOrientation> userInterfaceOrientation() {
-		return userInterfaceOrientation;
-	}
-
-	public StringProperty licenseKey() {
-		return licenseKey;
-	}
-
-	public BooleanProperty showMinimizeButton() {
-		return showMinimizeButton;
-	}
-
-	public BooleanProperty showTrayIcon() {
-		return showTrayIcon;
-	}
-
-	public IntegerProperty windowXPositionProperty() {
-		return windowXPosition;
-	}
-
-	public IntegerProperty windowYPositionProperty() {
-		return windowYPosition;
-	}
-
-	public IntegerProperty windowWidthProperty() {
-		return windowWidth;
-	}
-
-	public IntegerProperty windowHeightProperty() {
-		return windowHeight;
-	}
-
-	public StringProperty displayConfigurationProperty() {
-		return displayConfiguration;
-	}
-
-	public StringProperty languageProperty() {
-		return language;
-	}
-
 }
diff --git a/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/src/main/java/org/cryptomator/common/settings/VaultSettings.java
index 8989858e1..aa4d99663 100644
--- a/src/main/java/org/cryptomator/common/settings/VaultSettings.java
+++ b/src/main/java/org/cryptomator/common/settings/VaultSettings.java
@@ -42,19 +42,19 @@ public class VaultSettings {
 
 	private static final Random RNG = new Random();
 
-	private final String id;
-	private final ObjectProperty<Path> path;
-	private final StringProperty displayName;
-	private final BooleanProperty unlockAfterStartup;
-	private final BooleanProperty revealAfterMount;
-	private final BooleanProperty usesReadOnlyMode;
-	private final StringProperty mountFlags;
-	private final IntegerProperty maxCleartextFilenameLength;
-	private final ObjectProperty<WhenUnlocked> actionAfterUnlock;
-	private final BooleanProperty autoLockWhenIdle;
-	private final IntegerProperty autoLockIdleSeconds;
-	private final ObjectProperty<Path> mountPoint;
-	private final StringExpression mountName;
+	public final String id;
+	public final ObjectProperty<Path> path;
+	public final StringProperty displayName;
+	public final BooleanProperty unlockAfterStartup;
+	public final BooleanProperty revealAfterMount;
+	public final BooleanProperty usesReadOnlyMode;
+	public final StringProperty mountFlags;
+	public final IntegerProperty maxCleartextFilenameLength;
+	public final ObjectProperty<WhenUnlocked> actionAfterUnlock;
+	public final BooleanProperty autoLockWhenIdle;
+	public final IntegerProperty autoLockIdleSeconds;
+	public final ObjectProperty<Path> mountPoint;
+	public final StringExpression mountName;
 
 	VaultSettings(VaultSettingsJson json) {
 		this.id = json.id;
@@ -139,69 +139,6 @@ public class VaultSettings {
 		return CharMatcher.anyOf("<>:\"/\\|?*").or(CharMatcher.javaIsoControl()).collapseFrom(withoutFancyWhitespaces, '_');
 	}
 
-	/* Getter/Setter */
-	// TODO: remove accessors, make fields public
-
-	public String getId() {
-		return id;
-	}
-
-	public ObjectProperty<Path> path() {
-		return path;
-	}
-
-	public StringProperty displayName() {
-		return displayName;
-	}
-
-	public StringExpression mountName() {
-		return mountName;
-	}
-
-	public BooleanProperty unlockAfterStartup() {
-		return unlockAfterStartup;
-	}
-
-	public BooleanProperty revealAfterMount() {
-		return revealAfterMount;
-	}
-
-	public Path getMountPoint() {
-		return mountPoint.get();
-	}
-
-	public ObjectProperty<Path> mountPoint() {
-		return mountPoint;
-	}
-
-	public BooleanProperty usesReadOnlyMode() {
-		return usesReadOnlyMode;
-	}
-
-	public StringProperty mountFlags() {
-		return mountFlags;
-	}
-
-	public IntegerProperty maxCleartextFilenameLength() {
-		return maxCleartextFilenameLength;
-	}
-
-	public ObjectProperty<WhenUnlocked> actionAfterUnlock() {
-		return actionAfterUnlock;
-	}
-
-	public WhenUnlocked getActionAfterUnlock() {
-		return actionAfterUnlock.get();
-	}
-
-	public BooleanProperty autoLockWhenIdle() {
-		return autoLockWhenIdle;
-	}
-
-	public IntegerProperty autoLockIdleSeconds() {
-		return autoLockIdleSeconds;
-	}
-
 	/* Hashcode/Equals */
 
 	@Override
diff --git a/src/main/java/org/cryptomator/common/vaults/AutoLocker.java b/src/main/java/org/cryptomator/common/vaults/AutoLocker.java
index 8342367a4..beaa747ea 100644
--- a/src/main/java/org/cryptomator/common/vaults/AutoLocker.java
+++ b/src/main/java/org/cryptomator/common/vaults/AutoLocker.java
@@ -50,8 +50,8 @@ public class AutoLocker {
 
 	private boolean exceedsIdleTime(Vault vault) {
 		assert vault.isUnlocked();
-		if (vault.getVaultSettings().autoLockWhenIdle().get()) {
-			int maxIdleSeconds = vault.getVaultSettings().autoLockIdleSeconds().get();
+		if (vault.getVaultSettings().autoLockWhenIdle.get()) {
+			int maxIdleSeconds = vault.getVaultSettings().autoLockIdleSeconds.get();
 			var deadline = vault.getStats().getLastActivity().plusSeconds(maxIdleSeconds);
 			return deadline.isBefore(Instant.now());
 		} else {
diff --git a/src/main/java/org/cryptomator/common/vaults/Vault.java b/src/main/java/org/cryptomator/common/vaults/Vault.java
index de77f17b5..d1aacfe53 100644
--- a/src/main/java/org/cryptomator/common/vaults/Vault.java
+++ b/src/main/java/org/cryptomator/common/vaults/Vault.java
@@ -80,7 +80,7 @@ public class Vault {
 		this.state = state;
 		this.lastKnownException = lastKnownException;
 		this.stats = stats;
-		this.displayablePath = Bindings.createStringBinding(this::getDisplayablePath, vaultSettings.path());
+		this.displayablePath = Bindings.createStringBinding(this::getDisplayablePath, vaultSettings.path);
 		this.locked = Bindings.createBooleanBinding(this::isLocked, state);
 		this.processing = Bindings.createBooleanBinding(this::isProcessing, state);
 		this.unlocked = Bindings.createBooleanBinding(this::isUnlocked, state);
@@ -98,29 +98,29 @@ public class Vault {
 
 	private CryptoFileSystem createCryptoFileSystem(MasterkeyLoader keyLoader) throws IOException, MasterkeyLoadingFailedException {
 		Set<FileSystemFlags> flags = EnumSet.noneOf(FileSystemFlags.class);
-		if (vaultSettings.usesReadOnlyMode().get()) {
+		if (vaultSettings.usesReadOnlyMode.get()) {
 			flags.add(FileSystemFlags.READONLY);
-		} else if (vaultSettings.maxCleartextFilenameLength().get() == -1) {
+		} else if (vaultSettings.maxCleartextFilenameLength.get() == -1) {
 			LOG.debug("Determining cleartext filename length limitations...");
 			var checker = new FileSystemCapabilityChecker();
 			int shorteningThreshold = configCache.get().allegedShorteningThreshold();
 			int ciphertextLimit = checker.determineSupportedCiphertextFileNameLength(getPath());
 			if (ciphertextLimit < shorteningThreshold) {
 				int cleartextLimit = checker.determineSupportedCleartextFileNameLength(getPath());
-				vaultSettings.maxCleartextFilenameLength().set(cleartextLimit);
+				vaultSettings.maxCleartextFilenameLength.set(cleartextLimit);
 			} else {
-				vaultSettings.maxCleartextFilenameLength().setValue(UNLIMITED_FILENAME_LENGTH);
+				vaultSettings.maxCleartextFilenameLength.setValue(UNLIMITED_FILENAME_LENGTH);
 			}
 		}
 
-		if (vaultSettings.maxCleartextFilenameLength().get() < UNLIMITED_FILENAME_LENGTH) {
-			LOG.warn("Limiting cleartext filename length on this device to {}.", vaultSettings.maxCleartextFilenameLength().get());
+		if (vaultSettings.maxCleartextFilenameLength.get() < UNLIMITED_FILENAME_LENGTH) {
+			LOG.warn("Limiting cleartext filename length on this device to {}.", vaultSettings.maxCleartextFilenameLength.get());
 		}
 
 		CryptoFileSystemProperties fsProps = CryptoFileSystemProperties.cryptoFileSystemProperties() //
 				.withKeyLoader(keyLoader) //
 				.withFlags(flags) //
-				.withMaxCleartextNameLength(vaultSettings.maxCleartextFilenameLength().get()) //
+				.withMaxCleartextNameLength(vaultSettings.maxCleartextFilenameLength.get()) //
 				.withVaultConfigFilename(Constants.VAULTCONFIG_FILENAME) //
 				.build();
 		return CryptoFileSystemProvider.newFileSystem(getPath(), fsProps);
@@ -253,11 +253,11 @@ public class Vault {
 	}
 
 	public ReadOnlyStringProperty displayNameProperty() {
-		return vaultSettings.displayName();
+		return vaultSettings.displayName;
 	}
 
 	public String getDisplayName() {
-		return vaultSettings.displayName().get();
+		return vaultSettings.displayName.get();
 	}
 
 	public ObjectBinding<Mountpoint> mountPointProperty() {
@@ -274,7 +274,7 @@ public class Vault {
 	}
 
 	public String getDisplayablePath() {
-		Path p = vaultSettings.path().get();
+		Path p = vaultSettings.path.get();
 		if (p.startsWith(HOME_DIR)) {
 			Path relativePath = HOME_DIR.relativize(p);
 			String homePrefix = SystemUtils.IS_OS_WINDOWS ? "~\\" : "~/";
@@ -311,7 +311,7 @@ public class Vault {
 	}
 
 	public Path getPath() {
-		return vaultSettings.path().getValue();
+		return vaultSettings.path.get();
 	}
 
 	/**
@@ -346,7 +346,7 @@ public class Vault {
 	}
 
 	public String getId() {
-		return vaultSettings.getId();
+		return vaultSettings.id;
 	}
 
 	// ******************************************************************************
diff --git a/src/main/java/org/cryptomator/common/vaults/VaultConfigCache.java b/src/main/java/org/cryptomator/common/vaults/VaultConfigCache.java
index 80d70ffbf..b879b1f81 100644
--- a/src/main/java/org/cryptomator/common/vaults/VaultConfigCache.java
+++ b/src/main/java/org/cryptomator/common/vaults/VaultConfigCache.java
@@ -27,7 +27,7 @@ public class VaultConfigCache {
 
 	void reloadConfig() throws IOException {
 		try {
-			config.set(readConfigFromStorage(this.settings.path().get()));
+			config.set(readConfigFromStorage(this.settings.path.get()));
 		} catch (IOException e) {
 			config.set(null);
 			throw e;
diff --git a/src/main/java/org/cryptomator/common/vaults/VaultListManager.java b/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
index 138d74e36..53616c3db 100644
--- a/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
+++ b/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
@@ -49,8 +49,8 @@ public class VaultListManager {
 		this.vaultComponentFactory = vaultComponentFactory;
 		this.defaultVaultName = resourceBundle.getString("defaults.vault.vaultName");
 
-		addAll(settings.getDirectories());
-		vaultList.addListener(new VaultListChangeListener(settings.getDirectories()));
+		addAll(settings.directories);
+		vaultList.addListener(new VaultListChangeListener(settings.directories));
 		autoLocker.init();
 	}
 
@@ -70,11 +70,11 @@ public class VaultListManager {
 
 	private VaultSettings newVaultSettings(Path path) {
 		VaultSettings vaultSettings = VaultSettings.withRandomId();
-		vaultSettings.path().set(path);
+		vaultSettings.path.set(path);
 		if (path.getFileName() != null) {
-			vaultSettings.displayName().set(path.getFileName().toString());
+			vaultSettings.displayName.set(path.getFileName().toString());
 		} else {
-			vaultSettings.displayName().set(defaultVaultName);
+			vaultSettings.displayName.set(defaultVaultName);
 		}
 		return vaultSettings;
 	}
@@ -95,13 +95,13 @@ public class VaultListManager {
 	private Vault create(VaultSettings vaultSettings) {
 		var wrapper = new VaultConfigCache(vaultSettings);
 		try {
-			var vaultState = determineVaultState(vaultSettings.path().get());
+			var vaultState = determineVaultState(vaultSettings.path.get());
 			if (vaultState == LOCKED) { //for legacy reasons: pre v8 vault do not have a config, but they are in the NEEDS_MIGRATION state
 				wrapper.reloadConfig();
 			}
 			return vaultComponentFactory.create(vaultSettings, wrapper, vaultState, null).vault();
 		} catch (IOException e) {
-			LOG.warn("Failed to determine vault state for " + vaultSettings.path().get(), e);
+			LOG.warn("Failed to determine vault state for " + vaultSettings.path.get(), e);
 			return vaultComponentFactory.create(vaultSettings, wrapper, ERROR, e).vault();
 		}
 	}
diff --git a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java
index 2aa7c6abd..99477177b 100644
--- a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java
+++ b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java
@@ -29,7 +29,7 @@ public class SupportedLanguages {
 
 	@Inject
 	public SupportedLanguages(Settings settings) {
-		var preferredLanguage = settings.languageProperty().get();
+		var preferredLanguage = settings.language.get();
 		preferredLocale = preferredLanguage == null ? Locale.getDefault() : Locale.forLanguageTag(preferredLanguage);
 		var collator = Collator.getInstance(preferredLocale);
 		collator.setStrength(Collator.PRIMARY);
diff --git a/src/main/java/org/cryptomator/logging/DebugMode.java b/src/main/java/org/cryptomator/logging/DebugMode.java
index 386b0fd43..74bbfb1a5 100644
--- a/src/main/java/org/cryptomator/logging/DebugMode.java
+++ b/src/main/java/org/cryptomator/logging/DebugMode.java
@@ -26,8 +26,8 @@ public class DebugMode {
 	}
 
 	public void initialize() {
-		setLogLevels(settings.debugMode().get());
-		settings.debugMode().addListener(this::logLevelChanged);
+		setLogLevels(settings.debugMode.get());
+		settings.debugMode.addListener(this::logLevelChanged);
 	}
 
 	private void logLevelChanged(@SuppressWarnings("unused") ObservableValue<? extends Boolean> observable, @SuppressWarnings("unused") Boolean oldValue, Boolean newValue) {
diff --git a/src/main/java/org/cryptomator/ui/common/DefaultSceneFactory.java b/src/main/java/org/cryptomator/ui/common/DefaultSceneFactory.java
index 7f6daa44d..85e85ff71 100644
--- a/src/main/java/org/cryptomator/ui/common/DefaultSceneFactory.java
+++ b/src/main/java/org/cryptomator/ui/common/DefaultSceneFactory.java
@@ -36,7 +36,7 @@ public class DefaultSceneFactory implements Function<Parent, Scene> {
 	}
 
 	protected void configureRoot(Parent root) {
-		root.nodeOrientationProperty().bind(settings.userInterfaceOrientation());
+		root.nodeOrientationProperty().bind(settings.userInterfaceOrientation);
 	}
 
 	protected void configureScene(Scene scene) {
diff --git a/src/main/java/org/cryptomator/ui/fxapp/AutoUnlocker.java b/src/main/java/org/cryptomator/ui/fxapp/AutoUnlocker.java
index e99cd6680..719071ed2 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/AutoUnlocker.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/AutoUnlocker.java
@@ -36,7 +36,7 @@ public class AutoUnlocker {
 
 	public void tryUnlockForTimespan(int timespan, TimeUnit timeUnit) {
 		// Unlock all available auto unlock vaults
-		Predicate<Vault> shouldAutoUnlock = v -> v.getVaultSettings().unlockAfterStartup().get();
+		Predicate<Vault> shouldAutoUnlock = v -> v.getVaultSettings().unlockAfterStartup.get();
 		unlockSequentially(vaults.stream().filter(shouldAutoUnlock)).thenRun(() -> startUnlockMissing(timespan, timeUnit));
 	}
 
@@ -80,6 +80,6 @@ public class AutoUnlocker {
 	private Stream<Vault> getMissingAutoUnlockVaults() {
 		return vaults.stream()
 				.filter(Vault::isMissing)
-				.filter(v -> v.getVaultSettings().unlockAfterStartup().get());
+				.filter(v -> v.getVaultSettings().unlockAfterStartup.get());
 	}
 }
diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
index cfc7ba62b..b71da265c 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
@@ -45,7 +45,7 @@ public class FxApplication {
 
 		// init system tray
 		final boolean hasTrayIcon;
-		if (settings.showTrayIcon().get() && trayMenu.get().isSupported()) {
+		if (settings.showTrayIcon.get() && trayMenu.get().isSupported()) {
 			trayMenu.get().initializeTrayIcon();
 			Platform.setImplicitExit(false); // don't quit when closing all windows
 			hasTrayIcon = true;
@@ -55,7 +55,7 @@ public class FxApplication {
 
 		// show main window
 		appWindows.showMainWindow().thenAccept(stage -> {
-			if (settings.startHidden().get()) {
+			if (settings.startHidden.get()) {
 				if (hasTrayIcon) {
 					stage.hide();
 				} else {
diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java
index b6681f728..ee187fd65 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java
@@ -36,8 +36,8 @@ public class FxApplicationStyle {
 	}
 
 	public void initialize() {
-		settings.theme().addListener(this::appThemeChanged);
-		loadSelectedStyleSheet(settings.theme().get());
+		settings.theme.addListener(this::appThemeChanged);
+		loadSelectedStyleSheet(settings.theme.get());
 	}
 
 	private void appThemeChanged(@SuppressWarnings("unused") ObservableValue<? extends UiTheme> observable, @SuppressWarnings("unused") UiTheme oldValue, UiTheme newValue) {
diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
index f19cb3ed4..74938bc64 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java
@@ -107,7 +107,7 @@ public class FxApplicationTerminator {
 
 		if (allowQuitWithoutPrompt.get()) {
 			exitingResponse.performQuit();
-		} else if (settings.autoCloseVaults().get() && !preventQuitWithGracefulLock.get()) {
+		} else if (settings.autoCloseVaults.get() && !preventQuitWithGracefulLock.get()) {
 			var lockAllTask = vaultService.createLockAllTask(vaults.filtered(Vault::isUnlocked), false);
 			lockAllTask.setOnSucceeded(event -> {
 				LOG.info("Locked remaining vaults was succesful.");
diff --git a/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java b/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java
index b83fe8515..4418f79b5 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java
@@ -38,7 +38,7 @@ public class UpdateChecker {
 	}
 
 	public void automaticallyCheckForUpdatesIfEnabled() {
-		if (settings.checkForUpdates().get()) {
+		if (settings.checkForUpdates.get()) {
 			startCheckingForUpdates(AUTOCHECK_DELAY);
 		}
 	}
diff --git a/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerModule.java b/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerModule.java
index dd7c5bf77..ffc2a3d2f 100644
--- a/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerModule.java
+++ b/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerModule.java
@@ -70,7 +70,7 @@ public abstract class UpdateCheckerModule {
 	@Named("checkForUpdatesInterval")
 	@FxApplicationScoped
 	static ObjectBinding<Duration> provideCheckForUpdateInterval(Settings settings) {
-		return Bindings.when(settings.checkForUpdates()).then(UPDATE_CHECK_INTERVAL).otherwise(DISABLED_UPDATE_CHECK_INTERVAL);
+		return Bindings.when(settings.checkForUpdates).then(UPDATE_CHECK_INTERVAL).otherwise(DISABLED_UPDATE_CHECK_INTERVAL);
 	}
 
 	@Provides
diff --git a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java
index 70dea5366..479a2d860 100644
--- a/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java
+++ b/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java
@@ -49,7 +49,7 @@ public class MainWindowTitleController implements FxController {
 		this.updateAvailable = updateChecker.latestVersionProperty().isNotNull();
 		this.licenseHolder = licenseHolder;
 		this.settings = settings;
-		this.showMinimizeButton = Bindings.createBooleanBinding(this::isShowMinimizeButton, settings.showMinimizeButton(), settings.showTrayIcon());
+		this.showMinimizeButton = Bindings.createBooleanBinding(this::isShowMinimizeButton, settings.showMinimizeButton, settings.showTrayIcon);
 	}
 
 	@FXML
@@ -85,10 +85,10 @@ public class MainWindowTitleController implements FxController {
 	}
 
 	private void saveWindowSettings() {
-		settings.windowYPositionProperty().setValue(window.getY());
-		settings.windowXPositionProperty().setValue(window.getX());
-		settings.windowWidthProperty().setValue(window.getWidth());
-		settings.windowHeightProperty().setValue(window.getHeight());
+		settings.windowXPosition.setValue(window.getX());
+		settings.windowYPosition.setValue(window.getY());
+		settings.windowWidth.setValue(window.getWidth());
+		settings.windowHeight.setValue(window.getHeight());
 	}
 
 	@FXML
@@ -139,7 +139,7 @@ public class MainWindowTitleController implements FxController {
 	}
 
 	public ReadOnlyBooleanProperty debugModeEnabledProperty() {
-		return settings.debugMode();
+		return settings.debugMode;
 	}
 
 	public boolean isDebugModeEnabled() {
@@ -152,6 +152,6 @@ public class MainWindowTitleController implements FxController {
 
 	public boolean isShowMinimizeButton() {
 		// always show the minimize button if no tray icon is present OR it is explicitly enabled
-		return !trayMenuInitialized || settings.showMinimizeButton().get();
+		return !trayMenuInitialized || settings.showMinimizeButton.get();
 	}
 }
diff --git a/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java b/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java
index 11f035124..1b3f1b69f 100644
--- a/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java
+++ b/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java
@@ -54,7 +54,7 @@ public class ResizeController implements FxController {
 		LOG.trace("init ResizeController");
 
 		if (neverTouched()) {
-			settings.displayConfigurationProperty().setValue(getMonitorSizes());
+			settings.displayConfiguration.set(getMonitorSizes());
 			return;
 		} else {
 			if (didDisplayConfigurationChange()) {
@@ -65,24 +65,24 @@ public class ResizeController implements FxController {
 				window.setWidth(window.getMinWidth());
 				window.setHeight(window.getMinHeight());
 			} else {
-				window.setHeight(settings.windowHeightProperty().get() > window.getMinHeight() ? settings.windowHeightProperty().get() : window.getMinHeight());
-				window.setWidth(settings.windowWidthProperty().get() > window.getMinWidth() ? settings.windowWidthProperty().get() : window.getMinWidth());
-				window.setX(settings.windowXPositionProperty().get());
-				window.setY(settings.windowYPositionProperty().get());
+				window.setHeight(settings.windowHeight.get() > window.getMinHeight() ? settings.windowHeight.get() : window.getMinHeight());
+				window.setWidth(settings.windowWidth.get() > window.getMinWidth() ? settings.windowWidth.get() : window.getMinWidth());
+				window.setX(settings.windowXPosition.get());
+				window.setY(settings.windowYPosition.get());
 			}
 		}
 		savePositionalSettings();
 	}
 
 	private boolean neverTouched() {
-		return (settings.windowHeightProperty().get() == 0) && (settings.windowWidthProperty().get() == 0) && (settings.windowXPositionProperty().get() == 0) && (settings.windowYPositionProperty().get() == 0);
+		return (settings.windowHeight.get() == 0) && (settings.windowWidth.get() == 0) && (settings.windowXPosition.get() == 0) && (settings.windowYPosition.get() == 0);
 	}
 
 	private boolean didDisplayConfigurationChange() {
 		String currentDisplayConfiguration = getMonitorSizes();
-		String settingsDisplayConfiguration = settings.displayConfigurationProperty().get();
+		String settingsDisplayConfiguration = settings.displayConfiguration.get();
 		boolean configurationHasChanged = !settingsDisplayConfiguration.equals(currentDisplayConfiguration);
-		if (configurationHasChanged) settings.displayConfigurationProperty().setValue(currentDisplayConfiguration);
+		if (configurationHasChanged) settings.displayConfiguration.set(currentDisplayConfiguration);
 		return configurationHasChanged;
 	}
 
@@ -170,10 +170,10 @@ public class ResizeController implements FxController {
 
 	@FXML
 	public void savePositionalSettings() {
-		settings.windowHeightProperty().setValue(window.getHeight());
-		settings.windowWidthProperty().setValue(window.getWidth());
-		settings.windowYPositionProperty().setValue(window.getY());
-		settings.windowXPositionProperty().setValue(window.getX());
+		settings.windowWidth.setValue(window.getWidth());
+		settings.windowHeight.setValue(window.getHeight());
+		settings.windowXPosition.setValue(window.getX());
+		settings.windowYPosition.setValue(window.getY());
 	}
 
 	public BooleanBinding showResizingArrowsProperty() {
diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java
index bc372341a..372d29040 100644
--- a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java
+++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java
@@ -50,7 +50,7 @@ public class VaultDetailMissingVaultController implements FxController {
 		fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(resourceBundle.getString("addvaultwizard.existing.filePickerMimeDesc"), CRYPTOMATOR_FILENAME_GLOB));
 		File masterkeyFile = fileChooser.showOpenDialog(window);
 		if (masterkeyFile != null) {
-			vault.get().getVaultSettings().path().setValue(masterkeyFile.toPath().toAbsolutePath().getParent());
+			vault.get().getVaultSettings().path.setValue(masterkeyFile.toPath().toAbsolutePath().getParent());
 			recheck();
 		}
 	}
diff --git a/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index d2381b869..12fdeaab4 100644
--- a/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -55,17 +55,17 @@ public class GeneralPreferencesController implements FxController {
 
 	@FXML
 	public void initialize() {
-		startHiddenCheckbox.selectedProperty().bindBidirectional(settings.startHidden());
-		autoCloseVaultsCheckbox.selectedProperty().bindBidirectional(settings.autoCloseVaults());
-		debugModeCheckbox.selectedProperty().bindBidirectional(settings.debugMode());
+		startHiddenCheckbox.selectedProperty().bindBidirectional(settings.startHidden);
+		autoCloseVaultsCheckbox.selectedProperty().bindBidirectional(settings.autoCloseVaults);
+		debugModeCheckbox.selectedProperty().bindBidirectional(settings.debugMode);
 		autoStartProvider.ifPresent(autoStart -> autoStartCheckbox.setSelected(autoStart.isEnabled()));
 
 		var keychainSettingsConverter = new KeychainProviderClassNameConverter(keychainAccessProviders);
 		keychainBackendChoiceBox.getItems().addAll(keychainAccessProviders);
-		keychainBackendChoiceBox.setValue(keychainSettingsConverter.fromString(settings.keychainProvider().get()));
+		keychainBackendChoiceBox.setValue(keychainSettingsConverter.fromString(settings.keychainProvider.get()));
 		keychainBackendChoiceBox.setConverter(new KeychainProviderDisplayNameConverter());
-		Bindings.bindBidirectional(settings.keychainProvider(), keychainBackendChoiceBox.valueProperty(), keychainSettingsConverter);
-		useKeychainCheckbox.selectedProperty().bindBidirectional(settings.useKeychain());
+		Bindings.bindBidirectional(settings.keychainProvider, keychainBackendChoiceBox.valueProperty(), keychainSettingsConverter);
+		useKeychainCheckbox.selectedProperty().bindBidirectional(settings.useKeychain);
 		keychainBackendChoiceBox.disableProperty().bind(useKeychainCheckbox.selectedProperty().not());
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java
index 05b733f86..40983c3f0 100644
--- a/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java
+++ b/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java
@@ -57,22 +57,22 @@ public class InterfacePreferencesController implements FxController {
 	@FXML
 	public void initialize() {
 		themeChoiceBox.getItems().addAll(UiTheme.applicableValues());
-		if (!themeChoiceBox.getItems().contains(settings.theme().get())) {
-			settings.theme().set(UiTheme.LIGHT);
+		if (!themeChoiceBox.getItems().contains(settings.theme.get())) {
+			settings.theme.set(UiTheme.LIGHT);
 		}
-		themeChoiceBox.valueProperty().bindBidirectional(settings.theme());
+		themeChoiceBox.valueProperty().bindBidirectional(settings.theme);
 		themeChoiceBox.setConverter(new UiThemeConverter(resourceBundle));
 
-		showMinimizeButtonCheckbox.selectedProperty().bindBidirectional(settings.showMinimizeButton());
+		showMinimizeButtonCheckbox.selectedProperty().bindBidirectional(settings.showMinimizeButton);
 
-		showTrayIconCheckbox.selectedProperty().bindBidirectional(settings.showTrayIcon());
+		showTrayIconCheckbox.selectedProperty().bindBidirectional(settings.showTrayIcon);
 
 		preferredLanguageChoiceBox.getItems().addAll(supportedLanguages.getLanguageTags());
-		preferredLanguageChoiceBox.valueProperty().bindBidirectional(settings.languageProperty());
+		preferredLanguageChoiceBox.valueProperty().bindBidirectional(settings.language);
 		preferredLanguageChoiceBox.setConverter(new LanguageTagConverter(resourceBundle));
 
-		nodeOrientationLtr.setSelected(settings.userInterfaceOrientation().get() == NodeOrientation.LEFT_TO_RIGHT);
-		nodeOrientationRtl.setSelected(settings.userInterfaceOrientation().get() == NodeOrientation.RIGHT_TO_LEFT);
+		nodeOrientationLtr.setSelected(settings.userInterfaceOrientation.get() == NodeOrientation.LEFT_TO_RIGHT);
+		nodeOrientationRtl.setSelected(settings.userInterfaceOrientation.get() == NodeOrientation.RIGHT_TO_LEFT);
 		nodeOrientation.selectedToggleProperty().addListener(this::toggleNodeOrientation);
 	}
 
@@ -87,9 +87,9 @@ public class InterfacePreferencesController implements FxController {
 
 	private void toggleNodeOrientation(@SuppressWarnings("unused") ObservableValue<? extends Toggle> observable, @SuppressWarnings("unused") Toggle oldValue, Toggle newValue) {
 		if (nodeOrientationLtr.equals(newValue)) {
-			settings.userInterfaceOrientation().set(NodeOrientation.LEFT_TO_RIGHT);
+			settings.userInterfaceOrientation.set(NodeOrientation.LEFT_TO_RIGHT);
 		} else if (nodeOrientationRtl.equals(newValue)) {
-			settings.userInterfaceOrientation().set(NodeOrientation.RIGHT_TO_LEFT);
+			settings.userInterfaceOrientation.set(NodeOrientation.RIGHT_TO_LEFT);
 		} else {
 			LOG.warn("Unexpected toggle option {}", newValue);
 		}
diff --git a/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java b/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java
index db2554d67..bff56bc3c 100644
--- a/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java
+++ b/src/main/java/org/cryptomator/ui/preferences/SupporterCertificateController.java
@@ -48,7 +48,7 @@ public class SupporterCertificateController implements FxController {
 	private void registrationKeyChanged(@SuppressWarnings("unused") ObservableValue<? extends String> observable, @SuppressWarnings("unused") String oldValue, String newValue) {
 		licenseHolder.validateAndStoreLicense(newValue);
 		if (!licenseHolder.isValidLicense()) {
-			settings.theme().set(UiTheme.LIGHT);
+			settings.theme.set(UiTheme.LIGHT);
 		}
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java
index 6a47b992d..630b82776 100644
--- a/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java
+++ b/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java
@@ -42,7 +42,7 @@ public class UpdatesPreferencesController implements FxController {
 	}
 
 	public void initialize() {
-		checkForUpdatesCheckbox.selectedProperty().bindBidirectional(settings.checkForUpdates());
+		checkForUpdatesCheckbox.selectedProperty().bindBidirectional(settings.checkForUpdates);
 	}
 
 	@FXML
diff --git a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
index 0df67cb53..653c4c6e6 100644
--- a/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
+++ b/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
@@ -53,7 +53,7 @@ public class VolumePreferencesController implements FxController {
 		this.resourceBundle = resourceBundle;
 
 		var fallbackProvider = mountProviders.stream().findFirst().orElse(null);
-		this.selectedMountService = ObservableUtil.mapWithDefault(settings.mountService(), serviceName -> mountProviders.stream().filter(s -> s.getClass().getName().equals(serviceName)).findFirst().orElse(fallbackProvider), fallbackProvider);
+		this.selectedMountService = ObservableUtil.mapWithDefault(settings.mountService, serviceName -> mountProviders.stream().filter(s -> s.getClass().getName().equals(serviceName)).findFirst().orElse(fallbackProvider), fallbackProvider);
 		this.loopbackPortSupported = BooleanExpression.booleanExpression(selectedMountService.map(s -> s.hasCapability(MountCapability.LOOPBACK_PORT)));
 		this.mountToDirSupported = selectedMountService.map(s -> s.hasCapability(MountCapability.MOUNT_WITHIN_EXISTING_PARENT) || s.hasCapability(MountCapability.MOUNT_TO_EXISTING_DIR));
 		this.mountToDriveLetterSupported = selectedMountService.map(s -> s.hasCapability(MountCapability.MOUNT_AS_DRIVE_LETTER));
@@ -71,15 +71,15 @@ public class VolumePreferencesController implements FxController {
 		volumeTypeChoiceBox.getItems().add(null);
 		volumeTypeChoiceBox.getItems().addAll(mountProviders);
 		volumeTypeChoiceBox.setConverter(new MountServiceConverter());
-		boolean autoSelected = settings.mountService().get() == null;
+		boolean autoSelected = settings.mountService.get() == null;
 		volumeTypeChoiceBox.getSelectionModel().select(autoSelected ? null : selectedMountService.getValue());
 		volumeTypeChoiceBox.valueProperty().addListener((observableValue, oldProvider, newProvider) -> {
 			var toSet = Optional.ofNullable(newProvider).map(nP -> nP.getClass().getName()).orElse(null);
-			settings.mountService().set(toSet);
+			settings.mountService.set(toSet);
 		});
 
-		loopbackPortField.setText(String.valueOf(settings.port().get()));
-		loopbackPortApplyButton.visibleProperty().bind(settings.port().asString().isNotEqualTo(loopbackPortField.textProperty()));
+		loopbackPortField.setText(String.valueOf(settings.port.get()));
+		loopbackPortApplyButton.visibleProperty().bind(settings.port.asString().isNotEqualTo(loopbackPortField.textProperty()));
 		loopbackPortApplyButton.disableProperty().bind(Bindings.createBooleanBinding(this::validateLoopbackPort, loopbackPortField.textProperty()).not());
 	}
 
@@ -95,7 +95,7 @@ public class VolumePreferencesController implements FxController {
 
 	public void doChangeLoopbackPort() {
 		if (validateLoopbackPort()) {
-			settings.port().set(Integer.parseInt(loopbackPortField.getText()));
+			settings.port.set(Integer.parseInt(loopbackPortField.getText()));
 		}
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java b/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java
index 835654242..c1ac5a509 100644
--- a/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java
+++ b/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java
@@ -50,7 +50,7 @@ public class UnlockSuccessController implements FxController {
 		LOG.trace("UnlockSuccessController.close()");
 		window.close();
 		if (rememberChoiceCheckbox.isSelected()) {
-			vault.getVaultSettings().actionAfterUnlock().setValue(WhenUnlocked.IGNORE);
+			vault.getVaultSettings().actionAfterUnlock.setValue(WhenUnlocked.IGNORE);
 		}
 	}
 
@@ -73,7 +73,7 @@ public class UnlockSuccessController implements FxController {
 		});
 		executor.execute(revealTask);
 		if (rememberChoiceCheckbox.isSelected()) {
-			vault.getVaultSettings().actionAfterUnlock().setValue(WhenUnlocked.REVEAL);
+			vault.getVaultSettings().actionAfterUnlock.setValue(WhenUnlocked.REVEAL);
 		}
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index 985f1b471..cd4f5fcba 100644
--- a/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -94,7 +94,7 @@ public class UnlockWorkflow extends Task<Boolean> {
 	protected void succeeded() {
 		LOG.info("Unlock of '{}' succeeded.", vault.getDisplayName());
 
-		switch (vault.getVaultSettings().actionAfterUnlock().get()) {
+		switch (vault.getVaultSettings().actionAfterUnlock.get()) {
 			case ASK -> Platform.runLater(() -> {
 				window.setScene(successScene.get());
 				window.show();
diff --git a/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java b/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
index 633797820..59a52adf2 100644
--- a/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
+++ b/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
@@ -45,21 +45,21 @@ public class GeneralVaultOptionsController implements FxController {
 
 	@FXML
 	public void initialize() {
-		vaultName.textProperty().set(vault.getVaultSettings().displayName().get());
+		vaultName.textProperty().set(vault.getVaultSettings().displayName.get());
 		vaultName.focusedProperty().addListener(this::trimVaultNameOnFocusLoss);
 		vaultName.setTextFormatter(new TextFormatter<>(this::checkVaultNameLength));
-		unlockOnStartupCheckbox.selectedProperty().bindBidirectional(vault.getVaultSettings().unlockAfterStartup());
+		unlockOnStartupCheckbox.selectedProperty().bindBidirectional(vault.getVaultSettings().unlockAfterStartup);
 		actionAfterUnlockChoiceBox.getItems().addAll(WhenUnlocked.values());
-		actionAfterUnlockChoiceBox.valueProperty().bindBidirectional(vault.getVaultSettings().actionAfterUnlock());
+		actionAfterUnlockChoiceBox.valueProperty().bindBidirectional(vault.getVaultSettings().actionAfterUnlock);
 		actionAfterUnlockChoiceBox.setConverter(new WhenUnlockedConverter(resourceBundle));
-		lockAfterTimeCheckbox.selectedProperty().bindBidirectional(vault.getVaultSettings().autoLockWhenIdle());
-		Bindings.bindBidirectional(lockTimeInMinutesTextField.textProperty(), vault.getVaultSettings().autoLockIdleSeconds(), new IdleTimeSecondsConverter());
+		lockAfterTimeCheckbox.selectedProperty().bindBidirectional(vault.getVaultSettings().autoLockWhenIdle);
+		Bindings.bindBidirectional(lockTimeInMinutesTextField.textProperty(), vault.getVaultSettings().autoLockIdleSeconds, new IdleTimeSecondsConverter());
 	}
 
 	private void trimVaultNameOnFocusLoss(Observable observable, Boolean wasFocussed, Boolean isFocussed) {
 		if (!isFocussed) {
 			var trimmed = vaultName.getText().trim();
-			vault.getVaultSettings().displayName().set(trimmed);
+			vault.getVaultSettings().displayName.set(trimmed);
 		}
 	}
 
diff --git a/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
index 502d4312a..5eeab43e0 100644
--- a/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
+++ b/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
@@ -74,18 +74,18 @@ public class MountOptionsController implements FxController {
 		this.mountpointDriveLetterSupported = mountService.map(as -> as.service().hasCapability(MountCapability.MOUNT_AS_DRIVE_LETTER));
 		this.mountFlagsSupported = mountService.map(as -> as.service().hasCapability(MountCapability.MOUNT_FLAGS));
 		this.readOnlySupported = mountService.map(as -> as.service().hasCapability(MountCapability.READ_ONLY));
-		this.directoryPath = vault.getVaultSettings().mountPoint().map(p -> isDriveLetter(p) ? null : p.toString());
+		this.directoryPath = vault.getVaultSettings().mountPoint.map(p -> isDriveLetter(p) ? null : p.toString());
 		this.applicationWindows = applicationWindows;
 	}
 
 	@FXML
 	public void initialize() {
 		// readonly:
-		readOnlyCheckbox.selectedProperty().bindBidirectional(vaultSettings.usesReadOnlyMode());
+		readOnlyCheckbox.selectedProperty().bindBidirectional(vaultSettings.usesReadOnlyMode);
 
 		// custom mount flags:
 		mountFlagsField.disableProperty().bind(customMountFlagsCheckbox.selectedProperty().not());
-		customMountFlagsCheckbox.setSelected(!Strings.isNullOrEmpty(vaultSettings.mountFlags().getValue()));
+		customMountFlagsCheckbox.setSelected(!Strings.isNullOrEmpty(vaultSettings.mountFlags.getValue()));
 		toggleUseCustomMountFlags();
 
 		//driveLetter choice box
@@ -93,14 +93,14 @@ public class MountOptionsController implements FxController {
 		driveLetterSelection.setConverter(new WinDriveLetterLabelConverter(windowsDriveLetters, resourceBundle));
 
 		//mountPoint toggle group
-		var mountPoint = vaultSettings.getMountPoint();
+		var mountPoint = vaultSettings.mountPoint.get();
 		if (mountPoint == null) {
 			//prepare and select auto
 			mountPointToggleGroup.selectToggle(mountPointAutoBtn);
 		} else if (mountPoint.getParent() == null && isDriveLetter(mountPoint)) {
 			//prepare and select drive letter
 			mountPointToggleGroup.selectToggle(mountPointDriveLetterBtn);
-			driveLetterSelection.valueProperty().bindBidirectional(vaultSettings.mountPoint());
+			driveLetterSelection.valueProperty().bindBidirectional(vaultSettings.mountPoint);
 		} else {
 			//prepare and select dir
 			mountPointToggleGroup.selectToggle(mountPointDirBtn);
@@ -118,14 +118,14 @@ public class MountOptionsController implements FxController {
 		if (customMountFlagsCheckbox.isSelected()) {
 			readOnlyCheckbox.setSelected(false); // to prevent invalid states
 			mountFlagsField.textProperty().unbind();
-			var mountFlags = vaultSettings.mountFlags().get();
+			var mountFlags = vaultSettings.mountFlags.get();
 			if (mountFlags == null || mountFlags.isBlank()) {
-				vaultSettings.mountFlags().set(defaultMountFlags.getValue());
+				vaultSettings.mountFlags.set(defaultMountFlags.getValue());
 			}
-			mountFlagsField.textProperty().bindBidirectional(vaultSettings.mountFlags());
+			mountFlagsField.textProperty().bindBidirectional(vaultSettings.mountFlags);
 		} else {
-			mountFlagsField.textProperty().unbindBidirectional(vaultSettings.mountFlags());
-			vaultSettings.mountFlags().set(null);
+			mountFlagsField.textProperty().unbindBidirectional(vaultSettings.mountFlags);
+			vaultSettings.mountFlags.set(null);
 			mountFlagsField.textProperty().bind(defaultMountFlags);
 		}
 	}
@@ -134,7 +134,7 @@ public class MountOptionsController implements FxController {
 	public void chooseCustomMountPoint() {
 		try {
 			Path chosenPath = chooseCustomMountPointInternal();
-			vaultSettings.mountPoint().set(chosenPath);
+			vaultSettings.mountPoint.set(chosenPath);
 		} catch (NoDirSelectedException e) {
 			//no-op
 		}
@@ -151,7 +151,7 @@ public class MountOptionsController implements FxController {
 		DirectoryChooser directoryChooser = new DirectoryChooser();
 		directoryChooser.setTitle(resourceBundle.getString("vaultOptions.mount.mountPoint.directoryPickerTitle"));
 		try {
-			var mp = vaultSettings.mountPoint().get();
+			var mp = vaultSettings.mountPoint.get();
 			var initialDir = mp != null && !isDriveLetter(mp) ? mp : Path.of(System.getProperty("user.home"));
 
 			if (Files.isDirectory(initialDir)) {
@@ -170,13 +170,13 @@ public class MountOptionsController implements FxController {
 
 	private void selectedToggleChanged(ObservableValue<? extends Toggle> observable, Toggle oldToggle, Toggle newToggle) {
 		//Remark: the mountpoint corresponding to the newToggle must be null, otherwise it would not be new!
-		driveLetterSelection.valueProperty().unbindBidirectional(vaultSettings.mountPoint());
+		driveLetterSelection.valueProperty().unbindBidirectional(vaultSettings.mountPoint);
 		if (mountPointDriveLetterBtn.equals(newToggle)) {
-			vaultSettings.mountPoint().set(windowsDriveLetters.getFirstDesiredAvailable().orElse(windowsDriveLetters.getAll().stream().findAny().get()));
-			driveLetterSelection.valueProperty().bindBidirectional(vaultSettings.mountPoint());
+			vaultSettings.mountPoint.set(windowsDriveLetters.getFirstDesiredAvailable().orElse(windowsDriveLetters.getAll().stream().findAny().get()));
+			driveLetterSelection.valueProperty().bindBidirectional(vaultSettings.mountPoint);
 		} else if (mountPointDirBtn.equals(newToggle)) {
 			try {
-				vaultSettings.mountPoint().set(chooseCustomMountPointInternal());
+				vaultSettings.mountPoint.set(chooseCustomMountPointInternal());
 			} catch (NoDirSelectedException e) {
 				if (oldToggle != null && !mountPointDirBtn.equals(oldToggle)) {
 					mountPointToggleGroup.selectToggle(oldToggle);
@@ -185,7 +185,7 @@ public class MountOptionsController implements FxController {
 				}
 			}
 		} else {
-			vaultSettings.mountPoint().set(null);
+			vaultSettings.mountPoint.set(null);
 		}
 	}
 
diff --git a/src/test/java/org/cryptomator/common/settings/SettingsTest.java b/src/test/java/org/cryptomator/common/settings/SettingsTest.java
index 4f18ee866..cd737ac11 100644
--- a/src/test/java/org/cryptomator/common/settings/SettingsTest.java
+++ b/src/test/java/org/cryptomator/common/settings/SettingsTest.java
@@ -24,15 +24,15 @@ public class SettingsTest {
 		Mockito.verify(changeListener, Mockito.times(0)).accept(settings);
 
 		// first change (to property):
-		settings.port().set(42428);
+		settings.port.set(42428);
 		Mockito.verify(changeListener, Mockito.times(1)).accept(settings);
 
 		// second change (to list):
-		settings.getDirectories().add(vaultSettings);
+		settings.directories.add(vaultSettings);
 		Mockito.verify(changeListener, Mockito.times(2)).accept(settings);
 
 		// third change (to property of list item):
-		vaultSettings.displayName().set("asd");
+		vaultSettings.displayName.set("asd");
 		Mockito.verify(changeListener, Mockito.times(3)).accept(settings);
 	}
 
diff --git a/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java b/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
index 2fcc0cf3b..9d0395123 100644
--- a/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
+++ b/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
@@ -20,9 +20,9 @@ public class VaultModuleTest {
 
 	@BeforeEach
 	public void setup(@TempDir Path tmpDir) {
-		Mockito.when(vaultSettings.mountName()).thenReturn(Bindings.createStringBinding(() -> "TEST"));
-		Mockito.when(vaultSettings.usesReadOnlyMode()).thenReturn(new SimpleBooleanProperty(true));
-		Mockito.when(vaultSettings.displayName()).thenReturn(new SimpleStringProperty("Vault"));
+		Mockito.when(vaultSettings.mountName).thenReturn(Bindings.createStringBinding(() -> "TEST"));
+		Mockito.when(vaultSettings.usesReadOnlyMode).thenReturn(new SimpleBooleanProperty(true));
+		Mockito.when(vaultSettings.displayName).thenReturn(new SimpleStringProperty("Vault"));
 		System.setProperty("user.home", tmpDir.toString());
 	}
 

From a50bc8e05c811be51e1c2417def166689de512d4 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 30 Jun 2023 13:53:06 +0200
Subject: [PATCH 60/61] reduce api surface

---
 src/main/java/org/cryptomator/common/settings/Settings.java     | 2 +-
 .../java/org/cryptomator/common/settings/VaultSettings.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/settings/Settings.java b/src/main/java/org/cryptomator/common/settings/Settings.java
index d52b104c1..cfe30641d 100644
--- a/src/main/java/org/cryptomator/common/settings/Settings.java
+++ b/src/main/java/org/cryptomator/common/settings/Settings.java
@@ -161,7 +161,7 @@ public class Settings {
 		}
 	}
 
-	public SettingsJson serialized() {
+	SettingsJson serialized() {
 		var json = new SettingsJson();
 		json.directories = directories.stream().map(VaultSettings::serialized).toList();
 		json.askedForUpdateCheck = askedForUpdateCheck.get();
diff --git a/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/src/main/java/org/cryptomator/common/settings/VaultSettings.java
index aa4d99663..7b7e319c9 100644
--- a/src/main/java/org/cryptomator/common/settings/VaultSettings.java
+++ b/src/main/java/org/cryptomator/common/settings/VaultSettings.java
@@ -109,7 +109,7 @@ public class VaultSettings {
 		return BaseEncoding.base64Url().encode(randomBytes);
 	}
 
-	public VaultSettingsJson serialized() {
+	VaultSettingsJson serialized() {
 		var json = new VaultSettingsJson();
 		json.id = id;
 		json.path = path.map(Path::toString).getValue();

From ed8457ff3690ce372086ffa125e40241ac04da3a Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 30 Jun 2023 13:53:25 +0200
Subject: [PATCH 61/61] remove dead test

---
 .../common/vaults/VaultModuleTest.java        | 29 -------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java

diff --git a/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java b/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
deleted file mode 100644
index 9d0395123..000000000
--- a/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.cryptomator.common.vaults;
-
-import org.cryptomator.common.settings.Settings;
-import org.cryptomator.common.settings.VaultSettings;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.io.TempDir;
-import org.mockito.Mockito;
-
-import javafx.beans.binding.Bindings;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleStringProperty;
-import java.nio.file.Path;
-
-public class VaultModuleTest {
-
-	private final Settings settings = Mockito.mock(Settings.class);
-	private final VaultSettings vaultSettings = Mockito.mock(VaultSettings.class);
-
-	private final VaultModule module = new VaultModule();
-
-	@BeforeEach
-	public void setup(@TempDir Path tmpDir) {
-		Mockito.when(vaultSettings.mountName).thenReturn(Bindings.createStringBinding(() -> "TEST"));
-		Mockito.when(vaultSettings.usesReadOnlyMode).thenReturn(new SimpleBooleanProperty(true));
-		Mockito.when(vaultSettings.displayName).thenReturn(new SimpleStringProperty("Vault"));
-		System.setProperty("user.home", tmpDir.toString());
-	}
-
-}