From 8d15a6612f606e0d08733939ec01286190fceb2e Mon Sep 17 00:00:00 2001
From: Martin <beyer.martin.1998@gmail.com>
Date: Sun, 28 Jun 2020 11:05:27 +0200
Subject: [PATCH 001/169] Implements #1244 by adding a small button to regain
 focus

---
 .../java/org/cryptomator/ui/controls/FontAwesome5Icon.java | 3 ++-
 main/ui/src/main/resources/fxml/vault_detail_missing.fxml  | 7 ++++++-
 main/ui/src/main/resources/i18n/strings.properties         | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
index 7423fb899..7334b69da 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
@@ -26,17 +26,18 @@ public enum FontAwesome5Icon {
 	INFO_CIRCLE("\uF05A"), //
 	KEY("\uF084"), //
 	LINK("\uF0C1"), //
-	UNLINK("\uf127"),
 	LOCK("\uF023"), //
 	LOCK_OPEN("\uF3C1"), //
 	MAGIC("\uF0D0"), //
 	PLUS("\uF067"), //
 	PRINT("\uF02F"), //
 	QUESTION("\uF128"), //
+	REDO("\uF01E"), //
 	SEARCH("\uF002"), //
 	SPINNER("\uF110"), //
 	SYNC("\uF021"), //
 	TIMES("\uF00D"), //
+	UNLINK("\uf127"), //
 	WRENCH("\uF0AD"), //
 	WINDOW_MINIMIZE("\uF2D1"), //
 	;
diff --git a/main/ui/src/main/resources/fxml/vault_detail_missing.fxml b/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
index cf3b66276..dbeeedbd4 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
@@ -4,6 +4,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import javafx.scene.control.Button?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailMissingVaultController"
@@ -19,7 +20,11 @@
 				</StackPane.margin>
 			</FontAwesome5IconView>
 		</StackPane>
-
 		<Label text="%main.vaultDetail.missing.info" wrapText="true"/>
+		<Button text="%main.vaultDetail.missing.refresh" minWidth="120">
+			<graphic>
+				<FontAwesome5IconView glyph="REDO"/>
+			</graphic>
+		</Button>
 	</children>
 </VBox>
\ No newline at end of file
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 416971ef2..b476b558e 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -193,6 +193,7 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator could not find a vault at this path.
+main.vaultDetail.missing.refresh=Refresh current vault
 ### Needs Migration
 main.vaultDetail.migrateButton=Upgrade Vault
 main.vaultDetail.migratePrompt=Your vault needs to be upgraded to a new format, before you can access it

From e831debb943a7e37aaa2a4190a3611fe08f70715 Mon Sep 17 00:00:00 2001
From: Martin Beyer <beyer.martin.1998@gmail.com>
Date: Tue, 30 Jun 2020 09:36:46 +0200
Subject: [PATCH 002/169] fixes #1244 by renaming the refresh button and adding
 a method call

---
 .../ui/mainwindow/VaultDetailMissingVaultController.java    | 6 ++++++
 main/ui/src/main/resources/fxml/vault_detail_missing.fxml   | 2 +-
 main/ui/src/main/resources/i18n/strings.properties          | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java
index 8036cbb3c..f54bc447b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java
@@ -2,7 +2,9 @@ package org.cryptomator.ui.mainwindow;
 
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.fxml.FXML;
 import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
@@ -17,4 +19,8 @@ public class VaultDetailMissingVaultController implements FxController {
 		this.vault = vault;
 	}
 
+	@FXML
+	public void recheck() {
+		VaultListManager.redetermineVaultState(vault.get());
+	}
 }
diff --git a/main/ui/src/main/resources/fxml/vault_detail_missing.fxml b/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
index dbeeedbd4..367aa4479 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
@@ -21,7 +21,7 @@
 			</FontAwesome5IconView>
 		</StackPane>
 		<Label text="%main.vaultDetail.missing.info" wrapText="true"/>
-		<Button text="%main.vaultDetail.missing.refresh" minWidth="120">
+		<Button text="%main.vaultDetail.missing.recheck" minWidth="120" onAction="#recheck">
 			<graphic>
 				<FontAwesome5IconView glyph="REDO"/>
 			</graphic>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index b476b558e..858adee2b 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -193,7 +193,7 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator could not find a vault at this path.
-main.vaultDetail.missing.refresh=Refresh current vault
+main.vaultDetail.missing.recheck=Recheck
 ### Needs Migration
 main.vaultDetail.migrateButton=Upgrade Vault
 main.vaultDetail.migratePrompt=Your vault needs to be upgraded to a new format, before you can access it

From cd1ed088c3202b2023272b64c021f4390f9c45cf Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@zoho.eu>
Date: Fri, 3 Jul 2020 10:37:02 +0200
Subject: [PATCH 003/169] Update bug.md

Change bullet point "Drive" to "Volume type" such that users are less confused by this field. Also added where this info can be found.
---
 .github/ISSUE_TEMPLATE/bug.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 0504eebce..dfabee3e5 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -23,7 +23,7 @@ Of course, we also expect you to search for existing similar issues first! ;) ht
 
 * Operating system and version: [Windows/macOS/Linux + Version]
 * Cryptomator version: [Shown in the settings]
-* Drive: [Dokany/FUSE/WebDAV]
+* Volume type: [Dokany/FUSE/WebDAV, shown in the settings]
 
 ### Steps to Reproduce
 
@@ -58,4 +58,4 @@ Log file location:
 - macOS: ~/Library/Logs/Cryptomator
 - Linux: ~/.local/share/Cryptomator/logs
 
--->
\ No newline at end of file
+-->

From d3063c811781a21e069bb1ddd52f74a276f73292 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 7 Jul 2020 16:01:32 +0200
Subject: [PATCH 004/169] Make sure not to launch the FX app more than once.

---
 .../org/cryptomator/ui/launcher/FxApplicationStarter.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/FxApplicationStarter.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/FxApplicationStarter.java
index 41419caa4..7bdd46ce2 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/launcher/FxApplicationStarter.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/FxApplicationStarter.java
@@ -11,6 +11,7 @@ import javax.inject.Singleton;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 @Singleton
 public class FxApplicationStarter {
@@ -19,17 +20,19 @@ public class FxApplicationStarter {
 
 	private final FxApplicationComponent.Builder fxAppComponent;
 	private final ExecutorService executor;
+	private final AtomicBoolean started;
 	private final CompletableFuture<FxApplication> future;
 
 	@Inject
 	public FxApplicationStarter(FxApplicationComponent.Builder fxAppComponent, ExecutorService executor) {
 		this.fxAppComponent = fxAppComponent;
 		this.executor = executor;
+		this.started = new AtomicBoolean();
 		this.future = new CompletableFuture<>();
 	}
 
-	public synchronized CompletionStage<FxApplication> get(boolean hasTrayIcon) {
-		if (!future.isDone()) {
+	public CompletionStage<FxApplication> get(boolean hasTrayIcon) {
+		if (!started.getAndSet(true)) {
 			start(hasTrayIcon);
 		}
 		return future;

From e78155396d4f1aade4847e407e6de2f1215912f8 Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Wed, 8 Jul 2020 14:01:10 +0200
Subject: [PATCH 005/169] Implementing #1251

---
 .../org/cryptomator/common/Environment.java   |  3 ++
 .../ui/preferences/AutoStartModule.java       |  5 +--
 .../ui/preferences/AutoStartStrategy.java     |  7 ++++
 .../ui/preferences/AutoStartWinStrategy.java  | 33 ++++++++++++++++++-
 4 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/Environment.java b/main/commons/src/main/java/org/cryptomator/common/Environment.java
index 890840b7d..54e29df8b 100644
--- a/main/commons/src/main/java/org/cryptomator/common/Environment.java
+++ b/main/commons/src/main/java/org/cryptomator/common/Environment.java
@@ -40,6 +40,7 @@ public class Environment {
 		LOG.debug("cryptomator.mountPointsDir: {}", System.getProperty("cryptomator.mountPointsDir"));
 		LOG.debug("cryptomator.minPwLength: {}", System.getProperty("cryptomator.minPwLength"));
 		LOG.debug("cryptomator.buildNumber: {}", System.getProperty("cryptomator.buildNumber"));
+		LOG.debug("cryptomator.binaryPath: {}", System.getProperty("cryptomator.binaryPath"));
 	}
 
 	public boolean useCustomLogbackConfig() {
@@ -74,6 +75,8 @@ public class Environment {
 		return getInt("cryptomator.minPwLength", DEFAULT_MIN_PW_LENGTH);
 	}
 
+	public Optional<Path> getBinaryPath() { return getPath("cryptomator.binaryPath"); }
+
 	private int getInt(String propertyName, int defaultValue) {
 		String value = System.getProperty(propertyName);
 		try {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java
index d006d8681..1909b6af2 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java
@@ -3,6 +3,7 @@ package org.cryptomator.ui.preferences;
 import dagger.Module;
 import dagger.Provides;
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.Environment;
 import org.cryptomator.jni.MacFunctions;
 
 import java.util.Optional;
@@ -12,12 +13,12 @@ abstract class AutoStartModule {
 
 	@Provides
 	@PreferencesScoped
-	public static Optional<AutoStartStrategy> provideAutoStartStrategy(Optional<MacFunctions> macFunctions) {
+	public static Optional<AutoStartStrategy> provideAutoStartStrategy(Optional<MacFunctions> macFunctions, Environment env) {
 		if (SystemUtils.IS_OS_MAC_OSX && macFunctions.isPresent()) {
 			return Optional.of(new AutoStartMacStrategy(macFunctions.get()));
 		} else if (SystemUtils.IS_OS_WINDOWS) {
 			Optional<String> exeName = ProcessHandle.current().info().command();
-			return exeName.map(AutoStartWinStrategy::new);
+			return exeName.map(x -> new AutoStartWinStrategy(x, env));
 		} else {
 			return Optional.empty();
 		}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java
index 99b21b4cd..10a431e1f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java
@@ -21,4 +21,11 @@ public interface AutoStartStrategy {
 		}
 		
 	}
+	class TogglingAutoStartWithPowershellFailedException extends TogglingAutoStartFailedException {
+
+		public TogglingAutoStartWithPowershellFailedException(String message, Throwable cause) {
+			super(message, cause);
+		}
+
+	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
index f4a8b0578..3ffebfc18 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.preferences;
 
+import org.cryptomator.common.Environment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -15,9 +16,12 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 	private static final String HKCU_AUTOSTART_KEY = "\"HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run\"";
 	private static final String AUTOSTART_VALUE = "Cryptomator";
 	private final String exePath;
+	private static final String WINDOWS_START_MENU_FOLDER = "\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs";
+	private Environment env;
 
-	public AutoStartWinStrategy(String exePath) {
+	public AutoStartWinStrategy(String exePath, Environment env) {
 		this.exePath = exePath;
+		this.env = env;
 	}
 
 	@Override
@@ -47,9 +51,11 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 			if (finishedInTime) {
 				LOG.debug("Added {} to registry key {}.", AUTOSTART_VALUE, HKCU_AUTOSTART_KEY);
 			} else {
+				addShortcutOfAppToAutostartFolder();
 				throw new TogglingAutoStartFailedException("Adding registry value failed.");
 			}
 		} catch (IOException e) {
+			addShortcutOfAppToAutostartFolder();
 			throw new TogglingAutoStartFailedException("Adding registry value failed. " + command, e);
 		}
 	}
@@ -66,9 +72,11 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 			if (finishedInTime) {
 				LOG.debug("Removed {} from registry key {}.", AUTOSTART_VALUE, HKCU_AUTOSTART_KEY);
 			} else {
+				removeShortcutOfAppFromAutostartFolder();
 				throw new TogglingAutoStartFailedException("Removing registry value failed.");
 			}
 		} catch (IOException e) {
+			removeShortcutOfAppFromAutostartFolder();
 			throw new TogglingAutoStartFailedException("Removing registry value failed. " + command, e);
 		}
 	}
@@ -88,4 +96,27 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 		return finishedInTime;
 	}
 
+	private void addShortcutOfAppToAutostartFolder() throws TogglingAutoStartWithPowershellFailedException{
+		String startmenueDirectory = System.getProperty("user.home") + WINDOWS_START_MENU_FOLDER + "\\Cryptomator.lnk";
+		String cryptomator = env.getBinaryPath().get().toString();
+		String createShortcutCommand = "$s=(New-Object -COM WScript.Shell).CreateShortcut('" + startmenueDirectory + "');$s.TargetPath='" + cryptomator + "';$s.Save();";
+		ProcessBuilder shortcutAdd = new ProcessBuilder("cmd", "/c", "Start powershell " + createShortcutCommand);
+		try {
+			shortcutAdd.start();
+		} catch (IOException e) {
+			throw new TogglingAutoStartWithPowershellFailedException("Adding shortcut to autostart folder failed.", e);
+		}
+	}
+
+	private void removeShortcutOfAppFromAutostartFolder() throws TogglingAutoStartWithPowershellFailedException{
+		String startmenueDirectory = System.getProperty("user.home") + WINDOWS_START_MENU_FOLDER + "\\Cryptomator.lnk";
+		ProcessBuilder shortcutRemove = new ProcessBuilder("cmd", "/c del \"" + startmenueDirectory + "\"");
+		try {
+			shortcutRemove.start();
+		} catch (IOException e) {
+			throw new TogglingAutoStartWithPowershellFailedException("Removing shortcut from autostart folder failed.", e);
+		}
+	}
+
+
 }

From dcaa6e81a3868b72ea4c7a01405797aba017501f Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Wed, 8 Jul 2020 14:53:15 +0200
Subject: [PATCH 006/169] Improving Exception calling and logging

---
 .../ui/preferences/AutoStartWinStrategy.java           | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
index 3ffebfc18..f863cec61 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
@@ -48,9 +48,10 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 		try {
 			Process proc = regAdd.start();
 			boolean finishedInTime = waitForProcess(proc, 5, TimeUnit.SECONDS);
-			if (finishedInTime) {
+			if (finishedInTime && proc.exitValue() == 0) {
 				LOG.debug("Added {} to registry key {}.", AUTOSTART_VALUE, HKCU_AUTOSTART_KEY);
 			} else {
+				LOG.debug("Registry could not be edited. Error code was {}.", proc.exitValue());
 				addShortcutOfAppToAutostartFolder();
 				throw new TogglingAutoStartFailedException("Adding registry value failed.");
 			}
@@ -69,9 +70,10 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 		try {
 			Process proc = regRemove.start();
 			boolean finishedInTime = waitForProcess(proc, 5, TimeUnit.SECONDS);
-			if (finishedInTime) {
+			if (finishedInTime && proc.exitValue() == 0) {
 				LOG.debug("Removed {} from registry key {}.", AUTOSTART_VALUE, HKCU_AUTOSTART_KEY);
 			} else {
+				LOG.debug("Registry could not be edited. Error code was {}.", proc.exitValue());
 				removeShortcutOfAppFromAutostartFolder();
 				throw new TogglingAutoStartFailedException("Removing registry value failed.");
 			}
@@ -96,7 +98,7 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 		return finishedInTime;
 	}
 
-	private void addShortcutOfAppToAutostartFolder() throws TogglingAutoStartWithPowershellFailedException{
+	private void addShortcutOfAppToAutostartFolder() throws TogglingAutoStartWithPowershellFailedException {
 		String startmenueDirectory = System.getProperty("user.home") + WINDOWS_START_MENU_FOLDER + "\\Cryptomator.lnk";
 		String cryptomator = env.getBinaryPath().get().toString();
 		String createShortcutCommand = "$s=(New-Object -COM WScript.Shell).CreateShortcut('" + startmenueDirectory + "');$s.TargetPath='" + cryptomator + "';$s.Save();";
@@ -108,7 +110,7 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 		}
 	}
 
-	private void removeShortcutOfAppFromAutostartFolder() throws TogglingAutoStartWithPowershellFailedException{
+	private void removeShortcutOfAppFromAutostartFolder() throws TogglingAutoStartWithPowershellFailedException {
 		String startmenueDirectory = System.getProperty("user.home") + WINDOWS_START_MENU_FOLDER + "\\Cryptomator.lnk";
 		ProcessBuilder shortcutRemove = new ProcessBuilder("cmd", "/c del \"" + startmenueDirectory + "\"");
 		try {

From 81bad4eb25772b53a5c27b3d889e9f1baa28cd55 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Thu, 9 Jul 2020 22:34:57 +0200
Subject: [PATCH 007/169] Fixed bug: Some exceptions caused by unlock were not
 shown

If an unmatched exception occurred during unlocking it was neither logged nor shown to the user.
---
 .../main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index 08b8adf71..20109f01e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -9,7 +9,6 @@ import javafx.stage.Window;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.common.vaults.Volume;
-import org.cryptomator.cryptolib.api.CryptoException;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
 import org.cryptomator.keychain.KeychainAccessException;
 import org.cryptomator.keychain.KeychainManager;
@@ -87,7 +86,7 @@ public class UnlockWorkflow extends Task<Boolean> {
 		} catch (NotDirectoryException | DirectoryNotEmptyException e) {
 			handleInvalidMountPoint(e);
 			throw e; // rethrow to trigger correct exception handling in Task
-		} catch (CryptoException | Volume.VolumeException | IOException e) {
+		} catch (Exception e) {
 			handleGenericError(e);
 			throw e; // rethrow to trigger correct exception handling in Task
 		} finally {

From 526c8328f6192ee41d1540a36033daa1f15a623a Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Mon, 13 Jul 2020 15:21:24 +0200
Subject: [PATCH 008/169] Refactoring - Removing unnecessary environment
 variable

---
 .../java/org/cryptomator/common/Environment.java    |  3 ---
 .../cryptomator/ui/preferences/AutoStartModule.java |  2 +-
 .../ui/preferences/AutoStartWinStrategy.java        | 13 +++++--------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/Environment.java b/main/commons/src/main/java/org/cryptomator/common/Environment.java
index 54e29df8b..890840b7d 100644
--- a/main/commons/src/main/java/org/cryptomator/common/Environment.java
+++ b/main/commons/src/main/java/org/cryptomator/common/Environment.java
@@ -40,7 +40,6 @@ public class Environment {
 		LOG.debug("cryptomator.mountPointsDir: {}", System.getProperty("cryptomator.mountPointsDir"));
 		LOG.debug("cryptomator.minPwLength: {}", System.getProperty("cryptomator.minPwLength"));
 		LOG.debug("cryptomator.buildNumber: {}", System.getProperty("cryptomator.buildNumber"));
-		LOG.debug("cryptomator.binaryPath: {}", System.getProperty("cryptomator.binaryPath"));
 	}
 
 	public boolean useCustomLogbackConfig() {
@@ -75,8 +74,6 @@ public class Environment {
 		return getInt("cryptomator.minPwLength", DEFAULT_MIN_PW_LENGTH);
 	}
 
-	public Optional<Path> getBinaryPath() { return getPath("cryptomator.binaryPath"); }
-
 	private int getInt(String propertyName, int defaultValue) {
 		String value = System.getProperty(propertyName);
 		try {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java
index 1909b6af2..fa01756ab 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java
@@ -18,7 +18,7 @@ abstract class AutoStartModule {
 			return Optional.of(new AutoStartMacStrategy(macFunctions.get()));
 		} else if (SystemUtils.IS_OS_WINDOWS) {
 			Optional<String> exeName = ProcessHandle.current().info().command();
-			return exeName.map(x -> new AutoStartWinStrategy(x, env));
+			return exeName.map(AutoStartWinStrategy::new);
 		} else {
 			return Optional.empty();
 		}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
index f863cec61..02e4faa26 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
@@ -17,11 +17,9 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 	private static final String AUTOSTART_VALUE = "Cryptomator";
 	private final String exePath;
 	private static final String WINDOWS_START_MENU_FOLDER = "\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs";
-	private Environment env;
 
-	public AutoStartWinStrategy(String exePath, Environment env) {
+	public AutoStartWinStrategy(String exePath) {
 		this.exePath = exePath;
-		this.env = env;
 	}
 
 	@Override
@@ -99,9 +97,8 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 	}
 
 	private void addShortcutOfAppToAutostartFolder() throws TogglingAutoStartWithPowershellFailedException {
-		String startmenueDirectory = System.getProperty("user.home") + WINDOWS_START_MENU_FOLDER + "\\Cryptomator.lnk";
-		String cryptomator = env.getBinaryPath().get().toString();
-		String createShortcutCommand = "$s=(New-Object -COM WScript.Shell).CreateShortcut('" + startmenueDirectory + "');$s.TargetPath='" + cryptomator + "';$s.Save();";
+		String startMenuDirectory = System.getProperty("user.home") + WINDOWS_START_MENU_FOLDER + "\\Cryptomator.lnk";
+		String createShortcutCommand = "$s=(New-Object -COM WScript.Shell).CreateShortcut('" + startMenuDirectory + "');$s.TargetPath='" + exePath + "';$s.Save();";
 		ProcessBuilder shortcutAdd = new ProcessBuilder("cmd", "/c", "Start powershell " + createShortcutCommand);
 		try {
 			shortcutAdd.start();
@@ -111,8 +108,8 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 	}
 
 	private void removeShortcutOfAppFromAutostartFolder() throws TogglingAutoStartWithPowershellFailedException {
-		String startmenueDirectory = System.getProperty("user.home") + WINDOWS_START_MENU_FOLDER + "\\Cryptomator.lnk";
-		ProcessBuilder shortcutRemove = new ProcessBuilder("cmd", "/c del \"" + startmenueDirectory + "\"");
+		String startMenuDirectory = System.getProperty("user.home") + WINDOWS_START_MENU_FOLDER + "\\Cryptomator.lnk";
+		ProcessBuilder shortcutRemove = new ProcessBuilder("cmd", "/c del \"" + startMenuDirectory + "\"");
 		try {
 			shortcutRemove.start();
 		} catch (IOException e) {

From 7e0ffb43a6106699d5211049252e39a9f4589f98 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 17 Jul 2020 11:57:53 +0200
Subject: [PATCH 009/169] fixing bug where the mountName of the vault is
 initially set as the default one

---
 .../common/settings/VaultSettings.java         | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
index 1a1dfe140..57ca1ab18 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
@@ -63,12 +63,18 @@ public class VaultSettings {
 		return new Observable[]{path, mountName, winDriveLetter, unlockAfterStartup, revealAfterMount, useCustomMountPath, customMountPath, usesReadOnlyMode, mountFlags, filenameLengthLimit, actionAfterUnlock};
 	}
 
-	private void deriveMountNameFromPathOrUseDefault(Path path) {
-		if (StringUtils.isBlank(mountName.get())) {
-			if (path != null && path.getFileName() != null) {
-				mountName.set(normalizeMountName(path.getFileName().toString()));
-			} else {
-				mountName.set(DEFAULT_MOUNT_NAME);
+	private void deriveMountNameFromPathOrUseDefault(Path newPath) {
+		final boolean mountNameSet = !StringUtils.isBlank(mountName.get());
+		final boolean dirnameExists = (newPath != null) && (newPath.getFileName() != null);
+
+		if (!mountNameSet && dirnameExists) {
+			mountName.set(normalizeMountName(newPath.getFileName().toString()));
+		} else if (!mountNameSet && !dirnameExists) {
+			mountName.set(DEFAULT_MOUNT_NAME+id);
+		}else if (mountNameSet && dirnameExists) {
+			if(mountName.get().equals(DEFAULT_MOUNT_NAME+id)){
+				//this is okay, since this function is only executed if the path changes (aka, the vault is created or added)
+				mountName.set(newPath.getFileName().toString());
 			}
 		}
 	}

From 4ab7bfaa20a73a63d76a4867e8804c6329cb5650 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 17 Jul 2020 11:58:11 +0200
Subject: [PATCH 010/169] reformat

---
 .../org/cryptomator/common/settings/VaultSettings.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
index 57ca1ab18..13a0c8eed 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
@@ -38,7 +38,7 @@ public class VaultSettings {
 	public static final int DEFAULT_FILENAME_LENGTH_LIMIT = -1;
 	public static final WhenUnlocked DEFAULT_ACTION_AFTER_UNLOCK = WhenUnlocked.ASK;
 
-	private static final Random RNG = new Random(); 
+	private static final Random RNG = new Random();
 
 	private final String id;
 	private final ObjectProperty<Path> path = new SimpleObjectProperty();
@@ -70,9 +70,9 @@ public class VaultSettings {
 		if (!mountNameSet && dirnameExists) {
 			mountName.set(normalizeMountName(newPath.getFileName().toString()));
 		} else if (!mountNameSet && !dirnameExists) {
-			mountName.set(DEFAULT_MOUNT_NAME+id);
-		}else if (mountNameSet && dirnameExists) {
-			if(mountName.get().equals(DEFAULT_MOUNT_NAME+id)){
+			mountName.set(DEFAULT_MOUNT_NAME + id);
+		} else if (mountNameSet && dirnameExists) {
+			if (mountName.get().equals(DEFAULT_MOUNT_NAME + id)) {
 				//this is okay, since this function is only executed if the path changes (aka, the vault is created or added)
 				mountName.set(newPath.getFileName().toString());
 			}
@@ -157,7 +157,7 @@ public class VaultSettings {
 	public StringProperty mountFlags() {
 		return mountFlags;
 	}
-	
+
 	public IntegerProperty filenameLengthLimit() {
 		return filenameLengthLimit;
 	}

From e2e7755af26b03b3809cb292296251ee0686b506 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Sat, 18 Jul 2020 18:57:11 +0200
Subject: [PATCH 011/169] Added cryptomator.mountPointsDir-property to Windows
 Configs

---
 .idea/runConfigurations/Cryptomator_Windows.xml   | 2 +-
 main/buildkit/src/main/resources/launcher-win.bat | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.idea/runConfigurations/Cryptomator_Windows.xml b/.idea/runConfigurations/Cryptomator_Windows.xml
index 05852ad59..40d4aba23 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="launcher" />
-    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/AppData/Roaming/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator/keychain.json&quot; -Xss2m -Xmx512m" />
+    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/AppData/Roaming/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.mountPointsDir=&quot;~/Mount&quot; -Xss2m -Xmx512m" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/main/buildkit/src/main/resources/launcher-win.bat b/main/buildkit/src/main/resources/launcher-win.bat
index 505981c9e..be367815f 100644
--- a/main/buildkit/src/main/resources/launcher-win.bat
+++ b/main/buildkit/src/main/resources/launcher-win.bat
@@ -4,6 +4,7 @@ java ^
 	-Dcryptomator.settingsPath="~/AppData/Roaming/Cryptomator/settings.json" ^
 	-Dcryptomator.ipcPortPath="~/AppData/Roaming/Cryptomator/ipcPort.bin" ^
 	-Dcryptomator.logDir="~/AppData/Roaming/Cryptomator" ^
+	-Dcryptomator.mountPointsDir="~/Mount" ^
 	-Dcryptomator.keychainPath="~/AppData/Roaming/Cryptomator/keychain.json" ^
 	-Xss20m ^
 	-Xmx512m ^

From 45f6caa7bda3589eb572df43a4f1451a56905728 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Sat, 18 Jul 2020 19:05:18 +0200
Subject: [PATCH 012/169] Added basic support for FUSE-Mounting on Windows

---
 .../cryptomator/common/vaults/FuseVolume.java |  2 +-
 .../common/vaults/VaultModule.java            | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index 4b6918be9..c3afe2624 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -171,7 +171,7 @@ public class FuseVolume implements Volume {
 	}
 
 	public static boolean isSupportedStatic() {
-		return (SystemUtils.IS_OS_MAC_OSX || SystemUtils.IS_OS_LINUX) && FuseMountFactory.isFuseSupported();
+		return (SystemUtils.IS_OS_MAC_OSX || SystemUtils.IS_OS_LINUX || SystemUtils.IS_OS_WINDOWS) && FuseMountFactory.isFuseSupported();
 	}
 
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
index 1afd9d88b..3631230ff 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
@@ -86,6 +86,8 @@ public class VaultModule {
 				return getMacFuseDefaultMountFlags(mountName, readOnly);
 			} else if (v == VolumeImpl.FUSE && SystemUtils.IS_OS_LINUX) {
 				return getLinuxFuseDefaultMountFlags(readOnly);
+			} else if (v == VolumeImpl.FUSE && SystemUtils.IS_OS_WINDOWS) {
+				return getWindowsFuseDefaultMountFlags(mountName, readOnly);
 			} else if (v == VolumeImpl.DOKANY && SystemUtils.IS_OS_WINDOWS) {
 				return getDokanyDefaultMountFlags(readOnly);
 			} else {
@@ -144,6 +146,25 @@ public class VaultModule {
 		return flags.toString().strip();
 	}
 
+	// see https://github.com/billziss-gh/winfsp/blob/5d0b10d0b643652c00ebb4704dc2bb28e7244973/src/dll/fuse/fuse_main.c#L53-L62 for syntax guide
+	// see https://github.com/billziss-gh/winfsp/blob/5d0b10d0b643652c00ebb4704dc2bb28e7244973/src/dll/fuse/fuse.c#L295-L319 for options (-o <...>)
+	// see https://github.com/billziss-gh/winfsp/wiki/Frequently-Asked-Questions/5ba00e4be4f5e938eaae6ef1500b331de12dee77 (FUSE 4.) on why the given defaults were choosen
+	private String getWindowsFuseDefaultMountFlags(ReadOnlyStringProperty mountName, ReadOnlyBooleanProperty readOnly) {
+		assert SystemUtils.IS_OS_WINDOWS;
+		StringBuilder flags = new StringBuilder();
+
+		//WinFSP has no explicit "readonly"-option, nut not setting the group/user-id has the same effect, tho.
+		//So for the time being not setting them is the way to go...
+		if (!readOnly.get()) {
+			flags.append(" -ouid=-1");
+			flags.append(" -ogid=-1");
+		}
+		flags.append(" -ovolname=").append(mountName.get());
+		flags.append(" -oThreadCount=").append(5);
+
+		return flags.toString().strip();
+	}
+
 	// see https://github.com/cryptomator/dokany-nio-adapter/blob/develop/src/main/java/org/cryptomator/frontend/dokany/MountUtil.java#L30-L34
 	private String getDokanyDefaultMountFlags(ReadOnlyBooleanProperty readOnly) {
 		assert SystemUtils.IS_OS_WINDOWS;

From c59d3cd03f92c82d2b00f8f8098c88d0dbf8bdc7 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Mon, 20 Jul 2020 21:23:35 +0200
Subject: [PATCH 013/169] Removed check for OS from
 FuseVolume#isSupportedStatic

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

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index c3afe2624..089a2e7d2 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -171,7 +171,7 @@ public class FuseVolume implements Volume {
 	}
 
 	public static boolean isSupportedStatic() {
-		return (SystemUtils.IS_OS_MAC_OSX || SystemUtils.IS_OS_LINUX || SystemUtils.IS_OS_WINDOWS) && FuseMountFactory.isFuseSupported();
+		return FuseMountFactory.isFuseSupported();
 	}
 
 }

From 902e66906a06d9bd60982003b7e5133f2b7a6469 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Mon, 20 Jul 2020 21:55:49 +0200
Subject: [PATCH 014/169] Refactored method
 FuseVolume#prepareTemporaryMountPoint

Refactored method FuseVolume#prepareTemporaryMountPoint to be more readable (removed duplicated code)
---
 .../main/java/org/cryptomator/common/vaults/FuseVolume.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index 089a2e7d2..fff8afc3c 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -74,13 +74,11 @@ public class FuseVolume implements Volume {
 		// https://github.com/osxfuse/osxfuse/issues/306#issuecomment-245114592:
 		// In order to allow non-admin users to mount FUSE volumes in `/Volumes`,
 		// starting with version 3.5.0, FUSE will create non-existent mount points automatically.
-		if (IS_MAC && mountPoint.getParent().equals(Paths.get("/Volumes"))) {
-			return mountPoint;
-		} else {
+		if (!(IS_MAC && mountPoint.getParent().equals(Paths.get("/Volumes")))) {
 			Files.createDirectories(mountPoint);
 			this.createdTemporaryMountPoint = true;
-			return mountPoint;
 		}
+		return mountPoint;
 	}
 
 	private Path chooseNonExistingTemporaryMountPoint() throws VolumeException {

From 341a98848dadefd0a04c368c14dba15b39fa2d76 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Mon, 20 Jul 2020 22:00:35 +0200
Subject: [PATCH 015/169] Modified check of provided mountpoint

Changed FuseVolume#checkProvidedMountPoint to handle FUSE on Windows correctly (WinFSP requires the folder to NOT exist...)
---
 .../org/cryptomator/common/vaults/FuseVolume.java  | 14 ++++++++++++++
 .../org/cryptomator/ui/unlock/UnlockWorkflow.java  |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index fff8afc3c..bce307afc 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -18,7 +18,9 @@ import javax.inject.Inject;
 import java.io.IOException;
 import java.nio.file.DirectoryNotEmptyException;
 import java.nio.file.DirectoryStream;
+import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.nio.file.NotDirectoryException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -59,6 +61,18 @@ public class FuseVolume implements Volume {
 	}
 
 	private void checkProvidedMountPoint(Path mountPoint) throws IOException {
+		//On Windows the target folder MUST NOT exist...
+		if (SystemUtils.IS_OS_WINDOWS) {
+			//We must use #notExists() here because notExists =/= !exists (see docs)
+			if (Files.notExists(mountPoint, LinkOption.NOFOLLOW_LINKS)) {
+				//File really doesn't exist
+				return;
+			}
+			//File exists OR can't be determined
+			throw new FileAlreadyExistsException(mountPoint.toString());
+		}
+
+		//... on Mac and Linux it's the opposite
 		if (!Files.isDirectory(mountPoint)) {
 			throw new NotDirectoryException(mountPoint.toString());
 		}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index 20109f01e..b44a9436b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -27,6 +27,7 @@ import javax.inject.Named;
 import java.io.IOException;
 import java.nio.CharBuffer;
 import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.FileSystemException;
 import java.nio.file.NotDirectoryException;
 import java.util.Arrays;
@@ -83,7 +84,7 @@ public class UnlockWorkflow extends Task<Boolean> {
 				cancel(false); // set Tasks state to cancelled
 				return false;
 			}
-		} catch (NotDirectoryException | DirectoryNotEmptyException e) {
+		} catch (FileAlreadyExistsException | NotDirectoryException | DirectoryNotEmptyException e) {
 			handleInvalidMountPoint(e);
 			throw e; // rethrow to trigger correct exception handling in Task
 		} catch (Exception e) {

From dae2814b0fd1e92caa2577a3d35f6e4a807c8402 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Mon, 20 Jul 2020 22:01:10 +0200
Subject: [PATCH 016/169] Added MountPointRequirement-Enum

Added MountPointRequirement-Enum and added method getMountPointRequirement() to Volume (and all implementing classes) to query the requirment for the specific VolumeProvider.
---
 .../common/vaults/DokanyVolume.java           |  5 +++
 .../cryptomator/common/vaults/FuseVolume.java |  5 +++
 .../common/vaults/MountPointRequirement.java  | 36 +++++++++++++++++++
 .../org/cryptomator/common/vaults/Volume.java |  2 ++
 .../common/vaults/WebDavVolume.java           |  5 +++
 5 files changed, 53 insertions(+)
 create mode 100644 main/commons/src/main/java/org/cryptomator/common/vaults/MountPointRequirement.java

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
index 1bfd813e3..0c0e4761e 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
@@ -106,6 +106,11 @@ public class DokanyVolume implements Volume {
 		return Optional.ofNullable(mountPoint);
 	}
 
+	@Override
+	public MountPointRequirement getMountPointRequirement() {
+		return MountPointRequirement.EMPTY_MOUNT_POINT;
+	}
+
 	public static boolean isSupportedStatic() {
 		return MountFactory.isApplicable();
 	}
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index bce307afc..e944d5fd6 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -182,6 +182,11 @@ public class FuseVolume implements Volume {
 		return Optional.ofNullable(mountPoint);
 	}
 
+	@Override
+	public MountPointRequirement getMountPointRequirement() {
+		return SystemUtils.IS_OS_WINDOWS ? MountPointRequirement.PARENT_NO_MOUNT_POINT : MountPointRequirement.EMPTY_MOUNT_POINT;
+	}
+
 	public static boolean isSupportedStatic() {
 		return FuseMountFactory.isFuseSupported();
 	}
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/MountPointRequirement.java b/main/commons/src/main/java/org/cryptomator/common/vaults/MountPointRequirement.java
new file mode 100644
index 000000000..192079220
--- /dev/null
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/MountPointRequirement.java
@@ -0,0 +1,36 @@
+package org.cryptomator.common.vaults;
+
+/**
+ * Enumeration used to indicate the requirements for mounting a vault
+ * using a specific {@link Volume VolumeProvider}, e.g. {@link FuseVolume}.
+ */
+public enum MountPointRequirement {
+
+	/**
+	 * No Mountpoint on the local filesystem required. (e.g. WebDAV)
+	 */
+	NONE,
+
+	/**
+	 * A parent folder is required, but the actual Mountpoint must not exist.
+	 */
+	PARENT_NO_MOUNT_POINT,
+
+	/**
+	 * A parent folder is required, but the actual Mountpoint may exist.
+	 */
+	PARENT_OPT_MOUNT_POINT,
+
+	/**
+	 * The actual Mountpoint must exist, must be empty and the parent must exist aswell.
+	 */
+	EMPTY_MOUNT_POINT;
+
+//	/**
+//	 * The actual Mountpoint must exist and may contain files.
+//	 */
+//	MOUNT_POINT;
+
+
+
+}
\ No newline at end of file
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java
index a0aa11be8..22759d61b 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java
@@ -32,6 +32,8 @@ public interface Volume {
 
 	Optional<Path> getMountPoint();
 
+	MountPointRequirement getMountPointRequirement();
+
 	// optional forced unmounting:
 
 	default boolean supportsForcedUnmount() {
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
index a12236230..a8e84c80c 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
@@ -101,6 +101,11 @@ public class WebDavVolume implements Volume {
 		return Optional.ofNullable(mountPoint);
 	}
 
+	@Override
+	public MountPointRequirement getMountPointRequirement() {
+		return MountPointRequirement.NONE;
+	}
+
 	private String getLocalhostAliasOrNull() {
 		try {
 			InetAddress alias = InetAddress.getByName(LOCALHOST_ALIAS);

From a1b375316c2770d1d6d2e2b66321e0c4f05dd9ec Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Mon, 20 Jul 2020 22:06:15 +0200
Subject: [PATCH 017/169] Specified the messages of failed UnlockWorkflows

Specified the messages of failed UnlockWorkflows by adding the ability to distinguish between the different MountPointRequirements

Translation for all languages but German and Englisch required
---
 .../java/org/cryptomator/common/vaults/Vault.java     |  4 ++++
 .../ui/unlock/UnlockInvalidMountPointController.java  |  8 ++++++++
 .../org/cryptomator/ui/unlock/UnlockWorkflow.java     | 11 ++++++++++-
 .../resources/fxml/unlock_invalid_mount_point.fxml    |  3 ++-
 main/ui/src/main/resources/i18n/strings.properties    |  3 ++-
 main/ui/src/main/resources/i18n/strings_de.properties |  3 ++-
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
index bc461c1d9..d16e7815c 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
@@ -319,6 +319,10 @@ public class Vault {
 		return vaultSettings.getId();
 	}
 
+	public MountPointRequirement getMountPointRequirement() {
+		return volume.getMountPointRequirement();
+	}
+
 	// ******************************************************************************
 	// Hashcode / Equals
 	// *******************************************************************************/
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
index f9cf4293e..b34d62b03 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
@@ -4,6 +4,7 @@ import dagger.Lazy;
 import javafx.fxml.FXML;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
+import org.cryptomator.common.vaults.MountPointRequirement;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
@@ -36,4 +37,11 @@ public class UnlockInvalidMountPointController implements FxController {
 		return vault.getVaultSettings().getCustomMountPath().orElse("AUTO");
 	}
 
+	public boolean getMustExist() {
+		MountPointRequirement requirement = vault.getMountPointRequirement();
+		assert requirement != MountPointRequirement.NONE; //An invalid MountPoint with no required MountPoint doesn't seem sensible
+
+		return requirement == MountPointRequirement.EMPTY_MOUNT_POINT;
+	}
+
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index b44a9436b..3da99fa59 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -6,6 +6,7 @@ import javafx.concurrent.Task;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 import javafx.stage.Window;
+import org.cryptomator.common.vaults.MountPointRequirement;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.common.vaults.Volume;
@@ -156,7 +157,15 @@ public class UnlockWorkflow extends Task<Boolean> {
 	}
 
 	private void handleInvalidMountPoint(FileSystemException e) {
-		LOG.error("Unlock failed. Mount point not an empty directory: {}", e.getMessage());
+		MountPointRequirement requirement = vault.getMountPointRequirement();
+		assert requirement != MountPointRequirement.NONE; //An invalid MountPoint with no required MountPoint doesn't seem sensible
+
+		if (requirement == MountPointRequirement.EMPTY_MOUNT_POINT) {
+			LOG.error("Unlock failed. Mount point not an empty directory or doesn't exist: {}", e.getMessage());
+		} else {
+			LOG.error("Unlock failed. Mount point/folder already exists or parent folder doesn't exist: {}", e.getMessage());
+		}
+
 		Platform.runLater(() -> {
 			window.setScene(invalidMountPointScene.get());
 		});
diff --git a/main/ui/src/main/resources/fxml/unlock_invalid_mount_point.fxml b/main/ui/src/main/resources/fxml/unlock_invalid_mount_point.fxml
index fd643223d..2104d3d15 100644
--- a/main/ui/src/main/resources/fxml/unlock_invalid_mount_point.fxml
+++ b/main/ui/src/main/resources/fxml/unlock_invalid_mount_point.fxml
@@ -27,7 +27,8 @@
 				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="EXCLAMATION" glyphSize="24"/>
 			</StackPane>
 			<VBox spacing="6" HBox.hgrow="ALWAYS">
-				<FormattedLabel format="%unlock.error.invalidMountPoint" arg1="${controller.mountPoint}" wrapText="true"/>
+				<FormattedLabel visible="${controller.mustExist}" managed="${controller.mustExist}" format="%unlock.error.invalidMountPoint.notExisting" arg1="${controller.mountPoint}" wrapText="true"/>
+				<FormattedLabel visible="${!controller.mustExist}" managed="${!controller.mustExist}" format="%unlock.error.invalidMountPoint.existing" arg1="${controller.mountPoint}" wrapText="true"/>
 			</VBox>
 		</HBox>
 
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 858adee2b..8315d88a5 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -100,7 +100,8 @@ unlock.success.message=Unlocked "%s" successfully! Your vault is now accessible.
 unlock.success.rememberChoice=Remember choice, don't show this again
 unlock.success.revealBtn=Reveal Vault
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=Mount point is not an empty directory: %s
+unlock.error.invalidMountPoint.notExisting=Mount point is not an empty directory or doesn't exist: %s
+unlock.error.invalidMountPoint.existing=Mount point/folder already exists or parent folder doesn't exist: %s
 
 # Migration
 migration.title=Upgrade Vault
diff --git a/main/ui/src/main/resources/i18n/strings_de.properties b/main/ui/src/main/resources/i18n/strings_de.properties
index e096aebfa..bd6bbc797 100644
--- a/main/ui/src/main/resources/i18n/strings_de.properties
+++ b/main/ui/src/main/resources/i18n/strings_de.properties
@@ -99,7 +99,8 @@ unlock.success.message=„%s“ erfolgreich entsperrt! Nun kannst du auf deinen
 unlock.success.rememberChoice=Auswahl speichern und nicht mehr anzeigen
 unlock.success.revealBtn=Tresor anzeigen
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=Einhängepunkt ist kein leeres Verzeichnis: %s
+unlock.error.invalidMountPoint.notExisting=Einhängepunkt ist kein leeres Verzeichnis oder existiert nicht: %s
+unlock.error.invalidMountPoint.existing=Einhängepunkt/-ordner existiert bereits oder das darüber liegende Verzeichnis existiert nicht: %s
 
 # Migration
 migration.title=Tresor aktualisieren

From 0091c401df3589e9e4236698690d242af77ffc1e Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Wed, 22 Jul 2020 15:26:21 +0200
Subject: [PATCH 018/169] Fixes #1267 by binding the
 settings.preferredVolumeImpl to VolumeImpl.WEBDAV, if preferredVolimeImpl
 isn't available

---
 .../ui/preferences/VolumePreferencesController.java | 13 +++++++++----
 .../src/main/resources/fxml/preferences_volume.fxml |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
index 9dd1bef82..44127696c 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
@@ -3,6 +3,7 @@ package org.cryptomator.ui.preferences;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.control.Button;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.TextField;
@@ -25,7 +26,7 @@ public class VolumePreferencesController implements FxController {
 	private final Settings settings;
 	private final BooleanBinding showWebDavSettings;
 	private final BooleanBinding showWebDavScheme;
-	public ChoiceBox<VolumeImpl> volumeTypeChoicBox;
+	public ChoiceBox<VolumeImpl> volumeTypeChoiceBox;
 	public TextField webDavPortField;
 	public Button changeWebDavPortButton;
 	public ChoiceBox<WebDavUrlScheme> webDavUrlSchemeChoiceBox;
@@ -38,9 +39,13 @@ public class VolumePreferencesController implements FxController {
 	}
 
 	public void initialize() {
-		volumeTypeChoicBox.getItems().addAll(Volume.getCurrentSupportedAdapters());
-		volumeTypeChoicBox.valueProperty().bindBidirectional(settings.preferredVolumeImpl());
-		volumeTypeChoicBox.setConverter(new VolumeImplConverter());
+		volumeTypeChoiceBox.getItems().addAll(Volume.getCurrentSupportedAdapters());
+		//If the in the settings specified preferredVolumeImplementation isn't available, overwrite the settings to use the default VolumeImpl.WEBDAV
+		if (!volumeTypeChoiceBox.getItems().contains(settings.preferredVolumeImpl().get())) {
+			settings.preferredVolumeImpl().bind(new SimpleObjectProperty<>(VolumeImpl.WEBDAV));
+		}
+		volumeTypeChoiceBox.valueProperty().bindBidirectional(settings.preferredVolumeImpl());
+		volumeTypeChoiceBox.setConverter(new VolumeImplConverter());
 
 		webDavPortField.setText(String.valueOf(settings.port().get()));
 		changeWebDavPortButton.visibleProperty().bind(settings.port().asString().isNotEqualTo(webDavPortField.textProperty()));
diff --git a/main/ui/src/main/resources/fxml/preferences_volume.fxml b/main/ui/src/main/resources/fxml/preferences_volume.fxml
index 43704e00f..1ac27fd85 100644
--- a/main/ui/src/main/resources/fxml/preferences_volume.fxml
+++ b/main/ui/src/main/resources/fxml/preferences_volume.fxml
@@ -17,7 +17,7 @@
 	<children>
 		<HBox spacing="6" alignment="CENTER_LEFT">
 			<Label text="%preferences.volume.type"/>
-			<ChoiceBox fx:id="volumeTypeChoicBox"/>
+			<ChoiceBox fx:id="volumeTypeChoiceBox"/>
 		</HBox>
 
 		<HBox spacing="6" alignment="CENTER_LEFT" visible="${controller.showWebDavSettings}">

From 8374599183ffe77d76784675290c6d074ea71efe Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Sun, 26 Jul 2020 23:02:26 +0200
Subject: [PATCH 019/169] Modified creation of temporary mountpoint, fixed
 bugs, added comments

Changed FuseVolume#prepareTemporaryMountPoint to handle FUSE on Windows correctly (WinFSP requires the folder to NOT exist...)
See: https://github.com/billziss-gh/winfsp/issues/320

Added comments
Fixed bug: Message showing a malformed path
---
 .../org/cryptomator/common/vaults/FuseVolume.java  | 14 +++++++++++---
 .../org/cryptomator/common/vaults/VaultModule.java |  5 ++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index e944d5fd6..f94548666 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -15,6 +15,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.DirectoryNotEmptyException;
 import java.nio.file.DirectoryStream;
@@ -30,7 +31,6 @@ public class FuseVolume implements Volume {
 
 	private static final Logger LOG = LoggerFactory.getLogger(FuseVolume.class);
 	private static final int MAX_TMPMOUNTPOINT_CREATION_RETRIES = 10;
-	private static final boolean IS_MAC = System.getProperty("os.name").toLowerCase().contains("mac");
 
 	private final VaultSettings vaultSettings;
 	private final Environment environment;
@@ -62,6 +62,7 @@ public class FuseVolume implements Volume {
 
 	private void checkProvidedMountPoint(Path mountPoint) throws IOException {
 		//On Windows the target folder MUST NOT exist...
+		//https://github.com/billziss-gh/winfsp/issues/320
 		if (SystemUtils.IS_OS_WINDOWS) {
 			//We must use #notExists() here because notExists =/= !exists (see docs)
 			if (Files.notExists(mountPoint, LinkOption.NOFOLLOW_LINKS)) {
@@ -88,7 +89,14 @@ public class FuseVolume implements Volume {
 		// https://github.com/osxfuse/osxfuse/issues/306#issuecomment-245114592:
 		// In order to allow non-admin users to mount FUSE volumes in `/Volumes`,
 		// starting with version 3.5.0, FUSE will create non-existent mount points automatically.
-		if (!(IS_MAC && mountPoint.getParent().equals(Paths.get("/Volumes")))) {
+		if (SystemUtils.IS_OS_MAC && mountPoint.getParent().equals(Paths.get("/Volumes"))) {
+			return mountPoint;
+		}
+
+		//WinFSP needs the parent, but the acutal Mount Point must not exist...
+		if (SystemUtils.IS_OS_WINDOWS) {
+			Files.createDirectories(mountPoint.getParent());
+		} else {
 			Files.createDirectories(mountPoint);
 			this.createdTemporaryMountPoint = true;
 		}
@@ -104,7 +112,7 @@ public class FuseVolume implements Volume {
 				return mountPoint;
 			}
 		}
-		LOG.error("Failed to find feasible mountpoint at {}/{}_x. Giving up after {} attempts.", parent, basename, MAX_TMPMOUNTPOINT_CREATION_RETRIES);
+		LOG.error("Failed to find feasible mountpoint at {}{}{}_x. Giving up after {} attempts.", parent, File.separator, basename, MAX_TMPMOUNTPOINT_CREATION_RETRIES);
 		throw new VolumeException("Did not find feasible mount point.");
 	}
 
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
index 3631230ff..caf347602 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
@@ -155,12 +155,15 @@ public class VaultModule {
 
 		//WinFSP has no explicit "readonly"-option, nut not setting the group/user-id has the same effect, tho.
 		//So for the time being not setting them is the way to go...
+		//See: https://github.com/billziss-gh/winfsp/issues/319
 		if (!readOnly.get()) {
 			flags.append(" -ouid=-1");
 			flags.append(" -ogid=-1");
 		}
 		flags.append(" -ovolname=").append(mountName.get());
-		flags.append(" -oThreadCount=").append(5);
+		//Dokany requires this option to be set, WinFSP doesn't seem to share this peculiarity,
+		//but the option exists. Let's keep this here in case we need it.
+//		flags.append(" -oThreadCount=").append(5);
 
 		return flags.toString().strip();
 	}

From 1ac6d086bd4d7d02f535fa4fbc9a9210175a27fd Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 28 Jul 2020 19:15:56 +0200
Subject: [PATCH 020/169] Disabled some experimental FUSE Features on Windows

Disabled some experimental FUSE Features on Windows unless they are explicitly enabled by using the flag '-Dfuse.experimental="true"'

They are enabled in the default IntelliJ-Config (disabled on Build)
---
 .../runConfigurations/Cryptomator_Windows.xml  |  2 +-
 .../vaultoptions/MountOptionsController.java   | 18 ++++++++++++++++--
 .../resources/fxml/vault_options_mount.fxml    |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.idea/runConfigurations/Cryptomator_Windows.xml b/.idea/runConfigurations/Cryptomator_Windows.xml
index 40d4aba23..05e5514e1 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="launcher" />
-    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/AppData/Roaming/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.mountPointsDir=&quot;~/Mount&quot; -Xss2m -Xmx512m" />
+    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/AppData/Roaming/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.mountPointsDir=&quot;~/Mount&quot; -Dfuse.experimental=&quot;true&quot; -Xss2m -Xmx512m" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
index 81753d83a..e9bb4f043 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
@@ -52,6 +52,10 @@ public class MountOptionsController implements FxController {
 	public RadioButton mountPointCustomDir;
 	public ChoiceBox<String> driveLetterSelection;
 
+	//FUSE + Windows -> Disable some (experimental) features for the user because they are unstable
+	//Use argument Dfuse.experimental="true" to override
+	private final BooleanBinding fuseAndWindows;
+
 	@Inject
 	MountOptionsController(@VaultOptionsWindow Stage window, @VaultOptionsWindow Vault vault, Settings settings, WindowsDriveLetters windowsDriveLetters, ResourceBundle resourceBundle) {
 		this.window = window;
@@ -59,6 +63,9 @@ public class MountOptionsController implements FxController {
 		this.webDavAndWindows = settings.preferredVolumeImpl().isEqualTo(VolumeImpl.WEBDAV).and(osIsWindows);
 		this.windowsDriveLetters = windowsDriveLetters;
 		this.resourceBundle = resourceBundle;
+
+		System.out.println(Boolean.getBoolean("fuse.experimental"));
+		this.fuseAndWindows = settings.preferredVolumeImpl().isEqualTo(VolumeImpl.FUSE).and(osIsWindows).and(new SimpleBooleanProperty(!Boolean.getBoolean("fuse.experimental")));
 	}
 
 	@FXML
@@ -67,7 +74,10 @@ public class MountOptionsController implements FxController {
 
 		// readonly:
 		readOnlyCheckbox.selectedProperty().bindBidirectional(vault.getVaultSettings().usesReadOnlyMode());
-		readOnlyCheckbox.disableProperty().bind(customMountFlagsCheckbox.selectedProperty());
+		if(isFuseAndWindows()) {
+			readOnlyCheckbox.setSelected(false); // to prevent invalid states
+		}
+		readOnlyCheckbox.disableProperty().bind(customMountFlagsCheckbox.selectedProperty().or(fuseAndWindows));
 
 		// custom mount flags:
 		mountFlags.disableProperty().bind(customMountFlagsCheckbox.selectedProperty().not());
@@ -85,7 +95,7 @@ public class MountOptionsController implements FxController {
 		driveLetterSelection.setConverter(new WinDriveLetterLabelConverter(windowsDriveLetters, resourceBundle));
 		driveLetterSelection.setValue(vault.getVaultSettings().winDriveLetter().get());
 
-		if (vault.getVaultSettings().useCustomMountPath().get()) {
+		if (vault.getVaultSettings().useCustomMountPath().get() && !isFuseAndWindows() /* to prevent invalid states */) {
 			mountPoint.selectToggle(mountPointCustomDir);
 		} else if (!Strings.isNullOrEmpty(vault.getVaultSettings().winDriveLetter().get())) {
 			mountPoint.selectToggle(mountPointWinDriveLetter);
@@ -193,4 +203,8 @@ public class MountOptionsController implements FxController {
 		return vault.getVaultSettings().customMountPath().get();
 	}
 
+	public Boolean isFuseAndWindows() {
+		return fuseAndWindows.get();
+	}
+
 }
diff --git a/main/ui/src/main/resources/fxml/vault_options_mount.fxml b/main/ui/src/main/resources/fxml/vault_options_mount.fxml
index 688e1bb1c..e8c1444da 100644
--- a/main/ui/src/main/resources/fxml/vault_options_mount.fxml
+++ b/main/ui/src/main/resources/fxml/vault_options_mount.fxml
@@ -49,7 +49,7 @@
 			<ChoiceBox fx:id="driveLetterSelection" disable="${!mountPointWinDriveLetter.selected}"/>
 		</HBox>
 		<HBox spacing="6" alignment="CENTER_LEFT" visible="${!controller.webDavAndWindows}" managed="${!controller.webDavAndWindows}">
-			<RadioButton toggleGroup="${mountPoint}" fx:id="mountPointCustomDir" text="%vaultOptions.mount.mountPoint.custom"/>
+			<RadioButton toggleGroup="${mountPoint}" fx:id="mountPointCustomDir" text="%vaultOptions.mount.mountPoint.custom" disable="${controller.fuseAndWindows}"/>
 			<Button text="%vaultOptions.mount.mountPoint.directoryPickerButton" onAction="#chooseCustomMountPoint" contentDisplay="LEFT" disable="${!mountPointCustomDir.selected}">
 				<graphic>
 					<FontAwesome5IconView glyph="FOLDER_OPEN" glyphSize="15"/>

From 3bd2a2f911e9c6733bd13613b22ac714b53e13c7 Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Wed, 29 Jul 2020 10:21:16 +0200
Subject: [PATCH 021/169] Fixes #1262 by adding new buttons, if a vault cannot
 be found

---
 .../ui/controls/FontAwesome5Icon.java         |  2 ++
 .../VaultDetailMissingVaultController.java    | 35 +++++++++++++++++--
 .../resources/fxml/vault_detail_missing.fxml  | 11 ++++++
 .../main/resources/i18n/strings.properties    |  2 ++
 4 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
index 7334b69da..e3d3c30d9 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
@@ -11,6 +11,7 @@ public enum FontAwesome5Icon {
 	COGS("\uF085"), //
 	COPY("\uF0C5"), //
 	CROWN("\uF521"), //
+	EDIT("\uF044"), //
 	EXCLAMATION("\uF12A"), //
 	EXCLAMATION_CIRCLE("\uF06A"), //
 	EXCLAMATION_TRIANGLE("\uF071"), //
@@ -37,6 +38,7 @@ public enum FontAwesome5Icon {
 	SPINNER("\uF110"), //
 	SYNC("\uF021"), //
 	TIMES("\uF00D"), //
+	TRASH("\uF1F8"), //
 	UNLINK("\uf127"), //
 	WRENCH("\uF0AD"), //
 	WINDOW_MINIMIZE("\uF2D1"), //
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java
index f54bc447b..095743490 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java
@@ -1,26 +1,55 @@
 package org.cryptomator.ui.mainwindow;
 
 import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.fxml.FXML;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.removevault.RemoveVaultComponent;
 
 import javax.inject.Inject;
+import java.io.File;
+import java.util.ResourceBundle;
 
 @MainWindowScoped
 public class VaultDetailMissingVaultController implements FxController {
 
-	private final ReadOnlyObjectProperty<Vault> vault;
+	private final ObjectProperty<Vault> vault;
+	private final RemoveVaultComponent.Builder removeVault;
+	private final ResourceBundle resourceBundle;
+	private final Stage window;
+
 
 	@Inject
-	public VaultDetailMissingVaultController(ObjectProperty<Vault> vault) {
+	public VaultDetailMissingVaultController(ObjectProperty<Vault> vault, RemoveVaultComponent.Builder removeVault, ResourceBundle resourceBundle, @MainWindow Stage window) {
 		this.vault = vault;
+		this.removeVault = removeVault;
+		this.resourceBundle = resourceBundle;
+		this.window = window;
 	}
 
 	@FXML
 	public void recheck() {
 		VaultListManager.redetermineVaultState(vault.get());
 	}
+
+	@FXML
+	void didClickRemoveVault() {
+		removeVault.vault(vault.get()).build().showRemoveVault();
+	}
+
+	@FXML
+	void changeLocation() {
+		// copied from ChooseExistingVaultController class
+		FileChooser fileChooser = new FileChooser();
+		fileChooser.setTitle(resourceBundle.getString("addvaultwizard.existing.filePickerTitle"));
+		fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Cryptomator Masterkey", "*.cryptomator"));
+		File masterkeyFile = fileChooser.showOpenDialog(window);
+		if (masterkeyFile != null) {
+			vault.get().getVaultSettings().path().setValue(masterkeyFile.toPath().toAbsolutePath().getParent());
+			recheck();
+		}
+	}
 }
diff --git a/main/ui/src/main/resources/fxml/vault_detail_missing.fxml b/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
index 367aa4479..63bb3d6dd 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
@@ -26,5 +26,16 @@
 				<FontAwesome5IconView glyph="REDO"/>
 			</graphic>
 		</Button>
+		<Button text="%main.vaultDetail.missing.changeLocation" minWidth="120" onAction="#changeLocation">
+			<graphic>
+				<FontAwesome5IconView glyph="EDIT"/>
+			</graphic>
+		</Button>
+		<Button text="%main.vaultDetail.missing.remove" minWidth="120" onAction="#didClickRemoveVault">
+			<graphic>
+				<FontAwesome5IconView glyph="TRASH"/>
+			</graphic>
+		</Button>
+
 	</children>
 </VBox>
\ No newline at end of file
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 858adee2b..cd6a2d625 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -194,6 +194,8 @@ main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator could not find a vault at this path.
 main.vaultDetail.missing.recheck=Recheck
+main.vaultDetail.missing.remove=Remove from Vault List
+main.vaultDetail.missing.changeLocation=Change Vault Location…
 ### Needs Migration
 main.vaultDetail.migrateButton=Upgrade Vault
 main.vaultDetail.migratePrompt=Your vault needs to be upgraded to a new format, before you can access it

From 570482521ad4c572e1db046dbe331cdd6d24498b Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 29 Jul 2020 22:14:51 +0200
Subject: [PATCH 022/169] Delegated choice of DriveLetter to WDL and made
 internal Set immutable

Delegated choice of DriveLetter to WindowsDriveLetters
Made internal Set ("C_TO_Z") immutable, that is returned by getAvailableDriveLetters()
Changed direct reference to C_TO_Z to use getAvailableDriveLetters() instead
---
 .../common/vaults/WindowsDriveLetters.java       | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/WindowsDriveLetters.java b/main/commons/src/main/java/org/cryptomator/common/vaults/WindowsDriveLetters.java
index 016c39a3a..35757cccd 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/WindowsDriveLetters.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/WindowsDriveLetters.java
@@ -12,6 +12,7 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -24,7 +25,7 @@ public final class WindowsDriveLetters {
 
 	static {
 		try (IntStream stream = IntStream.rangeClosed('C', 'Z')) {
-			C_TO_Z = stream.mapToObj(i -> String.valueOf((char) i)).collect(Collectors.toSet());
+			C_TO_Z = stream.mapToObj(i -> String.valueOf((char) i)).collect(Collectors.toUnmodifiableSet());
 		}
 	}
 
@@ -46,7 +47,18 @@ public final class WindowsDriveLetters {
 	}
 
 	public Set<String> getAvailableDriveLetters() {
-		return Sets.difference(C_TO_Z, getOccupiedDriveLetters());
+		return Sets.difference(getAllDriveLetters(), getOccupiedDriveLetters());
 	}
 
+	public Optional<String> getAvailableDriveLetter() {
+		return getAvailableDriveLetters().stream().findAny();
+	}
+
+	public Optional<Path> getAvailableDriveLetterPath() {
+		return getAvailableDriveLetter().map(this::toPath);
+	}
+
+	public Path toPath(String driveLetter) {
+		return Path.of(driveLetter + ":\\");
+	}
 }

From 32a810fe1d0439435045827c5b653a2e10f5c621 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 29 Jul 2020 22:01:57 +0200
Subject: [PATCH 023/169] Changed FuseVolume to choose a DriveLetter instead of
 a folder

Changed FuseVolume to choose a DriveLetter instead of a folder if the the mountpoint is chosen by the app.
Reworked priorities when choosing
Changed DokanyVolume to use the new methods supplied by WindowsDriveLetters
---
 .../common/vaults/DokanyVolume.java           | 10 ++--
 .../cryptomator/common/vaults/FuseVolume.java | 47 ++++++++++++++-----
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
index 0c0e4761e..7c4781aaa 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
@@ -68,12 +68,10 @@ public class DokanyVolume implements Volume {
 			return Path.of(vaultSettings.winDriveLetter().get().charAt(0) + ":\\");
 		} else {
 			//auto assign drive letter
-			if (!windowsDriveLetters.getAvailableDriveLetters().isEmpty()) {
-				return Path.of(windowsDriveLetters.getAvailableDriveLetters().iterator().next() + ":\\");
-			} else {
-				//TODO: Error Handling
-				throw new VolumeException("No free drive letter available.");
-			}
+			return windowsDriveLetters.getAvailableDriveLetterPath().orElseThrow(() -> {
+				//TODO: Error Handling/Fallback (See: FUSE)
+				return new VolumeException("No free drive letter available.");
+			});
 		}
 	}
 
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index f94548666..8d5ebd81a 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -1,6 +1,7 @@
 package org.cryptomator.common.vaults;
 
 import com.google.common.base.Splitter;
+import com.google.common.base.Strings;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.settings.VaultSettings;
@@ -34,32 +35,56 @@ public class FuseVolume implements Volume {
 
 	private final VaultSettings vaultSettings;
 	private final Environment environment;
+	private final WindowsDriveLetters windowsDriveLetters;
 
 	private Mount fuseMnt;
 	private Path mountPoint;
 	private boolean createdTemporaryMountPoint;
 
 	@Inject
-	public FuseVolume(VaultSettings vaultSettings, Environment environment) {
+	public FuseVolume(VaultSettings vaultSettings, Environment environment, WindowsDriveLetters windowsDriveLetters) {
 		this.vaultSettings = vaultSettings;
 		this.environment = environment;
+		this.windowsDriveLetters = windowsDriveLetters;
 	}
 
 	@Override
 	public void mount(CryptoFileSystem fs, String mountFlags) throws IOException, FuseNotSupportedException, VolumeException {
-		Optional<String> optionalCustomMountPoint = vaultSettings.getCustomMountPath();
-		if (optionalCustomMountPoint.isPresent()) {
-			Path customMountPoint = Paths.get(optionalCustomMountPoint.get());
-			checkProvidedMountPoint(customMountPoint);
-			this.mountPoint = customMountPoint;
-			LOG.debug("Successfully checked custom mount point: {}", mountPoint);
-		} else {
-			this.mountPoint = prepareTemporaryMountPoint();
-			LOG.debug("Successfully created mount point: {}", mountPoint);
-		}
+		this.mountPoint = determineMountPoint();
+
 		mount(fs.getPath("/"), mountFlags);
 	}
 
+	private Path determineMountPoint() throws IOException, VolumeException {
+		Path mountPoint;
+		Optional<String> optionalCustomMountPoint = vaultSettings.getCustomMountPath();
+		//Is there a custom mountpoint?
+		if (optionalCustomMountPoint.isPresent()) {
+			mountPoint = Paths.get(optionalCustomMountPoint.get());
+			checkProvidedMountPoint(mountPoint);
+			LOG.debug("Successfully checked custom mount point: {}", this.mountPoint);
+			return mountPoint;
+		}
+		//No custom mounpoint -> Are we on Windows?
+		if (SystemUtils.IS_OS_WINDOWS) {
+			//Is there a chosen Driveletter?
+			if (!Strings.isNullOrEmpty(vaultSettings.winDriveLetter().get())) {
+				mountPoint = Path.of(vaultSettings.winDriveLetter().get().charAt(0) + ":\\");
+				return mountPoint;
+			}
+
+			mountPoint = windowsDriveLetters.getAvailableDriveLetterPath().orElseThrow(() -> {
+				//TODO: Error Handling/Fallback (replace Exception with Flow to folderbased?)
+				return new VolumeException("No free drive letter available.");
+			});
+			return mountPoint;
+		}
+		//Nothing worked so far or we are not using Windows - Choose and prepare a folder
+		mountPoint = prepareTemporaryMountPoint();
+		LOG.debug("Successfully created mount point: {}", mountPoint);
+		return mountPoint;
+	}
+
 	private void checkProvidedMountPoint(Path mountPoint) throws IOException {
 		//On Windows the target folder MUST NOT exist...
 		//https://github.com/billziss-gh/winfsp/issues/320

From 51f7d74e4a786bbbe035c2de0e047a37d53b162c Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Mon, 3 Aug 2020 21:22:22 +0200
Subject: [PATCH 024/169] Changed cryptomator.mountPointsDir-property in
 Windows Configs

Changed cryptomator.mountPointsDir-property in Windows Configs from "~/Mount" to "~/Cryptomator
---
 .idea/runConfigurations/Cryptomator_Windows.xml   | 2 +-
 main/buildkit/src/main/resources/launcher-win.bat | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.idea/runConfigurations/Cryptomator_Windows.xml b/.idea/runConfigurations/Cryptomator_Windows.xml
index 05e5514e1..0e2b00d8f 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="launcher" />
-    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/AppData/Roaming/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.mountPointsDir=&quot;~/Mount&quot; -Dfuse.experimental=&quot;true&quot; -Xss2m -Xmx512m" />
+    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/AppData/Roaming/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator&quot; -Dfuse.experimental=&quot;true&quot; -Xss2m -Xmx512m" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/main/buildkit/src/main/resources/launcher-win.bat b/main/buildkit/src/main/resources/launcher-win.bat
index be367815f..d385d7e28 100644
--- a/main/buildkit/src/main/resources/launcher-win.bat
+++ b/main/buildkit/src/main/resources/launcher-win.bat
@@ -4,7 +4,7 @@ java ^
 	-Dcryptomator.settingsPath="~/AppData/Roaming/Cryptomator/settings.json" ^
 	-Dcryptomator.ipcPortPath="~/AppData/Roaming/Cryptomator/ipcPort.bin" ^
 	-Dcryptomator.logDir="~/AppData/Roaming/Cryptomator" ^
-	-Dcryptomator.mountPointsDir="~/Mount" ^
+	-Dcryptomator.mountPointsDir="~/Cryptomator" ^
 	-Dcryptomator.keychainPath="~/AppData/Roaming/Cryptomator/keychain.json" ^
 	-Xss20m ^
 	-Xmx512m ^

From 4f2120b7297f461d5d7db6335433e22d6335ee51 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Mon, 3 Aug 2020 22:20:20 +0200
Subject: [PATCH 025/169] Added support for folderbased backup-mountpoint to
 DokanyVol and FuseVol

---
 .../common/vaults/DokanyVolume.java           | 64 ++++++++++++++++---
 .../cryptomator/common/vaults/FuseVolume.java | 16 +++--
 2 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
index 7c4781aaa..d4b33315f 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
@@ -1,6 +1,7 @@
 package org.cryptomator.common.vaults;
 
 import com.google.common.base.Strings;
+import org.cryptomator.common.Environment;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.cryptofs.CryptoFileSystem;
 import org.cryptomator.frontend.dokany.Mount;
@@ -10,6 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.DirectoryNotEmptyException;
 import java.nio.file.DirectoryStream;
@@ -23,18 +25,22 @@ import java.util.concurrent.ExecutorService;
 public class DokanyVolume implements Volume {
 
 	private static final Logger LOG = LoggerFactory.getLogger(DokanyVolume.class);
+	private static final int MAX_TMPMOUNTPOINT_CREATION_RETRIES = 10;
 
 	private static final String FS_TYPE_NAME = "Cryptomator File System";
 
 	private final VaultSettings vaultSettings;
 	private final MountFactory mountFactory;
+	private final Environment environment;
 	private final WindowsDriveLetters windowsDriveLetters;
 	private Mount mount;
 	private Path mountPoint;
+	private boolean createdTemporaryMountPoint;
 
 	@Inject
-	public DokanyVolume(VaultSettings vaultSettings, ExecutorService executorService, WindowsDriveLetters windowsDriveLetters) {
+	public DokanyVolume(VaultSettings vaultSettings, Environment environment, ExecutorService executorService, WindowsDriveLetters windowsDriveLetters) {
 		this.vaultSettings = vaultSettings;
+		this.environment = environment;
 		this.mountFactory = new MountFactory(executorService);
 		this.windowsDriveLetters = windowsDriveLetters;
 	}
@@ -64,15 +70,21 @@ public class DokanyVolume implements Volume {
 			Path customMountPoint = Paths.get(optionalCustomMountPoint.get());
 			checkProvidedMountPoint(customMountPoint);
 			return customMountPoint;
-		} else if (!Strings.isNullOrEmpty(vaultSettings.winDriveLetter().get())) {
-			return Path.of(vaultSettings.winDriveLetter().get().charAt(0) + ":\\");
-		} else {
-			//auto assign drive letter
-			return windowsDriveLetters.getAvailableDriveLetterPath().orElseThrow(() -> {
-				//TODO: Error Handling/Fallback (See: FUSE)
-				return new VolumeException("No free drive letter available.");
-			});
 		}
+		if (!Strings.isNullOrEmpty(vaultSettings.winDriveLetter().get())) {
+			return Path.of(vaultSettings.winDriveLetter().get().charAt(0) + ":\\");
+		}
+
+		//auto assign drive letter
+		Optional<Path> optionalDriveLetter = windowsDriveLetters.getAvailableDriveLetterPath();
+		if (optionalDriveLetter.isPresent()) {
+			return optionalDriveLetter.get();
+		}
+
+		//Nothing has worked so far -> Choose and prepare a folder
+		mountPoint = prepareTemporaryMountPoint();
+		LOG.debug("Successfully created mount point: {}", mountPoint);
+		return mountPoint;
 	}
 
 	private void checkProvidedMountPoint(Path mountPoint) throws IOException {
@@ -86,6 +98,28 @@ public class DokanyVolume implements Volume {
 		}
 	}
 
+	private Path chooseNonExistingTemporaryMountPoint() throws VolumeException {
+		Path parent = environment.getMountPointsDir().orElseThrow();
+		String basename = vaultSettings.getId(); //FIXME
+		for (int i = 0; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) {
+			Path mountPoint = parent.resolve(basename + "_" + i);
+			if (Files.notExists(mountPoint)) {
+				return mountPoint;
+			}
+		}
+		LOG.error("Failed to find feasible mountpoint at {}{}{}_x. Giving up after {} attempts.", parent, File.separator, basename, MAX_TMPMOUNTPOINT_CREATION_RETRIES);
+		throw new VolumeException("Did not find feasible mount point.");
+	}
+
+	private Path prepareTemporaryMountPoint() throws IOException, VolumeException {
+		Path mountPoint = chooseNonExistingTemporaryMountPoint();
+
+		Files.createDirectories(mountPoint);
+		this.createdTemporaryMountPoint = true;
+
+		return mountPoint;
+	}
+
 	@Override
 	public void reveal() throws VolumeException {
 		boolean success = mount.reveal();
@@ -97,6 +131,18 @@ public class DokanyVolume implements Volume {
 	@Override
 	public void unmount() {
 		mount.close();
+		cleanupTemporaryMountPoint();
+	}
+
+	private void cleanupTemporaryMountPoint() {
+		if (createdTemporaryMountPoint) {
+			try {
+				Files.delete(mountPoint);
+				LOG.debug("Successfully deleted mount point: {}", mountPoint);
+			} catch (IOException e) {
+				LOG.warn("Could not delete mount point: {}", e.getMessage());
+			}
+		}
 	}
 
 	@Override
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index 8d5ebd81a..c9b08b0ed 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -73,13 +73,15 @@ public class FuseVolume implements Volume {
 				return mountPoint;
 			}
 
-			mountPoint = windowsDriveLetters.getAvailableDriveLetterPath().orElseThrow(() -> {
-				//TODO: Error Handling/Fallback (replace Exception with Flow to folderbased?)
-				return new VolumeException("No free drive letter available.");
-			});
-			return mountPoint;
+			//No chosen Driveltter -> Is there a free Driveletter?
+			Optional<Path> optionalDriveLetter = windowsDriveLetters.getAvailableDriveLetterPath();
+			if(optionalDriveLetter.isPresent()) {
+				mountPoint = optionalDriveLetter.get();
+				return mountPoint;
+			}
+			//No free or chosen Driveletter -> Continue below
 		}
-		//Nothing worked so far or we are not using Windows - Choose and prepare a folder
+		//Nothing has worked so far -> Choose and prepare a folder
 		mountPoint = prepareTemporaryMountPoint();
 		LOG.debug("Successfully created mount point: {}", mountPoint);
 		return mountPoint;
@@ -130,7 +132,7 @@ public class FuseVolume implements Volume {
 
 	private Path chooseNonExistingTemporaryMountPoint() throws VolumeException {
 		Path parent = environment.getMountPointsDir().orElseThrow();
-		String basename = vaultSettings.getId();
+		String basename = vaultSettings.getId(); //FIXME
 		for (int i = 0; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) {
 			Path mountPoint = parent.resolve(basename + "_" + i);
 			if (Files.notExists(mountPoint)) {

From 7c1d6973ba90f79e802286e8eac03ab0851b0c27 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 6 Aug 2020 15:18:30 +0200
Subject: [PATCH 026/169] fixes #1289 by decoupling storage path from vault
 name

---
 .../java/org/cryptomator/common/settings/VaultSettings.java  | 2 +-
 .../src/main/java/org/cryptomator/common/vaults/Vault.java   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
index 13a0c8eed..395b118dd 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
@@ -70,7 +70,7 @@ public class VaultSettings {
 		if (!mountNameSet && dirnameExists) {
 			mountName.set(normalizeMountName(newPath.getFileName().toString()));
 		} else if (!mountNameSet && !dirnameExists) {
-			mountName.set(DEFAULT_MOUNT_NAME + id);
+			mountName.set(DEFAULT_MOUNT_NAME + " " +  id);
 		} else if (mountNameSet && dirnameExists) {
 			if (mountName.get().equals(DEFAULT_MOUNT_NAME + id)) {
 				//this is okay, since this function is only executed if the path changes (aka, the vault is created or added)
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
index bc461c1d9..5ee0ee931 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
@@ -78,7 +78,7 @@ public class Vault {
 		this.state = state;
 		this.lastKnownException = lastKnownException;
 		this.stats = stats;
-		this.displayableName = Bindings.createStringBinding(this::getDisplayableName, vaultSettings.path());
+		this.displayableName = Bindings.createStringBinding(this::getDisplayableName, vaultSettings.mountName());
 		this.displayablePath = Bindings.createStringBinding(this::getDisplayablePath, vaultSettings.path());
 		this.locked = Bindings.createBooleanBinding(this::isLocked, state);
 		this.processing = Bindings.createBooleanBinding(this::isProcessing, state);
@@ -230,8 +230,7 @@ public class Vault {
 	}
 
 	public String getDisplayableName() {
-		Path p = vaultSettings.path().get();
-		return p.getFileName().toString();
+		return vaultSettings.mountName().get();
 	}
 
 	public StringBinding accessPointProperty() {

From ea4c91fb3785466c19017fc3782edd0846d9cb4d Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 6 Aug 2020 15:20:32 +0200
Subject: [PATCH 027/169] change meaning of mount name setting: * it is now
 considered the gerenal vault name * methods (except parsing) are renamed
 accordingly

---
 .../common/settings/VaultSettings.java        | 22 +++++++++----------
 .../settings/VaultSettingsJsonAdapter.java    |  4 ++--
 .../common/vaults/DokanyVolume.java           |  2 +-
 .../org/cryptomator/common/vaults/Vault.java  |  4 ++--
 .../common/vaults/VaultModule.java            |  2 +-
 .../common/vaults/WebDavVolume.java           |  2 +-
 .../common/settings/SettingsTest.java         |  2 +-
 .../VaultSettingsJsonAdapterTest.java         |  4 ++--
 .../common/vaults/VaultModuleTest.java        |  2 +-
 .../vaultoptions/MountOptionsController.java  |  2 +-
 10 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
index 395b118dd..e31a361ff 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
@@ -42,7 +42,7 @@ public class VaultSettings {
 
 	private final String id;
 	private final ObjectProperty<Path> path = new SimpleObjectProperty();
-	private final StringProperty mountName = new SimpleStringProperty();
+	private final StringProperty displayName = new SimpleStringProperty();
 	private final StringProperty winDriveLetter = new SimpleStringProperty();
 	private final BooleanProperty unlockAfterStartup = new SimpleBooleanProperty(DEFAULT_UNLOCK_AFTER_STARTUP);
 	private final BooleanProperty revealAfterMount = new SimpleBooleanProperty(DEFAULT_REAVEAL_AFTER_MOUNT);
@@ -56,25 +56,25 @@ public class VaultSettings {
 	public VaultSettings(String id) {
 		this.id = Objects.requireNonNull(id);
 
-		EasyBind.subscribe(path, this::deriveMountNameFromPathOrUseDefault);
+		EasyBind.subscribe(path, this::deriveDisplayNameFromPathOrUseDefault);
 	}
 
 	Observable[] observables() {
-		return new Observable[]{path, mountName, winDriveLetter, unlockAfterStartup, revealAfterMount, useCustomMountPath, customMountPath, usesReadOnlyMode, mountFlags, filenameLengthLimit, actionAfterUnlock};
+		return new Observable[]{path, displayName, winDriveLetter, unlockAfterStartup, revealAfterMount, useCustomMountPath, customMountPath, usesReadOnlyMode, mountFlags, filenameLengthLimit, actionAfterUnlock};
 	}
 
-	private void deriveMountNameFromPathOrUseDefault(Path newPath) {
-		final boolean mountNameSet = !StringUtils.isBlank(mountName.get());
+	private void deriveDisplayNameFromPathOrUseDefault(Path newPath) {
+		final boolean mountNameSet = !StringUtils.isBlank(displayName.get());
 		final boolean dirnameExists = (newPath != null) && (newPath.getFileName() != null);
 
 		if (!mountNameSet && dirnameExists) {
-			mountName.set(normalizeMountName(newPath.getFileName().toString()));
+			displayName.set(normalizeMountName(newPath.getFileName().toString()));
 		} else if (!mountNameSet && !dirnameExists) {
-			mountName.set(DEFAULT_MOUNT_NAME + " " +  id);
+			displayName.set(DEFAULT_MOUNT_NAME + " " +  id);
 		} else if (mountNameSet && dirnameExists) {
-			if (mountName.get().equals(DEFAULT_MOUNT_NAME + id)) {
+			if (displayName.get().equals(DEFAULT_MOUNT_NAME + id)) {
 				//this is okay, since this function is only executed if the path changes (aka, the vault is created or added)
-				mountName.set(newPath.getFileName().toString());
+				displayName.set(newPath.getFileName().toString());
 			}
 		}
 	}
@@ -118,8 +118,8 @@ public class VaultSettings {
 		return path;
 	}
 
-	public StringProperty mountName() {
-		return mountName;
+	public StringProperty displayName() {
+		return displayName;
 	}
 
 	public StringProperty winDriveLetter() {
diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
index d136ffaff..a8b940918 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
@@ -21,7 +21,7 @@ class VaultSettingsJsonAdapter {
 		out.beginObject();
 		out.name("id").value(value.getId());
 		out.name("path").value(value.path().get().toString());
-		out.name("mountName").value(value.mountName().get());
+		out.name("mountName").value(value.displayName().get());
 		out.name("winDriveLetter").value(value.winDriveLetter().get());
 		out.name("unlockAfterStartup").value(value.unlockAfterStartup().get());
 		out.name("revealAfterMount").value(value.revealAfterMount().get());
@@ -73,7 +73,7 @@ class VaultSettingsJsonAdapter {
 		in.endObject();
 
 		VaultSettings vaultSettings = (id == null) ? VaultSettings.withRandomId() : new VaultSettings(id);
-		vaultSettings.mountName().set(mountName);
+		vaultSettings.displayName().set(mountName);
 		vaultSettings.path().set(Paths.get(path));
 		vaultSettings.winDriveLetter().set(winDriveLetter);
 		vaultSettings.unlockAfterStartup().set(unlockAfterStartup);
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
index 1bfd813e3..f934bf25f 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
@@ -47,7 +47,7 @@ public class DokanyVolume implements Volume {
 	@Override
 	public void mount(CryptoFileSystem fs, String mountFlags) throws VolumeException, IOException {
 		this.mountPoint = determineMountPoint();
-		String mountName = vaultSettings.mountName().get();
+		String mountName = vaultSettings.displayName().get();
 		try {
 			this.mount = mountFactory.mount(fs.getPath("/"), mountPoint, mountName, FS_TYPE_NAME, mountFlags.strip());
 		} catch (MountFailedException e) {
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
index 5ee0ee931..ce49a564e 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
@@ -78,7 +78,7 @@ public class Vault {
 		this.state = state;
 		this.lastKnownException = lastKnownException;
 		this.stats = stats;
-		this.displayableName = Bindings.createStringBinding(this::getDisplayableName, vaultSettings.mountName());
+		this.displayableName = Bindings.createStringBinding(this::getDisplayableName, vaultSettings.displayName());
 		this.displayablePath = Bindings.createStringBinding(this::getDisplayablePath, vaultSettings.path());
 		this.locked = Bindings.createBooleanBinding(this::isLocked, state);
 		this.processing = Bindings.createBooleanBinding(this::isProcessing, state);
@@ -230,7 +230,7 @@ public class Vault {
 	}
 
 	public String getDisplayableName() {
-		return vaultSettings.mountName().get();
+		return vaultSettings.displayName().get();
 	}
 
 	public StringBinding accessPointProperty() {
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
index 1afd9d88b..d084be7bd 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
@@ -77,7 +77,7 @@ public class VaultModule {
 	@DefaultMountFlags
 	public StringBinding provideDefaultMountFlags(Settings settings, VaultSettings vaultSettings) {
 		ObjectProperty<VolumeImpl> preferredVolumeImpl = settings.preferredVolumeImpl();
-		StringProperty mountName = vaultSettings.mountName();
+		StringProperty mountName = vaultSettings.displayName();
 		BooleanProperty readOnly = vaultSettings.usesReadOnlyMode();
 
 		return Bindings.createStringBinding(() -> {
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
index a12236230..5ad63dd7b 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
@@ -44,7 +44,7 @@ public class WebDavVolume implements Volume {
 		if (!server.isRunning()) {
 			server.start();
 		}
-		servlet = server.createWebDavServlet(fs.getPath("/"), vaultSettings.getId() + "/" + vaultSettings.mountName().get());
+		servlet = server.createWebDavServlet(fs.getPath("/"), vaultSettings.getId() + "/" + vaultSettings.displayName().get());
 		servlet.start();
 		mount();
 	}
diff --git a/main/commons/src/test/java/org/cryptomator/common/settings/SettingsTest.java b/main/commons/src/test/java/org/cryptomator/common/settings/SettingsTest.java
index 708578763..33d384cf8 100644
--- a/main/commons/src/test/java/org/cryptomator/common/settings/SettingsTest.java
+++ b/main/commons/src/test/java/org/cryptomator/common/settings/SettingsTest.java
@@ -29,7 +29,7 @@ public class SettingsTest {
 		Mockito.verify(changeListener, Mockito.times(2)).accept(settings);
 
 		// third change (to property of list item):
-		vaultSettings.mountName().set("asd");
+		vaultSettings.displayName().set("asd");
 		Mockito.verify(changeListener, Mockito.times(3)).accept(settings);
 	}
 
diff --git a/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java b/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
index 237b00904..4c684d5d6 100644
--- a/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
+++ b/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
@@ -29,7 +29,7 @@ public class VaultSettingsJsonAdapterTest {
 		VaultSettings vaultSettings = adapter.read(jsonReader);
 		Assertions.assertEquals("foo", vaultSettings.getId());
 		Assertions.assertEquals(Paths.get("/foo/bar"), vaultSettings.path().get());
-		Assertions.assertEquals("test", vaultSettings.mountName().get());
+		Assertions.assertEquals("test", vaultSettings.displayName().get());
 		Assertions.assertEquals("X", vaultSettings.winDriveLetter().get());
 		Assertions.assertEquals("/home/test/crypto", vaultSettings.customMountPath().get());
 		Assertions.assertEquals("--foo --bar", vaultSettings.mountFlags().get());
@@ -41,7 +41,7 @@ public class VaultSettingsJsonAdapterTest {
 	public void testSerialize() throws IOException {
 		VaultSettings vaultSettings = new VaultSettings("test");
 		vaultSettings.path().set(Paths.get("/foo/bar"));
-		vaultSettings.mountName().set("mountyMcMountFace");
+		vaultSettings.displayName().set("mountyMcMountFace");
 		vaultSettings.mountFlags().set("--foo --bar");
 
 		StringWriter buf = new StringWriter();
diff --git a/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java b/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
index 1eb9a9d2f..0f4cbd102 100644
--- a/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
+++ b/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
@@ -28,7 +28,7 @@ public class VaultModuleTest {
 
 	@BeforeEach
 	public void setup(@TempDir Path tmpDir) {
-		Mockito.when(vaultSettings.mountName()).thenReturn(new SimpleStringProperty("TEST"));
+		Mockito.when(vaultSettings.displayName()).thenReturn(new SimpleStringProperty("TEST"));
 		Mockito.when(vaultSettings.usesReadOnlyMode()).thenReturn(new SimpleBooleanProperty(true));
 		System.setProperty("user.home", tmpDir.toString());
 	}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
index 81753d83a..dcff17836 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
@@ -63,7 +63,7 @@ public class MountOptionsController implements FxController {
 
 	@FXML
 	public void initialize() {
-		driveName.textProperty().bindBidirectional(vault.getVaultSettings().mountName());
+		driveName.textProperty().bindBidirectional(vault.getVaultSettings().displayName());
 
 		// readonly:
 		readOnlyCheckbox.selectedProperty().bindBidirectional(vault.getVaultSettings().usesReadOnlyMode());

From fb90128b63a191d403c3a5a30b1a24f87397cc92 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 6 Aug 2020 15:33:28 +0200
Subject: [PATCH 028/169] Move option to change display name of a vault from
 mount options to general options

---
 .../ui/vaultoptions/GeneralVaultOptionsController.java      | 3 +++
 .../cryptomator/ui/vaultoptions/MountOptionsController.java | 2 --
 main/ui/src/main/resources/fxml/vault_options_general.fxml  | 6 ++++++
 main/ui/src/main/resources/fxml/vault_options_mount.fxml    | 5 -----
 main/ui/src/main/resources/i18n/strings.properties          | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
index ddb6e0553..9849b0513 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
@@ -3,6 +3,7 @@ package org.cryptomator.ui.vaultoptions;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.TextField;
 import javafx.util.StringConverter;
 import org.cryptomator.common.settings.UiTheme;
 import org.cryptomator.common.settings.WhenUnlocked;
@@ -18,6 +19,7 @@ public class GeneralVaultOptionsController implements FxController {
 	private final Vault vault;
 	private final ResourceBundle resourceBundle;
 
+	public TextField vaultName;
 	public CheckBox unlockOnStartupCheckbox;
 	public ChoiceBox<WhenUnlocked> actionAfterUnlockChoiceBox;
 
@@ -29,6 +31,7 @@ public class GeneralVaultOptionsController implements FxController {
 
 	@FXML
 	public void initialize() {
+		vaultName.textProperty().bindBidirectional(vault.getVaultSettings().displayName());
 		unlockOnStartupCheckbox.selectedProperty().bindBidirectional(vault.getVaultSettings().unlockAfterStartup());
 		actionAfterUnlockChoiceBox.getItems().addAll(WhenUnlocked.values());
 		actionAfterUnlockChoiceBox.valueProperty().bindBidirectional(vault.getVaultSettings().actionAfterUnlock());
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
index dcff17836..0d5b631ab 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
@@ -42,7 +42,6 @@ public class MountOptionsController implements FxController {
 	private final BooleanBinding webDavAndWindows;
 	private final WindowsDriveLetters windowsDriveLetters;
 	private final ResourceBundle resourceBundle;
-	public TextField driveName;
 	public CheckBox readOnlyCheckbox;
 	public CheckBox customMountFlagsCheckbox;
 	public TextField mountFlags;
@@ -63,7 +62,6 @@ public class MountOptionsController implements FxController {
 
 	@FXML
 	public void initialize() {
-		driveName.textProperty().bindBidirectional(vault.getVaultSettings().displayName());
 
 		// readonly:
 		readOnlyCheckbox.selectedProperty().bindBidirectional(vault.getVaultSettings().usesReadOnlyMode());
diff --git a/main/ui/src/main/resources/fxml/vault_options_general.fxml b/main/ui/src/main/resources/fxml/vault_options_general.fxml
index f6c3c680c..5997191bc 100644
--- a/main/ui/src/main/resources/fxml/vault_options_general.fxml
+++ b/main/ui/src/main/resources/fxml/vault_options_general.fxml
@@ -6,6 +6,7 @@
 <?import javafx.scene.control.ChoiceBox?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.control.Label?>
+<?import org.cryptomator.ui.controls.AlphanumericTextField?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.vaultoptions.GeneralVaultOptionsController"
@@ -14,6 +15,11 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
+		<HBox spacing="6" alignment="CENTER_LEFT">
+			<Label text="%vaultOptions.general.vaultName"/>
+			<AlphanumericTextField fx:id="vaultName"/>
+		</HBox>
+
 		<CheckBox text="%vaultOptions.general.unlockAfterStartup" fx:id="unlockOnStartupCheckbox"/>
 
 		<HBox spacing="6" alignment="CENTER_LEFT">
diff --git a/main/ui/src/main/resources/fxml/vault_options_mount.fxml b/main/ui/src/main/resources/fxml/vault_options_mount.fxml
index 688e1bb1c..6ee1b84cd 100644
--- a/main/ui/src/main/resources/fxml/vault_options_mount.fxml
+++ b/main/ui/src/main/resources/fxml/vault_options_mount.fxml
@@ -23,11 +23,6 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<HBox spacing="6" alignment="CENTER_LEFT">
-			<Label text="%vaultOptions.mount.driveName"/>
-			<AlphanumericTextField fx:id="driveName"/>
-		</HBox>
-
 		<CheckBox fx:id="readOnlyCheckbox" text="%vaultOptions.mount.readonly"/>
 
 		<CheckBox fx:id="customMountFlagsCheckbox" text="%vaultOptions.mount.customMountFlags" onAction="#toggleUseCustomMountFlags" visible="${!controller.webDavAndWindows}" managed="${!controller.webDavAndWindows}"/>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index cd6a2d625..d077d71b3 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -213,6 +213,7 @@ wrongFileAlert.link=For further assistance, visit
 # Vault Options
 ## General
 vaultOptions.general=General
+vaultOptions.general.vaultName=Vault Name
 vaultOptions.general.unlockAfterStartup=Unlock vault when starting Cryptomator
 vaultOptions.general.actionAfterUnlock=After successful unlock
 vaultOptions.general.actionAfterUnlock.ignore=Do nothing
@@ -221,7 +222,6 @@ vaultOptions.general.actionAfterUnlock.ask=Ask
 ## Mount
 vaultOptions.mount=Mounting
 vaultOptions.mount.readonly=Read-Only
-vaultOptions.mount.driveName=Drive Name
 vaultOptions.mount.customMountFlags=Custom Mount Flags
 vaultOptions.mount.winDriveLetterOccupied=occupied
 vaultOptions.mount.mountPoint=Mount Point

From a975df6f8cab2dfb6e289670fd27364def9182a0 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Thu, 6 Aug 2020 18:30:34 +0200
Subject: [PATCH 029/169] added "Automatic" theme on macOS

---
 .../cryptomator/common/settings/UiTheme.java  | 20 +++++++---
 main/pom.xml                                  |  2 +-
 .../cryptomator/ui/fxapp/FxApplication.java   | 40 +++++++++++++++----
 .../GeneralPreferencesController.java         | 11 +++--
 .../ui/traymenu/TrayIconController.java       |  2 +-
 .../main/resources/i18n/strings.properties    |  1 +
 6 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/UiTheme.java b/main/commons/src/main/java/org/cryptomator/common/settings/UiTheme.java
index a8b66c65c..8df1e7f89 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/UiTheme.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/UiTheme.java
@@ -1,11 +1,21 @@
 package org.cryptomator.common.settings;
 
-public enum UiTheme {
-	LIGHT("preferences.general.theme.light"),
-	DARK("preferences.general.theme.dark");
-	// CUSTOM("Custom (%s)");
+import org.apache.commons.lang3.SystemUtils;
 
-	private String displayName;
+public enum UiTheme {
+	LIGHT("preferences.general.theme.light"), //
+	DARK("preferences.general.theme.dark"), //
+	AUTOMATIC("preferences.general.theme.automatic");
+
+	public static UiTheme[] applicableValues() {
+		if (SystemUtils.IS_OS_MAC) {
+			return values();
+		} else {
+			return new UiTheme[]{LIGHT, DARK};
+		}
+	}
+
+	private final String displayName;
 
 	UiTheme(String displayName) {
 		this.displayName = displayName;
diff --git a/main/pom.xml b/main/pom.xml
index 5f0d7e5ea..618793f93 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -25,7 +25,7 @@
 
 		<!-- cryptomator dependencies -->
 		<cryptomator.cryptofs.version>1.9.12</cryptomator.cryptofs.version>
-		<cryptomator.jni.version>2.2.2</cryptomator.jni.version>
+		<cryptomator.jni.version>2.2.3</cryptomator.jni.version>
 		<cryptomator.fuse.version>1.2.3</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.1.15</cryptomator.dokany.version>
 		<cryptomator.webdav.version>1.0.11</cryptomator.webdav.version>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
index 3172b6288..4d80a3451 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
@@ -6,7 +6,6 @@ import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.value.ObservableValue;
-import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
 import javafx.stage.Stage;
 import org.cryptomator.common.LicenseHolder;
@@ -46,6 +45,8 @@ public class FxApplication extends Application {
 	private final LicenseHolder licenseHolder;
 	private final BooleanBinding hasVisibleStages;
 
+	private Optional<String> macApperanceObserverIdentifier = Optional.empty();
+
 	@Inject
 	FxApplication(Settings settings, Lazy<MainWindowComponent> mainWindow, Lazy<PreferencesComponent> preferencesWindow, Provider<UnlockComponent.Builder> unlockWindowBuilderProvider, Provider<QuitComponent.Builder> quitWindowBuilderProvider, Optional<MacFunctions> macFunctions, VaultService vaultService, LicenseHolder licenseHolder, ObservableSet<Stage> visibleStages) {
 		this.settings = settings;
@@ -115,21 +116,44 @@ public class FxApplication extends Application {
 	}
 
 	private void themeChanged(@SuppressWarnings("unused") ObservableValue<? extends UiTheme> observable, @SuppressWarnings("unused") UiTheme oldValue, UiTheme newValue) {
+		if (macApperanceObserverIdentifier.isPresent()) {
+			macFunctions.map(MacFunctions::uiAppearance).ifPresent(uiAppearance -> uiAppearance.removeListener(macApperanceObserverIdentifier.get()));
+			macApperanceObserverIdentifier = Optional.empty();
+		}
 		loadSelectedStyleSheet(newValue);
 	}
 
 	private void loadSelectedStyleSheet(UiTheme desiredTheme) {
 		UiTheme theme = licenseHolder.isValidLicense() ? desiredTheme : UiTheme.LIGHT;
 		switch (theme) {
-			case DARK -> {
-				Application.setUserAgentStylesheet(getClass().getResource("/css/dark_theme.css").toString());
-				macFunctions.map(MacFunctions::uiAppearance).ifPresent(JniException.ignore(MacApplicationUiAppearance::setToDarkAqua));
-			}
-			case LIGHT -> {
-				Application.setUserAgentStylesheet(getClass().getResource("/css/light_theme.css").toString());
-				macFunctions.map(MacFunctions::uiAppearance).ifPresent(JniException.ignore(MacApplicationUiAppearance::setToAqua));
+			case LIGHT -> setToLightTheme();
+			case DARK -> setToDarkTheme();
+			case AUTOMATIC -> {
+				macFunctions.map(MacFunctions::uiAppearance).ifPresent(uiAppearance -> {
+					macApperanceObserverIdentifier = Optional.of(uiAppearance.addListener(this::macInterfaceThemeChanged));
+				});
+				macInterfaceThemeChanged();
 			}
 		}
 	}
 
+	private void macInterfaceThemeChanged() {
+		macFunctions.map(MacFunctions::uiAppearance).ifPresent(uiAppearance -> {
+			switch (uiAppearance.getCurrentInterfaceStyle()) {
+				case LIGHT -> setToLightTheme();
+				case DARK -> setToDarkTheme();
+			}
+		});
+	}
+
+	private void setToLightTheme() {
+		Application.setUserAgentStylesheet(getClass().getResource("/css/light_theme.css").toString());
+		macFunctions.map(MacFunctions::uiAppearance).ifPresent(JniException.ignore(MacApplicationUiAppearance::setToAqua));
+	}
+
+	private void setToDarkTheme() {
+		Application.setUserAgentStylesheet(getClass().getResource("/css/dark_theme.css").toString());
+		macFunctions.map(MacFunctions::uiAppearance).ifPresent(JniException.ignore(MacApplicationUiAppearance::setToDarkAqua));
+	}
+
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index 30f06b166..fdec00d62 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.preferences;
 
+import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.value.ObservableValue;
@@ -12,11 +13,10 @@ import javafx.scene.control.RadioButton;
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
 import javafx.util.StringConverter;
-import javafx.application.Application;
+import org.cryptomator.common.Environment;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
-import org.cryptomator.common.Environment;
 import org.cryptomator.ui.common.FxController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -64,7 +64,10 @@ public class GeneralPreferencesController implements FxController {
 
 	@FXML
 	public void initialize() {
-		themeChoiceBox.getItems().addAll(UiTheme.values());
+		themeChoiceBox.getItems().addAll(UiTheme.applicableValues());
+		if (!themeChoiceBox.getItems().contains(settings.theme().get())) {
+			settings.theme().set(UiTheme.LIGHT);
+		}
 		themeChoiceBox.valueProperty().bindBidirectional(settings.theme());
 		themeChoiceBox.setConverter(new UiThemeConverter(resourceBundle));
 
@@ -122,7 +125,7 @@ public class GeneralPreferencesController implements FxController {
 	}
 
 	@FXML
-	public void showLogfileDirectory(){
+	public void showLogfileDirectory() {
 		environment.getLogDir().ifPresent(logDirPath -> application.getHostServices().showDocument(logDirPath.toUri().toString()));
 	}
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java
index 78c5cfe62..13183a36e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java
@@ -47,7 +47,7 @@ public class TrayIconController {
 		trayMenuController.initTrayMenu();
 	}
 
-	public void macInterfaceThemeChanged() {
+	private void macInterfaceThemeChanged() {
 		trayIcon.setImage(imageFactory.loadImage());
 	}
 
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index cd6a2d625..6b1a89136 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -131,6 +131,7 @@ preferences.title=Preferences
 ## General
 preferences.general=General
 preferences.general.theme=Look & Feel
+preferences.general.theme.automatic=Automatic
 preferences.general.theme.light=Light
 preferences.general.theme.dark=Dark
 preferences.general.unlockThemes=Unlock dark mode

From 703fb4fb512fb05a3ca8801c540826470ce4c1be Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Thu, 6 Aug 2020 18:32:57 +0200
Subject: [PATCH 030/169] fixed
 https://github.com/cryptomator/cryptomator/commit/0091c401df3589e9e4236698690d242af77ffc1e#r40816364

---
 .../ui/preferences/VolumePreferencesController.java           | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
index 44127696c..5faf5b694 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
@@ -3,7 +3,6 @@ package org.cryptomator.ui.preferences;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.control.Button;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.TextField;
@@ -40,9 +39,8 @@ public class VolumePreferencesController implements FxController {
 
 	public void initialize() {
 		volumeTypeChoiceBox.getItems().addAll(Volume.getCurrentSupportedAdapters());
-		//If the in the settings specified preferredVolumeImplementation isn't available, overwrite the settings to use the default VolumeImpl.WEBDAV
 		if (!volumeTypeChoiceBox.getItems().contains(settings.preferredVolumeImpl().get())) {
-			settings.preferredVolumeImpl().bind(new SimpleObjectProperty<>(VolumeImpl.WEBDAV));
+			settings.preferredVolumeImpl().set(VolumeImpl.WEBDAV);
 		}
 		volumeTypeChoiceBox.valueProperty().bindBidirectional(settings.preferredVolumeImpl());
 		volumeTypeChoiceBox.setConverter(new VolumeImplConverter());

From 351f96fa8b5fa2288c52d52a98eaceeeda6d1713 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Fri, 7 Aug 2020 09:30:22 +0200
Subject: [PATCH 031/169] switch to light theme if donation key has changed and
 is invalid

---
 .../preferences/DonationKeyPreferencesController.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/DonationKeyPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/DonationKeyPreferencesController.java
index 476887b26..21a2d3d9a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/DonationKeyPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/DonationKeyPreferencesController.java
@@ -5,23 +5,27 @@ import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
 import javafx.scene.control.TextArea;
 import org.cryptomator.common.LicenseHolder;
+import org.cryptomator.common.settings.Settings;
+import org.cryptomator.common.settings.UiTheme;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
 
 @PreferencesScoped
 public class DonationKeyPreferencesController implements FxController {
-	
+
 	private static final String DONATION_URI = "https://store.cryptomator.org/desktop";
 
 	private final Application application;
 	private final LicenseHolder licenseHolder;
+	private final Settings settings;
 	public TextArea donationKeyField;
 
 	@Inject
-	DonationKeyPreferencesController(Application application, LicenseHolder licenseHolder) {
+	DonationKeyPreferencesController(Application application, LicenseHolder licenseHolder, Settings settings) {
 		this.application = application;
 		this.licenseHolder = licenseHolder;
+		this.settings = settings;
 	}
 
 	@FXML
@@ -32,6 +36,9 @@ public class DonationKeyPreferencesController 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);
+		}
 	}
 
 	@FXML

From 0e784a6ffcf853c97bdd1c97d8c8d9bff93cfe85 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Fri, 7 Aug 2020 17:09:55 +0200
Subject: [PATCH 032/169] also disable finish button in change password if old
 password field is empty

---
 .../ui/changepassword/ChangePasswordController.java      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
index 7a641b1e7..2d9998fb1 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
@@ -53,9 +53,10 @@ public class ChangePasswordController implements FxController {
 
 	@FXML
 	public void initialize() {
-		BooleanBinding hasNotConfirmedCheckbox = finalConfirmationCheckbox.selectedProperty().not();
-		BooleanBinding isInvalidNewPassword = Bindings.createBooleanBinding(() -> newPassword.get() == null || newPassword.get().length() == 0, newPassword); 
-		finishButton.disableProperty().bind(hasNotConfirmedCheckbox.or(isInvalidNewPassword));
+		BooleanBinding checkboxNotConfirmed = finalConfirmationCheckbox.selectedProperty().not();
+		BooleanBinding oldPasswordFieldEmpty = oldPasswordField.textProperty().isEmpty();
+		BooleanBinding newPasswordInvalid = Bindings.createBooleanBinding(() -> newPassword.get() == null || newPassword.get().length() == 0, newPassword);
+		finishButton.disableProperty().bind(checkboxNotConfirmed.or(oldPasswordFieldEmpty).or(newPasswordInvalid));
 	}
 
 	@FXML
@@ -96,5 +97,5 @@ public class ChangePasswordController implements FxController {
 	public Vault getVault() {
 		return vault;
 	}
-	
+
 }

From 25195fffe229eef84b4623a4a1a918a93d8085af Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Fri, 7 Aug 2020 17:47:49 +0200
Subject: [PATCH 033/169] added icon to password strength label in new password
 controller

---
 .../ui/common/NewPasswordController.java      | 21 ++++++++++++++++---
 main/ui/src/main/resources/css/dark_theme.css |  4 ++++
 .../ui/src/main/resources/css/light_theme.css |  4 ++++
 .../src/main/resources/fxml/new_password.fxml |  7 ++++---
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
index 2d0c424eb..24f3ac8db 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
@@ -26,6 +26,7 @@ public class NewPasswordController implements FxController {
 	public Label passwordStrengthLabel;
 	public Label passwordMatchLabel;
 	public FontAwesome5IconView checkmark;
+	public FontAwesome5IconView warning;
 	public FontAwesome5IconView cross;
 
 	public NewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater, ObjectProperty<CharSequence> password) {
@@ -36,11 +37,13 @@ public class NewPasswordController implements FxController {
 
 	@FXML
 	public void initialize() {
+		passwordStrength.bind(Bindings.createIntegerBinding(() -> strengthRater.computeRate(passwordField.getCharacters()), passwordField.textProperty()));
+
+		passwordStrengthLabel.graphicProperty().bind(Bindings.createObjectBinding(this::getIconViewForPasswordStrengthLabel, passwordField.textProperty(), passwordStrength));
+		passwordStrengthLabel.textProperty().bind(EasyBind.map(passwordStrength, strengthRater::getStrengthDescription));
+
 		BooleanBinding passwordsMatch = Bindings.createBooleanBinding(this::hasSamePasswordInBothFields, passwordField.textProperty(), reenterField.textProperty());
 		BooleanBinding reenterFieldNotEmpty = reenterField.textProperty().isNotEmpty();
-		passwordStrength.bind(Bindings.createIntegerBinding(() -> strengthRater.computeRate(passwordField.getCharacters()), passwordField.textProperty()));
-		passwordStrengthLabel.textProperty().bind(EasyBind.map(passwordStrength, strengthRater::getStrengthDescription));
-		
 		passwordMatchLabel.visibleProperty().bind(reenterFieldNotEmpty);
 		passwordMatchLabel.graphicProperty().bind(Bindings.when(passwordsMatch.and(reenterFieldNotEmpty)).then(checkmark).otherwise(cross));
 		passwordMatchLabel.textProperty().bind(Bindings.when(passwordsMatch.and(reenterFieldNotEmpty)).then(resourceBundle.getString("newPassword.passwordsMatch")).otherwise(resourceBundle.getString("newPassword.passwordsDoNotMatch")));
@@ -49,6 +52,18 @@ public class NewPasswordController implements FxController {
 		reenterField.textProperty().addListener(this::passwordsDidChange);
 	}
 
+	private FontAwesome5IconView getIconViewForPasswordStrengthLabel() {
+		if (passwordField.getCharacters().length() == 0) {
+			return null;
+		} else if (passwordStrength.intValue() <= -1) {
+			return cross;
+		} else if (passwordStrength.intValue() < 3) {
+			return warning;
+		} else {
+			return checkmark;
+		}
+	}
+
 	private void passwordsDidChange(@SuppressWarnings("unused") Observable observable) {
 		if (hasSamePasswordInBothFields() && strengthRater.fulfillsMinimumRequirements(passwordField.getCharacters())) {
 			password.set(passwordField.getCharacters());
diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index 6f8022beb..b6ab94b9b 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -143,6 +143,10 @@
 	-fx-fill: RED_5;
 }
 
+.glyph-icon-orange {
+	-fx-fill: ORANGE_5;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Main Window                                                                 *
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index 42f93bfbf..b650b6e17 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -143,6 +143,10 @@
 	-fx-fill: RED_5;
 }
 
+.glyph-icon-orange {
+	-fx-fill: ORANGE_5;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Main Window                                                                 *
diff --git a/main/ui/src/main/resources/fxml/new_password.fxml b/main/ui/src/main/resources/fxml/new_password.fxml
index b13da1245..7593a1ccd 100644
--- a/main/ui/src/main/resources/fxml/new_password.fxml
+++ b/main/ui/src/main/resources/fxml/new_password.fxml
@@ -13,18 +13,19 @@
 	  alignment="CENTER_LEFT">
 	<fx:define>
 		<FontAwesome5IconView fx:id="checkmark" styleClass="glyph-icon-primary" glyph="CHECK"/>
+		<FontAwesome5IconView fx:id="warning" styleClass="glyph-icon-orange" glyph="EXCLAMATION_TRIANGLE"/>
 		<FontAwesome5IconView fx:id="cross" styleClass="glyph-icon-red" glyph="TIMES"/>
 	</fx:define>
 	<children>
 		<Label text="%newPassword.promptText" labelFor="$passwordField"/>
 		<NiceSecurePasswordField fx:id="passwordField"/>
 		<PasswordStrengthIndicator spacing="6" prefHeight="6" strength="${controller.passwordStrength}"/>
-		<Label fx:id="passwordStrengthLabel" styleClass="label-muted" alignment="CENTER_RIGHT" maxWidth="Infinity"/>
-	
+		<Label fx:id="passwordStrengthLabel" styleClass="label-muted" alignment="CENTER_RIGHT" maxWidth="Infinity" graphicTextGap="6"/>
+
 		<Region/>
 
 		<Label text="%newPassword.reenterPassword" labelFor="$reenterField"/>
 		<NiceSecurePasswordField fx:id="reenterField"/>
-		<Label fx:id="passwordMatchLabel" styleClass="label-muted" alignment="CENTER_RIGHT" maxWidth="Infinity" graphicTextGap="6" contentDisplay="LEFT" />
+		<Label fx:id="passwordMatchLabel" styleClass="label-muted" alignment="CENTER_RIGHT" maxWidth="Infinity" graphicTextGap="6"/>
 	</children>
 </VBox>

From 817907c25aee7e8b967f9578736a35aaf6c8566e Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Fri, 7 Aug 2020 18:32:54 +0200
Subject: [PATCH 034/169] Add access functionality for KDE kwallets

---
 main/keychain/pom.xml                         |   8 +-
 .../cryptomator/keychain/KeychainModule.java  |   2 +-
 .../LinuxKDEWalletKeychainAccessImpl.java     | 121 ++++++++++++++++++
 ...ss.java => LinuxSystemKeychainAccess.java} |  20 +--
 main/pom.xml                                  |   8 +-
 5 files changed, 148 insertions(+), 11 deletions(-)
 create mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
 rename main/keychain/src/main/java/org/cryptomator/keychain/{LinuxSecretServiceKeychainAccess.java => LinuxSystemKeychainAccess.java} (64%)

diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml
index fd2b26c3a..3eaa5c2e7 100644
--- a/main/keychain/pom.xml
+++ b/main/keychain/pom.xml
@@ -24,7 +24,7 @@
 			<groupId>org.openjfx</groupId>
 			<artifactId>javafx-graphics</artifactId>
 		</dependency>
-		
+
 		<!-- Apache -->
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -53,6 +53,12 @@
 			<artifactId>secret-service</artifactId>
 		</dependency>
 
+		<!-- kdewallet lib -->
+		<dependency>
+			<groupId>org.purejava</groupId>
+			<artifactId>kdewallet</artifactId>
+		</dependency>
+
 		<!-- Logging -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
index 1db94fec6..a6054be2d 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
@@ -28,7 +28,7 @@ public abstract class KeychainModule {
 	
 	@Binds
 	@IntoSet
-	abstract KeychainAccessStrategy bindLinuxSecretServiceKeychainAccess(LinuxSecretServiceKeychainAccess keychainAccessStrategy);
+	abstract KeychainAccessStrategy bindLinuxSystemKeychainAccess(LinuxSystemKeychainAccess keychainAccessStrategy);
 
 	@Provides
 	@Singleton
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
new file mode 100644
index 000000000..120bef435
--- /dev/null
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
@@ -0,0 +1,121 @@
+package org.cryptomator.keychain;
+
+import org.freedesktop.dbus.connections.impl.DBusConnection;
+import org.freedesktop.dbus.exceptions.DBusException;
+import org.kde.KWallet;
+import org.kde.Static;
+import org.purejava.KDEWallet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy {
+
+    private final Logger log = LoggerFactory.getLogger(LinuxKDEWalletKeychainAccessImpl.class);
+
+    private final String FOLDER_NAME = "Cryptomator";
+    private final String APP_NAME = "Cryptomator";
+    private DBusConnection connection;
+    private KDEWallet wallet;
+    private int handle = -1;
+
+    public LinuxKDEWalletKeychainAccessImpl() {
+        try {
+            connection = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
+        } catch (DBusException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public boolean isSupported() {
+        try {
+            wallet = new KDEWallet(connection);
+            return wallet.isEnabled();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    @Override
+    public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
+        try {
+            if (walletIsOpen() &&
+                    !(wallet.hasEntry(handle, FOLDER_NAME, key, APP_NAME)
+                            && wallet.entryType(handle, FOLDER_NAME, key, APP_NAME) == 1)
+                    && wallet.writePassword(handle, FOLDER_NAME, key, passphrase.toString(), APP_NAME) == 0) {
+                log.debug("Passphrase successfully stored.");
+            } else {
+                log.debug("Passphrase was not stored.");
+            }
+        } catch (Exception e) {
+            log.error(e.toString(), e.getCause());
+            throw new KeychainAccessException(e);
+        }
+    }
+
+    @Override
+    public char[] loadPassphrase(String key) throws KeychainAccessException {
+        String password = "";
+        try {
+            if (walletIsOpen()) {
+                password = wallet.readPassword(handle, FOLDER_NAME, key, APP_NAME);
+                log.debug("loadPassphrase: wallet is open.");
+            } else {
+                log.debug("loadPassphrase: wallet is closed.");
+            }
+            return (password.equals("")) ? null : password.toCharArray();
+        } catch (Exception e) {
+            throw new KeychainAccessException(e);
+        }
+    }
+
+    @Override
+    public void deletePassphrase(String key) throws KeychainAccessException {
+        try {
+            if (walletIsOpen()
+                    && wallet.hasEntry(handle, FOLDER_NAME, key, APP_NAME)
+                    && wallet.entryType(handle, FOLDER_NAME, key, APP_NAME) == 1
+                    && wallet.removeEntry(handle, FOLDER_NAME, key, APP_NAME) == 0) {
+                log.debug("Passphrase successfully deleted.");
+            } else {
+                log.debug("Passphrase was not deleted.");
+            }
+        } catch (Exception e) {
+            throw new KeychainAccessException(e);
+        }
+    }
+
+    @Override
+    public void changePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
+        try {
+            if (walletIsOpen()
+                    && wallet.hasEntry(handle, FOLDER_NAME, key, APP_NAME)
+                    && wallet.entryType(handle, FOLDER_NAME, key, APP_NAME) == 1
+                    && wallet.writePassword(handle, FOLDER_NAME, key, passphrase.toString(), APP_NAME) == 0) {
+                log.debug("Passphrase successfully changed.");
+            } else {
+                log.debug("Passphrase could not be changed.");
+            }
+        } catch (Exception e) {
+            throw new KeychainAccessException(e);
+        }
+    }
+
+    private boolean walletIsOpen() throws KeychainAccessException {
+        try {
+            if (wallet.isOpen(Static.DEFAULT_WALLET)) {
+                // This is needed due to KeechainManager loading the passphase directly
+                if (handle == -1) handle = wallet.open(Static.DEFAULT_WALLET, 0, APP_NAME);
+                return true;
+            }
+            wallet.openAsync(Static.DEFAULT_WALLET, 0, APP_NAME, false);
+            wallet.getSignalHandler().await(KWallet.walletAsyncOpened.class, Static.ObjectPaths.KWALLETD5, () -> null);
+            handle = wallet.getSignalHandler().getLastHandledSignal(KWallet.walletAsyncOpened.class, Static.ObjectPaths.KWALLETD5).handle;
+            log.debug("Wallet successfully initialized.");
+            return handle != -1;
+        } catch (Exception e) {
+            throw new KeychainAccessException(e);
+        }
+    }
+}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSystemKeychainAccess.java
similarity index 64%
rename from main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccess.java
rename to main/keychain/src/main/java/org/cryptomator/keychain/LinuxSystemKeychainAccess.java
index f11bdbd45..cb2e5ce77 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccess.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSystemKeychainAccess.java
@@ -7,24 +7,28 @@ import javax.inject.Singleton;
 import java.util.Optional;
 
 /**
- * A facade to LinuxSecretServiceKeychainAccessImpl that doesn't depend on libraries that are unavailable on Mac and Windows.
+ * A facade to LinuxSecretServiceKeychainAccessImpl and LinuxKDEWalletKeychainAccessImpl
+ * that depend on libraries that are unavailable on Mac and Windows.
  */
 @Singleton
-public class LinuxSecretServiceKeychainAccess implements KeychainAccessStrategy {
+public class LinuxSystemKeychainAccess implements KeychainAccessStrategy {
 
-	// the actual implementation is hidden in this delegate object which is loaded via reflection,
+	// the actual implementation is hidden in this delegate objects which are loaded via reflection,
 	// as it depends on libraries that aren't necessarily available:
 	private final Optional<KeychainAccessStrategy> delegate;
 
 	@Inject
-	public LinuxSecretServiceKeychainAccess() {
-		this.delegate = constructGnomeKeyringKeychainAccess();
+	public LinuxSystemKeychainAccess() {
+		this.delegate = constructKeychainAccess();
 	}
 
-	private static Optional<KeychainAccessStrategy> constructGnomeKeyringKeychainAccess() {
-		try {
-			Class<?> clazz = Class.forName("org.cryptomator.keychain.LinuxSecretServiceKeychainAccessImpl");
+	private static Optional<KeychainAccessStrategy> constructKeychainAccess() {
+		try { // is kwallet or gnome-keyring installed?
+			Class<?> clazz = Class.forName("org.cryptomator.keychain.LinuxKDEWalletKeychainAccessImpl");
 			KeychainAccessStrategy instance = (KeychainAccessStrategy) clazz.getDeclaredConstructor().newInstance();
+			if (instance.isSupported()) return Optional.of(instance);
+			clazz = Class.forName("org.cryptomator.keychain.LinuxSecretServiceKeychainAccessImpl");
+			instance = (KeychainAccessStrategy) clazz.getDeclaredConstructor().newInstance();
 			return Optional.of(instance);
 		} catch (Exception e) {
 			return Optional.empty();
diff --git a/main/pom.xml b/main/pom.xml
index 5f0d7e5ea..fdea0eb14 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -34,6 +34,7 @@
 		<javafx.version>14</javafx.version>
 		<commons-lang3.version>3.10</commons-lang3.version>
 		<secret-service.version>1.0.0</secret-service.version>
+		<kdewallet.version>1.0.0</kdewallet.version>
 		<jwt.version>3.10.3</jwt.version>
 		<easybind.version>1.0.3</easybind.version>
 		<guava.version>29.0-jre</guava.version>
@@ -168,7 +169,12 @@
 				<artifactId>secret-service</artifactId>
 				<version>${secret-service.version}</version>
 			</dependency>
-			
+			<dependency>
+				<groupId>org.purejava</groupId>
+				<artifactId>kdewallet</artifactId>
+				<version>${kdewallet.version}</version>
+			</dependency>
+
 			<!-- JWT -->
 			<dependency>
 				<groupId>com.auth0</groupId>

From 100b83697990ed7f4b4b5557285cede953bebf8e Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Fri, 7 Aug 2020 18:49:07 +0200
Subject: [PATCH 035/169] Adjust buildkit to exclude kdewallet for Windows and
 macOS

---
 main/buildkit/pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml
index c86927d33..705138204 100644
--- a/main/buildkit/pom.xml
+++ b/main/buildkit/pom.xml
@@ -67,7 +67,7 @@
 						<configuration>
 							<outputDirectory>${project.build.directory}/libs</outputDirectory>
 							<excludeClassifiers>linux,mac,win</excludeClassifiers>
-							<excludeArtifactIds>dbus-java,secret-service,hkdf,java-utils</excludeArtifactIds>
+							<excludeArtifactIds>dbus-java,secret-service,kdewallet,hkdf,java-utils</excludeArtifactIds>
 						</configuration>
 					</execution>
 					<execution>
@@ -83,14 +83,14 @@
 						</configuration>
 					</execution>
 					<execution>
-						<id>copy-linux-secret-service</id>
+						<id>copy-linux-system-keychain-access</id>
 						<phase>prepare-package</phase>
 						<goals>
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
 							<outputDirectory>${project.build.directory}/linux-libs</outputDirectory>
-							<includeArtifactIds>dbus-java,secret-service,hkdf,java-utils</includeArtifactIds>
+							<includeArtifactIds>dbus-java,secret-service,kdewallet,hkdf,java-utils</includeArtifactIds>
 						</configuration>
 					</execution>
 					<execution>

From b1c66b181d441dfdd3c996b06dc2defb1d830b92 Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Sun, 9 Aug 2020 11:18:17 +0200
Subject: [PATCH 036/169] Depend on kdewallet 1.0.1, hence dbus-java 3.2.3 that
 fixes issues when dealing with multiple signals of the same name but
 different signatures

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

diff --git a/main/pom.xml b/main/pom.xml
index fdea0eb14..d4fe8da87 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -34,7 +34,7 @@
 		<javafx.version>14</javafx.version>
 		<commons-lang3.version>3.10</commons-lang3.version>
 		<secret-service.version>1.0.0</secret-service.version>
-		<kdewallet.version>1.0.0</kdewallet.version>
+		<kdewallet.version>1.0.1</kdewallet.version>
 		<jwt.version>3.10.3</jwt.version>
 		<easybind.version>1.0.3</easybind.version>
 		<guava.version>29.0-jre</guava.version>

From 597899d2bf363175ce292228e032ae5727f4b3a2 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 11 Aug 2020 02:23:42 +0200
Subject: [PATCH 037/169] Fixed random set order and updated
 #getAvailableDriveLetter()

Fixed bug introduced by 32a810fe1d0439435045827c5b653a2e10f5c621:
The Set of existing DriveLetters was in random order because Collectors#toUnmodifiableSet is an unordered collector.

Changed #getAvailableDriveLetter() to use Stream#findFirst() instead of #findAny()
---
 .../org/cryptomator/common/vaults/WindowsDriveLetters.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/WindowsDriveLetters.java b/main/commons/src/main/java/org/cryptomator/common/vaults/WindowsDriveLetters.java
index 35757cccd..f3ef2c7dc 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/WindowsDriveLetters.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/WindowsDriveLetters.java
@@ -5,6 +5,7 @@
  *******************************************************************************/
 package org.cryptomator.common.vaults;
 
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import org.apache.commons.lang3.SystemUtils;
 
@@ -25,7 +26,7 @@ public final class WindowsDriveLetters {
 
 	static {
 		try (IntStream stream = IntStream.rangeClosed('C', 'Z')) {
-			C_TO_Z = stream.mapToObj(i -> String.valueOf((char) i)).collect(Collectors.toUnmodifiableSet());
+			C_TO_Z = stream.mapToObj(i -> String.valueOf((char) i)).collect(ImmutableSet.toImmutableSet());
 		}
 	}
 
@@ -51,7 +52,7 @@ public final class WindowsDriveLetters {
 	}
 
 	public Optional<String> getAvailableDriveLetter() {
-		return getAvailableDriveLetters().stream().findAny();
+		return getAvailableDriveLetters().stream().findFirst();
 	}
 
 	public Optional<Path> getAvailableDriveLetterPath() {

From 429098733caabeb5846965603d5804e41d072d8e Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 11 Aug 2020 11:19:54 +0200
Subject: [PATCH 038/169] Improve the vault/mount name system: * fix bug where
 the default name is not replaced by the actual folder name * introduce new
 field in settings "mountName" as binding on displayName * change volumes to
 use mountName instead of displayName

---
 .../common/settings/VaultSettings.java        | 21 ++++++++++++++-----
 .../common/vaults/DokanyVolume.java           |  2 +-
 .../common/vaults/WebDavVolume.java           |  4 ++--
 .../common/settings/VaultSettingsTest.java    | 19 +++++++++++------
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
index e31a361ff..1fdaefebf 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
@@ -8,6 +8,8 @@ package org.cryptomator.common.settings;
 import com.google.common.base.Strings;
 import com.google.common.io.BaseEncoding;
 import javafx.beans.Observable;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.StringBinding;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.ObjectProperty;
@@ -53,8 +55,11 @@ public class VaultSettings {
 	private final IntegerProperty filenameLengthLimit = new SimpleIntegerProperty(DEFAULT_FILENAME_LENGTH_LIMIT);
 	private final ObjectProperty<WhenUnlocked> actionAfterUnlock = new SimpleObjectProperty<>(DEFAULT_ACTION_AFTER_UNLOCK);
 
+	private final StringBinding mountName;
+
 	public VaultSettings(String id) {
 		this.id = Objects.requireNonNull(id);
+		this.mountName = Bindings.createStringBinding(this::normalizeDisplayName, displayName);
 
 		EasyBind.subscribe(path, this::deriveDisplayNameFromPathOrUseDefault);
 	}
@@ -66,13 +71,14 @@ public class VaultSettings {
 	private void deriveDisplayNameFromPathOrUseDefault(Path newPath) {
 		final boolean mountNameSet = !StringUtils.isBlank(displayName.get());
 		final boolean dirnameExists = (newPath != null) && (newPath.getFileName() != null);
+		final String defaultPattern = DEFAULT_MOUNT_NAME + " " + id;
 
 		if (!mountNameSet && dirnameExists) {
-			displayName.set(normalizeMountName(newPath.getFileName().toString()));
+			displayName.set(newPath.getFileName().toString());
 		} else if (!mountNameSet && !dirnameExists) {
-			displayName.set(DEFAULT_MOUNT_NAME + " " +  id);
+			displayName.set(defaultPattern);
 		} else if (mountNameSet && dirnameExists) {
-			if (displayName.get().equals(DEFAULT_MOUNT_NAME + id)) {
+			if (displayName.get().equals(defaultPattern)) {
 				//this is okay, since this function is only executed if the path changes (aka, the vault is created or added)
 				displayName.set(newPath.getFileName().toString());
 			}
@@ -89,8 +95,9 @@ public class VaultSettings {
 		return BaseEncoding.base64Url().encode(randomBytes);
 	}
 
-	public static String normalizeMountName(String mountName) {
-		String normalizedMountName = StringUtils.stripAccents(mountName);
+	//visible for testing
+	String normalizeDisplayName() {
+		String normalizedMountName = StringUtils.stripAccents(displayName.get());
 		StringBuilder builder = new StringBuilder();
 		for (char c : normalizedMountName.toCharArray()) {
 			if (Character.isWhitespace(c)) {
@@ -122,6 +129,10 @@ public class VaultSettings {
 		return displayName;
 	}
 
+	public StringBinding mountName() {
+		return mountName;
+	}
+
 	public StringProperty winDriveLetter() {
 		return winDriveLetter;
 	}
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
index f934bf25f..117f888c9 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
@@ -49,7 +49,7 @@ public class DokanyVolume implements Volume {
 		this.mountPoint = determineMountPoint();
 		String mountName = vaultSettings.displayName().get();
 		try {
-			this.mount = mountFactory.mount(fs.getPath("/"), mountPoint, mountName, FS_TYPE_NAME, mountFlags.strip());
+			this.mount = mountFactory.mount(fs.getPath("/"), mountPoint, vaultSettings.mountName().get(), FS_TYPE_NAME, mountFlags.strip());
 		} catch (MountFailedException e) {
 			if (vaultSettings.getCustomMountPath().isPresent()) {
 				LOG.warn("Failed to mount vault into {}. Is this directory currently accessed by another process (e.g. Windows Explorer)?", mountPoint);
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
index 5ad63dd7b..9c59790fa 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
@@ -44,7 +44,7 @@ public class WebDavVolume implements Volume {
 		if (!server.isRunning()) {
 			server.start();
 		}
-		servlet = server.createWebDavServlet(fs.getPath("/"), vaultSettings.getId() + "/" + vaultSettings.displayName().get());
+		servlet = server.createWebDavServlet(fs.getPath("/"), vaultSettings.getId() + "/" + vaultSettings.mountName().get());
 		servlet.start();
 		mount();
 	}
@@ -98,7 +98,7 @@ public class WebDavVolume implements Volume {
 
 	@Override
 	public Optional<Path> getMountPoint() {
-		return Optional.ofNullable(mountPoint);
+		return Optional.ofNullable(mountPoint); //TODO
 	}
 
 	private String getLocalhostAliasOrNull() {
diff --git a/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsTest.java b/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsTest.java
index 042ff9896..779b017bc 100644
--- a/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsTest.java
+++ b/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsTest.java
@@ -15,12 +15,19 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class VaultSettingsTest {
 
 	@Test
-	public void testNormalize() throws Exception {
-		assertEquals("_", VaultSettings.normalizeMountName(" "));
-		assertEquals("a", VaultSettings.normalizeMountName("ä"));
-		assertEquals("C", VaultSettings.normalizeMountName("Ĉ"));
-		assertEquals("_", VaultSettings.normalizeMountName(":"));
-		assertEquals("_", VaultSettings.normalizeMountName("汉语"));
+	public void testNormalize() {
+		VaultSettings settings = new VaultSettings("id");
+		settings.displayName().setValue(" ");
+		assertEquals("_", settings.normalizeDisplayName());
+
+		settings.displayName().setValue("ä");
+		assertEquals("a", settings.normalizeDisplayName());
+		settings.displayName().setValue("Ĉ");
+		assertEquals("C", settings.normalizeDisplayName());
+		settings.displayName().setValue(":");
+		assertEquals("_", settings.normalizeDisplayName());
+		settings.displayName().setValue("汉语");
+		assertEquals("_", settings.normalizeDisplayName());
 	}
 
 }

From 31d95ae5b06018528259b20f0b5fff9bc7fdf758 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 11 Aug 2020 12:04:02 +0200
Subject: [PATCH 039/169] Remove restrictions of vault name filed to only
 contain alpha numeric characters

---
 .../ui/src/main/resources/fxml/vault_options_general.fxml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/ui/src/main/resources/fxml/vault_options_general.fxml b/main/ui/src/main/resources/fxml/vault_options_general.fxml
index 5997191bc..0c4caa772 100644
--- a/main/ui/src/main/resources/fxml/vault_options_general.fxml
+++ b/main/ui/src/main/resources/fxml/vault_options_general.fxml
@@ -2,11 +2,11 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.control.ChoiceBox?>
-<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.control.Label?>
-<?import org.cryptomator.ui.controls.AlphanumericTextField?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.vaultoptions.GeneralVaultOptionsController"
@@ -17,7 +17,7 @@
 	<children>
 		<HBox spacing="6" alignment="CENTER_LEFT">
 			<Label text="%vaultOptions.general.vaultName"/>
-			<AlphanumericTextField fx:id="vaultName"/>
+			<TextField fx:id="vaultName"/>
 		</HBox>
 
 		<CheckBox text="%vaultOptions.general.unlockAfterStartup" fx:id="unlockOnStartupCheckbox"/>

From ce262b691a3b7dbc05f7f71285df5072017474e0 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 11 Aug 2020 02:44:00 +0200
Subject: [PATCH 040/169] Added base classes for MountPointChoosers and added
 module to component

---
 .../InvalidMountPointException.java           | 16 ++++++
 .../common/mountpoint/MountPointChooser.java  | 50 +++++++++++++++++++
 .../mountpoint/MountPointChooserModule.java   |  8 +++
 .../common/vaults/VaultComponent.java         |  3 +-
 4 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 main/commons/src/main/java/org/cryptomator/common/mountpoint/InvalidMountPointException.java
 create mode 100644 main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
 create mode 100644 main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/InvalidMountPointException.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/InvalidMountPointException.java
new file mode 100644
index 000000000..b0c2fbd7a
--- /dev/null
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/InvalidMountPointException.java
@@ -0,0 +1,16 @@
+package org.cryptomator.common.mountpoint;
+
+public class InvalidMountPointException extends Exception {
+
+	public InvalidMountPointException(String message) {
+		super(message);
+	}
+
+	public InvalidMountPointException(Throwable cause) {
+		super(cause);
+	}
+
+	public InvalidMountPointException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
new file mode 100644
index 000000000..82ec789f0
--- /dev/null
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
@@ -0,0 +1,50 @@
+package org.cryptomator.common.mountpoint;
+
+import dagger.MapKey;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+public interface MountPointChooser {
+
+	default boolean isApplicable() {
+		return true; //Usually most of the choosers should be applicable
+	}
+
+	Optional<Path> chooseMountPoint();
+
+	default boolean prepare(Path mountPoint) throws InvalidMountPointException {
+		return false; //NO-OP
+	}
+
+	default void cleanup(Path mountPoint) {
+		//NO-OP
+	}
+
+	enum Phase {
+
+		CUSTOM_MOUNTPOINT(0),
+
+		CUSTOM_DRIVELETTER(1),
+
+		AVAILABLE_DRIVELETTER(2),
+
+		TEMPORARY_MOUNTPOINT(3);
+
+		private final int timing;
+
+		Phase(int timing) {
+			this.timing = timing;
+		}
+
+		public int getTiming() {
+			return timing;
+		}
+	}
+
+	@MapKey
+	@interface PhaseKey {
+
+		Phase value();
+	}
+}
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
new file mode 100644
index 000000000..bade9e1bb
--- /dev/null
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
@@ -0,0 +1,8 @@
+package org.cryptomator.common.mountpoint;
+
+import dagger.Module;
+
+@Module
+public abstract class MountPointChooserModule {
+
+}
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultComponent.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultComponent.java
index 98a9f951d..8d6baf1a3 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultComponent.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultComponent.java
@@ -6,6 +6,7 @@
 package org.cryptomator.common.vaults;
 
 import dagger.BindsInstance;
+import org.cryptomator.common.mountpoint.MountPointChooserModule;
 import org.cryptomator.common.settings.VaultSettings;
 
 import dagger.Subcomponent;
@@ -14,7 +15,7 @@ import javax.annotation.Nullable;
 import javax.inject.Named;
 
 @PerVault
-@Subcomponent(modules = {VaultModule.class})
+@Subcomponent(modules = {VaultModule.class, MountPointChooserModule.class})
 public interface VaultComponent {
 
 	Vault vault();

From c3fbddc671725038de12cb13f3fd6e42a0571392 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 11 Aug 2020 02:50:33 +0200
Subject: [PATCH 041/169] Refactored PerVault, Vault and VaultSettings

Made @`PerVault public
Added import for VaultException to Vault
Added convenience method to VaultSettings
---
 .../org/cryptomator/common/settings/VaultSettings.java    | 8 ++++++++
 .../main/java/org/cryptomator/common/vaults/PerVault.java | 2 +-
 .../main/java/org/cryptomator/common/vaults/Vault.java    | 7 ++++---
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
index 1a1dfe140..f702cff9f 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
@@ -120,6 +120,14 @@ public class VaultSettings {
 		return winDriveLetter;
 	}
 
+	public Optional<String> getWinDriveLetter() {
+		String current = this.winDriveLetter.get();
+		if (!Strings.isNullOrEmpty(current)) {
+			return Optional.of(current);
+		}
+		return Optional.empty();
+	}
+
 	public BooleanProperty unlockAfterStartup() {
 		return unlockAfterStartup;
 	}
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/PerVault.java b/main/commons/src/main/java/org/cryptomator/common/vaults/PerVault.java
index dab895b37..692349b61 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/PerVault.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/PerVault.java
@@ -8,6 +8,6 @@ import java.lang.annotation.RetentionPolicy;
 @Scope
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
-@interface PerVault {
+public @interface PerVault {
 
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
index d16e7815c..de41da4c1 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
@@ -17,6 +17,7 @@ import javafx.beans.property.ObjectProperty;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.LazyInitializer;
 import org.cryptomator.common.settings.VaultSettings;
+import org.cryptomator.common.vaults.Volume.VolumeException;
 import org.cryptomator.cryptofs.CryptoFileSystem;
 import org.cryptomator.cryptofs.CryptoFileSystemProperties;
 import org.cryptomator.cryptofs.CryptoFileSystemProperties.FileSystemFlags;
@@ -120,7 +121,7 @@ public class Vault {
 		return CryptoFileSystemProvider.newFileSystem(getPath(), fsProps);
 	}
 
-	public synchronized void unlock(CharSequence passphrase) throws CryptoException, IOException, Volume.VolumeException {
+	public synchronized void unlock(CharSequence passphrase) throws CryptoException, IOException, VolumeException {
 		if (vaultSettings.useCustomMountPath().get() && Strings.isNullOrEmpty(vaultSettings.customMountPath().get())) {
 			throw new NotDirectoryException("");
 		}
@@ -129,7 +130,7 @@ public class Vault {
 		volume.mount(fs, getEffectiveMountFlags());
 	}
 
-	public synchronized void lock(boolean forced) throws Volume.VolumeException {
+	public synchronized void lock(boolean forced) throws VolumeException {
 		if (forced && volume.supportsForcedUnmount()) {
 			volume.unmountForced();
 		} else {
@@ -145,7 +146,7 @@ public class Vault {
 		}
 	}
 
-	public void reveal() throws Volume.VolumeException {
+	public void reveal() throws VolumeException {
 		volume.reveal();
 	}
 

From b51a2602a9d8fe9d0a8ea739db459d1754f512a8 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 11 Aug 2020 22:35:22 +0200
Subject: [PATCH 042/169] Documented MountPointChooser

---
 .../common/mountpoint/MountPointChooser.java  | 117 ++++++++++++++++++
 1 file changed, 117 insertions(+)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
index 82ec789f0..dc972b5e8 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
@@ -1,26 +1,143 @@
 package org.cryptomator.common.mountpoint;
 
 import dagger.MapKey;
+import org.cryptomator.common.vaults.Volume;
 
 import java.nio.file.Path;
 import java.util.Optional;
+import java.util.Set;
 
+/**
+ * Base interface for the Mountpoint-Choosing-Operation that results in the choice and
+ * preparation of a Mountpoint or an exception otherwise.<br>
+ * <p>All <i>MountPointChoosers (MPCs)</i> need to implement this class and must be added to
+ * the pool of possible MPCs by {@link MountPointChooserModule MountPointChooserModule.}
+ * The MountPointChooserModule requires all {@link dagger.Provides Providermethods} to
+ * be annotated with the {@link PhaseKey @PhaseKey-Annotation} and a <b>unique</b> Phase to
+ * allow the Module to sort them according to the phases' {@link Phase#getTiming()} timing.}
+ * The timing must be defined by the developer to reflect a useful execution order.
+ *
+ * <p><b>Phase-Uniqueness:</b> Phases must be unique, meaning that they must not be used
+ * to annotate more than <i>one</i> Providermethod. Define a new phase for each additional
+ * MPC that is added to the Module. Timings can be reused; the order of Phases with equal
+ * timing among themselves is undefined.
+ *
+ * <p>MPCs are executed by a {@link Volume} in the order of their phase's timing to find
+ * and prepare a suitable Mountpoint for the Volume. The Volume only has access to a {@link Set}
+ * of MPCs in this specific order, that is provided by the Module; the according Phases and exact
+ * timings are inaccessible to the Volume. The Set only contains Choosers that were deemed
+ * {@link #isApplicable() applicable} by the Module.
+ *
+ * <p>At execution of a MPC {@link #chooseMountPoint()} and then {@link #prepare(Path)} are called
+ * by the Volume. If {@code #chooseMountPoint()} yields no result, the next MPC is executed
+ * without first calling the {@code #prepare(Path)}-Method of the current MPC.
+ * This is repeated until<br>
+ * <ul>
+ *     <li><b>either</b> a Mountpoint is returned by {@code #chooseMountPoint()}
+ *     and {@code #prepare(Path)} succeeds or fails</li>
+ *     <li><b>or</b> no MPC remains and an {@link InvalidMountPointException} is thrown.</li>
+ * </ul>
+ * If the {@code #prepare(Path)}-Method of a MPC fails the entire Mountpoint-Choosing-Operation
+ * is aborted and the method should do all necessary cleanup before throwing the exception.
+ * If the preparation succeeds {@link #cleanup(Path)} can be used after unmount to do any
+ * remaining cleanup.
+ */
 public interface MountPointChooser {
 
+	/**
+	 * Called by the {@link MountPointChooserModule} to determine whether this MountPointChooser is
+	 * applicable for the given Systemconfiguration.
+	 *
+	 * <p>The result of this method defaults to true. Developers should override this method to
+	 * check for Systemconfigurations that are unsuitable for this MPC.
+	 *
+	 * @return a boolean flag; true if applicable, else false.
+	 * @see #chooseMountPoint()
+	 */
 	default boolean isApplicable() {
 		return true; //Usually most of the choosers should be applicable
 	}
 
+	/**
+	 * Called by a {@link Volume} to do choose a Mountpoint according to the
+	 * MountPointChoosers strategy.
+	 *
+	 * <p>This method is only called for MPCs that were deemed {@link #isApplicable() applicable}
+	 * by the {@link MountPointChooserModule MountPointChooserModule.}
+	 * Developers should override this method to find or extract a Mountpoint for
+	 * the Volume <b>without</b> preparing it. Preparation should be done by
+	 * {@link #prepare(Path)} instead.
+	 * Exceptions in this method should be handled gracefully and result in returning
+	 * {@link Optional#empty()} instead of throwing an exception.
+	 *
+	 * @return the chosen path or {@link Optional#empty()} if an exception occurred
+	 * or no Mountpoint could be found.
+	 * @see #isApplicable()
+	 * @see #prepare(Path)
+	 */
 	Optional<Path> chooseMountPoint();
 
+	/**
+	 * Called by a {@link Volume} to prepare and/or verify the chosen Mountpoint.<br>
+	 * This method is only called if the {@link #chooseMountPoint()}-Method of the same
+	 * MountPointChooser returned a path.
+	 *
+	 * <p>Developers should override this method to prepare the Mountpoint for
+	 * the Volume and check for any obstacles that could hinder the Mount-Operation.
+	 * The Mountpoint is deemed "prepared" if it can be used to mount a Volume
+	 * without any further Filesystemactions or Userinteraction. If this is not possible,
+	 * this method should fail. In other words: This method should not return without
+	 * either failing or finalizing the preparation of the Mountpoint.
+	 * Generally speaking exceptions should be wrapped as
+	 * {@link InvalidMountPointException} to allow efficient handling by the caller.
+	 *
+	 * <p>Often the preparation of a Mountpoint involves creating files or others
+	 * actions that require cleaning up after the Volume is unmounted.
+	 * In this case developers should override the {@link #cleanup(Path)}-Method
+	 * and return {@code true} to the Volume to indicate that the
+	 * {@code #cleanup}-Method of this MPC should be called after unmount.
+	 *
+	 * <p><b>Please note:</b> If this method fails the entire
+	 * Mountpoint-Choosing-Operation is aborted without calling {@link #cleanup(Path)}
+	 * or any other MPCs. Therefore this method should do all necessary cleanup
+	 * before throwing the exception.
+	 *
+	 * @param mountPoint the Mountpoint chosen by {@link #chooseMountPoint()}
+	 * @return a boolean flag; true if cleanup is needed, false otherwise
+	 * @throws InvalidMountPointException
+	 */
 	default boolean prepare(Path mountPoint) throws InvalidMountPointException {
 		return false; //NO-OP
 	}
 
+	/**
+	 * Called by a {@link Volume} to do any cleanup needed after unmount.
+	 *
+	 * <p>This method is only called if the {@link #prepare(Path)}-Method of the same
+	 * MountPointChooser returned {@code true}. Typically developers want to
+	 * delete any files created prior to mount or do similar tasks.<br>
+	 * Exceptions in this method should be handled gracefully.
+	 *
+	 * @param mountPoint the Mountpoint that was prepared by {@link #prepare(Path)}
+	 */
 	default void cleanup(Path mountPoint) {
 		//NO-OP
 	}
 
+	/**
+	 * The phases of the existing {@link MountPointChooser MountPointChoosers.}
+	 * <p>The {@code Phases} of the MPCs are attached to them in the
+	 * {@link MountPointChooserModule} by annotating them with the
+	 * {@link PhaseKey @PhaseKey-Annotation.}
+	 * <p>Each MPC must have a <b>unique</b> Phase that allows the Module to sort
+	 * the MPCs according to their phases' {@link Phase#getTiming()} timing.}
+	 * The timing must be defined by the developer to reflect a useful execution order.
+	 *
+	 * <p><b>Phase-Uniqueness:</b> Phases must be unique, meaning that they must not be used
+	 * to annotate more than <i>one</i> Providermethod. Define a new phase for each additional
+	 * MPC that is added to the Module. Timings can be reused; the order of Phases with equal
+	 * timings among themselves is undefined.
+	 */
 	enum Phase {
 
 		CUSTOM_MOUNTPOINT(0),

From d6bbc4383ba2a5abf65f13462990196d077d9721 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 11 Aug 2020 22:39:54 +0200
Subject: [PATCH 043/169] Added implementations for MountPointChooser

Added AvailableDriveLetterChooser for automatic DriveLetter-choice
Added CustomDriveLetterChooser for a chosen DriveLetter
Added CustomMountPointChooser for a chosen directory
Added TemporaryMountPointChooser for automatic directory-choice
---
 .../AvailableDriveLetterChooser.java          | 26 ++++++
 .../mountpoint/CustomDriveLetterChooser.java  | 28 +++++++
 .../mountpoint/CustomMountPointChooser.java   | 69 ++++++++++++++++
 .../TemporaryMountPointChooser.java           | 79 +++++++++++++++++++
 4 files changed, 202 insertions(+)
 create mode 100644 main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
 create mode 100644 main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
 create mode 100644 main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
 create mode 100644 main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
new file mode 100644
index 000000000..0d94e8136
--- /dev/null
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
@@ -0,0 +1,26 @@
+package org.cryptomator.common.mountpoint;
+
+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.vaults.WindowsDriveLetters;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+public class AvailableDriveLetterChooser implements MountPointChooser {
+
+	private final WindowsDriveLetters windowsDriveLetters;
+
+	public AvailableDriveLetterChooser(WindowsDriveLetters windowsDriveLetters) {
+		this.windowsDriveLetters = windowsDriveLetters;
+	}
+
+	@Override
+	public boolean isApplicable() {
+		return SystemUtils.IS_OS_WINDOWS;
+	}
+
+	@Override
+	public Optional<Path> chooseMountPoint() {
+		return this.windowsDriveLetters.getAvailableDriveLetterPath();
+	}
+}
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
new file mode 100644
index 000000000..41bb5b24d
--- /dev/null
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
@@ -0,0 +1,28 @@
+package org.cryptomator.common.mountpoint;
+
+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.settings.VaultSettings;
+import org.cryptomator.common.vaults.Vault;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Optional;
+
+public class CustomDriveLetterChooser implements MountPointChooser {
+
+	private final VaultSettings vaultSettings;
+
+	public CustomDriveLetterChooser(Vault vault) {
+		this.vaultSettings = vault.getVaultSettings();
+	}
+
+	@Override
+	public boolean isApplicable() {
+		return SystemUtils.IS_OS_WINDOWS;
+	}
+
+	@Override
+	public Optional<Path> chooseMountPoint() {
+		return this.vaultSettings.getWinDriveLetter().map(letter -> letter.charAt(0) + ":\\").map(Paths::get);
+	}
+}
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
new file mode 100644
index 000000000..31dcc7aec
--- /dev/null
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
@@ -0,0 +1,69 @@
+package org.cryptomator.common.mountpoint;
+
+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.settings.VaultSettings;
+import org.cryptomator.common.vaults.Vault;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.FileAlreadyExistsException;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.NotDirectoryException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Optional;
+
+public class CustomMountPointChooser implements MountPointChooser {
+
+	private static final Logger LOG = LoggerFactory.getLogger(CustomMountPointChooser.class);
+
+	private final VaultSettings vaultSettings;
+
+	public CustomMountPointChooser(Vault vault) {
+		this.vaultSettings = vault.getVaultSettings();
+	}
+
+	@Override
+	public Optional<Path> chooseMountPoint() {
+		//VaultSettings#getCustomMountPath already checks whether the saved custom mountpoint should be used
+		return this.vaultSettings.getCustomMountPath().map(Paths::get);
+	}
+
+	@Override
+	public boolean prepare(Path mountPoint) throws InvalidMountPointException {
+		//On Windows the target folder MUST NOT exist...
+		//https://github.com/billziss-gh/winfsp/issues/320
+		if (SystemUtils.IS_OS_WINDOWS) {
+			//We must use #notExists() here because notExists =/= !exists (see docs)
+			if (Files.notExists(mountPoint, LinkOption.NOFOLLOW_LINKS)) {
+				//File really doesn't exist
+				return false;
+			}
+			//File exists OR can't be determined
+			throw wrapAsIMPE(new FileAlreadyExistsException(mountPoint.toString()));
+		}
+
+		//... on Mac and Linux it's the opposite
+		if (!Files.isDirectory(mountPoint)) {
+			throw wrapAsIMPE(new NotDirectoryException(mountPoint.toString()));
+		}
+		try (DirectoryStream<Path> ds = Files.newDirectoryStream(mountPoint)) {
+			if (ds.iterator().hasNext()) {
+				throw wrapAsIMPE(new DirectoryNotEmptyException(mountPoint.toString()));
+			}
+		} catch (IOException exception) {
+			throw wrapAsIMPE(exception);
+		}
+		LOG.debug("Successfully checked custom mount point: {}", mountPoint);
+		return false;
+	}
+
+	private InvalidMountPointException wrapAsIMPE(Exception exception) {
+		return new InvalidMountPointException(exception);
+	}
+
+}
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
new file mode 100644
index 000000000..a1dec25ce
--- /dev/null
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -0,0 +1,79 @@
+package org.cryptomator.common.mountpoint;
+
+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.Environment;
+import org.cryptomator.common.settings.VaultSettings;
+import org.cryptomator.common.vaults.Vault;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Optional;
+
+public class TemporaryMountPointChooser implements MountPointChooser {
+
+	private static final Logger LOG = LoggerFactory.getLogger(TemporaryMountPointChooser.class);
+	private static final int MAX_TMPMOUNTPOINT_CREATION_RETRIES = 10;
+
+	private final VaultSettings vaultSettings;
+	private final Environment environment;
+
+	public TemporaryMountPointChooser(Vault vault, Environment environment) {
+		this.vaultSettings = vault.getVaultSettings();
+		this.environment = environment;
+	}
+
+	@Override
+	public boolean isApplicable() {
+		if(this.environment.getMountPointsDir().isEmpty()) {
+			LOG.warn("\"cryptomator.mountPointsDir\" is not set to a valid path!");
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public Optional<Path> chooseMountPoint() {
+		//Shouldn't throw, but let's keep #orElseThrow in case we made a mistake and the check in #isApplicable failed
+		Path parent = this.environment.getMountPointsDir().orElseThrow();
+		String basename = this.vaultSettings.getId();
+		for (int i = 0; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) {
+			Path mountPoint = parent.resolve(basename + "_" + i);
+			if (Files.notExists(mountPoint)) {
+				return Optional.of(mountPoint);
+			}
+		}
+		return Optional.empty();
+	}
+
+	@Override
+	public boolean prepare(Path mountPoint) throws InvalidMountPointException {
+		// https://github.com/osxfuse/osxfuse/issues/306#issuecomment-245114592:
+		// In order to allow non-admin users to mount FUSE volumes in `/Volumes`,
+		// starting with version 3.5.0, FUSE will create non-existent mount points automatically.
+		if (SystemUtils.IS_OS_MAC && mountPoint.getParent().equals(Paths.get("/Volumes"))) {
+			return false;
+		}
+
+		try {
+			//WinFSP needs the parent, but the actual Mountpoint must not exist...
+			if (SystemUtils.IS_OS_WINDOWS) {
+				Files.createDirectories(mountPoint.getParent());
+				return false;
+			} else {
+				//For Linux and Mac the actual Mountpoint must exist
+				Files.createDirectories(mountPoint);
+				return true;
+			}
+		} catch (IOException exception) {
+			throw wrapAsIMPE(exception);
+		}
+	}
+
+	private InvalidMountPointException wrapAsIMPE(Exception exception) {
+		return new InvalidMountPointException(exception);
+	}
+}

From 00e0a0f79ac7d2b8ab3131daf0bb17a9a2251be6 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 11 Aug 2020 23:11:20 +0200
Subject: [PATCH 044/169] Fixed doc for MountPointChooser

---
 .../org/cryptomator/common/mountpoint/MountPointChooser.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
index dc972b5e8..fb5a6eaa5 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
@@ -104,7 +104,9 @@ public interface MountPointChooser {
 	 *
 	 * @param mountPoint the Mountpoint chosen by {@link #chooseMountPoint()}
 	 * @return a boolean flag; true if cleanup is needed, false otherwise
-	 * @throws InvalidMountPointException
+	 * @throws InvalidMountPointException if the preparation fails
+	 * @see #chooseMountPoint()
+	 * @see #cleanup(Path)
 	 */
 	default boolean prepare(Path mountPoint) throws InvalidMountPointException {
 		return false; //NO-OP
@@ -119,6 +121,7 @@ public interface MountPointChooser {
 	 * Exceptions in this method should be handled gracefully.
 	 *
 	 * @param mountPoint the Mountpoint that was prepared by {@link #prepare(Path)}
+	 * @see #prepare(Path)
 	 */
 	default void cleanup(Path mountPoint) {
 		//NO-OP

From 222ffd8c530439d2b6a221d53dfa463a1cb86f09 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 11 Aug 2020 23:11:48 +0200
Subject: [PATCH 045/169] Implemented MountPointChooserModule

---
 .../mountpoint/MountPointChooserModule.java   | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
index bade9e1bb..6f1fd0806 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
@@ -1,8 +1,70 @@
 package org.cryptomator.common.mountpoint;
 
+import com.google.common.collect.ImmutableSet;
 import dagger.Module;
+import dagger.Provides;
+import dagger.multibindings.IntoMap;
+import org.cryptomator.common.Environment;
+import org.cryptomator.common.mountpoint.MountPointChooser.Phase;
+import org.cryptomator.common.vaults.PerVault;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.common.vaults.WindowsDriveLetters;
 
+import javax.inject.Named;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Dagger-Module for {@link MountPointChooser MountPointChoosers.}<br>
+ * See there for additional information.
+ *
+ * @see MountPointChooser
+ */
 @Module
 public abstract class MountPointChooserModule {
 
+	@Provides
+	@IntoMap
+	@MountPointChooser.PhaseKey(Phase.CUSTOM_MOUNTPOINT)
+	@PerVault
+	public static MountPointChooser provideCustomMountPointChooser(Vault vault) {
+		return new CustomMountPointChooser(vault);
+	}
+
+	@Provides
+	@IntoMap
+	@MountPointChooser.PhaseKey(Phase.CUSTOM_DRIVELETTER)
+	@PerVault
+	public static MountPointChooser provideCustomDriveLetterChooser(Vault vault) {
+		return new CustomDriveLetterChooser(vault);
+	}
+
+	@Provides
+	@IntoMap
+	@MountPointChooser.PhaseKey(Phase.AVAILABLE_DRIVELETTER)
+	@PerVault
+	public static MountPointChooser provideAvailableDriveLetterChooser(WindowsDriveLetters windowsDriveLetters) {
+		return new AvailableDriveLetterChooser(windowsDriveLetters);
+	}
+
+	@Provides
+	@IntoMap
+	@MountPointChooser.PhaseKey(Phase.TEMPORARY_MOUNTPOINT)
+	@PerVault
+	public static MountPointChooser provideTemporaryMountPointChooser(Vault vault, Environment environment) {
+		return new TemporaryMountPointChooser(vault, environment);
+	}
+
+	@Provides
+	@PerVault
+	@Named("orderedValidMountPointChoosers")
+	public static Set<MountPointChooser> provideOrderedValidMountPointChoosers(Map<Phase, MountPointChooser> chooserMap) {
+		//Sorted Set
+		return chooserMap.entrySet().stream()
+				.sorted(Comparator.comparingInt(value -> value.getKey().getTiming()))
+				.map(Map.Entry::getValue)
+				.filter(MountPointChooser::isApplicable)
+				.collect(ImmutableSet.toImmutableSet());
+	}
 }

From b7f2fb0bdf1c979766c40f1820ffc1ff045ab170 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 11 Aug 2020 23:35:05 +0200
Subject: [PATCH 046/169] Added cleanup to TemporaryMountPointChooser

---
 .../common/mountpoint/TemporaryMountPointChooser.java  | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index a1dec25ce..c28c9ce20 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -73,6 +73,16 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 		}
 	}
 
+	@Override
+	public void cleanup(Path mountPoint) {
+		try {
+			Files.delete(mountPoint);
+			LOG.debug("Successfully deleted mount point: {}", mountPoint);
+		} catch (IOException e) {
+			LOG.warn("Could not delete mount point: {}", e.getMessage());
+		}
+	}
+
 	private InvalidMountPointException wrapAsIMPE(Exception exception) {
 		return new InvalidMountPointException(exception);
 	}

From 69f8c46f154667de57763b232026bc942d921936 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias.hagemann@skymatic.de>
Date: Wed, 12 Aug 2020 17:35:11 +0200
Subject: [PATCH 047/169] ui adjustments in vault detail missing

---
 .../resources/fxml/vault_detail_missing.fxml  | 59 ++++++++++---------
 .../main/resources/i18n/strings.properties    |  4 +-
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/main/ui/src/main/resources/fxml/vault_detail_missing.fxml b/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
index 63bb3d6dd..072ae0150 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
@@ -1,41 +1,44 @@
 <?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import javafx.scene.control.Button?>
 <VBox xmlns="http://javafx.com/javafx"
 	  xmlns:fx="http://javafx.com/fxml"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailMissingVaultController"
 	  alignment="TOP_CENTER"
-	  spacing="9">
+	  spacing="24">
 	<children>
-		<StackPane alignment="CENTER">
-			<Circle styleClass="glyph-icon-primary" radius="48"/>
-			<FontAwesome5IconView styleClass="glyph-icon-white" glyph="FILE" glyphSize="48"/>
-			<FontAwesome5IconView styleClass="glyph-icon-primary" glyph="SEARCH" glyphSize="24">
-				<StackPane.margin>
-					<Insets top="12"/>
-				</StackPane.margin>
-			</FontAwesome5IconView>
-		</StackPane>
-		<Label text="%main.vaultDetail.missing.info" wrapText="true"/>
-		<Button text="%main.vaultDetail.missing.recheck" minWidth="120" onAction="#recheck">
-			<graphic>
-				<FontAwesome5IconView glyph="REDO"/>
-			</graphic>
-		</Button>
-		<Button text="%main.vaultDetail.missing.changeLocation" minWidth="120" onAction="#changeLocation">
-			<graphic>
-				<FontAwesome5IconView glyph="EDIT"/>
-			</graphic>
-		</Button>
-		<Button text="%main.vaultDetail.missing.remove" minWidth="120" onAction="#didClickRemoveVault">
-			<graphic>
-				<FontAwesome5IconView glyph="TRASH"/>
-			</graphic>
-		</Button>
-
+		<VBox spacing="9" alignment="CENTER">
+			<StackPane alignment="CENTER">
+				<Circle styleClass="glyph-icon-primary" radius="48"/>
+				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="FILE" glyphSize="48"/>
+				<FontAwesome5IconView styleClass="glyph-icon-primary" glyph="SEARCH" glyphSize="24">
+					<StackPane.margin>
+						<Insets top="12"/>
+					</StackPane.margin>
+				</FontAwesome5IconView>
+			</StackPane>
+			<Label text="%main.vaultDetail.missing.info" wrapText="true"/>
+		</VBox>
+		<VBox spacing="6" alignment="CENTER">
+			<Button text="%main.vaultDetail.missing.recheck" minWidth="120" onAction="#recheck">
+				<graphic>
+					<FontAwesome5IconView glyph="REDO"/>
+				</graphic>
+			</Button>
+			<Button text="%main.vaultDetail.missing.changeLocation" minWidth="120" onAction="#changeLocation">
+				<graphic>
+					<FontAwesome5IconView glyph="EDIT"/>
+				</graphic>
+			</Button>
+			<Button text="%main.vaultDetail.missing.remove" minWidth="120" onAction="#didClickRemoveVault">
+				<graphic>
+					<FontAwesome5IconView glyph="TRASH"/>
+				</graphic>
+			</Button>
+		</VBox>
 	</children>
 </VBox>
\ No newline at end of file
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 6b1a89136..0338dbf31 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -171,7 +171,7 @@ main.dropZone.dropVault=Add this vault
 main.dropZone.unknownDragboardContent=If you want to add a vault, drag it to this window
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Click here to add a vault
-main.vaultlist.contextMenu.remove=Remove Vault
+main.vaultlist.contextMenu.remove=Remove Vault…
 main.vaultlist.addVaultBtn=Add Vault
 ## Vault Detail
 ### Welcome
@@ -195,7 +195,7 @@ main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator could not find a vault at this path.
 main.vaultDetail.missing.recheck=Recheck
-main.vaultDetail.missing.remove=Remove from Vault List
+main.vaultDetail.missing.remove=Remove from Vault List…
 main.vaultDetail.missing.changeLocation=Change Vault Location…
 ### Needs Migration
 main.vaultDetail.migrateButton=Upgrade Vault

From 724b20c826923433348d34fc399aec64e85faae1 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 12 Aug 2020 21:42:35 +0200
Subject: [PATCH 048/169] Fixed possible racecondition at Vault initialization

Fixed possible racecondition at Vault initialization: VaulSettings were read before the Vault was fully initialized resulting in breakage of the code if the excact order was to be changed.
---
 .../common/mountpoint/CustomDriveLetterChooser.java        | 7 +++----
 .../common/mountpoint/CustomMountPointChooser.java         | 7 +++----
 .../common/mountpoint/TemporaryMountPointChooser.java      | 7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
index 41bb5b24d..f01b04289 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
@@ -1,7 +1,6 @@
 package org.cryptomator.common.mountpoint;
 
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.common.vaults.Vault;
 
 import java.nio.file.Path;
@@ -10,10 +9,10 @@ import java.util.Optional;
 
 public class CustomDriveLetterChooser implements MountPointChooser {
 
-	private final VaultSettings vaultSettings;
+	private final Vault vault;
 
 	public CustomDriveLetterChooser(Vault vault) {
-		this.vaultSettings = vault.getVaultSettings();
+		this.vault = vault;
 	}
 
 	@Override
@@ -23,6 +22,6 @@ public class CustomDriveLetterChooser implements MountPointChooser {
 
 	@Override
 	public Optional<Path> chooseMountPoint() {
-		return this.vaultSettings.getWinDriveLetter().map(letter -> letter.charAt(0) + ":\\").map(Paths::get);
+		return this.vault.getVaultSettings().getWinDriveLetter().map(letter -> letter.charAt(0) + ":\\").map(Paths::get);
 	}
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
index 31dcc7aec..10852a272 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
@@ -1,7 +1,6 @@
 package org.cryptomator.common.mountpoint;
 
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.common.vaults.Vault;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,16 +20,16 @@ public class CustomMountPointChooser implements MountPointChooser {
 
 	private static final Logger LOG = LoggerFactory.getLogger(CustomMountPointChooser.class);
 
-	private final VaultSettings vaultSettings;
+	private final Vault vault;
 
 	public CustomMountPointChooser(Vault vault) {
-		this.vaultSettings = vault.getVaultSettings();
+		this.vault = vault;
 	}
 
 	@Override
 	public Optional<Path> chooseMountPoint() {
 		//VaultSettings#getCustomMountPath already checks whether the saved custom mountpoint should be used
-		return this.vaultSettings.getCustomMountPath().map(Paths::get);
+		return this.vault.getVaultSettings().getCustomMountPath().map(Paths::get);
 	}
 
 	@Override
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index c28c9ce20..964da6c54 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -2,7 +2,6 @@ package org.cryptomator.common.mountpoint;
 
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
-import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.common.vaults.Vault;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -18,11 +17,11 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 	private static final Logger LOG = LoggerFactory.getLogger(TemporaryMountPointChooser.class);
 	private static final int MAX_TMPMOUNTPOINT_CREATION_RETRIES = 10;
 
-	private final VaultSettings vaultSettings;
+	private final Vault vault;
 	private final Environment environment;
 
 	public TemporaryMountPointChooser(Vault vault, Environment environment) {
-		this.vaultSettings = vault.getVaultSettings();
+		this.vault = vault;
 		this.environment = environment;
 	}
 
@@ -39,7 +38,7 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 	public Optional<Path> chooseMountPoint() {
 		//Shouldn't throw, but let's keep #orElseThrow in case we made a mistake and the check in #isApplicable failed
 		Path parent = this.environment.getMountPointsDir().orElseThrow();
-		String basename = this.vaultSettings.getId();
+		String basename = this.vault.getVaultSettings().getId();
 		for (int i = 0; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) {
 			Path mountPoint = parent.resolve(basename + "_" + i);
 			if (Files.notExists(mountPoint)) {

From 708bcaa630677fb93fa0fe72fb30cd5b8f1f9a59 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 12 Aug 2020 22:22:04 +0200
Subject: [PATCH 049/169] Updated CustomMountPointChooser to use MPR instead of
 OS-Checks

Updated CustomMountPointChooser to use MountPointRequirements instead of OS-Checks.

This led to the discovery of the bug that was fixed in 724b20c826923433348d34fc399aec64e85faae1.
---
 .../mountpoint/CustomMountPointChooser.java   | 52 +++++++++++--------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
index 10852a272..3664fd72a 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
@@ -1,6 +1,6 @@
 package org.cryptomator.common.mountpoint;
 
-import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.vaults.MountPointRequirement;
 import org.cryptomator.common.vaults.Vault;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,28 +34,37 @@ public class CustomMountPointChooser implements MountPointChooser {
 
 	@Override
 	public boolean prepare(Path mountPoint) throws InvalidMountPointException {
-		//On Windows the target folder MUST NOT exist...
-		//https://github.com/billziss-gh/winfsp/issues/320
-		if (SystemUtils.IS_OS_WINDOWS) {
-			//We must use #notExists() here because notExists =/= !exists (see docs)
-			if (Files.notExists(mountPoint, LinkOption.NOFOLLOW_LINKS)) {
-				//File really doesn't exist
-				return false;
-			}
-			//File exists OR can't be determined
-			throw wrapAsIMPE(new FileAlreadyExistsException(mountPoint.toString()));
-		}
+		MountPointRequirement requirement = this.vault.getMountPointRequirement();
+		//Requirement "NONE" doesn't make any sense here.
+		//No need to prepare/verify a Mountpoint without requiring one...
+		assert requirement != MountPointRequirement.NONE;
 
-		//... on Mac and Linux it's the opposite
-		if (!Files.isDirectory(mountPoint)) {
-			throw wrapAsIMPE(new NotDirectoryException(mountPoint.toString()));
-		}
-		try (DirectoryStream<Path> ds = Files.newDirectoryStream(mountPoint)) {
-			if (ds.iterator().hasNext()) {
-				throw wrapAsIMPE(new DirectoryNotEmptyException(mountPoint.toString()));
+		//Not implemented anywhere (yet)
+		assert requirement != MountPointRequirement.PARENT_OPT_MOUNT_POINT;
+
+		if(requirement == MountPointRequirement.PARENT_NO_MOUNT_POINT) {
+			//This the case on Windows when using FUSE
+			//See https://github.com/billziss-gh/winfsp/issues/320
+
+			//We must use #notExists() here because notExists =/= !exists (see docs)
+			if (!Files.notExists(mountPoint, LinkOption.NOFOLLOW_LINKS)) {
+				//File exists OR can't be determined
+				throw wrapAsIMPE(new FileAlreadyExistsException(mountPoint.toString()));
+			}
+		} else if(requirement == MountPointRequirement.EMPTY_MOUNT_POINT) {
+			//This is the case for Windows when using Dokany
+			//and for Linux and Mac
+
+			if (!Files.isDirectory(mountPoint)) {
+				throw wrapAsIMPE(new NotDirectoryException(mountPoint.toString()));
+			}
+			try (DirectoryStream<Path> ds = Files.newDirectoryStream(mountPoint)) {
+				if (ds.iterator().hasNext()) {
+					throw wrapAsIMPE(new DirectoryNotEmptyException(mountPoint.toString()));
+				}
+			} catch (IOException exception) {
+				throw wrapAsIMPE(exception);
 			}
-		} catch (IOException exception) {
-			throw wrapAsIMPE(exception);
 		}
 		LOG.debug("Successfully checked custom mount point: {}", mountPoint);
 		return false;
@@ -64,5 +73,4 @@ public class CustomMountPointChooser implements MountPointChooser {
 	private InvalidMountPointException wrapAsIMPE(Exception exception) {
 		return new InvalidMountPointException(exception);
 	}
-
 }

From 51047dcbcee3785823bf34d4f879743211c09e4e Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 12 Aug 2020 23:22:26 +0200
Subject: [PATCH 050/169] Added additional debug messages

---
 .../common/mountpoint/TemporaryMountPointChooser.java         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index 964da6c54..589c01872 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -6,6 +6,7 @@ import org.cryptomator.common.vaults.Vault;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -45,6 +46,7 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 				return Optional.of(mountPoint);
 			}
 		}
+		LOG.error("Failed to find feasible mountpoint at {}{}{}_x. Giving up after {} attempts.", parent, File.separator, basename, MAX_TMPMOUNTPOINT_CREATION_RETRIES);
 		return Optional.empty();
 	}
 
@@ -61,10 +63,12 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 			//WinFSP needs the parent, but the actual Mountpoint must not exist...
 			if (SystemUtils.IS_OS_WINDOWS) {
 				Files.createDirectories(mountPoint.getParent());
+				LOG.debug("Successfully created folder for mount point: {}", mountPoint);
 				return false;
 			} else {
 				//For Linux and Mac the actual Mountpoint must exist
 				Files.createDirectories(mountPoint);
+				LOG.debug("Successfully created mount point: {}", mountPoint);
 				return true;
 			}
 		} catch (IOException exception) {

From 430da2b78d9c14d1147f78d00553033672700640 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 12 Aug 2020 23:32:59 +0200
Subject: [PATCH 051/169] Implemented MPC-System in FuseVolume and
 DokanyVolume, did refactoring

Implemented MPC-System in FuseVolume and DokanyVolume
Removed methods from FuseVol and DokanyVol
Renamed methods
Added chooser logic instead

Added imports for VolumeException to multiple classes
Added support for throwing and handling of InvalidMountPointException from Volume up to UnlockWorkflow (changed method signatures, added try-catchs, etc.)
---
 .../common/vaults/DokanyVolume.java           | 110 ++++---------
 .../cryptomator/common/vaults/FuseVolume.java | 148 ++++--------------
 .../org/cryptomator/common/vaults/Vault.java  |   3 +-
 .../org/cryptomator/common/vaults/Volume.java |   3 +-
 .../cryptomator/ui/unlock/UnlockWorkflow.java |  17 +-
 5 files changed, 79 insertions(+), 202 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
index d4b33315f..69ff035de 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
@@ -1,7 +1,9 @@
 package org.cryptomator.common.vaults;
 
-import com.google.common.base.Strings;
-import org.cryptomator.common.Environment;
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableSet;
+import org.cryptomator.common.mountpoint.InvalidMountPointException;
+import org.cryptomator.common.mountpoint.MountPointChooser;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.cryptofs.CryptoFileSystem;
 import org.cryptomator.frontend.dokany.Mount;
@@ -11,15 +13,10 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.DirectoryNotEmptyException;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.NotDirectoryException;
+import javax.inject.Named;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
 public class DokanyVolume implements Volume {
@@ -31,18 +28,21 @@ public class DokanyVolume implements Volume {
 
 	private final VaultSettings vaultSettings;
 	private final MountFactory mountFactory;
-	private final Environment environment;
-	private final WindowsDriveLetters windowsDriveLetters;
+
+	private final Set<MountPointChooser> choosers;
+
 	private Mount mount;
 	private Path mountPoint;
-	private boolean createdTemporaryMountPoint;
+
+	//Cleanup
+	private boolean cleanupRequired;
+	private MountPointChooser usedChooser;
 
 	@Inject
-	public DokanyVolume(VaultSettings vaultSettings, Environment environment, ExecutorService executorService, WindowsDriveLetters windowsDriveLetters) {
+	public DokanyVolume(VaultSettings vaultSettings, ExecutorService executorService, @Named("orderedValidMountPointChoosers") Set<MountPointChooser> choosers) {
 		this.vaultSettings = vaultSettings;
-		this.environment = environment;
 		this.mountFactory = new MountFactory(executorService);
-		this.windowsDriveLetters = windowsDriveLetters;
+		this.choosers = choosers;
 	}
 
 	@Override
@@ -51,7 +51,7 @@ public class DokanyVolume implements Volume {
 	}
 
 	@Override
-	public void mount(CryptoFileSystem fs, String mountFlags) throws VolumeException, IOException {
+	public void mount(CryptoFileSystem fs, String mountFlags) throws InvalidMountPointException, VolumeException {
 		this.mountPoint = determineMountPoint();
 		String mountName = vaultSettings.mountName().get();
 		try {
@@ -64,60 +64,21 @@ public class DokanyVolume implements Volume {
 		}
 	}
 
-	private Path determineMountPoint() throws VolumeException, IOException {
-		Optional<String> optionalCustomMountPoint = vaultSettings.getCustomMountPath();
-		if (optionalCustomMountPoint.isPresent()) {
-			Path customMountPoint = Paths.get(optionalCustomMountPoint.get());
-			checkProvidedMountPoint(customMountPoint);
-			return customMountPoint;
-		}
-		if (!Strings.isNullOrEmpty(vaultSettings.winDriveLetter().get())) {
-			return Path.of(vaultSettings.winDriveLetter().get().charAt(0) + ":\\");
-		}
-
-		//auto assign drive letter
-		Optional<Path> optionalDriveLetter = windowsDriveLetters.getAvailableDriveLetterPath();
-		if (optionalDriveLetter.isPresent()) {
-			return optionalDriveLetter.get();
-		}
-
-		//Nothing has worked so far -> Choose and prepare a folder
-		mountPoint = prepareTemporaryMountPoint();
-		LOG.debug("Successfully created mount point: {}", mountPoint);
-		return mountPoint;
-	}
-
-	private void checkProvidedMountPoint(Path mountPoint) throws IOException {
-		if (!Files.isDirectory(mountPoint)) {
-			throw new NotDirectoryException(mountPoint.toString());
-		}
-		try (DirectoryStream<Path> ds = Files.newDirectoryStream(mountPoint)) {
-			if (ds.iterator().hasNext()) {
-				throw new DirectoryNotEmptyException(mountPoint.toString());
+	private Path determineMountPoint() throws InvalidMountPointException {
+		for (MountPointChooser chooser : this.choosers) {
+			Optional<Path> chosenPath = chooser.chooseMountPoint();
+			if (chosenPath.isEmpty()) {
+				//Chooser was applicable, but couldn't find a feasible mountpoint
+				continue;
 			}
+			this.cleanupRequired = chooser.prepare(chosenPath.get()); //Fail entirely if an Exception occurs
+			this.usedChooser = chooser;
+			return chosenPath.get();
 		}
-	}
-
-	private Path chooseNonExistingTemporaryMountPoint() throws VolumeException {
-		Path parent = environment.getMountPointsDir().orElseThrow();
-		String basename = vaultSettings.getId(); //FIXME
-		for (int i = 0; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) {
-			Path mountPoint = parent.resolve(basename + "_" + i);
-			if (Files.notExists(mountPoint)) {
-				return mountPoint;
-			}
-		}
-		LOG.error("Failed to find feasible mountpoint at {}{}{}_x. Giving up after {} attempts.", parent, File.separator, basename, MAX_TMPMOUNTPOINT_CREATION_RETRIES);
-		throw new VolumeException("Did not find feasible mount point.");
-	}
-
-	private Path prepareTemporaryMountPoint() throws IOException, VolumeException {
-		Path mountPoint = chooseNonExistingTemporaryMountPoint();
-
-		Files.createDirectories(mountPoint);
-		this.createdTemporaryMountPoint = true;
-
-		return mountPoint;
+		String tried = Joiner.on(", ").join(this.choosers.stream()
+				.map((mpc) -> mpc.getClass().getTypeName())
+				.collect(ImmutableSet.toImmutableSet()));
+		throw new InvalidMountPointException(String.format("No feasible MountPoint found! Tried %s", tried));
 	}
 
 	@Override
@@ -131,17 +92,12 @@ public class DokanyVolume implements Volume {
 	@Override
 	public void unmount() {
 		mount.close();
-		cleanupTemporaryMountPoint();
+		cleanupMountPoint();
 	}
 
-	private void cleanupTemporaryMountPoint() {
-		if (createdTemporaryMountPoint) {
-			try {
-				Files.delete(mountPoint);
-				LOG.debug("Successfully deleted mount point: {}", mountPoint);
-			} catch (IOException e) {
-				LOG.warn("Could not delete mount point: {}", e.getMessage());
-			}
+	private void cleanupMountPoint() {
+		if (this.cleanupRequired) {
+			this.usedChooser.cleanup(this.mountPoint);
 		}
 	}
 
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index c9b08b0ed..c15f73e4b 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -1,10 +1,11 @@
 package org.cryptomator.common.vaults;
 
+import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
-import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableSet;
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.Environment;
-import org.cryptomator.common.settings.VaultSettings;
+import org.cryptomator.common.mountpoint.InvalidMountPointException;
+import org.cryptomator.common.mountpoint.MountPointChooser;
 import org.cryptomator.cryptofs.CryptoFileSystem;
 import org.cryptomator.frontend.fuse.mount.CommandFailedException;
 import org.cryptomator.frontend.fuse.mount.EnvironmentVariables;
@@ -16,131 +17,51 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.DirectoryNotEmptyException;
-import java.nio.file.DirectoryStream;
-import java.nio.file.FileAlreadyExistsException;
-import java.nio.file.Files;
-import java.nio.file.LinkOption;
-import java.nio.file.NotDirectoryException;
+import javax.inject.Named;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Optional;
+import java.util.Set;
 
 public class FuseVolume implements Volume {
 
 	private static final Logger LOG = LoggerFactory.getLogger(FuseVolume.class);
-	private static final int MAX_TMPMOUNTPOINT_CREATION_RETRIES = 10;
 
-	private final VaultSettings vaultSettings;
-	private final Environment environment;
-	private final WindowsDriveLetters windowsDriveLetters;
+	private final Set<MountPointChooser> choosers;
 
 	private Mount fuseMnt;
 	private Path mountPoint;
-	private boolean createdTemporaryMountPoint;
+
+	//Cleanup
+	private boolean cleanupRequired;
+	private MountPointChooser usedChooser;
 
 	@Inject
-	public FuseVolume(VaultSettings vaultSettings, Environment environment, WindowsDriveLetters windowsDriveLetters) {
-		this.vaultSettings = vaultSettings;
-		this.environment = environment;
-		this.windowsDriveLetters = windowsDriveLetters;
+	public FuseVolume(@Named("orderedValidMountPointChoosers") Set<MountPointChooser> choosers) {
+		this.choosers = choosers;
 	}
 
 	@Override
-	public void mount(CryptoFileSystem fs, String mountFlags) throws IOException, FuseNotSupportedException, VolumeException {
+	public void mount(CryptoFileSystem fs, String mountFlags) throws InvalidMountPointException, FuseNotSupportedException, VolumeException {
 		this.mountPoint = determineMountPoint();
 
 		mount(fs.getPath("/"), mountFlags);
 	}
 
-	private Path determineMountPoint() throws IOException, VolumeException {
-		Path mountPoint;
-		Optional<String> optionalCustomMountPoint = vaultSettings.getCustomMountPath();
-		//Is there a custom mountpoint?
-		if (optionalCustomMountPoint.isPresent()) {
-			mountPoint = Paths.get(optionalCustomMountPoint.get());
-			checkProvidedMountPoint(mountPoint);
-			LOG.debug("Successfully checked custom mount point: {}", this.mountPoint);
-			return mountPoint;
-		}
-		//No custom mounpoint -> Are we on Windows?
-		if (SystemUtils.IS_OS_WINDOWS) {
-			//Is there a chosen Driveletter?
-			if (!Strings.isNullOrEmpty(vaultSettings.winDriveLetter().get())) {
-				mountPoint = Path.of(vaultSettings.winDriveLetter().get().charAt(0) + ":\\");
-				return mountPoint;
+	private Path determineMountPoint() throws InvalidMountPointException {
+		for (MountPointChooser chooser : this.choosers) {
+			Optional<Path> chosenPath = chooser.chooseMountPoint();
+			if (chosenPath.isEmpty()) {
+				//Chooser was applicable, but couldn't find a feasible mountpoint
+				continue;
 			}
-
-			//No chosen Driveltter -> Is there a free Driveletter?
-			Optional<Path> optionalDriveLetter = windowsDriveLetters.getAvailableDriveLetterPath();
-			if(optionalDriveLetter.isPresent()) {
-				mountPoint = optionalDriveLetter.get();
-				return mountPoint;
-			}
-			//No free or chosen Driveletter -> Continue below
+			this.cleanupRequired = chooser.prepare(chosenPath.get()); //Fail entirely if an Exception occurs
+			this.usedChooser = chooser;
+			return chosenPath.get();
 		}
-		//Nothing has worked so far -> Choose and prepare a folder
-		mountPoint = prepareTemporaryMountPoint();
-		LOG.debug("Successfully created mount point: {}", mountPoint);
-		return mountPoint;
-	}
-
-	private void checkProvidedMountPoint(Path mountPoint) throws IOException {
-		//On Windows the target folder MUST NOT exist...
-		//https://github.com/billziss-gh/winfsp/issues/320
-		if (SystemUtils.IS_OS_WINDOWS) {
-			//We must use #notExists() here because notExists =/= !exists (see docs)
-			if (Files.notExists(mountPoint, LinkOption.NOFOLLOW_LINKS)) {
-				//File really doesn't exist
-				return;
-			}
-			//File exists OR can't be determined
-			throw new FileAlreadyExistsException(mountPoint.toString());
-		}
-
-		//... on Mac and Linux it's the opposite
-		if (!Files.isDirectory(mountPoint)) {
-			throw new NotDirectoryException(mountPoint.toString());
-		}
-		try (DirectoryStream<Path> ds = Files.newDirectoryStream(mountPoint)) {
-			if (ds.iterator().hasNext()) {
-				throw new DirectoryNotEmptyException(mountPoint.toString());
-			}
-		}
-	}
-
-	private Path prepareTemporaryMountPoint() throws IOException, VolumeException {
-		Path mountPoint = chooseNonExistingTemporaryMountPoint();
-		// https://github.com/osxfuse/osxfuse/issues/306#issuecomment-245114592:
-		// In order to allow non-admin users to mount FUSE volumes in `/Volumes`,
-		// starting with version 3.5.0, FUSE will create non-existent mount points automatically.
-		if (SystemUtils.IS_OS_MAC && mountPoint.getParent().equals(Paths.get("/Volumes"))) {
-			return mountPoint;
-		}
-
-		//WinFSP needs the parent, but the acutal Mount Point must not exist...
-		if (SystemUtils.IS_OS_WINDOWS) {
-			Files.createDirectories(mountPoint.getParent());
-		} else {
-			Files.createDirectories(mountPoint);
-			this.createdTemporaryMountPoint = true;
-		}
-		return mountPoint;
-	}
-
-	private Path chooseNonExistingTemporaryMountPoint() throws VolumeException {
-		Path parent = environment.getMountPointsDir().orElseThrow();
-		String basename = vaultSettings.getId(); //FIXME
-		for (int i = 0; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) {
-			Path mountPoint = parent.resolve(basename + "_" + i);
-			if (Files.notExists(mountPoint)) {
-				return mountPoint;
-			}
-		}
-		LOG.error("Failed to find feasible mountpoint at {}{}{}_x. Giving up after {} attempts.", parent, File.separator, basename, MAX_TMPMOUNTPOINT_CREATION_RETRIES);
-		throw new VolumeException("Did not find feasible mount point.");
+		String tried = Joiner.on(", ").join(this.choosers.stream()
+				.map((mpc) -> mpc.getClass().getTypeName())
+				.collect(ImmutableSet.toImmutableSet()));
+		throw new InvalidMountPointException(String.format("No feasible MountPoint found! Tried %s", tried));
 	}
 
 	private void mount(Path root, String mountFlags) throws VolumeException {
@@ -182,7 +103,7 @@ public class FuseVolume implements Volume {
 		} catch (CommandFailedException e) {
 			throw new VolumeException(e);
 		}
-		cleanupTemporaryMountPoint();
+		cleanupMountPoint();
 	}
 
 	@Override
@@ -193,17 +114,12 @@ public class FuseVolume implements Volume {
 		} catch (CommandFailedException e) {
 			throw new VolumeException(e);
 		}
-		cleanupTemporaryMountPoint();
+		cleanupMountPoint();
 	}
 
-	private void cleanupTemporaryMountPoint() {
-		if (createdTemporaryMountPoint) {
-			try {
-				Files.delete(mountPoint);
-				LOG.debug("Successfully deleted mount point: {}", mountPoint);
-			} catch (IOException e) {
-				LOG.warn("Could not delete mount point: {}", e.getMessage());
-			}
+	private void cleanupMountPoint() {
+		if (this.cleanupRequired) {
+			this.usedChooser.cleanup(this.mountPoint);
 		}
 	}
 
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
index de41da4c1..f4b3c6f4f 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
@@ -16,6 +16,7 @@ import javafx.beans.binding.StringBinding;
 import javafx.beans.property.ObjectProperty;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.LazyInitializer;
+import org.cryptomator.common.mountpoint.InvalidMountPointException;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.common.vaults.Volume.VolumeException;
 import org.cryptomator.cryptofs.CryptoFileSystem;
@@ -121,7 +122,7 @@ public class Vault {
 		return CryptoFileSystemProvider.newFileSystem(getPath(), fsProps);
 	}
 
-	public synchronized void unlock(CharSequence passphrase) throws CryptoException, IOException, VolumeException {
+	public synchronized void unlock(CharSequence passphrase) throws CryptoException, IOException, VolumeException, InvalidMountPointException {
 		if (vaultSettings.useCustomMountPath().get() && Strings.isNullOrEmpty(vaultSettings.customMountPath().get())) {
 			throw new NotDirectoryException("");
 		}
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java
index 22759d61b..54e28f028 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java
@@ -1,5 +1,6 @@
 package org.cryptomator.common.vaults;
 
+import org.cryptomator.common.mountpoint.InvalidMountPointException;
 import org.cryptomator.common.settings.VolumeImpl;
 import org.cryptomator.cryptofs.CryptoFileSystem;
 
@@ -24,7 +25,7 @@ public interface Volume {
 	 * @param fs
 	 * @throws IOException
 	 */
-	void mount(CryptoFileSystem fs, String mountFlags) throws IOException, VolumeException;
+	void mount(CryptoFileSystem fs, String mountFlags) throws IOException, VolumeException, InvalidMountPointException;
 
 	void reveal() throws VolumeException;
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index 3da99fa59..5d8cd6852 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -6,10 +6,11 @@ import javafx.concurrent.Task;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 import javafx.stage.Window;
+import org.cryptomator.common.mountpoint.InvalidMountPointException;
 import org.cryptomator.common.vaults.MountPointRequirement;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
-import org.cryptomator.common.vaults.Volume;
+import org.cryptomator.common.vaults.Volume.VolumeException;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
 import org.cryptomator.keychain.KeychainAccessException;
 import org.cryptomator.keychain.KeychainManager;
@@ -28,8 +29,6 @@ import javax.inject.Named;
 import java.io.IOException;
 import java.nio.CharBuffer;
 import java.nio.file.DirectoryNotEmptyException;
-import java.nio.file.FileAlreadyExistsException;
-import java.nio.file.FileSystemException;
 import java.nio.file.NotDirectoryException;
 import java.util.Arrays;
 import java.util.Optional;
@@ -76,7 +75,7 @@ public class UnlockWorkflow extends Task<Boolean> {
 	}
 
 	@Override
-	protected Boolean call() throws InterruptedException, IOException, Volume.VolumeException {
+	protected Boolean call() throws InterruptedException, IOException, VolumeException, InvalidMountPointException {
 		try {
 			if (attemptUnlock()) {
 				handleSuccess();
@@ -85,7 +84,11 @@ public class UnlockWorkflow extends Task<Boolean> {
 				cancel(false); // set Tasks state to cancelled
 				return false;
 			}
-		} catch (FileAlreadyExistsException | NotDirectoryException | DirectoryNotEmptyException e) {
+		} catch (NotDirectoryException | DirectoryNotEmptyException thrown) {
+			InvalidMountPointException e = new InvalidMountPointException(thrown);
+			handleInvalidMountPoint(e);
+			throw e; // rethrow to trigger correct exception handling in Task
+		} catch (InvalidMountPointException e) {
 			handleInvalidMountPoint(e);
 			throw e; // rethrow to trigger correct exception handling in Task
 		} catch (Exception e) {
@@ -97,7 +100,7 @@ public class UnlockWorkflow extends Task<Boolean> {
 		}
 	}
 
-	private boolean attemptUnlock() throws InterruptedException, IOException, Volume.VolumeException {
+	private boolean attemptUnlock() throws InterruptedException, IOException, VolumeException, InvalidMountPointException {
 		boolean proceed = password.get() != null || askForPassword(false) == PasswordEntry.PASSWORD_ENTERED;
 		while (proceed) {
 			try {
@@ -156,7 +159,7 @@ public class UnlockWorkflow extends Task<Boolean> {
 		}
 	}
 
-	private void handleInvalidMountPoint(FileSystemException e) {
+	private void handleInvalidMountPoint(InvalidMountPointException e) {
 		MountPointRequirement requirement = vault.getMountPointRequirement();
 		assert requirement != MountPointRequirement.NONE; //An invalid MountPoint with no required MountPoint doesn't seem sensible
 

From 3bf2b499a7c31022863fcd34e1619aa4f5d18a3f Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Fri, 14 Aug 2020 07:40:46 +0200
Subject: [PATCH 052/169] Reverse order to initialize backend The GNOME keyring
 feature was implemented first and we don't want to confuse users who used it
 before

---
 .../org/cryptomator/keychain/LinuxSystemKeychainAccess.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSystemKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSystemKeychainAccess.java
index cb2e5ce77..e75d387cb 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSystemKeychainAccess.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSystemKeychainAccess.java
@@ -23,11 +23,11 @@ public class LinuxSystemKeychainAccess implements KeychainAccessStrategy {
 	}
 
 	private static Optional<KeychainAccessStrategy> constructKeychainAccess() {
-		try { // is kwallet or gnome-keyring installed?
-			Class<?> clazz = Class.forName("org.cryptomator.keychain.LinuxKDEWalletKeychainAccessImpl");
+		try { // is gnome-keyring or kwallet installed?
+			Class<?> clazz = Class.forName("org.cryptomator.keychain.LinuxSecretServiceKeychainAccessImpl");
 			KeychainAccessStrategy instance = (KeychainAccessStrategy) clazz.getDeclaredConstructor().newInstance();
 			if (instance.isSupported()) return Optional.of(instance);
-			clazz = Class.forName("org.cryptomator.keychain.LinuxSecretServiceKeychainAccessImpl");
+			clazz = Class.forName("org.cryptomator.keychain.LinuxKDEWalletKeychainAccessImpl");
 			instance = (KeychainAccessStrategy) clazz.getDeclaredConstructor().newInstance();
 			return Optional.of(instance);
 		} catch (Exception e) {

From 8418038736adf57b5df1020c12791e4891aa6ae8 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Fri, 14 Aug 2020 12:47:11 +0200
Subject: [PATCH 053/169] dependency update

---
 main/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index 618793f93..2b91c918d 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -32,7 +32,7 @@
 
 		<!-- 3rd party dependencies -->
 		<javafx.version>14</javafx.version>
-		<commons-lang3.version>3.10</commons-lang3.version>
+		<commons-lang3.version>3.11</commons-lang3.version>
 		<secret-service.version>1.0.0</secret-service.version>
 		<jwt.version>3.10.3</jwt.version>
 		<easybind.version>1.0.3</easybind.version>
@@ -168,7 +168,7 @@
 				<artifactId>secret-service</artifactId>
 				<version>${secret-service.version}</version>
 			</dependency>
-			
+
 			<!-- JWT -->
 			<dependency>
 				<groupId>com.auth0</groupId>

From 3de69021dfb2bf738f14248e4790cdb0786d479d Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
Date: Mon, 22 Jun 2020 18:10:08 +0200
Subject: [PATCH 054/169] New Crowdin updates (#1255)

[ci skip]
---
 .../src/main/resources/i18n/strings_ar.properties  |  3 ++-
 .../src/main/resources/i18n/strings_ca.properties  |  1 -
 .../src/main/resources/i18n/strings_cs.properties  |  6 +++++-
 .../src/main/resources/i18n/strings_de.properties  |  6 +++++-
 .../src/main/resources/i18n/strings_el.properties  | 14 +++++++++-----
 .../src/main/resources/i18n/strings_es.properties  |  6 +++++-
 .../src/main/resources/i18n/strings_fr.properties  |  6 +++++-
 .../src/main/resources/i18n/strings_it.properties  |  6 +++++-
 .../src/main/resources/i18n/strings_ja.properties  |  4 +++-
 .../src/main/resources/i18n/strings_ko.properties  |  6 +++++-
 .../src/main/resources/i18n/strings_lv.properties  |  1 -
 .../src/main/resources/i18n/strings_nb.properties  |  2 +-
 .../src/main/resources/i18n/strings_nl.properties  |  1 -
 .../src/main/resources/i18n/strings_nn.properties  |  2 +-
 .../src/main/resources/i18n/strings_pl.properties  |  8 ++++++--
 .../src/main/resources/i18n/strings_pt.properties  |  1 +
 .../main/resources/i18n/strings_pt_BR.properties   |  6 +++++-
 .../src/main/resources/i18n/strings_ru.properties  | 12 ++++++++----
 .../src/main/resources/i18n/strings_sk.properties  |  5 ++++-
 .../src/main/resources/i18n/strings_sv.properties  |  4 +++-
 .../src/main/resources/i18n/strings_tr.properties  |  6 +++++-
 .../src/main/resources/i18n/strings_zh.properties  |  6 ++++--
 .../main/resources/i18n/strings_zh_TW.properties   |  8 ++++++--
 23 files changed, 88 insertions(+), 32 deletions(-)

diff --git a/main/ui/src/main/resources/i18n/strings_ar.properties b/main/ui/src/main/resources/i18n/strings_ar.properties
index ef2935aea..959bee104 100644
--- a/main/ui/src/main/resources/i18n/strings_ar.properties
+++ b/main/ui/src/main/resources/i18n/strings_ar.properties
@@ -169,7 +169,6 @@ main.dropZone.dropVault=أضف هذا المخزن
 main.dropZone.unknownDragboardContent=إذا كنت ترغب في إضافة مخزن، قم بسحبه إلى هذه النافذة
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=انقر هنا لإضافة خزنة
-main.vaultlist.contextMenu.remove=احذف الحافظة
 main.vaultlist.addVaultBtn=أضِف مخزنًا
 ## Vault Detail
 ### Welcome
@@ -192,6 +191,8 @@ main.vaultDetail.throughput.kbps=%.1f كيلوبايت/ث
 main.vaultDetail.throughput.mbps=%.1f ميجابايت/ث
 ### Missing
 main.vaultDetail.missing.info=لم يتمكن Cryptomator من العثور على خزنة في هذا المسار.
+main.vaultDetail.missing.recheck=إعادة الفحص
+main.vaultDetail.missing.changeLocation=تغيير موقع الخزنة…
 ### Needs Migration
 main.vaultDetail.migrateButton=ترقية الحافظة
 main.vaultDetail.migratePrompt=يجب ترقية المخزن الخاص بك إلى تنسيق جديد، قبل أن تتمكن من الوصول إليه
diff --git a/main/ui/src/main/resources/i18n/strings_ca.properties b/main/ui/src/main/resources/i18n/strings_ca.properties
index 6846d5b5e..87a6fa52e 100644
--- a/main/ui/src/main/resources/i18n/strings_ca.properties
+++ b/main/ui/src/main/resources/i18n/strings_ca.properties
@@ -168,7 +168,6 @@ main.dropZone.dropVault=Afegeix aquesta caixa forta
 main.dropZone.unknownDragboardContent=Si voleu afegir una caixa forta, arrossegueu-la a aquesta finestra
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Feu clic aquí per afegir una caixa forta
-main.vaultlist.contextMenu.remove=Elimina la caixa forta
 main.vaultlist.addVaultBtn=Afegir una caixa forta
 ## Vault Detail
 ### Welcome
diff --git a/main/ui/src/main/resources/i18n/strings_cs.properties b/main/ui/src/main/resources/i18n/strings_cs.properties
index 66c0ecb5f..30c550120 100644
--- a/main/ui/src/main/resources/i18n/strings_cs.properties
+++ b/main/ui/src/main/resources/i18n/strings_cs.properties
@@ -130,6 +130,7 @@ preferences.title=Nastavení
 ## General
 preferences.general=Obecné
 preferences.general.theme=Vzhled
+preferences.general.theme.automatic=Automaticky
 preferences.general.theme.light=Světlý
 preferences.general.theme.dark=Tmavý
 preferences.general.unlockThemes=Odemknout tmavý režim
@@ -169,7 +170,7 @@ main.dropZone.dropVault=Přidat tento trezor
 main.dropZone.unknownDragboardContent=Pokud chcete přidat trezor, přetáhněte jej do tohoto okna
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Klikněte zde pro přidání nového trezoru
-main.vaultlist.contextMenu.remove=Odstranit trezor
+main.vaultlist.contextMenu.remove=Odstranit trezor…
 main.vaultlist.addVaultBtn=Přidat trezor
 ## Vault Detail
 ### Welcome
@@ -192,6 +193,9 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator nemohl najít trezor na této cestě.
+main.vaultDetail.missing.recheck=Znovu zkontrolovat
+main.vaultDetail.missing.remove=Odebrat ze seznamu trezorů…
+main.vaultDetail.missing.changeLocation=Změnit umístění trezoru…
 ### Needs Migration
 main.vaultDetail.migrateButton=Upgrade trezoru
 main.vaultDetail.migratePrompt=Váš trezor musí být aktualizován na nový formát, než k němu budete mít přístup
diff --git a/main/ui/src/main/resources/i18n/strings_de.properties b/main/ui/src/main/resources/i18n/strings_de.properties
index e096aebfa..35b865072 100644
--- a/main/ui/src/main/resources/i18n/strings_de.properties
+++ b/main/ui/src/main/resources/i18n/strings_de.properties
@@ -130,6 +130,7 @@ preferences.title=Einstellungen
 ## General
 preferences.general=Allgemein
 preferences.general.theme=Erscheinungsbild
+preferences.general.theme.automatic=Automatisch
 preferences.general.theme.light=Hell
 preferences.general.theme.dark=Dunkel
 preferences.general.unlockThemes=Dunklen Modus freischalten
@@ -169,7 +170,7 @@ main.dropZone.dropVault=Diesen Tresor hinzufügen
 main.dropZone.unknownDragboardContent=Wenn Sie einen Tresor hinzufügen möchten, ziehen Sie ihn in dieses Fenster
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Klicke hier, um einen Tresor hinzuzufügen
-main.vaultlist.contextMenu.remove=Tresor entfernen
+main.vaultlist.contextMenu.remove=Tresor entfernen…
 main.vaultlist.addVaultBtn=Tresor hinzufügen
 ## Vault Detail
 ### Welcome
@@ -192,6 +193,9 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Mit diesem Pfad konnte Cryptomator keinen Tresor finden.
+main.vaultDetail.missing.recheck=Erneut prüfen
+main.vaultDetail.missing.remove=Aus Tresorliste entfernen…
+main.vaultDetail.missing.changeLocation=Speicherort des Tresors ändern…
 ### Needs Migration
 main.vaultDetail.migrateButton=Tresor aktualisieren
 main.vaultDetail.migratePrompt=Dein Tresor muss auf ein neues Format aktualisiert werden, bevor du auf ihn zugreifen kannst
diff --git a/main/ui/src/main/resources/i18n/strings_el.properties b/main/ui/src/main/resources/i18n/strings_el.properties
index 9dd62095b..0dbee5286 100644
--- a/main/ui/src/main/resources/i18n/strings_el.properties
+++ b/main/ui/src/main/resources/i18n/strings_el.properties
@@ -39,7 +39,7 @@ addvaultwizard.new.locationInstruction=Που θα αποθηκεύσει το C
 addvaultwizard.new.locationLabel=Θέση αποθήκευσης
 addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Προσαρμοσμένη τοποθεσία
-addvaultwizard.new.directoryPickerButton=Επιλογή
+addvaultwizard.new.directoryPickerButton=Επιλογή…
 addvaultwizard.new.directoryPickerTitle=Επιλογή φακέλου
 addvaultwizard.new.fileAlreadyExists=Το vault δεν μπορεί να δημιουργηθεί σε αυτό το μονοπάτι καθώς κάποια αντικείμενα υπάρχουν ήδη.
 addvaultwizard.new.locationDoesNotExist=Το vault δεν μπορεί να δημιουργηθεί σε αυτό το μονοπάτι καθώς τουλάχιστον ένα στοιχείο του μονοπατιού δεν υπάρχει.
@@ -68,7 +68,7 @@ addvault.new.readme.accessLocation.3=Κάθε αρχείο που θα προσ
 addvault.new.readme.accessLocation.4=Μπορείτε ελεύθερα να αφαιρέσετε το αρχείο.
 ## Existing
 addvaultwizard.existing.instruction=Επιλέξτε το αρχείο "masterkey.cryptomator" του υπάρχοντος vault σας.
-addvaultwizard.existing.chooseBtn=Επιλογή
+addvaultwizard.existing.chooseBtn=Επιλογή…
 addvaultwizard.existing.filePickerTitle=Επιλέξτε το αρχείο Masterkey
 ## Success
 addvaultwizard.success.nextStepsInstructions=Προστέθηκε το vault "%s".\nΠρέπει να ξεκλειδώσετε αυτό το vault για να έχετε πρόσβαση ή να προσθέσετε περιεχόμενο. Εναλλακτικά μπορείτε να το ξεκλειδώσετε κάποια άλλη στιγμή.
@@ -130,6 +130,7 @@ preferences.title=Προτιμήσεις
 ## General
 preferences.general=Γενικά
 preferences.general.theme=Εμφάνιση
+preferences.general.theme.automatic=Αυτόματα
 preferences.general.theme.light=Ανοιχτό
 preferences.general.theme.dark=Σκούρο
 preferences.general.unlockThemes=Ξεκλείδωσε το σκούρο θέμα
@@ -166,10 +167,10 @@ main.preferencesBtn.tooltip=Προτιμήσεις
 main.donationKeyMissing.tooltip=Παρακαλώ σκεφτείτε τη δωρεά
 ## Drag 'n' Drop
 main.dropZone.dropVault=Προσθήκη vault
-main.dropZone.unknownDragboardContent=Αν θέλετε να προσθέσετε ένα vault, σύρτε το σε αυτό το παράθυρο
+main.dropZone.unknownDragboardContent=Αν θέλετε να προσθέσετε ένα vault, σύρετε το σε αυτό το παράθυρο
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Κάντε κλικ εδώ για να προσθέσετε ένα vault
-main.vaultlist.contextMenu.remove=Διαγραφή Vault
+main.vaultlist.contextMenu.remove=Διαγραφή Vault…
 main.vaultlist.addVaultBtn=Προσθήκη Vault
 ## Vault Detail
 ### Welcome
@@ -192,6 +193,9 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator δεν βρήκε vault σε αυτόν τον κατάλογο.
+main.vaultDetail.missing.recheck=Επανέλεγχος
+main.vaultDetail.missing.remove=Κατάργηση από την λίστα των Vault…
+main.vaultDetail.missing.changeLocation=Αλλαγή τοποθεσίας Vault…
 ### Needs Migration
 main.vaultDetail.migrateButton=Αναβάθμιση Vault
 main.vaultDetail.migratePrompt=Το vault σας πρέπει να αναβαθμιστεί σε νέα μορφή, προτού να έχετε πρόσβαση σε αυτό
@@ -224,7 +228,7 @@ vaultOptions.mount.mountPoint=Σημείο προσάρτησης
 vaultOptions.mount.mountPoint.auto=Επιλογή κατάλληλης τοποθεσίας αυτόματα
 vaultOptions.mount.mountPoint.driveLetter=Χρήση επιλεγμένου γράμματος δίσκου
 vaultOptions.mount.mountPoint.custom=Προσαρμοσμένη διαδρομή
-vaultOptions.mount.mountPoint.directoryPickerButton=Επιλογή
+vaultOptions.mount.mountPoint.directoryPickerButton=Επιλογή…
 vaultOptions.mount.mountPoint.directoryPickerTitle=Επιλέξτε ένα άδειο φάκελο
 ## Master Key
 vaultOptions.masterkey=Κωδικός πρόσβασης
diff --git a/main/ui/src/main/resources/i18n/strings_es.properties b/main/ui/src/main/resources/i18n/strings_es.properties
index 393c35882..58095b4e1 100644
--- a/main/ui/src/main/resources/i18n/strings_es.properties
+++ b/main/ui/src/main/resources/i18n/strings_es.properties
@@ -130,6 +130,7 @@ preferences.title=Preferencias
 ## General
 preferences.general=General
 preferences.general.theme=Apariencia
+preferences.general.theme.automatic=Automático
 preferences.general.theme.light=Claro
 preferences.general.theme.dark=Oscuro
 preferences.general.unlockThemes=Desbloquear el modo oscuro
@@ -169,7 +170,7 @@ main.dropZone.dropVault=Añadir esta bóveda
 main.dropZone.unknownDragboardContent=Si desea añadir una bóveda, arrástrela a esta ventana
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Hacer clic aquí para añadir una bóveda
-main.vaultlist.contextMenu.remove=Eliminar bóveda
+main.vaultlist.contextMenu.remove=Eliminar bóveda…
 main.vaultlist.addVaultBtn=Añadir bóveda
 ## Vault Detail
 ### Welcome
@@ -192,6 +193,9 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator no pudo encontrar una bóveda en esta ruta.
+main.vaultDetail.missing.recheck=Volver a comprobar
+main.vaultDetail.missing.remove=Eliminar de la lista de bóveda…
+main.vaultDetail.missing.changeLocation=Cambiar ubicación de la bóveda…
 ### Needs Migration
 main.vaultDetail.migrateButton=Mejorar bóveda
 main.vaultDetail.migratePrompt=Su bóveda necesita ser actualizada a un formato nuevo antes de poder acceder a ella
diff --git a/main/ui/src/main/resources/i18n/strings_fr.properties b/main/ui/src/main/resources/i18n/strings_fr.properties
index beb9ed55c..ddd560419 100644
--- a/main/ui/src/main/resources/i18n/strings_fr.properties
+++ b/main/ui/src/main/resources/i18n/strings_fr.properties
@@ -130,6 +130,7 @@ preferences.title=Préférences
 ## General
 preferences.general=Général
 preferences.general.theme=Apparence
+preferences.general.theme.automatic=Automatique
 preferences.general.theme.light=Clair
 preferences.general.theme.dark=Sombre
 preferences.general.unlockThemes=Débloquer le mode nuit
@@ -169,7 +170,7 @@ main.dropZone.dropVault=Ajouter ce coffre
 main.dropZone.unknownDragboardContent=Si vous voulez ajouter un coffre, faites-le glisser dans cette fenêtre
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Cliquez ici pour ajouter un coffre
-main.vaultlist.contextMenu.remove=Supprimer le coffre
+main.vaultlist.contextMenu.remove=Supprimer le coffre…
 main.vaultlist.addVaultBtn=Ajouter un coffre
 ## Vault Detail
 ### Welcome
@@ -192,6 +193,9 @@ main.vaultDetail.throughput.kbps=%.1fkB/s
 main.vaultDetail.throughput.mbps=%.1fMB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomateur n'a pas pu trouver de coffre-fort dans ce chemin d'accès.
+main.vaultDetail.missing.recheck=Revérifier
+main.vaultDetail.missing.remove=Retirer de la liste des coffres…
+main.vaultDetail.missing.changeLocation=Changer l'Emplacement du Coffre…
 ### Needs Migration
 main.vaultDetail.migrateButton=Mettre à jour le coffre
 main.vaultDetail.migratePrompt=Votre coffre doit être converti dans un nouveau format avant d'y accéder
diff --git a/main/ui/src/main/resources/i18n/strings_it.properties b/main/ui/src/main/resources/i18n/strings_it.properties
index 09a9295c5..674171dc9 100644
--- a/main/ui/src/main/resources/i18n/strings_it.properties
+++ b/main/ui/src/main/resources/i18n/strings_it.properties
@@ -130,6 +130,7 @@ preferences.title=Impostazioni
 ## General
 preferences.general=Generali
 preferences.general.theme=Aspetto
+preferences.general.theme.automatic=Automatico
 preferences.general.theme.light=Chiaro
 preferences.general.theme.dark=Scuro
 preferences.general.unlockThemes=Sblocca modalità scura
@@ -169,7 +170,7 @@ main.dropZone.dropVault=Aggiungi questa cassaforte
 main.dropZone.unknownDragboardContent=Se vuoi aggiungere una cassaforte, trascinala in questa finestra
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Clicca qui per aggiungere una cassaforte
-main.vaultlist.contextMenu.remove=Rimuovi Cassaforte
+main.vaultlist.contextMenu.remove=Rimuovi Cassaforte…
 main.vaultlist.addVaultBtn=Aggiungi Cassaforte
 ## Vault Detail
 ### Welcome
@@ -192,6 +193,9 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator non ha potuto trovare una cassaforte in questo percorso.
+main.vaultDetail.missing.recheck=Ricontrollare
+main.vaultDetail.missing.remove=Rimuovi dalla Lista Cassaforte…
+main.vaultDetail.missing.changeLocation=Cambia posizione della Cassaforte…
 ### Needs Migration
 main.vaultDetail.migrateButton=Aggiorna la cassaforte
 main.vaultDetail.migratePrompt=Prima di potervi accedere la tua cassaforte deve essere aggiornata al nuovo formato
diff --git a/main/ui/src/main/resources/i18n/strings_ja.properties b/main/ui/src/main/resources/i18n/strings_ja.properties
index 2f7d28058..4c2e2985a 100644
--- a/main/ui/src/main/resources/i18n/strings_ja.properties
+++ b/main/ui/src/main/resources/i18n/strings_ja.properties
@@ -130,6 +130,7 @@ preferences.title=設定
 ## General
 preferences.general=基本設定
 preferences.general.theme=外見 & 操作性
+preferences.general.theme.automatic=自動
 preferences.general.theme.light=ライト
 preferences.general.theme.dark=ダーク
 preferences.general.unlockThemes=ダークモードの解錠
@@ -169,7 +170,6 @@ main.dropZone.dropVault=この金庫を追加
 main.dropZone.unknownDragboardContent=このウィンドウにドラッグして、金庫を追加
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=ここをクリックして金庫を追加
-main.vaultlist.contextMenu.remove=金庫を削除
 main.vaultlist.addVaultBtn=金庫を追加
 ## Vault Detail
 ### Welcome
@@ -192,6 +192,8 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator はこのパスの金庫を見つけることができませんでした。
+main.vaultDetail.missing.recheck=再確認
+main.vaultDetail.missing.changeLocation=金庫の場所を変更...
 ### Needs Migration
 main.vaultDetail.migrateButton=金庫をアップグレード
 main.vaultDetail.migratePrompt=金庫にアクセスする前に、 金庫を新しい形式にアップグレードする必要があります
diff --git a/main/ui/src/main/resources/i18n/strings_ko.properties b/main/ui/src/main/resources/i18n/strings_ko.properties
index 8d2267136..55a733504 100644
--- a/main/ui/src/main/resources/i18n/strings_ko.properties
+++ b/main/ui/src/main/resources/i18n/strings_ko.properties
@@ -130,6 +130,7 @@ preferences.title=환경설정
 ## General
 preferences.general=일반
 preferences.general.theme=테마설정
+preferences.general.theme.automatic=자동
 preferences.general.theme.light=밝게
 preferences.general.theme.dark=어둡게
 preferences.general.unlockThemes=다크모드 해제
@@ -169,7 +170,7 @@ main.dropZone.dropVault=이 Vault를 추가
 main.dropZone.unknownDragboardContent=Vault를 추가하려면, 이 창에 드래그 하십시요.
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Vault를 추가하기 위해 이곳을 클릭합니다.
-main.vaultlist.contextMenu.remove=Vault 제거
+main.vaultlist.contextMenu.remove=Vault 제거...
 main.vaultlist.addVaultBtn=Vault 추가
 ## Vault Detail
 ### Welcome
@@ -192,6 +193,9 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator가 이 경로에 있는 Vault를 찾지 못했습니다.
+main.vaultDetail.missing.recheck=다시 시도
+main.vaultDetail.missing.remove=Vault 목록에서 제거...
+main.vaultDetail.missing.changeLocation=Vault 위치 변경
 ### Needs Migration
 main.vaultDetail.migrateButton=Vault 업그레이드
 main.vaultDetail.migratePrompt=Vault에 접근하기 전, 새로운 포멧으로 업그레이드가 필요합니다.
diff --git a/main/ui/src/main/resources/i18n/strings_lv.properties b/main/ui/src/main/resources/i18n/strings_lv.properties
index 131a5dbd8..8882ac5b7 100644
--- a/main/ui/src/main/resources/i18n/strings_lv.properties
+++ b/main/ui/src/main/resources/i18n/strings_lv.properties
@@ -162,7 +162,6 @@ main.dropZone.dropVault=Pievienot šo glabātuvi
 main.dropZone.unknownDragboardContent=Ja jūs vēlaties pievienot glabātuvi, velciet to uz šo logu
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Spied šeit, lai pievienotu glabātuvi
-main.vaultlist.contextMenu.remove=Noņemt glabātuvi
 main.vaultlist.addVaultBtn=Pievienot glabātuvi
 ## Vault Detail
 ### Welcome
diff --git a/main/ui/src/main/resources/i18n/strings_nb.properties b/main/ui/src/main/resources/i18n/strings_nb.properties
index 924af01e0..99ab81a8a 100644
--- a/main/ui/src/main/resources/i18n/strings_nb.properties
+++ b/main/ui/src/main/resources/i18n/strings_nb.properties
@@ -169,7 +169,6 @@ main.dropZone.dropVault=Legg til dette hvelvet
 main.dropZone.unknownDragboardContent=Hvis du vil legge til et hvelv, kan du dra det til dette vinduet
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Klikk her for å legge til et hvelv
-main.vaultlist.contextMenu.remove=Fjern hvelvet
 main.vaultlist.addVaultBtn=Legg til hvelv
 ## Vault Detail
 ### Welcome
@@ -192,6 +191,7 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator kunne ikke finne et hvelv på denne søkestien.
+main.vaultDetail.missing.recheck=Kontroller igjen
 ### Needs Migration
 main.vaultDetail.migrateButton=Oppgrader hvelv
 main.vaultDetail.migratePrompt=Hvelvet ditt må oppgraderes til et nytt format før du kan få tilgang til det
diff --git a/main/ui/src/main/resources/i18n/strings_nl.properties b/main/ui/src/main/resources/i18n/strings_nl.properties
index c4405fc7c..7c54b5362 100644
--- a/main/ui/src/main/resources/i18n/strings_nl.properties
+++ b/main/ui/src/main/resources/i18n/strings_nl.properties
@@ -158,7 +158,6 @@ main.dropZone.dropVault=Voeg deze kluis toe
 main.dropZone.unknownDragboardContent=Als u een kluis wilt toevoegen, sleep deze dan naar dit venster
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Klik hier om een kluis toe te voegen
-main.vaultlist.contextMenu.remove=Verwijder Kluis
 main.vaultlist.addVaultBtn=Kluis toevoegen
 ## Vault Detail
 ### Welcome
diff --git a/main/ui/src/main/resources/i18n/strings_nn.properties b/main/ui/src/main/resources/i18n/strings_nn.properties
index f9c88c993..e760ae3ab 100644
--- a/main/ui/src/main/resources/i18n/strings_nn.properties
+++ b/main/ui/src/main/resources/i18n/strings_nn.properties
@@ -169,7 +169,6 @@ main.dropZone.dropVault=Legg til denne kvelven
 main.dropZone.unknownDragboardContent=Viss du vil legga til ein kvelv, kan du dra det til dette vindauget
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Klikk her for å legga til ein kvelv
-main.vaultlist.contextMenu.remove=Fjern kvelv
 main.vaultlist.addVaultBtn=Legg til kvelv
 ## Vault Detail
 ### Welcome
@@ -192,6 +191,7 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator kunne ikkje finna ein kvelv på denne søkastien.
+main.vaultDetail.missing.recheck=Kontroller igjen
 ### Needs Migration
 main.vaultDetail.migrateButton=Oppgrader kvelv
 main.vaultDetail.migratePrompt=Kvelven din må oppgraderast til eit nytt format før du kan få tilgang til det
diff --git a/main/ui/src/main/resources/i18n/strings_pl.properties b/main/ui/src/main/resources/i18n/strings_pl.properties
index d011f4db8..9ae689c66 100644
--- a/main/ui/src/main/resources/i18n/strings_pl.properties
+++ b/main/ui/src/main/resources/i18n/strings_pl.properties
@@ -111,7 +111,7 @@ migration.run.enterPassword=Wprowadź hasło dla "%s"
 migration.run.startMigrationBtn=Aktualizuj sejf
 migration.run.progressHint=To może chwilę potrwać…
 ## Sucess
-migration.success.nextStepsInstructions=Aktualizacja "%s" zakończona pomyślnie. Możesz już odblokować swój sejf.
+migration.success.nextStepsInstructions=Aktualizacja "%s" zakończona pomyślnie.\nMożesz już odblokować swój sejf.
 migration.success.unlockNow=Odblokuj teraz
 ## Missing file system capabilities
 migration.error.missingFileSystemCapabilities.title=Nieobsługiwany system plików
@@ -130,6 +130,7 @@ preferences.title=Ustawienia
 ## General
 preferences.general=Ogólne
 preferences.general.theme=Interfejs
+preferences.general.theme.automatic=Automatycznie
 preferences.general.theme.light=Jasny
 preferences.general.theme.dark=Ciemny
 preferences.general.unlockThemes=Odblokuj tryb ciemny
@@ -169,7 +170,7 @@ main.dropZone.dropVault=Dodaj ten sejf
 main.dropZone.unknownDragboardContent=Jeśli chcesz dodać sejf, przeciągnij go do tego okna
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Kliknij tutaj, aby dodać sejf
-main.vaultlist.contextMenu.remove=Usuń sejf
+main.vaultlist.contextMenu.remove=Usuń sejf…
 main.vaultlist.addVaultBtn=Dodaj sejf
 ## Vault Detail
 ### Welcome
@@ -192,6 +193,9 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator nie mógł znaleźć sejfu w tej lokalizacji.
+main.vaultDetail.missing.recheck=Ponów próbę
+main.vaultDetail.missing.remove=Usuń z listy sejfów…
+main.vaultDetail.missing.changeLocation=Zmień lokalizację sejfu…
 ### Needs Migration
 main.vaultDetail.migrateButton=Aktualizuj sejf
 main.vaultDetail.migratePrompt=Twój sejf musi zostać zaktualizowany do nowego formatu, zanim będziesz mógł go używać
diff --git a/main/ui/src/main/resources/i18n/strings_pt.properties b/main/ui/src/main/resources/i18n/strings_pt.properties
index 5fae79003..d3c42e9a9 100644
--- a/main/ui/src/main/resources/i18n/strings_pt.properties
+++ b/main/ui/src/main/resources/i18n/strings_pt.properties
@@ -69,6 +69,7 @@ addvaultwizard.success.nextStepsInstructions=Adicionado cofre "%s".\nPrecisa de
 addvaultwizard.success.unlockNow=Destrancar agora
 
 # Remove Vault
+removeVault.title=Remover Cofre
 removeVault.confirmBtn=Remover Cofre
 
 # Change Password
diff --git a/main/ui/src/main/resources/i18n/strings_pt_BR.properties b/main/ui/src/main/resources/i18n/strings_pt_BR.properties
index 5b97e108a..56daf33fe 100644
--- a/main/ui/src/main/resources/i18n/strings_pt_BR.properties
+++ b/main/ui/src/main/resources/i18n/strings_pt_BR.properties
@@ -129,6 +129,7 @@ preferences.title=Preferências
 ## General
 preferences.general=Geral
 preferences.general.theme=Aparência
+preferences.general.theme.automatic=Automático
 preferences.general.theme.light=Claro
 preferences.general.theme.dark=Escuro
 preferences.general.unlockThemes=Desbloquear o modo escuro
@@ -168,7 +169,7 @@ main.dropZone.dropVault=Adicionar este cofre
 main.dropZone.unknownDragboardContent=Se você quer adicionar um cofre, arraste-o para esta janela
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Clique aqui para adicionar um cofre
-main.vaultlist.contextMenu.remove=Remover Cofre
+main.vaultlist.contextMenu.remove=Remover Cofre…
 main.vaultlist.addVaultBtn=Adicionar Cofre
 ## Vault Detail
 ### Welcome
@@ -189,6 +190,9 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=O Cryptomator não conseguiu encontrar um cofre neste caminho.
+main.vaultDetail.missing.recheck=Verificar novamente
+main.vaultDetail.missing.remove=Remover da lista de Cofres…
+main.vaultDetail.missing.changeLocation=Alterar Localização do Cofre…
 ### Needs Migration
 main.vaultDetail.migrateButton=Atualizar Cofre
 main.vaultDetail.migratePrompt=Seu cofre precisa ser atualizado para um novo formato antes de poder acessá-lo
diff --git a/main/ui/src/main/resources/i18n/strings_ru.properties b/main/ui/src/main/resources/i18n/strings_ru.properties
index 1d4c33b8f..842b33429 100644
--- a/main/ui/src/main/resources/i18n/strings_ru.properties
+++ b/main/ui/src/main/resources/i18n/strings_ru.properties
@@ -7,7 +7,7 @@ generic.button.back=Назад
 generic.button.cancel=Отмена
 generic.button.change=Изменить
 generic.button.close=Закрыть
-generic.button.copy=Скопировать
+generic.button.copy=Копировать
 generic.button.copied=Скопировано!
 generic.button.done=Готово
 generic.button.next=Далее
@@ -130,9 +130,10 @@ preferences.title=Настройки
 ## General
 preferences.general=Общие
 preferences.general.theme=Внешний вид
+preferences.general.theme.automatic=Автоматически
 preferences.general.theme.light=Светлая
 preferences.general.theme.dark=Тёмная
-preferences.general.unlockThemes=Разблокировать темный режим
+preferences.general.unlockThemes=Разблокировать тёмный режим
 preferences.general.startHidden=Скрывать окно при запуске Cryptomator
 preferences.general.debugLogging=Вести журнал отладки
 preferences.general.debugDirectory=Показать файлы журнала
@@ -169,11 +170,11 @@ main.dropZone.dropVault=Добавить это хранилище
 main.dropZone.unknownDragboardContent=Если вы хотите добавить хранилище, перетащите его в это окно
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Нажмите здесь, чтобы добавить хранилище
-main.vaultlist.contextMenu.remove=Удалить хранилище
+main.vaultlist.contextMenu.remove=Удалить хранилище…
 main.vaultlist.addVaultBtn=Добавить хранилище
 ## Vault Detail
 ### Welcome
-main.vaultDetail.welcomeOnboarding=Спасибо, что выбрали Cryptomator для защиты ваших файлов. Если вам нужна помощь, ознакомьтесь с нашими руководствами по началу работы:
+main.vaultDetail.welcomeOnboarding=Благодарим за выбор Cryptomator для защиты ваших файлов. Если требуется помощь, ознакомьтесь с документацией по началу работы:
 ### Locked
 main.vaultDetail.lockedStatus=ЗАБЛОКИРОВАНО
 main.vaultDetail.unlockBtn=Разблокировка…
@@ -192,6 +193,9 @@ main.vaultDetail.throughput.kbps=%.1f КиБ/с
 main.vaultDetail.throughput.mbps=%.1f МиБ/с
 ### Missing
 main.vaultDetail.missing.info=Cryptomator не смог найти хранилище по этому пути.
+main.vaultDetail.missing.recheck=Перепроверить
+main.vaultDetail.missing.remove=Удалить из списка хранилищ…
+main.vaultDetail.missing.changeLocation=Изменить расположение хранилища…
 ### Needs Migration
 main.vaultDetail.migrateButton=Обновить хранилище
 main.vaultDetail.migratePrompt=Чтобы получить доступ к хранилищу, его нужно преобразовать в новый формат
diff --git a/main/ui/src/main/resources/i18n/strings_sk.properties b/main/ui/src/main/resources/i18n/strings_sk.properties
index 5e4834175..3c0b6fc93 100644
--- a/main/ui/src/main/resources/i18n/strings_sk.properties
+++ b/main/ui/src/main/resources/i18n/strings_sk.properties
@@ -108,6 +108,7 @@ migration.success.unlockNow=Odomknúť teraz
 # Preferences
 preferences.title=Predvoľby
 ## General
+preferences.general.theme.automatic=Automaticky
 ## Volume
 ## Updates
 ## Donation Key
@@ -118,7 +119,7 @@ main.closeBtn.tooltip=Zavrieť
 main.preferencesBtn.tooltip=Predvoľby
 ## Drag 'n' Drop
 ## Vault List
-main.vaultlist.contextMenu.remove=Odstrániť trezor
+main.vaultlist.contextMenu.remove=Odstrániť peňaženku…
 main.vaultlist.addVaultBtn=Pridať trezor
 ## Vault Detail
 ### Welcome
@@ -129,6 +130,8 @@ main.vaultDetail.passwordSavedInKeychain=Heslo uložené
 ### Unlocked
 main.vaultDetail.lockBtn=Uzamknúť
 ### Missing
+main.vaultDetail.missing.recheck=Prekontrolovať
+main.vaultDetail.missing.remove=Odstrániť zo zoznamu peňaženky…
 ### Needs Migration
 
 # Wrong File Alert
diff --git a/main/ui/src/main/resources/i18n/strings_sv.properties b/main/ui/src/main/resources/i18n/strings_sv.properties
index f71a0b1de..75a63ee88 100644
--- a/main/ui/src/main/resources/i18n/strings_sv.properties
+++ b/main/ui/src/main/resources/i18n/strings_sv.properties
@@ -42,6 +42,7 @@ addvaultwizard.new.directoryPickerLabel=Anpassad plats
 addvaultwizard.new.directoryPickerButton=Välj…
 addvaultwizard.new.directoryPickerTitle=Välj katalog
 addvaultwizard.new.fileAlreadyExists=Valvet kan inte skapas på denna plats då vissa filer redan existerar.
+addvaultwizard.new.locationDoesNotExist=Valvet kan inte skapas på den här platsen då åtminstone en komponent inte finns.
 addvaultwizard.new.invalidName=Felaktigt namn på valvet. Vänligen ange ett vanligt katalognamn.
 ### Password
 addvaultwizard.new.createVaultBtn=Skapa Valv
@@ -168,7 +169,6 @@ main.dropZone.dropVault=Lägg till detta valv
 main.dropZone.unknownDragboardContent=Om du vill lägga till ett valv, dra in det till detta fönster
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Klicka här för att lägga till valv
-main.vaultlist.contextMenu.remove=Ta bort valv
 main.vaultlist.addVaultBtn=Lägg till valv
 ## Vault Detail
 ### Welcome
@@ -191,6 +191,8 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator kunde inte hitta ett valv i denna sökväg.
+main.vaultDetail.missing.recheck=Kontrollera igen
+main.vaultDetail.missing.changeLocation=Ändra valvets plats…
 ### Needs Migration
 main.vaultDetail.migrateButton=Uppgradera valv
 main.vaultDetail.migratePrompt=Ditt valv behöver uppgraderas till ett nytt format innan du kan använda det
diff --git a/main/ui/src/main/resources/i18n/strings_tr.properties b/main/ui/src/main/resources/i18n/strings_tr.properties
index b0df399f3..2abb261eb 100644
--- a/main/ui/src/main/resources/i18n/strings_tr.properties
+++ b/main/ui/src/main/resources/i18n/strings_tr.properties
@@ -130,6 +130,7 @@ preferences.title=Seçenekler
 ## General
 preferences.general=Genel
 preferences.general.theme=Görünüş ve Davranış
+preferences.general.theme.automatic=Otomatik
 preferences.general.theme.light=Açık
 preferences.general.theme.dark=Koyu
 preferences.general.unlockThemes=Koyu modun kilidini aç
@@ -169,7 +170,7 @@ main.dropZone.dropVault=Bu kasayı ekle
 main.dropZone.unknownDragboardContent=Bir kasa eklemek istiyorsanız, onu bu pencereye sürükleyin
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Kasa eklemek için buraya tıklayın
-main.vaultlist.contextMenu.remove=Kasayı Sil
+main.vaultlist.contextMenu.remove=Kasayı Sil…
 main.vaultlist.addVaultBtn=Kasa Ekle
 ## Vault Detail
 ### Welcome
@@ -192,6 +193,9 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Şifreleyici bu dosya yolunda bir kasa bulamadı.
+main.vaultDetail.missing.recheck=Yeniden denetle
+main.vaultDetail.missing.remove=Kasa Listesinden Sil…
+main.vaultDetail.missing.changeLocation=Kasa Yerini Değiştir…
 ### Needs Migration
 main.vaultDetail.migrateButton=Kasayı Güncelle
 main.vaultDetail.migratePrompt=Kasaya erişmeden önce kasanızın yeni bir formata yükseltilmesi gerekiyor
diff --git a/main/ui/src/main/resources/i18n/strings_zh.properties b/main/ui/src/main/resources/i18n/strings_zh.properties
index 927499897..90fe3c4ba 100644
--- a/main/ui/src/main/resources/i18n/strings_zh.properties
+++ b/main/ui/src/main/resources/i18n/strings_zh.properties
@@ -130,13 +130,14 @@ preferences.title=首选项
 ## General
 preferences.general=常规​​​​​
 preferences.general.theme=界面外观
+preferences.general.theme.automatic=自动
 preferences.general.theme.light=亮色
 preferences.general.theme.dark=暗色
 preferences.general.unlockThemes=解锁暗黑模式
 preferences.general.startHidden=最小化启动 Cryptomator 到系统托盘
 preferences.general.debugLogging=启用调试日志
 preferences.general.debugDirectory=显示日志文件
-preferences.general.autoStart=开机运行 Cryptomator
+preferences.general.autoStart=开机自动启动
 preferences.general.interfaceOrientation=界面方向
 preferences.general.interfaceOrientation.ltr=从左到右
 preferences.general.interfaceOrientation.rtl=从右到左
@@ -169,7 +170,6 @@ main.dropZone.dropVault=添加此保险库
 main.dropZone.unknownDragboardContent=如果您想要添加一个保险库，将其拖动到此窗口
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=点击此处添加一个保险库
-main.vaultlist.contextMenu.remove=删除保险库
 main.vaultlist.addVaultBtn=添加保险库
 ## Vault Detail
 ### Welcome
@@ -192,6 +192,8 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator在此路径找不到保险库
+main.vaultDetail.missing.recheck=重新检查
+main.vaultDetail.missing.changeLocation=更改保险库位置…
 ### Needs Migration
 main.vaultDetail.migrateButton=升级保险库
 main.vaultDetail.migratePrompt=您的保险库需要升级到新格式，然后才能访问
diff --git a/main/ui/src/main/resources/i18n/strings_zh_TW.properties b/main/ui/src/main/resources/i18n/strings_zh_TW.properties
index acd195148..de0bf6e3d 100644
--- a/main/ui/src/main/resources/i18n/strings_zh_TW.properties
+++ b/main/ui/src/main/resources/i18n/strings_zh_TW.properties
@@ -60,7 +60,7 @@ addvault.new.readme.storageLocation.6=如果您想加密檔案並檢視加密檔
 addvault.new.readme.storageLocation.7=1.  把這個加密檔案庫加進 Cryptomator。
 addvault.new.readme.storageLocation.8=2.  在 Cryptomator 中解鎖加密檔案庫。
 addvault.new.readme.storageLocation.9=3.  按「顯示」按鈕存取資料。
-addvault.new.readme.storageLocation.10=如果您需邀幫助，請參照這份文件：%s
+addvault.new.readme.storageLocation.10=如果您需要幫助，請參閱這份文件：%s
 addvault.new.readme.accessLocation.fileName=歡迎.rtf
 addvault.new.readme.accessLocation.1=🔐️  加密磁區  🔐️
 addvault.new.readme.accessLocation.2=這是您加密檔案庫的存取位置。
@@ -130,6 +130,7 @@ preferences.title=偏好
 ## General
 preferences.general=一般
 preferences.general.theme=外觀
+preferences.general.theme.automatic=自動
 preferences.general.theme.light=亮色
 preferences.general.theme.dark=暗色
 preferences.general.unlockThemes=解鎖暗色模式
@@ -169,7 +170,7 @@ main.dropZone.dropVault=加入這個加密檔案庫
 main.dropZone.unknownDragboardContent=如果您想加入一個加密檔案庫，請將他拖到這個視窗裡
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=點擊此處以加入加密檔案庫
-main.vaultlist.contextMenu.remove=移除加密檔案庫
+main.vaultlist.contextMenu.remove=移除加密檔案庫…
 main.vaultlist.addVaultBtn=新增加密檔案庫
 ## Vault Detail
 ### Welcome
@@ -192,6 +193,9 @@ main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator 無法在指定位置找到加密檔案庫。
+main.vaultDetail.missing.recheck=重新檢查
+main.vaultDetail.missing.remove=從加密檔案庫列表中移除…
+main.vaultDetail.missing.changeLocation=更改加密檔案庫位置…
 ### Needs Migration
 main.vaultDetail.migrateButton=升級加密檔案庫
 main.vaultDetail.migratePrompt=您必須先更新加密檔案庫才能存取內容

From 411aca8695c228295ed32560c7053917fe56ebf7 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Fri, 14 Aug 2020 12:30:12 +0200
Subject: [PATCH 055/169] preparing 1.5.7

---
 main/buildkit/pom.xml | 2 +-
 main/commons/pom.xml  | 2 +-
 main/keychain/pom.xml | 2 +-
 main/launcher/pom.xml | 2 +-
 main/pom.xml          | 2 +-
 main/ui/pom.xml       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml
index c86927d33..0d1ee6078 100644
--- a/main/buildkit/pom.xml
+++ b/main/buildkit/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
+		<version>1.5.7</version>
 	</parent>
 	<artifactId>buildkit</artifactId>
 	<packaging>pom</packaging>
diff --git a/main/commons/pom.xml b/main/commons/pom.xml
index 54e711559..e1707b3d6 100644
--- a/main/commons/pom.xml
+++ b/main/commons/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
+		<version>1.5.7</version>
 	</parent>
 	<artifactId>commons</artifactId>
 	<name>Cryptomator Commons</name>
diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml
index fd2b26c3a..db66faf35 100644
--- a/main/keychain/pom.xml
+++ b/main/keychain/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
+		<version>1.5.7</version>
 	</parent>
 	<artifactId>keychain</artifactId>
 	<name>System Keychain Access</name>
diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml
index 21a8f910c..e1d8f1550 100644
--- a/main/launcher/pom.xml
+++ b/main/launcher/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
+		<version>1.5.7</version>
 	</parent>
 	<artifactId>launcher</artifactId>
 	<name>Cryptomator Launcher</name>
diff --git a/main/pom.xml b/main/pom.xml
index 2b91c918d..2395fc725 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
-	<version>1.6.0-SNAPSHOT</version>
+	<version>1.5.7</version>
 	<packaging>pom</packaging>
 	<name>Cryptomator</name>
 
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index c27fbb1aa..cf2750852 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
+		<version>1.5.7</version>
 	</parent>
 	<artifactId>ui</artifactId>
 	<name>Cryptomator GUI</name>

From 4110057fa188bc07043ee68c6800a1eac9a4bfaf Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Thu, 13 Aug 2020 19:32:04 +0200
Subject: [PATCH 056/169] Refactored multiple classes

Refactored UnlockWorkflow, CustomMountPointChooser, DokanyVolume and UnlockInvalidMountPointController

Changed UnlockWorkflow#handleGenericError() to accept Throwables

Added check for parent to CustomMountPointChooser (when using FUSE on Win)

Removed legacy constant from DokanyVolume

Added asserts to UnlockInvalidMountPointController and UnlockWorkflow
---
 .../common/mountpoint/CustomMountPointChooser.java            | 4 ++++
 .../main/java/org/cryptomator/common/vaults/DokanyVolume.java | 1 -
 .../ui/unlock/UnlockInvalidMountPointController.java          | 1 +
 .../main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java   | 3 ++-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
index 3664fd72a..2a69b8cc3 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
@@ -46,6 +46,10 @@ public class CustomMountPointChooser implements MountPointChooser {
 			//This the case on Windows when using FUSE
 			//See https://github.com/billziss-gh/winfsp/issues/320
 
+			Path parent = mountPoint.getParent();
+			if (!Files.isDirectory(parent)) {
+				throw wrapAsIMPE(new NotDirectoryException(parent.toString()));
+			}
 			//We must use #notExists() here because notExists =/= !exists (see docs)
 			if (!Files.notExists(mountPoint, LinkOption.NOFOLLOW_LINKS)) {
 				//File exists OR can't be determined
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
index 69ff035de..becd3d7e8 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
@@ -22,7 +22,6 @@ import java.util.concurrent.ExecutorService;
 public class DokanyVolume implements Volume {
 
 	private static final Logger LOG = LoggerFactory.getLogger(DokanyVolume.class);
-	private static final int MAX_TMPMOUNTPOINT_CREATION_RETRIES = 10;
 
 	private static final String FS_TYPE_NAME = "Cryptomator File System";
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
index b34d62b03..a70f58311 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
@@ -40,6 +40,7 @@ public class UnlockInvalidMountPointController implements FxController {
 	public boolean getMustExist() {
 		MountPointRequirement requirement = vault.getMountPointRequirement();
 		assert requirement != MountPointRequirement.NONE; //An invalid MountPoint with no required MountPoint doesn't seem sensible
+		assert requirement != MountPointRequirement.PARENT_OPT_MOUNT_POINT; //Not implemented anywhere (yet)
 
 		return requirement == MountPointRequirement.EMPTY_MOUNT_POINT;
 	}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index 5d8cd6852..829f8f740 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -162,6 +162,7 @@ public class UnlockWorkflow extends Task<Boolean> {
 	private void handleInvalidMountPoint(InvalidMountPointException e) {
 		MountPointRequirement requirement = vault.getMountPointRequirement();
 		assert requirement != MountPointRequirement.NONE; //An invalid MountPoint with no required MountPoint doesn't seem sensible
+		assert requirement != MountPointRequirement.PARENT_OPT_MOUNT_POINT; //Not implemented anywhere (yet)
 
 		if (requirement == MountPointRequirement.EMPTY_MOUNT_POINT) {
 			LOG.error("Unlock failed. Mount point not an empty directory or doesn't exist: {}", e.getMessage());
@@ -174,7 +175,7 @@ public class UnlockWorkflow extends Task<Boolean> {
 		});
 	}
 
-	private void handleGenericError(Exception e) {
+	private void handleGenericError(Throwable e) {
 		LOG.error("Unlock failed for technical reasons.", e);
 		Platform.runLater(() -> {
 			errorComponent.cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene();

From 8c4d35d3db98c190861bfa5420a4f52036d2e510 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 18 Aug 2020 10:36:55 +0200
Subject: [PATCH 057/169] updated webdav dependencies

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

diff --git a/main/pom.xml b/main/pom.xml
index 2b91c918d..2637067c1 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -28,7 +28,7 @@
 		<cryptomator.jni.version>2.2.3</cryptomator.jni.version>
 		<cryptomator.fuse.version>1.2.3</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.1.15</cryptomator.dokany.version>
-		<cryptomator.webdav.version>1.0.11</cryptomator.webdav.version>
+		<cryptomator.webdav.version>1.0.12</cryptomator.webdav.version>
 
 		<!-- 3rd party dependencies -->
 		<javafx.version>14</javafx.version>

From 841d4eb9c78a67f77d8d646f1173f49d50fa6537 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Tue, 18 Aug 2020 13:59:37 +0200
Subject: [PATCH 058/169] updated third-party licenses

---
 .../main/resources/license/THIRD-PARTY.txt    | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt
index a988029e9..1914c284e 100644
--- a/main/ui/src/main/resources/license/THIRD-PARTY.txt
+++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt
@@ -33,17 +33,17 @@ Cryptomator uses 52 third-party dependencies under the following licenses:
 		- javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/)
 		- Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna)
 		- Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna)
-		- Apache Commons Lang (org.apache.commons:commons-lang3:3.10 - https://commons.apache.org/proper/commons-lang/)
+		- Apache Commons Lang (org.apache.commons:commons-lang3:3.11 - https://commons.apache.org/proper/commons-lang/)
 		- Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.13 - http://hc.apache.org/httpcomponents-core-ga)
-		- Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.21.0 - http://jackrabbit.apache.org/jackrabbit-webdav/)
-		- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.28.v20200408 - http://www.eclipse.org/jetty)
+		- Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.21.3 - http://jackrabbit.apache.org/jackrabbit-webdav/)
+		- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.31.v20200723 - http://www.eclipse.org/jetty)
 	BSD:
 		- asm (org.ow2.asm:asm:7.1 - http://asm.ow2.org/)
 		- asm-analysis (org.ow2.asm:asm-analysis:7.1 - http://asm.ow2.org/)
@@ -51,14 +51,14 @@ Cryptomator uses 52 third-party dependencies under the following licenses:
 		- asm-tree (org.ow2.asm:asm-tree:7.1 - http://asm.ow2.org/)
 		- asm-util (org.ow2.asm:asm-util:7.1 - http://asm.ow2.org/)
 	Eclipse Public License - Version 1.0:
-		- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.28.v20200408 - http://www.eclipse.org/jetty)
+		- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.31.v20200723 - http://www.eclipse.org/jetty)
 	Eclipse Public License - v 2.0:
 		- jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
 	GPLv2:

From 710c7d0da798243325468e0a21f424acf0f42288 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Tue, 18 Aug 2020 16:08:23 +0200
Subject: [PATCH 059/169] added button to main window title if debug mode is
 enabled, fixes #1065

---
 .../ui/controls/FontAwesome5Icon.java         |  1 +
 .../mainwindow/MainWindowTitleController.java | 21 ++++++++++++++++++-
 .../resources/fxml/main_window_title.fxml     |  8 +++++++
 .../main/resources/i18n/strings.properties    |  1 +
 4 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
index e3d3c30d9..f4d0d058a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java
@@ -6,6 +6,7 @@ package org.cryptomator.ui.controls;
 public enum FontAwesome5Icon {
 	ANCHOR("\uF13D"), //
 	ARROW_UP("\uF062"), //
+	BUG("\uF188"), //
 	CHECK("\uF00C"), //
 	COG("\uF013"), //
 	COGS("\uF085"), //
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java
index 53044e00a..1f8fbc271 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java
@@ -1,10 +1,12 @@
 package org.cryptomator.ui.mainwindow;
 
+import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.fxml.FXML;
 import javafx.scene.layout.HBox;
 import javafx.stage.Stage;
 import org.cryptomator.common.LicenseHolder;
+import org.cryptomator.common.settings.Settings;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.fxapp.UpdateChecker;
@@ -30,12 +32,14 @@ public class MainWindowTitleController implements FxController {
 	private final UpdateChecker updateChecker;
 	private final BooleanBinding updateAvailable;
 	private final LicenseHolder licenseHolder;
+	private final Settings settings;
+	private final BooleanBinding debugModeEnabled;
 
 	private double xOffset;
 	private double yOffset;
 
 	@Inject
-	MainWindowTitleController(AppLifecycleListener appLifecycle, @MainWindow Stage window, FxApplication application, @Named("trayMenuSupported") boolean minimizeToSysTray, UpdateChecker updateChecker, LicenseHolder licenseHolder) {
+	MainWindowTitleController(AppLifecycleListener appLifecycle, @MainWindow Stage window, FxApplication application, @Named("trayMenuSupported") boolean minimizeToSysTray, UpdateChecker updateChecker, LicenseHolder licenseHolder, Settings settings) {
 		this.appLifecycle = appLifecycle;
 		this.window = window;
 		this.application = application;
@@ -43,6 +47,8 @@ public class MainWindowTitleController implements FxController {
 		this.updateChecker = updateChecker;
 		this.updateAvailable = updateChecker.latestVersionProperty().isNotNull();
 		this.licenseHolder = licenseHolder;
+		this.settings = settings;
+		this.debugModeEnabled = Bindings.createBooleanBinding(this::isDebugModeEnabled, settings.debugMode());
 	}
 
 	@FXML
@@ -82,6 +88,11 @@ public class MainWindowTitleController implements FxController {
 		application.showPreferencesWindow(SelectedPreferencesTab.ANY);
 	}
 
+	@FXML
+	public void showGeneralPreferences() {
+		application.showPreferencesWindow(SelectedPreferencesTab.GENERAL);
+	}
+
 	@FXML
 	public void showDonationKeyPreferences() {
 		application.showPreferencesWindow(SelectedPreferencesTab.DONATION_KEY);
@@ -104,4 +115,12 @@ public class MainWindowTitleController implements FxController {
 	public boolean isMinimizeToSysTray() {
 		return minimizeToSysTray;
 	}
+
+	public BooleanBinding debugModeEnabledProperty() {
+		return debugModeEnabled;
+	}
+
+	public boolean isDebugModeEnabled() {
+		return settings.debugMode().get();
+	}
 }
diff --git a/main/ui/src/main/resources/fxml/main_window_title.fxml b/main/ui/src/main/resources/fxml/main_window_title.fxml
index 31965fea0..031e48b07 100644
--- a/main/ui/src/main/resources/fxml/main_window_title.fxml
+++ b/main/ui/src/main/resources/fxml/main_window_title.fxml
@@ -32,6 +32,14 @@
 				<Tooltip text="%main.donationKeyMissing.tooltip"/>
 			</tooltip>
 		</Button>
+		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#showGeneralPreferences" focusTraversable="false" visible="${controller.debugModeEnabled}">
+			<graphic>
+				<FontAwesome5IconView glyph="BUG" glyphSize="16"/>
+			</graphic>
+			<tooltip>
+				<Tooltip text="%main.debugModeEnabled.tooltip"/>
+			</tooltip>
+		</Button>
 		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#showPreferences" focusTraversable="false">
 			<graphic>
 				<StackPane>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 0338dbf31..3a6d25644 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -165,6 +165,7 @@ preferences.about=About
 main.closeBtn.tooltip=Close
 main.minimizeBtn.tooltip=Minimize
 main.preferencesBtn.tooltip=Preferences
+main.debugModeEnabled.tooltip=Debug mode is enabled
 main.donationKeyMissing.tooltip=Please consider donating
 ## Drag 'n' Drop
 main.dropZone.dropVault=Add this vault

From 6aa14fcfb11c2b52f34dae12fc45820d2b8b62dc Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Sun, 16 Aug 2020 18:42:59 +0200
Subject: [PATCH 060/169] Updated Errorhandling of UnlockWorkflow

---
 .../org/cryptomator/common/vaults/Vault.java  |  4 --
 .../cryptomator/ui/unlock/UnlockWorkflow.java | 47 +++++++++++++++----
 .../main/resources/i18n/strings.properties    |  2 +-
 3 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
index f4b3c6f4f..34433db0e 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
@@ -35,7 +35,6 @@ import javax.inject.Named;
 import javax.inject.Provider;
 import java.io.IOException;
 import java.nio.file.NoSuchFileException;
-import java.nio.file.NotDirectoryException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.EnumSet;
@@ -123,9 +122,6 @@ public class Vault {
 	}
 
 	public synchronized void unlock(CharSequence passphrase) throws CryptoException, IOException, VolumeException, InvalidMountPointException {
-		if (vaultSettings.useCustomMountPath().get() && Strings.isNullOrEmpty(vaultSettings.customMountPath().get())) {
-			throw new NotDirectoryException("");
-		}
 		CryptoFileSystem fs = getCryptoFileSystem(passphrase);
 		volume = volumeProvider.get();
 		volume.mount(fs, getEffectiveMountFlags());
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index 829f8f740..d216fc12b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -29,6 +29,7 @@ import javax.inject.Named;
 import java.io.IOException;
 import java.nio.CharBuffer;
 import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.NotDirectoryException;
 import java.util.Arrays;
 import java.util.Optional;
@@ -84,10 +85,6 @@ public class UnlockWorkflow extends Task<Boolean> {
 				cancel(false); // set Tasks state to cancelled
 				return false;
 			}
-		} catch (NotDirectoryException | DirectoryNotEmptyException thrown) {
-			InvalidMountPointException e = new InvalidMountPointException(thrown);
-			handleInvalidMountPoint(e);
-			throw e; // rethrow to trigger correct exception handling in Task
 		} catch (InvalidMountPointException e) {
 			handleInvalidMountPoint(e);
 			throw e; // rethrow to trigger correct exception handling in Task
@@ -159,17 +156,49 @@ public class UnlockWorkflow extends Task<Boolean> {
 		}
 	}
 
-	private void handleInvalidMountPoint(InvalidMountPointException e) {
+	private void handleInvalidMountPoint(InvalidMountPointException impExc) {
 		MountPointRequirement requirement = vault.getMountPointRequirement();
 		assert requirement != MountPointRequirement.NONE; //An invalid MountPoint with no required MountPoint doesn't seem sensible
 		assert requirement != MountPointRequirement.PARENT_OPT_MOUNT_POINT; //Not implemented anywhere (yet)
 
-		if (requirement == MountPointRequirement.EMPTY_MOUNT_POINT) {
-			LOG.error("Unlock failed. Mount point not an empty directory or doesn't exist: {}", e.getMessage());
-		} else {
-			LOG.error("Unlock failed. Mount point/folder already exists or parent folder doesn't exist: {}", e.getMessage());
+		Throwable cause = impExc.getCause();
+		//Cause is either null (cause the IMPE was thrown directly, e.g. because no MPC succeeded)
+		//or the cause was not an Exception (but some other kind of Throwable)
+		//Either way: Handle as generic error
+		if(!(cause instanceof Exception)) {
+			handleGenericError(impExc);
+			return;
 		}
 
+		//From here on handle the cause, not the caught exception
+		if(cause instanceof NotDirectoryException) {
+			if(requirement == MountPointRequirement.PARENT_NO_MOUNT_POINT) {
+				LOG.error("Unlock failed. Parent folder is missing: {}", cause.getMessage());
+			} else {
+				LOG.error("Unlock failed. Mountpoint doesn't exist (needs to be a folder): {}", cause.getMessage());
+			}
+			showInvalidMountPointScene();
+			return;
+		}
+
+		if(cause instanceof FileAlreadyExistsException) {
+			LOG.error("Unlock failed. Mountpoint already exists: {}", cause.getMessage());
+			showInvalidMountPointScene();
+			return;
+		}
+
+		if(cause instanceof DirectoryNotEmptyException) {
+			LOG.error("Unlock failed. Mountpoint not an empty directory: {}", cause.getMessage());
+			showInvalidMountPointScene();
+			return;
+		}
+
+		//Everything else (especially IOException) results in a generic error
+		//This must be done after the other exceptions because they extend IOException...
+		handleGenericError(cause);
+	}
+
+	private void showInvalidMountPointScene() {
 		Platform.runLater(() -> {
 			window.setScene(invalidMountPointScene.get());
 		});
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 8315d88a5..920fc1a39 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -101,7 +101,7 @@ unlock.success.rememberChoice=Remember choice, don't show this again
 unlock.success.revealBtn=Reveal Vault
 ## Invalid Mount Point
 unlock.error.invalidMountPoint.notExisting=Mount point is not an empty directory or doesn't exist: %s
-unlock.error.invalidMountPoint.existing=Mount point/folder already exists or parent folder doesn't exist: %s
+unlock.error.invalidMountPoint.existing=Mount point/folder already exists or parent folder is missing: %s
 
 # Migration
 migration.title=Upgrade Vault

From bbf9379f5646205da80c351be2331074ca0088ff Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Mon, 17 Aug 2020 22:02:01 +0200
Subject: [PATCH 061/169] Changed DokanyVolumes and FuseVolumes to use
 mountnames

Changed DokanyVolumes and FuseVolumes to use mountnames for automatic, folder-based mounting instead of ids.
---
 .../common/mountpoint/TemporaryMountPointChooser.java           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index 589c01872..7c3239fc1 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -39,7 +39,7 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 	public Optional<Path> chooseMountPoint() {
 		//Shouldn't throw, but let's keep #orElseThrow in case we made a mistake and the check in #isApplicable failed
 		Path parent = this.environment.getMountPointsDir().orElseThrow();
-		String basename = this.vault.getVaultSettings().getId();
+		String basename = this.vault.getVaultSettings().mountName().get();
 		for (int i = 0; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) {
 			Path mountPoint = parent.resolve(basename + "_" + i);
 			if (Files.notExists(mountPoint)) {

From 84fbf7392b6232a638680846189582bd0bb38be4 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 18 Aug 2020 16:55:14 +0200
Subject: [PATCH 062/169] Updated usage of FuseNotSupportedException

---
 .../main/java/org/cryptomator/common/vaults/FuseVolume.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index c15f73e4b..ad5128570 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -41,7 +41,7 @@ public class FuseVolume implements Volume {
 	}
 
 	@Override
-	public void mount(CryptoFileSystem fs, String mountFlags) throws InvalidMountPointException, FuseNotSupportedException, VolumeException {
+	public void mount(CryptoFileSystem fs, String mountFlags) throws InvalidMountPointException, VolumeException {
 		this.mountPoint = determineMountPoint();
 
 		mount(fs.getPath("/"), mountFlags);
@@ -71,7 +71,7 @@ public class FuseVolume implements Volume {
 					.withFlags(splitFlags(mountFlags)).withMountPoint(mountPoint) //
 					.build();
 			this.fuseMnt = mounter.mount(root, envVars);
-		} catch (CommandFailedException e) {
+		} catch (CommandFailedException | FuseNotSupportedException e) {
 			throw new VolumeException("Unable to mount Filesystem", e);
 		}
 	}

From f601ff4ce3bc0500998cc46a56d9de456d147f8b Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 18 Aug 2020 18:57:38 +0200
Subject: [PATCH 063/169] Moved #isSupported() in the file, moved
 #determineMountPoint()

---
 .../common/vaults/AbstractVolume.java         | 29 +++++++++++++++++
 .../common/vaults/DokanyVolume.java           | 31 ++++---------------
 .../cryptomator/common/vaults/FuseVolume.java | 21 +------------
 3 files changed, 36 insertions(+), 45 deletions(-)
 create mode 100644 main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
new file mode 100644
index 000000000..69fdfc8af
--- /dev/null
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
@@ -0,0 +1,29 @@
+package org.cryptomator.common.vaults;
+
+import com.google.common.base.Joiner;
+import com.google.common.collect.ImmutableSet;
+import org.cryptomator.common.mountpoint.InvalidMountPointException;
+import org.cryptomator.common.mountpoint.MountPointChooser;
+import org.cryptomator.cryptofs.CryptoFileSystem;
+
+import java.io.IOException;
+import java.nio.file.Path;
+import java.util.Optional;
+
+public abstract class AbstractVolume implements Volume {
+
+	public Path determineMountPoint() throws InvalidMountPointException {
+		for (MountPointChooser chooser : this.choosers) {
+			Optional<Path> chosenPath = chooser.chooseMountPoint();
+			if (chosenPath.isEmpty()) {
+				//Chooser was applicable, but couldn't find a feasible mountpoint
+				continue;
+			}
+			this.cleanupRequired = chooser.prepare(chosenPath.get()); //Fail entirely if an Exception occurs
+			this.usedChooser = chooser;
+			return chosenPath.get();
+		}
+		String tried = Joiner.on(", ").join(this.choosers.stream().map((mpc) -> mpc.getClass().getTypeName()).collect(ImmutableSet.toImmutableSet()));
+		throw new InvalidMountPointException(String.format("No feasible MountPoint found! Tried %s", tried));
+	}
+}
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
index becd3d7e8..f1f595429 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
@@ -1,7 +1,5 @@
 package org.cryptomator.common.vaults;
 
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableSet;
 import org.cryptomator.common.mountpoint.InvalidMountPointException;
 import org.cryptomator.common.mountpoint.MountPointChooser;
 import org.cryptomator.common.settings.VaultSettings;
@@ -19,7 +17,7 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
-public class DokanyVolume implements Volume {
+public class DokanyVolume extends AbstractVolume {
 
 	private static final Logger LOG = LoggerFactory.getLogger(DokanyVolume.class);
 
@@ -44,11 +42,6 @@ public class DokanyVolume implements Volume {
 		this.choosers = choosers;
 	}
 
-	@Override
-	public boolean isSupported() {
-		return DokanyVolume.isSupportedStatic();
-	}
-
 	@Override
 	public void mount(CryptoFileSystem fs, String mountFlags) throws InvalidMountPointException, VolumeException {
 		this.mountPoint = determineMountPoint();
@@ -63,23 +56,6 @@ public class DokanyVolume implements Volume {
 		}
 	}
 
-	private Path determineMountPoint() throws InvalidMountPointException {
-		for (MountPointChooser chooser : this.choosers) {
-			Optional<Path> chosenPath = chooser.chooseMountPoint();
-			if (chosenPath.isEmpty()) {
-				//Chooser was applicable, but couldn't find a feasible mountpoint
-				continue;
-			}
-			this.cleanupRequired = chooser.prepare(chosenPath.get()); //Fail entirely if an Exception occurs
-			this.usedChooser = chooser;
-			return chosenPath.get();
-		}
-		String tried = Joiner.on(", ").join(this.choosers.stream()
-				.map((mpc) -> mpc.getClass().getTypeName())
-				.collect(ImmutableSet.toImmutableSet()));
-		throw new InvalidMountPointException(String.format("No feasible MountPoint found! Tried %s", tried));
-	}
-
 	@Override
 	public void reveal() throws VolumeException {
 		boolean success = mount.reveal();
@@ -100,6 +76,11 @@ public class DokanyVolume implements Volume {
 		}
 	}
 
+	@Override
+	public boolean isSupported() {
+		return DokanyVolume.isSupportedStatic();
+	}
+
 	@Override
 	public Optional<Path> getMountPoint() {
 		return Optional.ofNullable(mountPoint);
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index ad5128570..eac288bcc 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -1,8 +1,6 @@
 package org.cryptomator.common.vaults;
 
-import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableSet;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.mountpoint.InvalidMountPointException;
 import org.cryptomator.common.mountpoint.MountPointChooser;
@@ -22,7 +20,7 @@ import java.nio.file.Path;
 import java.util.Optional;
 import java.util.Set;
 
-public class FuseVolume implements Volume {
+public class FuseVolume extends AbstractVolume {
 
 	private static final Logger LOG = LoggerFactory.getLogger(FuseVolume.class);
 
@@ -47,23 +45,6 @@ public class FuseVolume implements Volume {
 		mount(fs.getPath("/"), mountFlags);
 	}
 
-	private Path determineMountPoint() throws InvalidMountPointException {
-		for (MountPointChooser chooser : this.choosers) {
-			Optional<Path> chosenPath = chooser.chooseMountPoint();
-			if (chosenPath.isEmpty()) {
-				//Chooser was applicable, but couldn't find a feasible mountpoint
-				continue;
-			}
-			this.cleanupRequired = chooser.prepare(chosenPath.get()); //Fail entirely if an Exception occurs
-			this.usedChooser = chooser;
-			return chosenPath.get();
-		}
-		String tried = Joiner.on(", ").join(this.choosers.stream()
-				.map((mpc) -> mpc.getClass().getTypeName())
-				.collect(ImmutableSet.toImmutableSet()));
-		throw new InvalidMountPointException(String.format("No feasible MountPoint found! Tried %s", tried));
-	}
-
 	private void mount(Path root, String mountFlags) throws VolumeException {
 		try {
 			Mounter mounter = FuseMountFactory.getMounter();

From cbef54f05cb59f8ffe88c9a7bb6d6a3cb41c478b Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 18 Aug 2020 19:49:24 +0200
Subject: [PATCH 064/169] Added Logger, moved cleanup, moved choosing

---
 .../common/vaults/AbstractVolume.java         | 23 +++++++++++++++++--
 .../common/vaults/DokanyVolume.java           | 14 +----------
 .../cryptomator/common/vaults/FuseVolume.java | 14 +----------
 3 files changed, 23 insertions(+), 28 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
index 69fdfc8af..33741730d 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
@@ -4,14 +4,27 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableSet;
 import org.cryptomator.common.mountpoint.InvalidMountPointException;
 import org.cryptomator.common.mountpoint.MountPointChooser;
-import org.cryptomator.cryptofs.CryptoFileSystem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Optional;
+import java.util.Set;
 
 public abstract class AbstractVolume implements Volume {
 
+	private static final Logger LOG = LoggerFactory.getLogger(AbstractVolume.class);
+
+	private final Set<MountPointChooser> choosers;
+
+	//Cleanup
+	private boolean cleanupRequired;
+	private MountPointChooser usedChooser;
+
+	public AbstractVolume(Set<MountPointChooser> choosers) {
+		this.choosers = choosers;
+	}
+
 	public Path determineMountPoint() throws InvalidMountPointException {
 		for (MountPointChooser chooser : this.choosers) {
 			Optional<Path> chosenPath = chooser.chooseMountPoint();
@@ -26,4 +39,10 @@ public abstract class AbstractVolume implements Volume {
 		String tried = Joiner.on(", ").join(this.choosers.stream().map((mpc) -> mpc.getClass().getTypeName()).collect(ImmutableSet.toImmutableSet()));
 		throw new InvalidMountPointException(String.format("No feasible MountPoint found! Tried %s", tried));
 	}
+
+	public void cleanupMountPoint() {
+		if (this.cleanupRequired) {
+			this.usedChooser.cleanup(this.mountPoint);
+		}
+	}
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
index f1f595429..51a7dac0b 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
@@ -26,20 +26,14 @@ public class DokanyVolume extends AbstractVolume {
 	private final VaultSettings vaultSettings;
 	private final MountFactory mountFactory;
 
-	private final Set<MountPointChooser> choosers;
-
 	private Mount mount;
 	private Path mountPoint;
 
-	//Cleanup
-	private boolean cleanupRequired;
-	private MountPointChooser usedChooser;
-
 	@Inject
 	public DokanyVolume(VaultSettings vaultSettings, ExecutorService executorService, @Named("orderedValidMountPointChoosers") Set<MountPointChooser> choosers) {
+		super(choosers);
 		this.vaultSettings = vaultSettings;
 		this.mountFactory = new MountFactory(executorService);
-		this.choosers = choosers;
 	}
 
 	@Override
@@ -70,12 +64,6 @@ public class DokanyVolume extends AbstractVolume {
 		cleanupMountPoint();
 	}
 
-	private void cleanupMountPoint() {
-		if (this.cleanupRequired) {
-			this.usedChooser.cleanup(this.mountPoint);
-		}
-	}
-
 	@Override
 	public boolean isSupported() {
 		return DokanyVolume.isSupportedStatic();
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index eac288bcc..421471579 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -24,18 +24,12 @@ public class FuseVolume extends AbstractVolume {
 
 	private static final Logger LOG = LoggerFactory.getLogger(FuseVolume.class);
 
-	private final Set<MountPointChooser> choosers;
-
 	private Mount fuseMnt;
 	private Path mountPoint;
 
-	//Cleanup
-	private boolean cleanupRequired;
-	private MountPointChooser usedChooser;
-
 	@Inject
 	public FuseVolume(@Named("orderedValidMountPointChoosers") Set<MountPointChooser> choosers) {
-		this.choosers = choosers;
+		super(choosers);
 	}
 
 	@Override
@@ -98,12 +92,6 @@ public class FuseVolume extends AbstractVolume {
 		cleanupMountPoint();
 	}
 
-	private void cleanupMountPoint() {
-		if (this.cleanupRequired) {
-			this.usedChooser.cleanup(this.mountPoint);
-		}
-	}
-
 	@Override
 	public boolean isSupported() {
 		return FuseVolume.isSupportedStatic();

From 16462d05c8ac73ffa7f0356a1a6705094b818020 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 18 Aug 2020 19:04:18 +0200
Subject: [PATCH 065/169] Refactored changes, cleaned up

Changed visibility of methods
Removed Logger from AbstractVolume
Moved mountPoint and #getMountPoint()
Renamed fuseMnt to mount in FuseVol (as in DokanyVol)
Removed unnecessary mountPoint-field from WebDavVolume
---
 .../common/vaults/AbstractVolume.java         | 15 +++++++------
 .../common/vaults/DokanyVolume.java           |  8 -------
 .../cryptomator/common/vaults/FuseVolume.java | 21 +++++++------------
 .../common/vaults/WebDavVolume.java           |  3 +--
 4 files changed, 17 insertions(+), 30 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
index 33741730d..8b47ffe07 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
@@ -4,8 +4,6 @@ import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableSet;
 import org.cryptomator.common.mountpoint.InvalidMountPointException;
 import org.cryptomator.common.mountpoint.MountPointChooser;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.nio.file.Path;
 import java.util.Optional;
@@ -13,10 +11,10 @@ import java.util.Set;
 
 public abstract class AbstractVolume implements Volume {
 
-	private static final Logger LOG = LoggerFactory.getLogger(AbstractVolume.class);
-
 	private final Set<MountPointChooser> choosers;
 
+	protected Path mountPoint;
+
 	//Cleanup
 	private boolean cleanupRequired;
 	private MountPointChooser usedChooser;
@@ -25,7 +23,7 @@ public abstract class AbstractVolume implements Volume {
 		this.choosers = choosers;
 	}
 
-	public Path determineMountPoint() throws InvalidMountPointException {
+	protected Path determineMountPoint() throws InvalidMountPointException {
 		for (MountPointChooser chooser : this.choosers) {
 			Optional<Path> chosenPath = chooser.chooseMountPoint();
 			if (chosenPath.isEmpty()) {
@@ -40,9 +38,14 @@ public abstract class AbstractVolume implements Volume {
 		throw new InvalidMountPointException(String.format("No feasible MountPoint found! Tried %s", tried));
 	}
 
-	public void cleanupMountPoint() {
+	protected void cleanupMountPoint() {
 		if (this.cleanupRequired) {
 			this.usedChooser.cleanup(this.mountPoint);
 		}
 	}
+
+	@Override
+	public Optional<Path> getMountPoint() {
+		return Optional.ofNullable(mountPoint);
+	}
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
index 51a7dac0b..e65b3f0f9 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
@@ -12,8 +12,6 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
-import java.nio.file.Path;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
@@ -27,7 +25,6 @@ public class DokanyVolume extends AbstractVolume {
 	private final MountFactory mountFactory;
 
 	private Mount mount;
-	private Path mountPoint;
 
 	@Inject
 	public DokanyVolume(VaultSettings vaultSettings, ExecutorService executorService, @Named("orderedValidMountPointChoosers") Set<MountPointChooser> choosers) {
@@ -69,11 +66,6 @@ public class DokanyVolume extends AbstractVolume {
 		return DokanyVolume.isSupportedStatic();
 	}
 
-	@Override
-	public Optional<Path> getMountPoint() {
-		return Optional.ofNullable(mountPoint);
-	}
-
 	@Override
 	public MountPointRequirement getMountPointRequirement() {
 		return MountPointRequirement.EMPTY_MOUNT_POINT;
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index 421471579..8f1926f4a 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -17,15 +17,13 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import javax.inject.Named;
 import java.nio.file.Path;
-import java.util.Optional;
 import java.util.Set;
 
 public class FuseVolume extends AbstractVolume {
 
 	private static final Logger LOG = LoggerFactory.getLogger(FuseVolume.class);
 
-	private Mount fuseMnt;
-	private Path mountPoint;
+	private Mount mount;
 
 	@Inject
 	public FuseVolume(@Named("orderedValidMountPointChoosers") Set<MountPointChooser> choosers) {
@@ -45,7 +43,7 @@ public class FuseVolume extends AbstractVolume {
 			EnvironmentVariables envVars = EnvironmentVariables.create() //
 					.withFlags(splitFlags(mountFlags)).withMountPoint(mountPoint) //
 					.build();
-			this.fuseMnt = mounter.mount(root, envVars);
+			this.mount = mounter.mount(root, envVars);
 		} catch (CommandFailedException | FuseNotSupportedException e) {
 			throw new VolumeException("Unable to mount Filesystem", e);
 		}
@@ -58,7 +56,7 @@ public class FuseVolume extends AbstractVolume {
 	@Override
 	public void reveal() throws VolumeException {
 		try {
-			fuseMnt.revealInFileManager();
+			mount.revealInFileManager();
 		} catch (CommandFailedException e) {
 			LOG.debug("Revealing the vault in file manger failed: " + e.getMessage());
 			throw new VolumeException(e);
@@ -73,8 +71,8 @@ public class FuseVolume extends AbstractVolume {
 	@Override
 	public synchronized void unmountForced() throws VolumeException {
 		try {
-			fuseMnt.unmountForced();
-			fuseMnt.close();
+			mount.unmountForced();
+			mount.close();
 		} catch (CommandFailedException e) {
 			throw new VolumeException(e);
 		}
@@ -84,8 +82,8 @@ public class FuseVolume extends AbstractVolume {
 	@Override
 	public synchronized void unmount() throws VolumeException {
 		try {
-			fuseMnt.unmount();
-			fuseMnt.close();
+			mount.unmount();
+			mount.close();
 		} catch (CommandFailedException e) {
 			throw new VolumeException(e);
 		}
@@ -97,11 +95,6 @@ public class FuseVolume extends AbstractVolume {
 		return FuseVolume.isSupportedStatic();
 	}
 
-	@Override
-	public Optional<Path> getMountPoint() {
-		return Optional.ofNullable(mountPoint);
-	}
-
 	@Override
 	public MountPointRequirement getMountPointRequirement() {
 		return SystemUtils.IS_OS_WINDOWS ? MountPointRequirement.PARENT_NO_MOUNT_POINT : MountPointRequirement.EMPTY_MOUNT_POINT;
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
index a8e84c80c..ecdb31d88 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
@@ -27,7 +27,6 @@ public class WebDavVolume implements Volume {
 	private WebDavServer server;
 	private WebDavServletController servlet;
 	private Mounter.Mount mount;
-	private Path mountPoint;
 
 	@Inject
 	public WebDavVolume(Provider<WebDavServer> serverProvider, VaultSettings vaultSettings, Settings settings) {
@@ -98,7 +97,7 @@ public class WebDavVolume implements Volume {
 
 	@Override
 	public Optional<Path> getMountPoint() {
-		return Optional.ofNullable(mountPoint);
+		return Optional.empty();
 	}
 
 	@Override

From f45b78d8c060042ec444f92254e1e8707b1ad72e Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 19 Aug 2020 11:31:32 +0200
Subject: [PATCH 066/169] Removed accidental debugcode, updated lookup for
 env-var

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472848604
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472851003
---
 .../src/main/java/org/cryptomator/common/Environment.java   | 5 +++++
 .../cryptomator/ui/vaultoptions/MountOptionsController.java | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/Environment.java b/main/commons/src/main/java/org/cryptomator/common/Environment.java
index 890840b7d..d920b1b9f 100644
--- a/main/commons/src/main/java/org/cryptomator/common/Environment.java
+++ b/main/commons/src/main/java/org/cryptomator/common/Environment.java
@@ -40,6 +40,7 @@ public class Environment {
 		LOG.debug("cryptomator.mountPointsDir: {}", System.getProperty("cryptomator.mountPointsDir"));
 		LOG.debug("cryptomator.minPwLength: {}", System.getProperty("cryptomator.minPwLength"));
 		LOG.debug("cryptomator.buildNumber: {}", System.getProperty("cryptomator.buildNumber"));
+		LOG.debug("fuse.experimental: {}", Boolean.getBoolean("fuse.experimental"));
 	}
 
 	public boolean useCustomLogbackConfig() {
@@ -74,6 +75,10 @@ public class Environment {
 		return getInt("cryptomator.minPwLength", DEFAULT_MIN_PW_LENGTH);
 	}
 
+	public boolean useExperimentalFuse() {
+		return Boolean.getBoolean("fuse.experimental");
+	}
+
 	private int getInt(String propertyName, int defaultValue) {
 		String value = System.getProperty(propertyName);
 		try {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
index e9bb4f043..975f40bf3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
@@ -18,6 +18,7 @@ import javafx.stage.DirectoryChooser;
 import javafx.stage.Stage;
 import javafx.util.StringConverter;
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.Environment;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VolumeImpl;
 import org.cryptomator.common.vaults.Vault;
@@ -57,15 +58,14 @@ public class MountOptionsController implements FxController {
 	private final BooleanBinding fuseAndWindows;
 
 	@Inject
-	MountOptionsController(@VaultOptionsWindow Stage window, @VaultOptionsWindow Vault vault, Settings settings, WindowsDriveLetters windowsDriveLetters, ResourceBundle resourceBundle) {
+	MountOptionsController(@VaultOptionsWindow Stage window, @VaultOptionsWindow Vault vault, Settings settings, WindowsDriveLetters windowsDriveLetters, ResourceBundle resourceBundle, Environment environment) {
 		this.window = window;
 		this.vault = vault;
 		this.webDavAndWindows = settings.preferredVolumeImpl().isEqualTo(VolumeImpl.WEBDAV).and(osIsWindows);
 		this.windowsDriveLetters = windowsDriveLetters;
 		this.resourceBundle = resourceBundle;
 
-		System.out.println(Boolean.getBoolean("fuse.experimental"));
-		this.fuseAndWindows = settings.preferredVolumeImpl().isEqualTo(VolumeImpl.FUSE).and(osIsWindows).and(new SimpleBooleanProperty(!Boolean.getBoolean("fuse.experimental")));
+		this.fuseAndWindows = settings.preferredVolumeImpl().isEqualTo(VolumeImpl.FUSE).and(osIsWindows).and(new SimpleBooleanProperty(!environment.useExperimentalFuse()));
 	}
 
 	@FXML

From ea6925f9056bf0763ff6bdb255a5cae3d6600acb Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 19 Aug 2020 11:39:34 +0200
Subject: [PATCH 067/169] Replaced #wrapAsIMPE() with explicit call to IMPExc

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472872373 https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472859488 https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472827776
---
 .../common/mountpoint/CustomMountPointChooser.java | 14 +++++---------
 .../mountpoint/TemporaryMountPointChooser.java     |  6 +-----
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
index 2a69b8cc3..a186696cd 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
@@ -48,33 +48,29 @@ public class CustomMountPointChooser implements MountPointChooser {
 
 			Path parent = mountPoint.getParent();
 			if (!Files.isDirectory(parent)) {
-				throw wrapAsIMPE(new NotDirectoryException(parent.toString()));
+				throw new InvalidMountPointException(new NotDirectoryException(parent.toString()));
 			}
 			//We must use #notExists() here because notExists =/= !exists (see docs)
 			if (!Files.notExists(mountPoint, LinkOption.NOFOLLOW_LINKS)) {
 				//File exists OR can't be determined
-				throw wrapAsIMPE(new FileAlreadyExistsException(mountPoint.toString()));
+				throw new InvalidMountPointException(new FileAlreadyExistsException(mountPoint.toString()));
 			}
 		} else if(requirement == MountPointRequirement.EMPTY_MOUNT_POINT) {
 			//This is the case for Windows when using Dokany
 			//and for Linux and Mac
 
 			if (!Files.isDirectory(mountPoint)) {
-				throw wrapAsIMPE(new NotDirectoryException(mountPoint.toString()));
+				throw new InvalidMountPointException(new NotDirectoryException(mountPoint.toString()));
 			}
 			try (DirectoryStream<Path> ds = Files.newDirectoryStream(mountPoint)) {
 				if (ds.iterator().hasNext()) {
-					throw wrapAsIMPE(new DirectoryNotEmptyException(mountPoint.toString()));
+					throw new InvalidMountPointException(new DirectoryNotEmptyException(mountPoint.toString()));
 				}
 			} catch (IOException exception) {
-				throw wrapAsIMPE(exception);
+				throw new InvalidMountPointException(exception);
 			}
 		}
 		LOG.debug("Successfully checked custom mount point: {}", mountPoint);
 		return false;
 	}
-
-	private InvalidMountPointException wrapAsIMPE(Exception exception) {
-		return new InvalidMountPointException(exception);
-	}
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index 7c3239fc1..f1dccce06 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -72,7 +72,7 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 				return true;
 			}
 		} catch (IOException exception) {
-			throw wrapAsIMPE(exception);
+			throw new InvalidMountPointException(exception);
 		}
 	}
 
@@ -85,8 +85,4 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 			LOG.warn("Could not delete mount point: {}", e.getMessage());
 		}
 	}
-
-	private InvalidMountPointException wrapAsIMPE(Exception exception) {
-		return new InvalidMountPointException(exception);
-	}
 }

From 3ecc0cf9060d670b30a27410279dde3080056485 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 19 Aug 2020 14:43:18 +0200
Subject: [PATCH 068/169] Cleaned up MountPointRequirement

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472827299
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472826920
---
 .../common/vaults/MountPointRequirement.java           | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/MountPointRequirement.java b/main/commons/src/main/java/org/cryptomator/common/vaults/MountPointRequirement.java
index 192079220..84a798e59 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/MountPointRequirement.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/MountPointRequirement.java
@@ -22,15 +22,7 @@ public enum MountPointRequirement {
 	PARENT_OPT_MOUNT_POINT,
 
 	/**
-	 * The actual Mountpoint must exist, must be empty and the parent must exist aswell.
+	 * The actual Mountpoint must exist and must be empty.
 	 */
 	EMPTY_MOUNT_POINT;
-
-//	/**
-//	 * The actual Mountpoint must exist and may contain files.
-//	 */
-//	MOUNT_POINT;
-
-
-
 }
\ No newline at end of file

From bd854e7f7acb32f121731fb6386ac17d52424cfc Mon Sep 17 00:00:00 2001
From: Martin Beyer <martin.beyer@skymatic.de>
Date: Wed, 19 Aug 2020 15:31:42 +0200
Subject: [PATCH 069/169] updates secret-service for linux keychains and fixes
 #1268

---
 .../keychain/LinuxSecretServiceKeychainAccessImpl.java    | 3 +++
 main/pom.xml                                              | 2 +-
 main/ui/src/main/resources/license/THIRD-PARTY.txt        | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java
index 675992e5c..48b76fccb 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java
@@ -28,6 +28,9 @@ class LinuxSecretServiceKeychainAccessImpl implements KeychainAccessStrategy {
 			if (list == null) {
 				keyring.createItem(LABEL_FOR_SECRET_IN_KEYRING, passphrase, createAttributes(key));
 			}
+			else {
+				changePassphrase(key, passphrase);
+			}
 		} catch (IOException e) {
 			throw new KeychainAccessException(e);
 		}
diff --git a/main/pom.xml b/main/pom.xml
index 2637067c1..0e9dd8a26 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -33,7 +33,7 @@
 		<!-- 3rd party dependencies -->
 		<javafx.version>14</javafx.version>
 		<commons-lang3.version>3.11</commons-lang3.version>
-		<secret-service.version>1.0.0</secret-service.version>
+		<secret-service.version>1.1.0</secret-service.version>
 		<jwt.version>3.10.3</jwt.version>
 		<easybind.version>1.0.3</easybind.version>
 		<guava.version>29.0-jre</guava.version>
diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt
index 1914c284e..58a034c81 100644
--- a/main/ui/src/main/resources/license/THIRD-PARTY.txt
+++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt
@@ -17,9 +17,9 @@ Cryptomator uses 52 third-party dependencies under the following licenses:
 		- jffi (com.github.jnr:jffi:1.2.23 - http://github.com/jnr/jffi)
 		- jnr-a64asm (com.github.jnr:jnr-a64asm:1.0.0 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm)
 		- jnr-constants (com.github.jnr:jnr-constants:0.9.15 - http://github.com/jnr/jnr-constants)
-		- jnr-enxio (com.github.jnr:jnr-enxio:0.21 - http://github.com/jnr/jnr-enxio)
+		- jnr-enxio (com.github.jnr:jnr-enxio:0.28 - http://github.com/jnr/jnr-enxio)
 		- jnr-ffi (com.github.jnr:jnr-ffi:2.1.12 - http://github.com/jnr/jnr-ffi)
-		- jnr-unixsocket (com.github.jnr:jnr-unixsocket:0.23 - http://github.com/jnr/jnr-unixsocket)
+		- jnr-unixsocket (com.github.jnr:jnr-unixsocket:0.33 - http://github.com/jnr/jnr-unixsocket)
 		- FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/)
 		- Gson (com.google.code.gson:gson:2.8.6 - https://github.com/google/gson/gson)
 		- Dagger (com.google.dagger:dagger:2.22 - https://github.com/google/dagger)
@@ -70,7 +70,7 @@ Cryptomator uses 52 third-party dependencies under the following licenses:
 		- javafx-fxml (org.openjfx:javafx-fxml:14 - https://openjdk.java.net/projects/openjfx/javafx-fxml/)
 		- javafx-graphics (org.openjfx:javafx-graphics:14 - https://openjdk.java.net/projects/openjfx/javafx-graphics/)
 	LGPL 2.1:
-		- dbus-java (com.github.hypfvieh:dbus-java:3.2.1 - https://github.com/hypfvieh/dbus-java/dbus-java)
+		- dbus-java (com.github.hypfvieh:dbus-java:3.2.3 - https://github.com/hypfvieh/dbus-java/dbus-java)
 		- jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
 		- Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna)
 		- Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna)
@@ -80,7 +80,7 @@ Cryptomator uses 52 third-party dependencies under the following licenses:
 		- jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - http://github.com/jnr/jnr-x86asm)
 		- jnr-fuse (com.github.serceman:jnr-fuse:0.5.4 - no url defined)
 		- zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - https://github.com/nulab/zxcvbn4j)
-		- secret-service (de.swiesend:secret-service:1.0.0 - https://github.com/swiesend/secret-service)
+		- secret-service (de.swiesend:secret-service:1.1.0 - https://github.com/swiesend/secret-service)
 		- Checker Qual (org.checkerframework:checker-qual:2.11.1 - https://checkerframework.org)
 		- SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org)
 	The BSD 2-Clause License:

From 58ce1e45b85189301576daccfa160c12a6389aaf Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 19 Aug 2020 15:27:07 +0200
Subject: [PATCH 070/169] Updated Codestyle to not use any arrangements

---
 .idea/codeStyles/Project.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index d6cb2c866..0c9e1cbd8 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -36,6 +36,9 @@
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />
       </indentOptions>
+      <arrangement>
+        <rules />
+      </arrangement>
     </codeStyleSettings>
     <codeStyleSettings language="JSON">
       <indentOptions>

From 1ef359e68b005964ed7e5ebcee4cb3be24c1ee07 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 19 Aug 2020 15:45:54 +0200
Subject: [PATCH 071/169] Added messages to rethrown IOExceptions

---
 .../cryptomator/common/mountpoint/CustomMountPointChooser.java  | 2 +-
 .../common/mountpoint/TemporaryMountPointChooser.java           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
index a186696cd..55ad471ad 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
@@ -67,7 +67,7 @@ public class CustomMountPointChooser implements MountPointChooser {
 					throw new InvalidMountPointException(new DirectoryNotEmptyException(mountPoint.toString()));
 				}
 			} catch (IOException exception) {
-				throw new InvalidMountPointException(exception);
+				throw new InvalidMountPointException("IOException while checking folder content", exception);
 			}
 		}
 		LOG.debug("Successfully checked custom mount point: {}", mountPoint);
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index f1dccce06..5924bf2ef 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -72,7 +72,7 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 				return true;
 			}
 		} catch (IOException exception) {
-			throw new InvalidMountPointException(exception);
+			throw new InvalidMountPointException("IOException while preparing mountpoint", exception);
 		}
 	}
 

From 0f56d424da63aee65ed9349ea2cd86739601f9ff Mon Sep 17 00:00:00 2001
From: infeo <armin.schrenk@zoho.eu>
Date: Thu, 20 Aug 2020 12:18:57 +0200
Subject: [PATCH 072/169] Refactored AutoStartStrategy: * prevented on best
 effort basis inconsistent states * extracted the registry setting as an own
 strategy (by methods) * refactored the overriden methods to call the
 strategies (registry or folder) depending on the different variables *
 removed Powershell specific ToggleException * added documentation

---
 .../ui/preferences/AutoStartStrategy.java     |   7 -
 .../ui/preferences/AutoStartWinStrategy.java  | 181 +++++++++++++-----
 2 files changed, 132 insertions(+), 56 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java
index 10a431e1f..99b21b4cd 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java
@@ -21,11 +21,4 @@ public interface AutoStartStrategy {
 		}
 		
 	}
-	class TogglingAutoStartWithPowershellFailedException extends TogglingAutoStartFailedException {
-
-		public TogglingAutoStartWithPowershellFailedException(String message, Throwable cause) {
-			super(message, cause);
-		}
-
-	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
index 02e4faa26..0d2f20536 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
@@ -1,87 +1,185 @@
 package org.cryptomator.ui.preferences;
 
-import org.cryptomator.common.Environment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
+/**
+ * OS specific class to check, en- and disable the auto start on Windows.
+ * <p>
+ * Two strategies are implemented for this feature, the first uses the registry and the second one the autostart folder.
+ * <p>
+ * To check if it is enabled at all, both locations are checked.
+ * To enable it, first the registry is tried and only on failure the autostart folder is used.
+ * To disable it, first it is determined, which strategies must be used and in the second step those are executed.
+ *
+ * @apiNote This class is not thread safe, hence it should be avoided to be used simultaniously by the same threads.
+ */
 class AutoStartWinStrategy implements AutoStartStrategy {
 
 	private static final Logger LOG = LoggerFactory.getLogger(AutoStartWinStrategy.class);
 	private static final String HKCU_AUTOSTART_KEY = "\"HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run\"";
 	private static final String AUTOSTART_VALUE = "Cryptomator";
+	private static final String WINDOWS_START_MENU_ENTRY = "\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\\Cryptomator.lnk";
+
 	private final String exePath;
-	private static final String WINDOWS_START_MENU_FOLDER = "\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs";
+
+	private boolean activatedOverFolder;
+	private boolean activatedOverRegistry;
 
 	public AutoStartWinStrategy(String exePath) {
 		this.exePath = exePath;
+		this.activatedOverFolder = false;
+		this.activatedOverRegistry = false;
 	}
 
 	@Override
 	public CompletionStage<Boolean> isAutoStartEnabled() {
+		return isAutoStartEnabledOverRegistry().thenCombine(isAutoStartEnabledOverFolder(), (bReg, bFolder) -> bReg || bFolder);
+	}
+
+	private CompletableFuture<Boolean> isAutoStartEnabledOverFolder() {
+		Path autoStartEntry = Path.of(System.getProperty("user.home") + WINDOWS_START_MENU_ENTRY);
+		this.activatedOverFolder = Files.exists(autoStartEntry);
+		return CompletableFuture.completedFuture(activatedOverFolder);
+	}
+
+	private CompletableFuture<Boolean> isAutoStartEnabledOverRegistry() {
 		ProcessBuilder regQuery = new ProcessBuilder("reg", "query", HKCU_AUTOSTART_KEY, //
 				"/v", AUTOSTART_VALUE);
 		try {
 			Process proc = regQuery.start();
-			return proc.onExit().thenApply(p -> p.exitValue() == 0);
+			return proc.onExit().thenApply(p -> {
+				this.activatedOverRegistry = p.exitValue() == 0;
+				return activatedOverRegistry;
+			});
 		} catch (IOException e) {
-			LOG.warn("Failed to query {} from registry key {}", AUTOSTART_VALUE, HKCU_AUTOSTART_KEY);
+			LOG.debug("Failed to query {} from registry key {}", AUTOSTART_VALUE, HKCU_AUTOSTART_KEY);
 			return CompletableFuture.completedFuture(false);
 		}
 	}
 
 	@Override
 	public void enableAutoStart() throws TogglingAutoStartFailedException {
+		try {
+			enableAutoStartOverRegistry().thenAccept((Void v) -> this.activatedOverRegistry = true).exceptionallyCompose(e -> {
+				LOG.debug("Falling back to using autostart folder.");
+				return this.enableAutoStartOverFolder();
+			}).thenAccept((Void v) -> this.activatedOverFolder = true).get();
+		} catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
+			throw new TogglingAutoStartFailedException("Execution of enabling auto start setting was interrupted.");
+		} catch (ExecutionException e) {
+			throw new TogglingAutoStartFailedException("Enabling auto start failed both over registry and auto start folder.");
+		}
+	}
+
+	private CompletableFuture<Void> enableAutoStartOverRegistry() {
 		ProcessBuilder regAdd = new ProcessBuilder("reg", "add", HKCU_AUTOSTART_KEY, //
 				"/v", AUTOSTART_VALUE, //
 				"/t", "REG_SZ", //
 				"/d", "\"" + exePath + "\"", //
 				"/f");
-		String command = regAdd.command().stream().collect(Collectors.joining(" "));
 		try {
 			Process proc = regAdd.start();
-			boolean finishedInTime = waitForProcess(proc, 5, TimeUnit.SECONDS);
+			boolean finishedInTime = waitForProcessOrCancel(proc, 5, TimeUnit.SECONDS);
 			if (finishedInTime && proc.exitValue() == 0) {
 				LOG.debug("Added {} to registry key {}.", AUTOSTART_VALUE, HKCU_AUTOSTART_KEY);
+				return CompletableFuture.completedFuture(null);
 			} else {
-				LOG.debug("Registry could not be edited. Error code was {}.", proc.exitValue());
-				addShortcutOfAppToAutostartFolder();
-				throw new TogglingAutoStartFailedException("Adding registry value failed.");
+				throw new IOException("Process existed with error code " + proc.exitValue());
 			}
 		} catch (IOException e) {
-			addShortcutOfAppToAutostartFolder();
-			throw new TogglingAutoStartFailedException("Adding registry value failed. " + command, e);
+			LOG.debug("Registry could not be edited to set auto start.", e);
+			return CompletableFuture.failedFuture(new SystemCommandException("Adding registry value failed."));
 		}
 	}
 
+	private CompletableFuture<Void> enableAutoStartOverFolder() {
+		String autoStartFolderEntry = System.getProperty("user.home") + WINDOWS_START_MENU_ENTRY;
+		String createShortcutCommand = "$s=(New-Object -COM WScript.Shell).CreateShortcut('" + autoStartFolderEntry + "');$s.TargetPath='" + exePath + "';$s.Save();";
+		ProcessBuilder shortcutAdd = new ProcessBuilder("cmd", "/c", "Start powershell " + createShortcutCommand);
+		try {
+			Process proc = shortcutAdd.start();
+			boolean finishedInTime = waitForProcessOrCancel(proc, 5, TimeUnit.SECONDS);
+			if (finishedInTime && proc.exitValue() == 0) {
+				LOG.debug("Created file {} for auto start.", autoStartFolderEntry);
+				return CompletableFuture.completedFuture(null);
+			} else {
+				throw new IOException("Process existed with error code " + proc.exitValue());
+			}
+		} catch (IOException e) {
+			LOG.debug("Adding entry to auto start folder failed.", e);
+			return CompletableFuture.failedFuture(new SystemCommandException("Adding entry to auto start folder failed."));
+		}
+	}
+
+
 	@Override
 	public void disableAutoStart() throws TogglingAutoStartFailedException {
-		ProcessBuilder regRemove = new ProcessBuilder("reg", "delete", HKCU_AUTOSTART_KEY, //
-				"/v", AUTOSTART_VALUE, //
-				"/f");
-		String command = regRemove.command().stream().collect(Collectors.joining(" "));
-		try {
-			Process proc = regRemove.start();
-			boolean finishedInTime = waitForProcess(proc, 5, TimeUnit.SECONDS);
-			if (finishedInTime && proc.exitValue() == 0) {
-				LOG.debug("Removed {} from registry key {}.", AUTOSTART_VALUE, HKCU_AUTOSTART_KEY);
-			} else {
-				LOG.debug("Registry could not be edited. Error code was {}.", proc.exitValue());
-				removeShortcutOfAppFromAutostartFolder();
-				throw new TogglingAutoStartFailedException("Removing registry value failed.");
-			}
-		} catch (IOException e) {
-			removeShortcutOfAppFromAutostartFolder();
-			throw new TogglingAutoStartFailedException("Removing registry value failed. " + command, e);
+		if (activatedOverRegistry) {
+			disableAutoStartOverRegistry().whenComplete((voit, ex) -> {
+				if (ex == null) {
+					this.activatedOverRegistry = false;
+				}
+			});
+		}
+
+		if (activatedOverFolder) {
+			disableAutoStartOverFolder().whenComplete((voit, ex) -> {
+				if (ex == null) {
+					this.activatedOverFolder = false;
+				}
+			});
+		}
+
+		if (activatedOverRegistry || activatedOverFolder) {
+			throw new TogglingAutoStartFailedException("Disabling auto start failed both over registry and auto start folder.");
 		}
 	}
 
-	private static boolean waitForProcess(Process proc, int timeout, TimeUnit timeUnit) {
+	public CompletableFuture<Void> disableAutoStartOverRegistry() {
+		ProcessBuilder regRemove = new ProcessBuilder("reg", "delete", HKCU_AUTOSTART_KEY, //
+				"/v", AUTOSTART_VALUE, //
+				"/f");
+		try {
+			Process proc = regRemove.start();
+			boolean finishedInTime = waitForProcessOrCancel(proc, 5, TimeUnit.SECONDS);
+			if (finishedInTime && proc.exitValue() == 0) {
+				LOG.debug("Removed {} from registry key {}.", AUTOSTART_VALUE, HKCU_AUTOSTART_KEY);
+				return CompletableFuture.completedFuture(null);
+			} else {
+				throw new IOException("Process existed with error code " + proc.exitValue());
+			}
+		} catch (IOException e) {
+			LOG.debug("Registry could not be edited to remove auto start.", e);
+			return CompletableFuture.failedFuture(new SystemCommandException("Removing registry value failed."));
+		}
+	}
+
+	private CompletableFuture<Void> disableAutoStartOverFolder() {
+		try {
+			Files.delete(Path.of(WINDOWS_START_MENU_ENTRY));
+			LOG.debug("Successfully deleted {}.", WINDOWS_START_MENU_ENTRY);
+			return CompletableFuture.completedFuture(null);
+		} catch (NoSuchFileException e) {
+			//that is also okay
+			return CompletableFuture.completedFuture(null);
+		} catch (IOException e) {
+			LOG.debug("Failed to delete entry from auto start folder.", e);
+			return CompletableFuture.failedFuture(e);
+		}
+	}
+
+	private static boolean waitForProcessOrCancel(Process proc, int timeout, TimeUnit timeUnit) {
 		boolean finishedInTime = false;
 		try {
 			finishedInTime = proc.waitFor(timeout, timeUnit);
@@ -96,26 +194,11 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 		return finishedInTime;
 	}
 
-	private void addShortcutOfAppToAutostartFolder() throws TogglingAutoStartWithPowershellFailedException {
-		String startMenuDirectory = System.getProperty("user.home") + WINDOWS_START_MENU_FOLDER + "\\Cryptomator.lnk";
-		String createShortcutCommand = "$s=(New-Object -COM WScript.Shell).CreateShortcut('" + startMenuDirectory + "');$s.TargetPath='" + exePath + "';$s.Save();";
-		ProcessBuilder shortcutAdd = new ProcessBuilder("cmd", "/c", "Start powershell " + createShortcutCommand);
-		try {
-			shortcutAdd.start();
-		} catch (IOException e) {
-			throw new TogglingAutoStartWithPowershellFailedException("Adding shortcut to autostart folder failed.", e);
+	public class SystemCommandException extends RuntimeException {
+
+		public SystemCommandException(String msg) {
+			super(msg);
 		}
 	}
 
-	private void removeShortcutOfAppFromAutostartFolder() throws TogglingAutoStartWithPowershellFailedException {
-		String startMenuDirectory = System.getProperty("user.home") + WINDOWS_START_MENU_FOLDER + "\\Cryptomator.lnk";
-		ProcessBuilder shortcutRemove = new ProcessBuilder("cmd", "/c del \"" + startMenuDirectory + "\"");
-		try {
-			shortcutRemove.start();
-		} catch (IOException e) {
-			throw new TogglingAutoStartWithPowershellFailedException("Removing shortcut from autostart folder failed.", e);
-		}
-	}
-
-
 }

From 921b70ebaa21ffa963164a3d56062336ab18082f Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 18 Aug 2020 10:36:55 +0200
Subject: [PATCH 073/169] updated webdav dependencies

(cherry picked from commit 8c4d35d3db98c190861bfa5420a4f52036d2e510)
---
 main/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/pom.xml b/main/pom.xml
index 5f0d7e5ea..9a55f782a 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -28,7 +28,7 @@
 		<cryptomator.jni.version>2.2.2</cryptomator.jni.version>
 		<cryptomator.fuse.version>1.2.3</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.1.15</cryptomator.dokany.version>
-		<cryptomator.webdav.version>1.0.11</cryptomator.webdav.version>
+		<cryptomator.webdav.version>1.0.12</cryptomator.webdav.version>
 
 		<!-- 3rd party dependencies -->
 		<javafx.version>14</javafx.version>

From 1d38ee2fcb620abf8b8d3f60133d740d97c4faab Mon Sep 17 00:00:00 2001
From: infeo <armin.schrenk@zoho.eu>
Date: Thu, 20 Aug 2020 13:49:31 +0200
Subject: [PATCH 074/169] Further improvements: * corrected bad english *
 improved documentation * restricted visibility of specific exception

---
 .../ui/preferences/AutoStartWinStrategy.java  | 67 ++++++++++---------
 1 file changed, 35 insertions(+), 32 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
index 0d2f20536..3f51af849 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
@@ -17,11 +17,14 @@ import java.util.concurrent.TimeUnit;
  * <p>
  * Two strategies are implemented for this feature, the first uses the registry and the second one the autostart folder.
  * <p>
- * To check if it is enabled at all, both locations are checked.
- * To enable it, first the registry is tried and only on failure the autostart folder is used.
- * To disable it, first it is determined, which strategies must be used and in the second step those are executed.
+ * The registry strategy checks/add/removes at the registry key {@value HKCU_AUTOSTART_KEY} an entry for Cryptomator.
+ * The folder strategy checks/add/removes at the location {@value WINDOWS_START_MENU_ENTRY}.
+ * <p>
+ * To check if the feature is active, both strategies are applied.
+ * To enable the feature, first the registry is tried and only on failure the autostart folder is used.
+ * To disable it, first it is determined by an internal state, which strategies must be used and in the second step those are executed.
  *
- * @apiNote This class is not thread safe, hence it should be avoided to be used simultaniously by the same threads.
+ * @apiNote This class is not thread safe, hence it should be avoided to call its methods simultaniously by different threads.
  */
 class AutoStartWinStrategy implements AutoStartStrategy {
 
@@ -32,34 +35,34 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 
 	private final String exePath;
 
-	private boolean activatedOverFolder;
-	private boolean activatedOverRegistry;
+	private boolean activatedUsingFolder;
+	private boolean activatedUsingRegistry;
 
 	public AutoStartWinStrategy(String exePath) {
 		this.exePath = exePath;
-		this.activatedOverFolder = false;
-		this.activatedOverRegistry = false;
+		this.activatedUsingFolder = false;
+		this.activatedUsingRegistry = false;
 	}
 
 	@Override
 	public CompletionStage<Boolean> isAutoStartEnabled() {
-		return isAutoStartEnabledOverRegistry().thenCombine(isAutoStartEnabledOverFolder(), (bReg, bFolder) -> bReg || bFolder);
+		return isAutoStartEnabledUsingRegistry().thenCombine(isAutoStartEnabledUsingFolder(), (bReg, bFolder) -> bReg || bFolder);
 	}
 
-	private CompletableFuture<Boolean> isAutoStartEnabledOverFolder() {
+	private CompletableFuture<Boolean> isAutoStartEnabledUsingFolder() {
 		Path autoStartEntry = Path.of(System.getProperty("user.home") + WINDOWS_START_MENU_ENTRY);
-		this.activatedOverFolder = Files.exists(autoStartEntry);
-		return CompletableFuture.completedFuture(activatedOverFolder);
+		this.activatedUsingFolder = Files.exists(autoStartEntry);
+		return CompletableFuture.completedFuture(activatedUsingFolder);
 	}
 
-	private CompletableFuture<Boolean> isAutoStartEnabledOverRegistry() {
+	private CompletableFuture<Boolean> isAutoStartEnabledUsingRegistry() {
 		ProcessBuilder regQuery = new ProcessBuilder("reg", "query", HKCU_AUTOSTART_KEY, //
 				"/v", AUTOSTART_VALUE);
 		try {
 			Process proc = regQuery.start();
 			return proc.onExit().thenApply(p -> {
-				this.activatedOverRegistry = p.exitValue() == 0;
-				return activatedOverRegistry;
+				this.activatedUsingRegistry = p.exitValue() == 0;
+				return activatedUsingRegistry;
 			});
 		} catch (IOException e) {
 			LOG.debug("Failed to query {} from registry key {}", AUTOSTART_VALUE, HKCU_AUTOSTART_KEY);
@@ -70,19 +73,19 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 	@Override
 	public void enableAutoStart() throws TogglingAutoStartFailedException {
 		try {
-			enableAutoStartOverRegistry().thenAccept((Void v) -> this.activatedOverRegistry = true).exceptionallyCompose(e -> {
+			enableAutoStartUsingRegistry().thenAccept((Void v) -> this.activatedUsingRegistry = true).exceptionallyCompose(e -> {
 				LOG.debug("Falling back to using autostart folder.");
-				return this.enableAutoStartOverFolder();
-			}).thenAccept((Void v) -> this.activatedOverFolder = true).get();
+				return this.enableAutoStartUsingFolder();
+			}).thenAccept((Void v) -> this.activatedUsingFolder = true).get();
 		} catch (InterruptedException e) {
 			Thread.currentThread().interrupt();
 			throw new TogglingAutoStartFailedException("Execution of enabling auto start setting was interrupted.");
 		} catch (ExecutionException e) {
-			throw new TogglingAutoStartFailedException("Enabling auto start failed both over registry and auto start folder.");
+			throw new TogglingAutoStartFailedException("Enabling auto start failed both using registry and auto start folder.");
 		}
 	}
 
-	private CompletableFuture<Void> enableAutoStartOverRegistry() {
+	private CompletableFuture<Void> enableAutoStartUsingRegistry() {
 		ProcessBuilder regAdd = new ProcessBuilder("reg", "add", HKCU_AUTOSTART_KEY, //
 				"/v", AUTOSTART_VALUE, //
 				"/t", "REG_SZ", //
@@ -103,7 +106,7 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 		}
 	}
 
-	private CompletableFuture<Void> enableAutoStartOverFolder() {
+	private CompletableFuture<Void> enableAutoStartUsingFolder() {
 		String autoStartFolderEntry = System.getProperty("user.home") + WINDOWS_START_MENU_ENTRY;
 		String createShortcutCommand = "$s=(New-Object -COM WScript.Shell).CreateShortcut('" + autoStartFolderEntry + "');$s.TargetPath='" + exePath + "';$s.Save();";
 		ProcessBuilder shortcutAdd = new ProcessBuilder("cmd", "/c", "Start powershell " + createShortcutCommand);
@@ -125,28 +128,28 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 
 	@Override
 	public void disableAutoStart() throws TogglingAutoStartFailedException {
-		if (activatedOverRegistry) {
-			disableAutoStartOverRegistry().whenComplete((voit, ex) -> {
+		if (activatedUsingRegistry) {
+			disableAutoStartUsingRegistry().whenComplete((voit, ex) -> {
 				if (ex == null) {
-					this.activatedOverRegistry = false;
+					this.activatedUsingRegistry = false;
 				}
 			});
 		}
 
-		if (activatedOverFolder) {
-			disableAutoStartOverFolder().whenComplete((voit, ex) -> {
+		if (activatedUsingFolder) {
+			disableAutoStartUsingFolder().whenComplete((voit, ex) -> {
 				if (ex == null) {
-					this.activatedOverFolder = false;
+					this.activatedUsingFolder = false;
 				}
 			});
 		}
 
-		if (activatedOverRegistry || activatedOverFolder) {
-			throw new TogglingAutoStartFailedException("Disabling auto start failed both over registry and auto start folder.");
+		if (activatedUsingRegistry || activatedUsingFolder) {
+			throw new TogglingAutoStartFailedException("Disabling auto start failed both using registry and auto start folder.");
 		}
 	}
 
-	public CompletableFuture<Void> disableAutoStartOverRegistry() {
+	public CompletableFuture<Void> disableAutoStartUsingRegistry() {
 		ProcessBuilder regRemove = new ProcessBuilder("reg", "delete", HKCU_AUTOSTART_KEY, //
 				"/v", AUTOSTART_VALUE, //
 				"/f");
@@ -165,7 +168,7 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 		}
 	}
 
-	private CompletableFuture<Void> disableAutoStartOverFolder() {
+	private CompletableFuture<Void> disableAutoStartUsingFolder() {
 		try {
 			Files.delete(Path.of(WINDOWS_START_MENU_ENTRY));
 			LOG.debug("Successfully deleted {}.", WINDOWS_START_MENU_ENTRY);
@@ -194,7 +197,7 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 		return finishedInTime;
 	}
 
-	public class SystemCommandException extends RuntimeException {
+	private class SystemCommandException extends RuntimeException {
 
 		public SystemCommandException(String msg) {
 			super(msg);

From 06f4e160d671306b2b360f73c9f05189773db25c Mon Sep 17 00:00:00 2001
From: infeo <armin.schrenk@zoho.eu>
Date: Thu, 20 Aug 2020 21:25:54 +0200
Subject: [PATCH 075/169] Migrate to easybind fork

---
 main/commons/pom.xml                          |  2 +-
 .../org/cryptomator/common/CommonsModule.java |  2 +-
 .../common/settings/VaultSettings.java        |  2 +-
 main/pom.xml                                  |  4 ++--
 main/ui/pom.xml                               |  2 +-
 .../ui/common/NewPasswordController.java      |  2 +-
 .../ui/controls/DraggableListCell.java        |  2 +-
 .../controls/PasswordStrengthIndicator.java   |  2 +-
 .../ui/mainwindow/VaultDetailController.java  | 22 ++++++++++++-------
 .../VaultDetailLockedController.java          |  2 +-
 .../VaultDetailUnknownErrorController.java    | 16 +++++++++-----
 .../mainwindow/VaultListCellController.java   | 22 ++++++++++++-------
 .../main/resources/license/THIRD-PARTY.txt    |  2 +-
 13 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/main/commons/pom.xml b/main/commons/pom.xml
index 54e711559..a6d00c2db 100644
--- a/main/commons/pom.xml
+++ b/main/commons/pom.xml
@@ -44,7 +44,7 @@
 
 		<!-- EasyBind -->
 		<dependency>
-			<groupId>org.fxmisc.easybind</groupId>
+			<groupId>com.tobiasdiez</groupId>
 			<artifactId>easybind</artifactId>
 		</dependency>
 
diff --git a/main/commons/src/main/java/org/cryptomator/common/CommonsModule.java b/main/commons/src/main/java/org/cryptomator/common/CommonsModule.java
index bac0114da..93e0d3d44 100644
--- a/main/commons/src/main/java/org/cryptomator/common/CommonsModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/CommonsModule.java
@@ -5,6 +5,7 @@
  *******************************************************************************/
 package org.cryptomator.common;
 
+import com.tobiasdiez.easybind.EasyBind;
 import dagger.Module;
 import dagger.Provides;
 import javafx.beans.binding.Binding;
@@ -17,7 +18,6 @@ import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultComponent;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.frontend.webdav.WebDavServer;
-import org.fxmisc.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
index 13a0c8eed..a440b2bab 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
@@ -7,6 +7,7 @@ package org.cryptomator.common.settings;
 
 import com.google.common.base.Strings;
 import com.google.common.io.BaseEncoding;
+import com.tobiasdiez.easybind.EasyBind;
 import javafx.beans.Observable;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
@@ -17,7 +18,6 @@ import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import org.apache.commons.lang3.StringUtils;
-import org.fxmisc.easybind.EasyBind;
 
 import java.nio.file.Path;
 import java.util.Objects;
diff --git a/main/pom.xml b/main/pom.xml
index 0e9dd8a26..e08f71378 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -35,7 +35,7 @@
 		<commons-lang3.version>3.11</commons-lang3.version>
 		<secret-service.version>1.1.0</secret-service.version>
 		<jwt.version>3.10.3</jwt.version>
-		<easybind.version>1.0.3</easybind.version>
+		<easybind.version>2.1.0</easybind.version>
 		<guava.version>29.0-jre</guava.version>
 		<dagger.version>2.22</dagger.version>
 		<gson.version>2.8.6</gson.version>
@@ -178,7 +178,7 @@
 
 			<!-- EasyBind -->
 			<dependency>
-				<groupId>org.fxmisc.easybind</groupId>
+				<groupId>com.tobiasdiez</groupId>
 				<artifactId>easybind</artifactId>
 				<version>${easybind.version}</version>
 			</dependency>
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index c27fbb1aa..0991215cc 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -35,7 +35,7 @@
 
 		<!-- EasyBind -->
 		<dependency>
-			<groupId>org.fxmisc.easybind</groupId>
+			<groupId>com.tobiasdiez</groupId>
 			<artifactId>easybind</artifactId>
 		</dependency>
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
index 24f3ac8db..6a14272e7 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.common;
 
+import com.tobiasdiez.easybind.EasyBind;
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -10,7 +11,6 @@ import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import org.cryptomator.ui.controls.FontAwesome5IconView;
 import org.cryptomator.ui.controls.NiceSecurePasswordField;
-import org.fxmisc.easybind.EasyBind;
 
 import java.util.ResourceBundle;
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/DraggableListCell.java b/main/ui/src/main/java/org/cryptomator/ui/controls/DraggableListCell.java
index 62f87c1f4..ca78bcac6 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/DraggableListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/DraggableListCell.java
@@ -8,6 +8,7 @@
  *******************************************************************************/
 package org.cryptomator.ui.controls;
 
+import com.tobiasdiez.easybind.EasyBind;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.scene.SnapshotParameters;
@@ -18,7 +19,6 @@ import javafx.scene.input.DragEvent;
 import javafx.scene.input.Dragboard;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.TransferMode;
-import org.fxmisc.easybind.EasyBind;
 
 import java.util.List;
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/PasswordStrengthIndicator.java b/main/ui/src/main/java/org/cryptomator/ui/controls/PasswordStrengthIndicator.java
index a1619968b..156da3b0b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/PasswordStrengthIndicator.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/PasswordStrengthIndicator.java
@@ -1,12 +1,12 @@
 package org.cryptomator.ui.controls;
 
+import com.tobiasdiez.easybind.EasyBind;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.Region;
-import org.fxmisc.easybind.EasyBind;
 
 public class PasswordStrengthIndicator extends HBox {
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java
index 36a746039..e384a67bc 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.mainwindow;
 
+import com.tobiasdiez.easybind.EasyBind;
 import javafx.beans.binding.Binding;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ObjectProperty;
@@ -10,7 +11,6 @@ import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.controls.FontAwesome5Icon;
 import org.cryptomator.ui.fxapp.FxApplication;
-import org.fxmisc.easybind.EasyBind;
 
 import javax.inject.Inject;
 
@@ -26,17 +26,23 @@ public class VaultDetailController implements FxController {
 	VaultDetailController(ObjectProperty<Vault> vault, FxApplication application) {
 		this.vault = vault;
 		this.application = application;
-		this.glyph = EasyBind.select(vault).selectObject(Vault::stateProperty).map(this::getGlyphForVaultState).orElse(FontAwesome5Icon.EXCLAMATION_TRIANGLE);
+		this.glyph = EasyBind.select(vault) //
+				.selectObject(Vault::stateProperty) //
+				.map(this::getGlyphForVaultState);
 		this.anyVaultSelected = vault.isNotNull();
 	}
 
 	private FontAwesome5Icon getGlyphForVaultState(VaultState state) {
-		return switch (state) {
-			case LOCKED -> FontAwesome5Icon.LOCK;
-			case PROCESSING -> FontAwesome5Icon.SPINNER;
-			case UNLOCKED -> FontAwesome5Icon.LOCK_OPEN;
-			case NEEDS_MIGRATION, MISSING, ERROR -> FontAwesome5Icon.EXCLAMATION_TRIANGLE;
-		};
+		if (state != null) {
+			return switch (state) {
+				case LOCKED -> FontAwesome5Icon.LOCK;
+				case PROCESSING -> FontAwesome5Icon.SPINNER;
+				case UNLOCKED -> FontAwesome5Icon.LOCK_OPEN;
+				case NEEDS_MIGRATION, MISSING, ERROR -> FontAwesome5Icon.EXCLAMATION_TRIANGLE;
+			};
+		} else {
+			return FontAwesome5Icon.EXCLAMATION_TRIANGLE;
+		}
 	}
 
 	@FXML
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
index 55720521b..f615d51ca 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.mainwindow;
 
+import com.tobiasdiez.easybind.EasyBind;
 import javafx.beans.binding.BooleanExpression;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
@@ -11,7 +12,6 @@ import org.cryptomator.keychain.KeychainManager;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.vaultoptions.VaultOptionsComponent;
-import org.fxmisc.easybind.EasyBind;
 
 import javax.inject.Inject;
 import java.util.Optional;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnknownErrorController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnknownErrorController.java
index 4c23ba4ae..b975174f8 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnknownErrorController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnknownErrorController.java
@@ -1,10 +1,10 @@
 package org.cryptomator.ui.mainwindow;
 
+import com.tobiasdiez.easybind.EasyBind;
 import javafx.beans.binding.Binding;
 import javafx.beans.property.ObjectProperty;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
-import org.fxmisc.easybind.EasyBind;
 
 import javax.inject.Inject;
 import java.io.ByteArrayOutputStream;
@@ -18,14 +18,20 @@ public class VaultDetailUnknownErrorController implements FxController {
 
 	@Inject
 	public VaultDetailUnknownErrorController(ObjectProperty<Vault> vault) {
-		this.stackTrace = EasyBind.select(vault).selectObject(Vault::lastKnownExceptionProperty).map(this::provideStackTrace).orElse("");
+		this.stackTrace = EasyBind.select(vault) //
+				.selectObject(Vault::lastKnownExceptionProperty) //
+				.map(this::provideStackTrace);
 	}
 
 	private String provideStackTrace(Throwable cause) {
 		// TODO deduplicate ErrorModule.java
-		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		cause.printStackTrace(new PrintStream(baos));
-		return baos.toString(StandardCharsets.UTF_8);
+		if (cause != null) {
+			ByteArrayOutputStream baos = new ByteArrayOutputStream();
+			cause.printStackTrace(new PrintStream(baos));
+			return baos.toString(StandardCharsets.UTF_8);
+		} else {
+			return "";
+		}
 	}
 
 	/* Getter/Setter */
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java
index 6703ec674..999afaaf1 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.mainwindow;
 
+import com.tobiasdiez.easybind.EasyBind;
 import javafx.beans.binding.Binding;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -7,7 +8,6 @@ import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.controls.FontAwesome5Icon;
-import org.fxmisc.easybind.EasyBind;
 
 import javax.inject.Inject;
 
@@ -19,16 +19,22 @@ public class VaultListCellController implements FxController {
 
 	@Inject
 	VaultListCellController() {
-		this.glyph = EasyBind.select(vault).selectObject(Vault::stateProperty).map(this::getGlyphForVaultState).orElse(FontAwesome5Icon.EXCLAMATION_TRIANGLE);
+		this.glyph = EasyBind.select(vault) //
+				.selectObject(Vault::stateProperty) //
+				.map(this::getGlyphForVaultState);
 	}
 
 	private FontAwesome5Icon getGlyphForVaultState(VaultState state) {
-		return switch (state) {
-			case LOCKED -> FontAwesome5Icon.LOCK;
-			case PROCESSING -> FontAwesome5Icon.SPINNER;
-			case UNLOCKED -> FontAwesome5Icon.LOCK_OPEN;
-			case NEEDS_MIGRATION, MISSING, ERROR -> FontAwesome5Icon.EXCLAMATION_TRIANGLE;
-		};
+		if(state != null){
+			return switch (state) {
+				case LOCKED -> FontAwesome5Icon.LOCK;
+				case PROCESSING -> FontAwesome5Icon.SPINNER;
+				case UNLOCKED -> FontAwesome5Icon.LOCK_OPEN;
+				case NEEDS_MIGRATION, MISSING, ERROR -> FontAwesome5Icon.EXCLAMATION_TRIANGLE;
+			};
+		} else {
+			return FontAwesome5Icon.EXCLAMATION_TRIANGLE;
+		}
 	}
 
 	/* Getter/Setter */
diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt
index 58a034c81..4fb29473b 100644
--- a/main/ui/src/main/resources/license/THIRD-PARTY.txt
+++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt
@@ -84,7 +84,7 @@ Cryptomator uses 52 third-party dependencies under the following licenses:
 		- Checker Qual (org.checkerframework:checker-qual:2.11.1 - https://checkerframework.org)
 		- SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org)
 	The BSD 2-Clause License:
-		- EasyBind (org.fxmisc.easybind:easybind:1.0.3 - http://www.fxmisc.org/easybind/)
+		- EasyBind (com.tobiasdiez:easybind:2.1.0 - https://github.com/tobiasdiez/EasyBind)
 
 Cryptomator uses other third-party assets under the following licenses:
 	SIL OFL 1.1 License:

From 5dac594cc922d701f0147da5672335813edd6324 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Thu, 20 Aug 2020 23:58:21 +0200
Subject: [PATCH 076/169] Removed Phasesystem, specified docs, removed default
 #isApplicable()

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472835069 https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472839837 https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472820689 https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472872901
---
 .../AvailableDriveLetterChooser.java          |   7 ++
 .../mountpoint/CustomDriveLetterChooser.java  |   7 ++
 .../mountpoint/CustomMountPointChooser.java   |  12 ++
 .../common/mountpoint/MountPointChooser.java  | 111 ++++++++----------
 .../mountpoint/MountPointChooserModule.java   |  25 ++--
 .../TemporaryMountPointChooser.java           |   7 ++
 6 files changed, 89 insertions(+), 80 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
index 0d94e8136..86e64427d 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
@@ -8,6 +8,8 @@ import java.util.Optional;
 
 public class AvailableDriveLetterChooser implements MountPointChooser {
 
+	private static final int POSITION = 200;
+
 	private final WindowsDriveLetters windowsDriveLetters;
 
 	public AvailableDriveLetterChooser(WindowsDriveLetters windowsDriveLetters) {
@@ -23,4 +25,9 @@ public class AvailableDriveLetterChooser implements MountPointChooser {
 	public Optional<Path> chooseMountPoint() {
 		return this.windowsDriveLetters.getAvailableDriveLetterPath();
 	}
+
+	@Override
+	public int getPosition() {
+		return POSITION;
+	}
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
index f01b04289..fd3d2ae68 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
@@ -9,6 +9,8 @@ import java.util.Optional;
 
 public class CustomDriveLetterChooser implements MountPointChooser {
 
+	public static final int POSITION = 100;
+
 	private final Vault vault;
 
 	public CustomDriveLetterChooser(Vault vault) {
@@ -24,4 +26,9 @@ public class CustomDriveLetterChooser implements MountPointChooser {
 	public Optional<Path> chooseMountPoint() {
 		return this.vault.getVaultSettings().getWinDriveLetter().map(letter -> letter.charAt(0) + ":\\").map(Paths::get);
 	}
+
+	@Override
+	public int getPosition() {
+		return POSITION;
+	}
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
index 55ad471ad..0a07f7ec3 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
@@ -18,6 +18,8 @@ import java.util.Optional;
 
 public class CustomMountPointChooser implements MountPointChooser {
 
+	public static final int POSITION = 0;
+
 	private static final Logger LOG = LoggerFactory.getLogger(CustomMountPointChooser.class);
 
 	private final Vault vault;
@@ -26,6 +28,11 @@ public class CustomMountPointChooser implements MountPointChooser {
 		this.vault = vault;
 	}
 
+	@Override
+	public boolean isApplicable() {
+		return true;
+	}
+
 	@Override
 	public Optional<Path> chooseMountPoint() {
 		//VaultSettings#getCustomMountPath already checks whether the saved custom mountpoint should be used
@@ -73,4 +80,9 @@ public class CustomMountPointChooser implements MountPointChooser {
 		LOG.debug("Successfully checked custom mount point: {}", mountPoint);
 		return false;
 	}
+
+	@Override
+	public int getPosition() {
+		return POSITION;
+	}
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
index fb5a6eaa5..79326aeb3 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
@@ -1,65 +1,63 @@
 package org.cryptomator.common.mountpoint;
 
-import dagger.MapKey;
 import org.cryptomator.common.vaults.Volume;
 
 import java.nio.file.Path;
 import java.util.Optional;
-import java.util.Set;
+import java.util.SortedSet;
 
 /**
  * Base interface for the Mountpoint-Choosing-Operation that results in the choice and
  * preparation of a Mountpoint or an exception otherwise.<br>
  * <p>All <i>MountPointChoosers (MPCs)</i> need to implement this class and must be added to
- * the pool of possible MPCs by {@link MountPointChooserModule MountPointChooserModule.}
- * The MountPointChooserModule requires all {@link dagger.Provides Providermethods} to
- * be annotated with the {@link PhaseKey @PhaseKey-Annotation} and a <b>unique</b> Phase to
- * allow the Module to sort them according to the phases' {@link Phase#getTiming()} timing.}
- * The timing must be defined by the developer to reflect a useful execution order.
+ * the pool of possible MPCs by the {@link MountPointChooserModule MountPointChooserModule.}
+ * The MountPointChooserModule will sort them according to their {@link #getPosition() position.}
+ * The position must be defined by the developer to reflect a useful execution order;
+ * the order of execution of MPCs with equal position is undefined.
  *
- * <p><b>Phase-Uniqueness:</b> Phases must be unique, meaning that they must not be used
- * to annotate more than <i>one</i> Providermethod. Define a new phase for each additional
- * MPC that is added to the Module. Timings can be reused; the order of Phases with equal
- * timing among themselves is undefined.
+ * <p>MPCs are executed by a {@link Volume} in ascedning order of their position to find
+ * and prepare a suitable Mountpoint for the Volume. The Volume has access to a
+ * {@link SortedSet} of MPCs in this specific order, that is provided by the Module.
+ * The Set only contains Choosers that were deemed {@link #isApplicable() applicable}
+ * by the Module.
  *
- * <p>MPCs are executed by a {@link Volume} in the order of their phase's timing to find
- * and prepare a suitable Mountpoint for the Volume. The Volume only has access to a {@link Set}
- * of MPCs in this specific order, that is provided by the Module; the according Phases and exact
- * timings are inaccessible to the Volume. The Set only contains Choosers that were deemed
- * {@link #isApplicable() applicable} by the Module.
+ * <p>At execution of a MPC {@link #chooseMountPoint()} is called to choose a Mountpoint
+ * according to the MPC's <i>strategy.</i> The <i>strategy</i> can involve reading configs,
+ * searching the filesystem, processing user-input or similar operations.
+ * If {@code #chooseMountPoint()} returns a non-null path (everthing but
+ * {@linkplain Optional#empty()}) the MPC's {@link #prepare(Path)}-Method is called and the
+ * MountPoint is verfied and/or prepared. In this case <i>no other MPC's will be called for
+ * this Volume, even if {@code #prepare(Path)} fails.</i>
  *
- * <p>At execution of a MPC {@link #chooseMountPoint()} and then {@link #prepare(Path)} are called
- * by the Volume. If {@code #chooseMountPoint()} yields no result, the next MPC is executed
- * without first calling the {@code #prepare(Path)}-Method of the current MPC.
+ * <p>If {@code #chooseMountPoint()} yields no result, the next MPC is executed
+ * <i>without</i> first calling the {@code #prepare(Path)}-Method of the current MPC.
  * This is repeated until<br>
  * <ul>
  *     <li><b>either</b> a Mountpoint is returned by {@code #chooseMountPoint()}
- *     and {@code #prepare(Path)} succeeds or fails</li>
+ *     and {@code #prepare(Path)} succeeds or fails, ending the entire operation</li>
  *     <li><b>or</b> no MPC remains and an {@link InvalidMountPointException} is thrown.</li>
  * </ul>
- * If the {@code #prepare(Path)}-Method of a MPC fails the entire Mountpoint-Choosing-Operation
+ * If the {@code #prepare(Path)}-Method of a MPC fails, the entire Mountpoint-Choosing-Operation
  * is aborted and the method should do all necessary cleanup before throwing the exception.
  * If the preparation succeeds {@link #cleanup(Path)} can be used after unmount to do any
  * remaining cleanup.
  */
-public interface MountPointChooser {
+public interface MountPointChooser extends Comparable<MountPointChooser> {
 
 	/**
 	 * Called by the {@link MountPointChooserModule} to determine whether this MountPointChooser is
 	 * applicable for the given Systemconfiguration.
 	 *
-	 * <p>The result of this method defaults to true. Developers should override this method to
+	 * <p>Developers should override this method to
 	 * check for Systemconfigurations that are unsuitable for this MPC.
 	 *
 	 * @return a boolean flag; true if applicable, else false.
 	 * @see #chooseMountPoint()
 	 */
-	default boolean isApplicable() {
-		return true; //Usually most of the choosers should be applicable
-	}
+	boolean isApplicable();
 
 	/**
-	 * Called by a {@link Volume} to do choose a Mountpoint according to the
+	 * Called by a {@link Volume} to choose a Mountpoint according to the
 	 * MountPointChoosers strategy.
 	 *
 	 * <p>This method is only called for MPCs that were deemed {@link #isApplicable() applicable}
@@ -128,43 +126,32 @@ public interface MountPointChooser {
 	}
 
 	/**
-	 * The phases of the existing {@link MountPointChooser MountPointChoosers.}
-	 * <p>The {@code Phases} of the MPCs are attached to them in the
-	 * {@link MountPointChooserModule} by annotating them with the
-	 * {@link PhaseKey @PhaseKey-Annotation.}
-	 * <p>Each MPC must have a <b>unique</b> Phase that allows the Module to sort
-	 * the MPCs according to their phases' {@link Phase#getTiming()} timing.}
-	 * The timing must be defined by the developer to reflect a useful execution order.
+	 * Called by the {@link MountPointChooserModule} to sort the available MPCs
+	 * and determine their execution order.
+	 * The position must be defined by the developer to reflect a useful execution order.
+	 * MPCs with lower positions will be placed at lower indices in the resulting
+	 * {@link SortedSet} and will be executed with higher probability.
+	 * The order of execution of MPCs with equal position is undefined.
 	 *
-	 * <p><b>Phase-Uniqueness:</b> Phases must be unique, meaning that they must not be used
-	 * to annotate more than <i>one</i> Providermethod. Define a new phase for each additional
-	 * MPC that is added to the Module. Timings can be reused; the order of Phases with equal
-	 * timings among themselves is undefined.
+	 * @return the position of this MPC.
 	 */
-	enum Phase {
+	int getPosition();
 
-		CUSTOM_MOUNTPOINT(0),
-
-		CUSTOM_DRIVELETTER(1),
-
-		AVAILABLE_DRIVELETTER(2),
-
-		TEMPORARY_MOUNTPOINT(3);
-
-		private final int timing;
-
-		Phase(int timing) {
-			this.timing = timing;
-		}
-
-		public int getTiming() {
-			return timing;
-		}
-	}
-
-	@MapKey
-	@interface PhaseKey {
-
-		Phase value();
+	/**
+	 * Called by the {@link MountPointChooserModule} to determine the execution order
+	 * of the registered MPCs. <b>Implementations usually should not override this
+	 * method.</b> This default implementation sorts the MPCs in ascending order
+	 * of their {@link #getPosition() position.}<br>
+	 * <br>
+	 * <b>Original description:</b>
+	 * <p>{@inheritDoc}
+	 *
+	 * @implNote This default implementation sorts the MPCs in ascending order
+	 * of their {@link #getPosition() position.}
+	 */
+	@Override
+	default int compareTo(MountPointChooser other) {
+		//Sort by position (ascending order)
+		return Integer.compare(this.getPosition(), other.getPosition());
 	}
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
index 6f1fd0806..9a2332c94 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
@@ -3,16 +3,13 @@ package org.cryptomator.common.mountpoint;
 import com.google.common.collect.ImmutableSet;
 import dagger.Module;
 import dagger.Provides;
-import dagger.multibindings.IntoMap;
+import dagger.multibindings.IntoSet;
 import org.cryptomator.common.Environment;
-import org.cryptomator.common.mountpoint.MountPointChooser.Phase;
 import org.cryptomator.common.vaults.PerVault;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.WindowsDriveLetters;
 
 import javax.inject.Named;
-import java.util.Comparator;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -25,32 +22,28 @@ import java.util.Set;
 public abstract class MountPointChooserModule {
 
 	@Provides
-	@IntoMap
-	@MountPointChooser.PhaseKey(Phase.CUSTOM_MOUNTPOINT)
+	@IntoSet
 	@PerVault
 	public static MountPointChooser provideCustomMountPointChooser(Vault vault) {
 		return new CustomMountPointChooser(vault);
 	}
 
 	@Provides
-	@IntoMap
-	@MountPointChooser.PhaseKey(Phase.CUSTOM_DRIVELETTER)
+	@IntoSet
 	@PerVault
 	public static MountPointChooser provideCustomDriveLetterChooser(Vault vault) {
 		return new CustomDriveLetterChooser(vault);
 	}
 
 	@Provides
-	@IntoMap
-	@MountPointChooser.PhaseKey(Phase.AVAILABLE_DRIVELETTER)
+	@IntoSet
 	@PerVault
 	public static MountPointChooser provideAvailableDriveLetterChooser(WindowsDriveLetters windowsDriveLetters) {
 		return new AvailableDriveLetterChooser(windowsDriveLetters);
 	}
 
 	@Provides
-	@IntoMap
-	@MountPointChooser.PhaseKey(Phase.TEMPORARY_MOUNTPOINT)
+	@IntoSet
 	@PerVault
 	public static MountPointChooser provideTemporaryMountPointChooser(Vault vault, Environment environment) {
 		return new TemporaryMountPointChooser(vault, environment);
@@ -59,12 +52,8 @@ public abstract class MountPointChooserModule {
 	@Provides
 	@PerVault
 	@Named("orderedValidMountPointChoosers")
-	public static Set<MountPointChooser> provideOrderedValidMountPointChoosers(Map<Phase, MountPointChooser> chooserMap) {
+	public static Set<MountPointChooser> provideOrderedValidMountPointChoosers(Set<MountPointChooser> choosers) {
 		//Sorted Set
-		return chooserMap.entrySet().stream()
-				.sorted(Comparator.comparingInt(value -> value.getKey().getTiming()))
-				.map(Map.Entry::getValue)
-				.filter(MountPointChooser::isApplicable)
-				.collect(ImmutableSet.toImmutableSet());
+		return choosers.stream().sorted().filter(MountPointChooser::isApplicable).collect(ImmutableSet.toImmutableSet());
 	}
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index 5924bf2ef..786f1961f 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -15,6 +15,8 @@ import java.util.Optional;
 
 public class TemporaryMountPointChooser implements MountPointChooser {
 
+	public static final int POSITION = 300;
+
 	private static final Logger LOG = LoggerFactory.getLogger(TemporaryMountPointChooser.class);
 	private static final int MAX_TMPMOUNTPOINT_CREATION_RETRIES = 10;
 
@@ -85,4 +87,9 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 			LOG.warn("Could not delete mount point: {}", e.getMessage());
 		}
 	}
+
+	@Override
+	public int getPosition() {
+		return POSITION;
+	}
 }

From 8483f71f57ae83153afd2c48c1dd0adce471af6c Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Fri, 21 Aug 2020 00:54:57 +0200
Subject: [PATCH 077/169] Refactored CustomMountPointChooser

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472832435
---
 .../mountpoint/CustomMountPointChooser.java   | 72 ++++++++++---------
 1 file changed, 38 insertions(+), 34 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
index 0a07f7ec3..cab733089 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
@@ -1,6 +1,5 @@
 package org.cryptomator.common.mountpoint;
 
-import org.cryptomator.common.vaults.MountPointRequirement;
 import org.cryptomator.common.vaults.Vault;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,46 +40,51 @@ public class CustomMountPointChooser implements MountPointChooser {
 
 	@Override
 	public boolean prepare(Path mountPoint) throws InvalidMountPointException {
-		MountPointRequirement requirement = this.vault.getMountPointRequirement();
-		//Requirement "NONE" doesn't make any sense here.
-		//No need to prepare/verify a Mountpoint without requiring one...
-		assert requirement != MountPointRequirement.NONE;
-
-		//Not implemented anywhere (yet)
-		assert requirement != MountPointRequirement.PARENT_OPT_MOUNT_POINT;
-
-		if(requirement == MountPointRequirement.PARENT_NO_MOUNT_POINT) {
-			//This the case on Windows when using FUSE
-			//See https://github.com/billziss-gh/winfsp/issues/320
-
-			Path parent = mountPoint.getParent();
-			if (!Files.isDirectory(parent)) {
-				throw new InvalidMountPointException(new NotDirectoryException(parent.toString()));
+		switch (this.vault.getMountPointRequirement()) {
+			case PARENT_NO_MOUNT_POINT -> prepareParentNoMountPoint(mountPoint);
+			case EMPTY_MOUNT_POINT -> prepareEmptyMountPoint(mountPoint);
+			case NONE -> {
+				//Requirement "NONE" doesn't make any sense here.
+				//No need to prepare/verify a Mountpoint without requiring one...
+				assert false : "Illegal MountPointRequirement";
 			}
-			//We must use #notExists() here because notExists =/= !exists (see docs)
-			if (!Files.notExists(mountPoint, LinkOption.NOFOLLOW_LINKS)) {
-				//File exists OR can't be determined
-				throw new InvalidMountPointException(new FileAlreadyExistsException(mountPoint.toString()));
-			}
-		} else if(requirement == MountPointRequirement.EMPTY_MOUNT_POINT) {
-			//This is the case for Windows when using Dokany
-			//and for Linux and Mac
-
-			if (!Files.isDirectory(mountPoint)) {
-				throw new InvalidMountPointException(new NotDirectoryException(mountPoint.toString()));
-			}
-			try (DirectoryStream<Path> ds = Files.newDirectoryStream(mountPoint)) {
-				if (ds.iterator().hasNext()) {
-					throw new InvalidMountPointException(new DirectoryNotEmptyException(mountPoint.toString()));
-				}
-			} catch (IOException exception) {
-				throw new InvalidMountPointException("IOException while checking folder content", exception);
+			default -> {
+				//Currently the case for "PARENT_OPT_MOUNT_POINT"
+				assert false : "Not implemented";
 			}
 		}
 		LOG.debug("Successfully checked custom mount point: {}", mountPoint);
 		return false;
 	}
 
+	private void prepareParentNoMountPoint(Path mountPoint) throws InvalidMountPointException {
+		//This the case on Windows when using FUSE
+		//See https://github.com/billziss-gh/winfsp/issues/320
+		Path parent = mountPoint.getParent();
+		if (!Files.isDirectory(parent)) {
+			throw new InvalidMountPointException(new NotDirectoryException(parent.toString()));
+		}
+		//We must use #notExists() here because notExists =/= !exists (see docs)
+		if (!Files.notExists(mountPoint, LinkOption.NOFOLLOW_LINKS)) {
+			//File exists OR can't be determined
+			throw new InvalidMountPointException(new FileAlreadyExistsException(mountPoint.toString()));
+		}
+	}
+
+	private void prepareEmptyMountPoint(Path mountPoint) throws InvalidMountPointException {
+		//This is the case for Windows when using Dokany and for Linux and Mac
+		if (!Files.isDirectory(mountPoint)) {
+			throw new InvalidMountPointException(new NotDirectoryException(mountPoint.toString()));
+		}
+		try (DirectoryStream<Path> ds = Files.newDirectoryStream(mountPoint)) {
+			if (ds.iterator().hasNext()) {
+				throw new InvalidMountPointException(new DirectoryNotEmptyException(mountPoint.toString()));
+			}
+		} catch (IOException exception) {
+			throw new InvalidMountPointException("IOException while checking folder content", exception);
+		}
+	}
+
 	@Override
 	public int getPosition() {
 		return POSITION;

From 4723416d45464744c877e52d6aaac7cefad602f6 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Fri, 21 Aug 2020 10:13:45 +0200
Subject: [PATCH 078/169] fixed icon views of labels in new password screen
 that could only appear once

---
 .../ui/common/NewPasswordController.java         | 16 +++++++++-------
 .../ui/src/main/resources/fxml/new_password.fxml |  8 +++++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
index 24f3ac8db..19e33f7c3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
@@ -24,10 +24,12 @@ public class NewPasswordController implements FxController {
 	public NiceSecurePasswordField passwordField;
 	public NiceSecurePasswordField reenterField;
 	public Label passwordStrengthLabel;
+	public FontAwesome5IconView passwordStrengthCheckmark;
+	public FontAwesome5IconView passwordStrengthWarning;
+	public FontAwesome5IconView passwordStrengthCross;
 	public Label passwordMatchLabel;
-	public FontAwesome5IconView checkmark;
-	public FontAwesome5IconView warning;
-	public FontAwesome5IconView cross;
+	public FontAwesome5IconView passwordMatchCheckmark;
+	public FontAwesome5IconView passwordMatchCross;
 
 	public NewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater, ObjectProperty<CharSequence> password) {
 		this.resourceBundle = resourceBundle;
@@ -45,7 +47,7 @@ public class NewPasswordController implements FxController {
 		BooleanBinding passwordsMatch = Bindings.createBooleanBinding(this::hasSamePasswordInBothFields, passwordField.textProperty(), reenterField.textProperty());
 		BooleanBinding reenterFieldNotEmpty = reenterField.textProperty().isNotEmpty();
 		passwordMatchLabel.visibleProperty().bind(reenterFieldNotEmpty);
-		passwordMatchLabel.graphicProperty().bind(Bindings.when(passwordsMatch.and(reenterFieldNotEmpty)).then(checkmark).otherwise(cross));
+		passwordMatchLabel.graphicProperty().bind(Bindings.when(passwordsMatch.and(reenterFieldNotEmpty)).then(passwordMatchCheckmark).otherwise(passwordMatchCross));
 		passwordMatchLabel.textProperty().bind(Bindings.when(passwordsMatch.and(reenterFieldNotEmpty)).then(resourceBundle.getString("newPassword.passwordsMatch")).otherwise(resourceBundle.getString("newPassword.passwordsDoNotMatch")));
 
 		passwordField.textProperty().addListener(this::passwordsDidChange);
@@ -56,11 +58,11 @@ public class NewPasswordController implements FxController {
 		if (passwordField.getCharacters().length() == 0) {
 			return null;
 		} else if (passwordStrength.intValue() <= -1) {
-			return cross;
+			return passwordStrengthCross;
 		} else if (passwordStrength.intValue() < 3) {
-			return warning;
+			return passwordStrengthWarning;
 		} else {
-			return checkmark;
+			return passwordStrengthCheckmark;
 		}
 	}
 
diff --git a/main/ui/src/main/resources/fxml/new_password.fxml b/main/ui/src/main/resources/fxml/new_password.fxml
index 7593a1ccd..c406b8c70 100644
--- a/main/ui/src/main/resources/fxml/new_password.fxml
+++ b/main/ui/src/main/resources/fxml/new_password.fxml
@@ -12,9 +12,11 @@
 	  spacing="6"
 	  alignment="CENTER_LEFT">
 	<fx:define>
-		<FontAwesome5IconView fx:id="checkmark" styleClass="glyph-icon-primary" glyph="CHECK"/>
-		<FontAwesome5IconView fx:id="warning" styleClass="glyph-icon-orange" glyph="EXCLAMATION_TRIANGLE"/>
-		<FontAwesome5IconView fx:id="cross" styleClass="glyph-icon-red" glyph="TIMES"/>
+		<FontAwesome5IconView fx:id="passwordStrengthCheckmark" styleClass="glyph-icon-primary" glyph="CHECK"/>
+		<FontAwesome5IconView fx:id="passwordStrengthWarning" styleClass="glyph-icon-orange" glyph="EXCLAMATION_TRIANGLE"/>
+		<FontAwesome5IconView fx:id="passwordStrengthCross" styleClass="glyph-icon-red" glyph="TIMES"/>
+		<FontAwesome5IconView fx:id="passwordMatchCheckmark" styleClass="glyph-icon-primary" glyph="CHECK"/>
+		<FontAwesome5IconView fx:id="passwordMatchCross" styleClass="glyph-icon-red" glyph="TIMES"/>
 	</fx:define>
 	<children>
 		<Label text="%newPassword.promptText" labelFor="$passwordField"/>

From 900fdd7f6f4c810f4a223d337ee496ae794179f5 Mon Sep 17 00:00:00 2001
From: infeo <armin.schrenk@zoho.eu>
Date: Fri, 21 Aug 2020 11:17:55 +0200
Subject: [PATCH 079/169] minor changes * removing unused imports * exchanging
 addListener() by Easybind.subscribe()

---
 .../CreateNewVaultLocationController.java           |  7 ++++---
 .../CreateNewVaultPasswordController.java           |  1 -
 .../org/cryptomator/ui/fxapp/FxApplication.java     |  5 +++--
 .../ui/mainwindow/VaultListController.java          | 13 +++++--------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java
index 5b4549db1..c1f224529 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.addvaultwizard;
 
+import com.tobiasdiez.easybind.EasyBind;
 import dagger.Lazy;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -83,11 +84,11 @@ public class CreateNewVaultLocationController implements FxController {
 	public void initialize() {
 		predefinedLocationToggler.selectedToggleProperty().addListener(this::togglePredefinedLocation);
 		usePresetPath.bind(predefinedLocationToggler.selectedToggleProperty().isNotEqualTo(customRadioButton));
-		vaultPath.addListener(this::vaultPathDidChange);
+		EasyBind.subscribe(vaultPath, this::vaultPathDidChange);
 	}
 
-	private void vaultPathDidChange(@SuppressWarnings("unused") ObservableValue<? extends Path> observable, @SuppressWarnings("unused") Path oldValue, Path newValue) {
-		if (!Files.notExists(newValue)) {
+	private void vaultPathDidChange(Path newValue) {
+		if ( newValue != null && !Files.notExists(newValue)) {
 			warningText.set(resourceBundle.getString("addvaultwizard.new.fileAlreadyExists"));
 		} else {
 			warningText.set(null);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java
index 2c2f3885a..87152f7b5 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java
@@ -32,7 +32,6 @@ import javax.inject.Named;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.channels.WritableByteChannel;
-import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
index 4d80a3451..e862b8045 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.fxapp;
 
+import com.tobiasdiez.easybind.EasyBind;
 import dagger.Lazy;
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -64,7 +65,7 @@ public class FxApplication extends Application {
 		LOG.trace("FxApplication.start()");
 		Platform.setImplicitExit(false);
 
-		hasVisibleStages.addListener(this::hasVisibleStagesChanged);
+		EasyBind.subscribe(hasVisibleStages, this::hasVisibleStagesChanged);
 
 		settings.theme().addListener(this::themeChanged);
 		loadSelectedStyleSheet(settings.theme().get());
@@ -75,7 +76,7 @@ public class FxApplication extends Application {
 		throw new UnsupportedOperationException("Use start() instead.");
 	}
 
-	private void hasVisibleStagesChanged(@SuppressWarnings("unused") ObservableValue<? extends Boolean> observableValue, @SuppressWarnings("unused") boolean oldValue, boolean newValue) {
+	private void hasVisibleStagesChanged(boolean newValue) {
 		if (newValue) {
 			macFunctions.map(MacFunctions::uiState).ifPresent(MacApplicationUiState::transformToForegroundApplication);
 		} else {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
index c0a6c7720..d1aecb19f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
@@ -1,16 +1,15 @@
 package org.cryptomator.ui.mainwindow;
 
+import com.tobiasdiez.easybind.EasyBind;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ObjectProperty;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.ListView;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
-import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.ui.addvaultwizard.AddVaultWizardComponent;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.removevault.RemoveVaultComponent;
@@ -18,7 +17,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
-import java.io.IOException;
 
 @MainWindowScoped
 public class VaultListController implements FxController {
@@ -43,7 +41,7 @@ public class VaultListController implements FxController {
 		this.removeVault = removeVault;
 		this.noVaultSelected = selectedVault.isNull();
 		this.emptyVaultList = Bindings.isEmpty(vaults);
-		selectedVault.addListener(this::selectedVaultDidChange);
+		EasyBind.subscribe(selectedVault, this::selectedVaultDidChange);
 	}
 
 	public void initialize() {
@@ -60,11 +58,10 @@ public class VaultListController implements FxController {
 		});
 	}
 
-	private void selectedVaultDidChange(@SuppressWarnings("unused") ObservableValue<? extends Vault> observableValue, @SuppressWarnings("unused") Vault oldValue, Vault newValue) {
-		if (newValue == null) {
-			return;
+	private void selectedVaultDidChange(Vault newValue) {
+		if (newValue != null) {
+			VaultListManager.redetermineVaultState(newValue);
 		}
-		VaultListManager.redetermineVaultState(newValue);
 	}
 
 	@FXML

From 49a8689090e6844ff3705eca2a01d73f33a64deb Mon Sep 17 00:00:00 2001
From: infeo <armin.schrenk@zoho.eu>
Date: Fri, 21 Aug 2020 13:30:05 +0200
Subject: [PATCH 080/169] Remove legacy concepts: * in vaultSettings,
 displayName does not listen on path * the caller/creater of vault settings
 must set the name explicitly * add localizable default vault name

---
 .../common/settings/VaultSettings.java        | 20 ----------------
 .../settings/VaultSettingsJsonAdapter.java    |  6 ++---
 .../common/vaults/VaultListManager.java       | 23 ++++++++++++++-----
 .../main/resources/i18n/strings.properties    |  3 +++
 4 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
index 1fdaefebf..6e2bd3cd8 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
@@ -19,7 +19,6 @@ import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import org.apache.commons.lang3.StringUtils;
-import org.fxmisc.easybind.EasyBind;
 
 import java.nio.file.Path;
 import java.util.Objects;
@@ -60,31 +59,12 @@ public class VaultSettings {
 	public VaultSettings(String id) {
 		this.id = Objects.requireNonNull(id);
 		this.mountName = Bindings.createStringBinding(this::normalizeDisplayName, displayName);
-
-		EasyBind.subscribe(path, this::deriveDisplayNameFromPathOrUseDefault);
 	}
 
 	Observable[] observables() {
 		return new Observable[]{path, displayName, winDriveLetter, unlockAfterStartup, revealAfterMount, useCustomMountPath, customMountPath, usesReadOnlyMode, mountFlags, filenameLengthLimit, actionAfterUnlock};
 	}
 
-	private void deriveDisplayNameFromPathOrUseDefault(Path newPath) {
-		final boolean mountNameSet = !StringUtils.isBlank(displayName.get());
-		final boolean dirnameExists = (newPath != null) && (newPath.getFileName() != null);
-		final String defaultPattern = DEFAULT_MOUNT_NAME + " " + id;
-
-		if (!mountNameSet && dirnameExists) {
-			displayName.set(newPath.getFileName().toString());
-		} else if (!mountNameSet && !dirnameExists) {
-			displayName.set(defaultPattern);
-		} else if (mountNameSet && dirnameExists) {
-			if (displayName.get().equals(defaultPattern)) {
-				//this is okay, since this function is only executed if the path changes (aka, the vault is created or added)
-				displayName.set(newPath.getFileName().toString());
-			}
-		}
-	}
-
 	public static VaultSettings withRandomId() {
 		return new VaultSettings(generateId());
 	}
diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
index a8b940918..a6dafd9f9 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
@@ -37,7 +37,7 @@ class VaultSettingsJsonAdapter {
 	public VaultSettings read(JsonReader in) throws IOException {
 		String id = null;
 		String path = null;
-		String mountName = null;
+		String displayName = null;
 		String customMountPath = null;
 		String winDriveLetter = null;
 		boolean unlockAfterStartup = VaultSettings.DEFAULT_UNLOCK_AFTER_STARTUP;
@@ -54,7 +54,7 @@ class VaultSettingsJsonAdapter {
 			switch (name) {
 				case "id" -> id = in.nextString();
 				case "path" -> path = in.nextString();
-				case "mountName" -> mountName = in.nextString();
+				case "mountName" -> displayName = in.nextString(); //YES, this is correct (legacy reasons)
 				case "winDriveLetter" -> winDriveLetter = in.nextString();
 				case "unlockAfterStartup" -> unlockAfterStartup = in.nextBoolean();
 				case "revealAfterMount" -> revealAfterMount = in.nextBoolean();
@@ -73,7 +73,7 @@ class VaultSettingsJsonAdapter {
 		in.endObject();
 
 		VaultSettings vaultSettings = (id == null) ? VaultSettings.withRandomId() : new VaultSettings(id);
-		vaultSettings.displayName().set(mountName);
+		vaultSettings.displayName().set(displayName);
 		vaultSettings.path().set(Paths.get(path));
 		vaultSettings.winDriveLetter().set(winDriveLetter);
 		vaultSettings.unlockAfterStartup().set(unlockAfterStartup);
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
index 75a48c6fc..85309c0dc 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
@@ -20,11 +20,11 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Optional;
+import java.util.ResourceBundle;
 import java.util.stream.Collectors;
 
 import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
@@ -35,11 +35,13 @@ public class VaultListManager {
 	private static final Logger LOG = LoggerFactory.getLogger(VaultListManager.class);
 
 	private final VaultComponent.Builder vaultComponentBuilder;
+	private final ResourceBundle resourceBundle;
 	private final ObservableList<Vault> vaultList;
 
 	@Inject
-	public VaultListManager(VaultComponent.Builder vaultComponentBuilder, Settings settings) {
+	public VaultListManager(VaultComponent.Builder vaultComponentBuilder, ResourceBundle resourceBundle, Settings settings) {
 		this.vaultComponentBuilder = vaultComponentBuilder;
+		this.resourceBundle = resourceBundle;
 		this.vaultList = FXCollections.observableArrayList(Vault::observables);
 
 		addAll(settings.getDirectories());
@@ -59,14 +61,23 @@ public class VaultListManager {
 		if (alreadyExistingVault.isPresent()) {
 			return alreadyExistingVault.get();
 		} else {
-			VaultSettings vaultSettings = VaultSettings.withRandomId();
-			vaultSettings.path().set(normalizedPathToVault);
-			Vault newVault = create(vaultSettings);
+			Vault newVault = create(newVaultSettings(normalizedPathToVault));
 			vaultList.add(newVault);
 			return newVault;
 		}
 	}
 
+	private VaultSettings newVaultSettings(Path path) {
+		VaultSettings vaultSettings = VaultSettings.withRandomId();
+		vaultSettings.path().set(path);
+		if (path.getFileName() != null) {
+			vaultSettings.displayName().set(path.getFileName().toString());
+		} else {
+			vaultSettings.displayName().set(resourceBundle.getString("defaults.vault.vaultName"));
+		}
+		return vaultSettings;
+	}
+
 	private void addAll(Collection<VaultSettings> vaultSettings) {
 		Collection<Vault> vaults = vaultSettings.stream().map(this::create).collect(Collectors.toList());
 		vaultList.addAll(vaults);
@@ -92,7 +103,7 @@ public class VaultListManager {
 		}
 		return compBuilder.build().vault();
 	}
-	
+
 	public static VaultState redetermineVaultState(Vault vault) {
 		VaultState previousState = vault.getState();
 		return switch (previousState) {
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index d077d71b3..9a1a54c9f 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -17,6 +17,9 @@ generic.button.print=Print
 generic.error.title=An unexpected error occured
 generic.error.instruction=This should not have happened. Please report the error text below and include a description of what steps did lead to this error.
 
+# Defaults
+defaults.vault.vaultName=Vault
+
 # Tray Menu
 traymenu.showMainWindow=Show
 traymenu.showPreferencesWindow=Preferences

From 6f542ac8b85bfbcbcf32ca0d8f4e30a83bd07f95 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Fri, 21 Aug 2020 21:54:33 +0200
Subject: [PATCH 081/169] Replaced "assert" with IllegalStateException

---
 .../common/mountpoint/CustomMountPointChooser.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
index cab733089..80d2b25bb 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
@@ -46,11 +46,11 @@ public class CustomMountPointChooser implements MountPointChooser {
 			case NONE -> {
 				//Requirement "NONE" doesn't make any sense here.
 				//No need to prepare/verify a Mountpoint without requiring one...
-				assert false : "Illegal MountPointRequirement";
+				throw new InvalidMountPointException(new IllegalStateException("Illegal MountPointRequirement"));
 			}
 			default -> {
 				//Currently the case for "PARENT_OPT_MOUNT_POINT"
-				assert false : "Not implemented";
+				throw new InvalidMountPointException(new IllegalStateException("Not implemented"));
 			}
 		}
 		LOG.debug("Successfully checked custom mount point: {}", mountPoint);

From ec64055d93f15efa96eafe23deb42726f83b5ee9 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Fri, 21 Aug 2020 22:41:15 +0200
Subject: [PATCH 082/169] Renamed property "position" (defined by MPC) to
 "priority"

---
 .../AvailableDriveLetterChooser.java          |  6 ++---
 .../mountpoint/CustomDriveLetterChooser.java  |  6 ++---
 .../mountpoint/CustomMountPointChooser.java   |  6 ++---
 .../common/mountpoint/MountPointChooser.java  | 26 +++++++++----------
 .../TemporaryMountPointChooser.java           |  6 ++---
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
index 86e64427d..04e7c74ff 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
@@ -8,7 +8,7 @@ import java.util.Optional;
 
 public class AvailableDriveLetterChooser implements MountPointChooser {
 
-	private static final int POSITION = 200;
+	public static final int PRIORITY = 200;
 
 	private final WindowsDriveLetters windowsDriveLetters;
 
@@ -27,7 +27,7 @@ public class AvailableDriveLetterChooser implements MountPointChooser {
 	}
 
 	@Override
-	public int getPosition() {
-		return POSITION;
+	public int getPriority() {
+		return PRIORITY;
 	}
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
index fd3d2ae68..0c44150d1 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
@@ -9,7 +9,7 @@ import java.util.Optional;
 
 public class CustomDriveLetterChooser implements MountPointChooser {
 
-	public static final int POSITION = 100;
+	public static final int PRIORITY = 100;
 
 	private final Vault vault;
 
@@ -28,7 +28,7 @@ public class CustomDriveLetterChooser implements MountPointChooser {
 	}
 
 	@Override
-	public int getPosition() {
-		return POSITION;
+	public int getPriority() {
+		return PRIORITY;
 	}
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
index 80d2b25bb..01cb8c568 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
@@ -17,7 +17,7 @@ import java.util.Optional;
 
 public class CustomMountPointChooser implements MountPointChooser {
 
-	public static final int POSITION = 0;
+	public static final int PRIORITY = 0;
 
 	private static final Logger LOG = LoggerFactory.getLogger(CustomMountPointChooser.class);
 
@@ -86,7 +86,7 @@ public class CustomMountPointChooser implements MountPointChooser {
 	}
 
 	@Override
-	public int getPosition() {
-		return POSITION;
+	public int getPriority() {
+		return PRIORITY;
 	}
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
index 79326aeb3..0da0f6b3d 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
@@ -11,11 +11,11 @@ import java.util.SortedSet;
  * preparation of a Mountpoint or an exception otherwise.<br>
  * <p>All <i>MountPointChoosers (MPCs)</i> need to implement this class and must be added to
  * the pool of possible MPCs by the {@link MountPointChooserModule MountPointChooserModule.}
- * The MountPointChooserModule will sort them according to their {@link #getPosition() position.}
- * The position must be defined by the developer to reflect a useful execution order;
- * the order of execution of MPCs with equal position is undefined.
+ * The MountPointChooserModule will sort them according to their {@link #getPriority() priority.}
+ * The priority must be defined by the developer to reflect a useful execution order;
+ * the order of execution of MPCs with equal priority is undefined.
  *
- * <p>MPCs are executed by a {@link Volume} in ascedning order of their position to find
+ * <p>MPCs are executed by a {@link Volume} in ascedning order of their priority to find
  * and prepare a suitable Mountpoint for the Volume. The Volume has access to a
  * {@link SortedSet} of MPCs in this specific order, that is provided by the Module.
  * The Set only contains Choosers that were deemed {@link #isApplicable() applicable}
@@ -128,30 +128,30 @@ public interface MountPointChooser extends Comparable<MountPointChooser> {
 	/**
 	 * Called by the {@link MountPointChooserModule} to sort the available MPCs
 	 * and determine their execution order.
-	 * The position must be defined by the developer to reflect a useful execution order.
-	 * MPCs with lower positions will be placed at lower indices in the resulting
+	 * The priority must be defined by the developer to reflect a useful execution order.
+	 * MPCs with lower priorities will be placed at lower indices in the resulting
 	 * {@link SortedSet} and will be executed with higher probability.
-	 * The order of execution of MPCs with equal position is undefined.
+	 * The order of execution of MPCs with equal priority is undefined.
 	 *
-	 * @return the position of this MPC.
+	 * @return the priority of this MPC.
 	 */
-	int getPosition();
+	int getPriority();
 
 	/**
 	 * Called by the {@link MountPointChooserModule} to determine the execution order
 	 * of the registered MPCs. <b>Implementations usually should not override this
 	 * method.</b> This default implementation sorts the MPCs in ascending order
-	 * of their {@link #getPosition() position.}<br>
+	 * of their {@link #getPriority() priority.}<br>
 	 * <br>
 	 * <b>Original description:</b>
 	 * <p>{@inheritDoc}
 	 *
 	 * @implNote This default implementation sorts the MPCs in ascending order
-	 * of their {@link #getPosition() position.}
+	 * of their {@link #getPriority() priority.}
 	 */
 	@Override
 	default int compareTo(MountPointChooser other) {
-		//Sort by position (ascending order)
-		return Integer.compare(this.getPosition(), other.getPosition());
+		//Sort by priority (ascending order)
+		return Integer.compare(this.getPriority(), other.getPriority());
 	}
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index 786f1961f..2638db0b4 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -15,7 +15,7 @@ import java.util.Optional;
 
 public class TemporaryMountPointChooser implements MountPointChooser {
 
-	public static final int POSITION = 300;
+	public static final int PRIORITY = 300;
 
 	private static final Logger LOG = LoggerFactory.getLogger(TemporaryMountPointChooser.class);
 	private static final int MAX_TMPMOUNTPOINT_CREATION_RETRIES = 10;
@@ -89,7 +89,7 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 	}
 
 	@Override
-	public int getPosition() {
-		return POSITION;
+	public int getPriority() {
+		return PRIORITY;
 	}
 }

From a2a990bd0c86fd3531addd09e6a8e15bc2cdee6e Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Wed, 26 Aug 2020 10:25:12 +0200
Subject: [PATCH 083/169] Correct spelling

---
 .../cryptomator/ui/preferences/AutoStartWinStrategy.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
index 3f51af849..438c468bd 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
@@ -98,7 +98,7 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 				LOG.debug("Added {} to registry key {}.", AUTOSTART_VALUE, HKCU_AUTOSTART_KEY);
 				return CompletableFuture.completedFuture(null);
 			} else {
-				throw new IOException("Process existed with error code " + proc.exitValue());
+				throw new IOException("Process exited with error code " + proc.exitValue());
 			}
 		} catch (IOException e) {
 			LOG.debug("Registry could not be edited to set auto start.", e);
@@ -117,7 +117,7 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 				LOG.debug("Created file {} for auto start.", autoStartFolderEntry);
 				return CompletableFuture.completedFuture(null);
 			} else {
-				throw new IOException("Process existed with error code " + proc.exitValue());
+				throw new IOException("Process exited with error code " + proc.exitValue());
 			}
 		} catch (IOException e) {
 			LOG.debug("Adding entry to auto start folder failed.", e);
@@ -145,7 +145,7 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 		}
 
 		if (activatedUsingRegistry || activatedUsingFolder) {
-			throw new TogglingAutoStartFailedException("Disabling auto start failed both using registry and auto start folder.");
+			throw new TogglingAutoStartFailedException("Disabling auto start failed using registry and/or auto start folder.");
 		}
 	}
 
@@ -160,7 +160,7 @@ class AutoStartWinStrategy implements AutoStartStrategy {
 				LOG.debug("Removed {} from registry key {}.", AUTOSTART_VALUE, HKCU_AUTOSTART_KEY);
 				return CompletableFuture.completedFuture(null);
 			} else {
-				throw new IOException("Process existed with error code " + proc.exitValue());
+				throw new IOException("Process exited with error code " + proc.exitValue());
 			}
 		} catch (IOException e) {
 			LOG.debug("Registry could not be edited to remove auto start.", e);

From ce06ddf312668a22b042c43d6699db61cb580d74 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 18 Aug 2020 10:36:55 +0200
Subject: [PATCH 084/169] updated webdav dependencies

(cherry picked from commit 8c4d35d3db98c190861bfa5420a4f52036d2e510)
---
 main/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/pom.xml b/main/pom.xml
index 5f0d7e5ea..9a55f782a 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -28,7 +28,7 @@
 		<cryptomator.jni.version>2.2.2</cryptomator.jni.version>
 		<cryptomator.fuse.version>1.2.3</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.1.15</cryptomator.dokany.version>
-		<cryptomator.webdav.version>1.0.11</cryptomator.webdav.version>
+		<cryptomator.webdav.version>1.0.12</cryptomator.webdav.version>
 
 		<!-- 3rd party dependencies -->
 		<javafx.version>14</javafx.version>

From a8cb015a06639513a58f80617efa9a9b706b070f Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 27 Aug 2020 15:52:16 +0200
Subject: [PATCH 085/169] rename property and getters in vault class for
 display name.

---
 .../main/java/org/cryptomator/common/vaults/Vault.java | 10 +++++-----
 .../ui/changepassword/ChangePasswordController.java    |  4 ++--
 .../java/org/cryptomator/ui/common/VaultService.java   | 10 +++++-----
 .../ui/forgetPassword/ForgetPasswordController.java    |  2 +-
 .../java/org/cryptomator/ui/fxapp/FxApplication.java   |  3 +--
 .../ui/migration/MigrationRunController.java           |  4 ++--
 .../java/org/cryptomator/ui/quit/QuitController.java   |  2 +-
 .../cryptomator/ui/recoverykey/RecoveryKeyModule.java  |  4 +---
 .../ui/removevault/RemoveVaultController.java          |  2 +-
 .../cryptomator/ui/traymenu/TrayMenuController.java    |  2 +-
 .../org/cryptomator/ui/unlock/UnlockController.java    |  2 +-
 .../java/org/cryptomator/ui/unlock/UnlockModule.java   |  2 +-
 .../java/org/cryptomator/ui/unlock/UnlockWorkflow.java |  2 +-
 .../ui/vaultoptions/VaultOptionsModule.java            |  5 +----
 main/ui/src/main/resources/fxml/addvault_success.fxml  |  2 +-
 main/ui/src/main/resources/fxml/changepassword.fxml    |  2 +-
 main/ui/src/main/resources/fxml/migration_run.fxml     |  2 +-
 main/ui/src/main/resources/fxml/migration_start.fxml   |  2 +-
 main/ui/src/main/resources/fxml/migration_success.fxml |  2 +-
 .../ui/src/main/resources/fxml/recoverykey_create.fxml |  2 +-
 .../src/main/resources/fxml/recoverykey_recover.fxml   |  2 +-
 main/ui/src/main/resources/fxml/unlock_success.fxml    |  2 +-
 main/ui/src/main/resources/fxml/vault_detail.fxml      |  4 ++--
 main/ui/src/main/resources/fxml/vault_list_cell.fxml   |  2 +-
 24 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
index ce49a564e..8a3735b65 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
@@ -56,7 +56,7 @@ public class Vault {
 	private final ObjectProperty<VaultState> state;
 	private final ObjectProperty<Exception> lastKnownException;
 	private final VaultStats stats;
-	private final StringBinding displayableName;
+	private final StringBinding displayName;
 	private final StringBinding displayablePath;
 	private final BooleanBinding locked;
 	private final BooleanBinding processing;
@@ -78,7 +78,7 @@ public class Vault {
 		this.state = state;
 		this.lastKnownException = lastKnownException;
 		this.stats = stats;
-		this.displayableName = Bindings.createStringBinding(this::getDisplayableName, vaultSettings.displayName());
+		this.displayName = Bindings.createStringBinding(this::getDisplayName, vaultSettings.displayName());
 		this.displayablePath = Bindings.createStringBinding(this::getDisplayablePath, vaultSettings.path());
 		this.locked = Bindings.createBooleanBinding(this::isLocked, state);
 		this.processing = Bindings.createBooleanBinding(this::isProcessing, state);
@@ -225,11 +225,11 @@ public class Vault {
 		return state.get() == VaultState.ERROR;
 	}
 
-	public StringBinding displayableNameProperty() {
-		return displayableName;
+	public StringBinding displayNameProperty() {
+		return displayName;
 	}
 
-	public String getDisplayableName() {
+	public String getDisplayName() {
 		return vaultSettings.displayName().get();
 	}
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
index 7a641b1e7..39be745fd 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
@@ -67,7 +67,7 @@ public class ChangePasswordController implements FxController {
 	public void finish() {
 		try {
 			CryptoFileSystemProvider.changePassphrase(vault.getPath(), MASTERKEY_FILENAME, oldPasswordField.getCharacters(), newPassword.get());
-			LOG.info("Successfully changed password for {}", vault.getDisplayableName());
+			LOG.info("Successfully changed password for {}", vault.getDisplayName());
 			window.close();
 			updatePasswordInSystemkeychain();
 		} catch (IOException e) {
@@ -84,7 +84,7 @@ public class ChangePasswordController implements FxController {
 		if (keychain.isPresent()) {
 			try {
 				keychain.get().changePassphrase(vault.getId(), CharBuffer.wrap(newPassword.get()));
-				LOG.info("Successfully updated password in system keychain for {}", vault.getDisplayableName());
+				LOG.info("Successfully updated password in system keychain for {}", vault.getDisplayName());
 			} catch (KeychainAccessException e) {
 				LOG.error("Failed to update password in system keychain.", e);
 			}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java
index 3e09e1fad..8aadd8c98 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java
@@ -44,8 +44,8 @@ public class VaultService {
 	 */
 	public Task<Vault> createRevealTask(Vault vault) {
 		Task<Vault> task = new RevealVaultTask(vault);
-		task.setOnSucceeded(evt -> LOG.info("Revealed {}", vault.getDisplayableName()));
-		task.setOnFailed(evt -> LOG.error("Failed to reveal " + vault.getDisplayableName(), evt.getSource().getException()));
+		task.setOnSucceeded(evt -> LOG.info("Revealed {}", vault.getDisplayName()));
+		task.setOnFailed(evt -> LOG.error("Failed to reveal " + vault.getDisplayName(), evt.getSource().getException()));
 		return task;
 	}
 
@@ -68,8 +68,8 @@ public class VaultService {
 	 */
 	public Task<Vault> createLockTask(Vault vault, boolean forced) {
 		Task<Vault> task = new LockVaultTask(vault, forced);
-		task.setOnSucceeded(evt -> LOG.info("Locked {}", vault.getDisplayableName()));
-		task.setOnFailed(evt -> LOG.error("Failed to lock " + vault.getDisplayableName(), evt.getSource().getException()));
+		task.setOnSucceeded(evt -> LOG.info("Locked {}", vault.getDisplayName()));
+		task.setOnFailed(evt -> LOG.error("Failed to lock " + vault.getDisplayName(), evt.getSource().getException()));
 		return task;
 	}
 
@@ -94,7 +94,7 @@ public class VaultService {
 		List<Task<Vault>> lockTasks = vaults.stream().map(v -> new LockVaultTask(v, forced)).collect(Collectors.toUnmodifiableList());
 		lockTasks.forEach(executorService::execute);
 		Task<Collection<Vault>> task = new WaitForTasksTask(lockTasks);
-		String vaultNames = vaults.stream().map(Vault::getDisplayableName).collect(Collectors.joining(", "));
+		String vaultNames = vaults.stream().map(Vault::getDisplayName).collect(Collectors.joining(", "));
 		task.setOnSucceeded(evt -> LOG.info("Locked {}", vaultNames));
 		task.setOnFailed(evt -> LOG.error("Failed to lock vaults " + vaultNames, evt.getSource().getException()));
 		return task;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java
index ea1e0530e..008668126 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java
@@ -41,7 +41,7 @@ public class ForgetPasswordController implements FxController {
 		if (keychain.isPresent()) {
 			try {
 				keychain.get().deletePassphrase(vault.getId());
-				LOG.debug("Forgot password for vault {}.", vault.getDisplayableName());
+				LOG.debug("Forgot password for vault {}.", vault.getDisplayName());
 				confirmedResult.setValue(true);
 			} catch (KeychainAccessException e) {
 				LOG.error("Failed to remove entry from system keychain.", e);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
index 3172b6288..70f31e67b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
@@ -6,7 +6,6 @@ import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.value.ObservableValue;
-import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
 import javafx.stage.Stage;
 import org.cryptomator.common.LicenseHolder;
@@ -99,7 +98,7 @@ public class FxApplication extends Application {
 	public void startUnlockWorkflow(Vault vault, Optional<Stage> owner) {
 		Platform.runLater(() -> {
 			unlockWindowBuilderProvider.get().vault(vault).owner(owner).build().startUnlockWorkflow();
-			LOG.debug("Showing UnlockWindow for {}", vault.getDisplayableName());
+			LOG.debug("Showing UnlockWindow for {}", vault.getDisplayName());
 		});
 	}
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java
index 3123d4cb2..5233d979b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java
@@ -116,10 +116,10 @@ public class MigrationRunController implements FxController {
 			return migrators.needsMigration(vault.getPath(), MASTERKEY_FILENAME);
 		}).onSuccess(needsAnotherMigration -> {
 			if (needsAnotherMigration) {
-				LOG.info("Migration of '{}' succeeded, but another migration is required.", vault.getDisplayableName());
+				LOG.info("Migration of '{}' succeeded, but another migration is required.", vault.getDisplayName());
 				vault.setState(VaultState.NEEDS_MIGRATION);
 			} else {
-				LOG.info("Migration of '{}' succeeded.", vault.getDisplayableName());
+				LOG.info("Migration of '{}' succeeded.", vault.getDisplayName());
 				vault.setState(VaultState.LOCKED);
 				passwordField.wipe();
 				window.setScene(successScene.get());
diff --git a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java
index 66dd13ade..7255115ea 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java
@@ -53,7 +53,7 @@ public class QuitController implements FxController {
 
 		Task<Collection<Vault>> lockAllTask = vaultService.createLockAllTask(unlockedVaults, false);
 		lockAllTask.setOnSucceeded(evt -> {
-			LOG.info("Locked {}", lockAllTask.getValue().stream().map(Vault::getDisplayableName).collect(Collectors.joining(", ")));
+			LOG.info("Locked {}", lockAllTask.getValue().stream().map(Vault::getDisplayName).collect(Collectors.joining(", ")));
 			if (unlockedVaults.isEmpty()) {
 				window.close();
 				response.performQuit();
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
index 48e81f3a5..9ad3d73ad 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
@@ -9,7 +9,6 @@ import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.Scene;
-import javafx.scene.image.Image;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
@@ -25,7 +24,6 @@ import org.cryptomator.ui.common.StageFactory;
 
 import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
 
@@ -107,7 +105,7 @@ abstract class RecoveryKeyModule {
 	@IntoMap
 	@FxControllerKey(RecoveryKeyDisplayController.class)
 	static FxController provideRecoveryKeyDisplayController(@RecoveryKeyWindow Stage window, @RecoveryKeyWindow Vault vault, @RecoveryKeyWindow StringProperty recoveryKey, ResourceBundle localization) {
-		return new RecoveryKeyDisplayController(window, vault.getDisplayableName(), recoveryKey.get(), localization);
+		return new RecoveryKeyDisplayController(window, vault.getDisplayName(), recoveryKey.get(), localization);
 	}
 
 	@Binds
diff --git a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java
index e2d5ec024..836ed519f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java
@@ -34,7 +34,7 @@ public class RemoveVaultController implements FxController {
 	@FXML
 	public void finish() {
 		vaults.remove(vault);
-		LOG.debug("Removing vault {}.", vault.getDisplayableName());
+		LOG.debug("Removing vault {}.", vault.getDisplayName());
 		window.close();
 	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
index af12beebe..1610c6862 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
@@ -80,7 +80,7 @@ class TrayMenuController {
 	}
 
 	private Menu buildSubmenu(Vault vault) {
-		Menu submenu = new Menu(vault.getDisplayableName());
+		Menu submenu = new Menu(vault.getDisplayName());
 
 		if (vault.isLocked()) {
 			MenuItem unlockItem = new MenuItem(resourceBundle.getString("traymenu.vault.unlock"));
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
index 7310a369c..537eba9a8 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
@@ -77,7 +77,7 @@ public class UnlockController implements FxController {
 		this.unlockButtonContentDisplay = Bindings.createObjectBinding(this::getUnlockButtonContentDisplay, passwordEntryLock.awaitingInteraction());
 		this.userInteractionDisabled = passwordEntryLock.awaitingInteraction().not();
 		this.unlockButtonDisabled = new SimpleBooleanProperty();
-		this.vaultName = WeakBindings.bindString(vault.displayableNameProperty());
+		this.vaultName = WeakBindings.bindString(vault.displayNameProperty());
 		this.window.setOnCloseRequest(windowEvent -> cancel());
 	}
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
index e07583c84..bef612dc1 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
@@ -82,7 +82,7 @@ abstract class UnlockModule {
 	@UnlockScoped
 	static Stage provideStage(StageFactory factory, @UnlockWindow Vault vault, @Named("unlockWindowOwner") Optional<Stage> owner) {
 		Stage stage = factory.create();
-		stage.setTitle(vault.getDisplayableName());
+		stage.setTitle(vault.getDisplayName());
 		stage.setResizable(false);
 		if (owner.isPresent()) {
 			stage.initOwner(owner.get());
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index 08b8adf71..e0a2a4f0b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -128,7 +128,7 @@ public class UnlockWorkflow extends Task<Boolean> {
 	}
 
 	private void handleSuccess() {
-		LOG.info("Unlock of '{}' succeeded.", vault.getDisplayableName());
+		LOG.info("Unlock of '{}' succeeded.", vault.getDisplayName());
 		if (savePassword.get()) {
 			savePasswordToSystemkeychain();
 		}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java
index d0aa49281..f39af7e34 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java
@@ -5,7 +5,6 @@ import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
 import javafx.scene.Scene;
-import javafx.scene.image.Image;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
@@ -20,9 +19,7 @@ import org.cryptomator.ui.common.StageFactory;
 import org.cryptomator.ui.mainwindow.MainWindow;
 import org.cryptomator.ui.recoverykey.RecoveryKeyComponent;
 
-import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
 
@@ -41,7 +38,7 @@ abstract class VaultOptionsModule {
 	@VaultOptionsScoped
 	static Stage provideStage(StageFactory factory, @MainWindow Stage owner, @VaultOptionsWindow Vault vault) {
 		Stage stage = factory.create();
-		stage.setTitle(vault.getDisplayableName());
+		stage.setTitle(vault.getDisplayName());
 		stage.setResizable(true);
 		stage.setMinWidth(400);
 		stage.setMinHeight(300);
diff --git a/main/ui/src/main/resources/fxml/addvault_success.fxml b/main/ui/src/main/resources/fxml/addvault_success.fxml
index 6bb4808c5..fd0309450 100644
--- a/main/ui/src/main/resources/fxml/addvault_success.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_success.fxml
@@ -30,7 +30,7 @@
 
 		<Region VBox.vgrow="ALWAYS"/>
 
-		<FormattedLabel format="%addvaultwizard.success.nextStepsInstructions" arg1="${controller.vault.displayableName}" wrapText="true" HBox.hgrow="ALWAYS"/>
+		<FormattedLabel format="%addvaultwizard.success.nextStepsInstructions" arg1="${controller.vault.displayName}" wrapText="true" HBox.hgrow="ALWAYS"/>
 
 		<Region VBox.vgrow="ALWAYS"/>
 
diff --git a/main/ui/src/main/resources/fxml/changepassword.fxml b/main/ui/src/main/resources/fxml/changepassword.fxml
index 07fe7cbc4..18c1b9383 100644
--- a/main/ui/src/main/resources/fxml/changepassword.fxml
+++ b/main/ui/src/main/resources/fxml/changepassword.fxml
@@ -19,7 +19,7 @@
 	</padding>
 	<children>
 		<VBox spacing="6">
-			<FormattedLabel format="%changepassword.enterOldPassword" arg1="${controller.vault.displayableName}" wrapText="true"/>
+			<FormattedLabel format="%changepassword.enterOldPassword" arg1="${controller.vault.displayName}" wrapText="true"/>
 			<NiceSecurePasswordField fx:id="oldPasswordField"/>
 		</VBox>
 
diff --git a/main/ui/src/main/resources/fxml/migration_run.fxml b/main/ui/src/main/resources/fxml/migration_run.fxml
index 03be9a140..f70f27ce3 100644
--- a/main/ui/src/main/resources/fxml/migration_run.fxml
+++ b/main/ui/src/main/resources/fxml/migration_run.fxml
@@ -21,7 +21,7 @@
 	</padding>
 	<children>
 		<VBox spacing="6" visible="${!controller.vault.processing}" managed="${!controller.vault.processing}">
-			<FormattedLabel format="%migration.run.enterPassword" arg1="${controller.vault.displayableName}" wrapText="true"/>
+			<FormattedLabel format="%migration.run.enterPassword" arg1="${controller.vault.displayName}" wrapText="true"/>
 			<NiceSecurePasswordField fx:id="passwordField"/>
 		</VBox>
 
diff --git a/main/ui/src/main/resources/fxml/migration_start.fxml b/main/ui/src/main/resources/fxml/migration_start.fxml
index c568ae9cb..c836a9393 100644
--- a/main/ui/src/main/resources/fxml/migration_start.fxml
+++ b/main/ui/src/main/resources/fxml/migration_start.fxml
@@ -28,7 +28,7 @@
 			</StackPane>
 
 			<VBox spacing="6" HBox.hgrow="ALWAYS">
-				<FormattedLabel format="%migration.start.prompt" arg1="${controller.vault.displayableName}" wrapText="true" />
+				<FormattedLabel format="%migration.start.prompt" arg1="${controller.vault.displayName}" wrapText="true" />
 				<CheckBox fx:id="confirmSyncDone" text="%migration.start.confirm"/>
 			</VBox>
 		</HBox>
diff --git a/main/ui/src/main/resources/fxml/migration_success.fxml b/main/ui/src/main/resources/fxml/migration_success.fxml
index 59e997550..9fd081757 100644
--- a/main/ui/src/main/resources/fxml/migration_success.fxml
+++ b/main/ui/src/main/resources/fxml/migration_success.fxml
@@ -25,7 +25,7 @@
 				<Circle styleClass="glyph-icon-primary" radius="24"/>
 				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="CHECK" glyphSize="24"/>
 			</StackPane>
-			<FormattedLabel format="%migration.success.nextStepsInstructions" arg1="${controller.vault.displayableName}" wrapText="true" HBox.hgrow="ALWAYS"/>
+			<FormattedLabel format="%migration.success.nextStepsInstructions" arg1="${controller.vault.displayName}" wrapText="true" HBox.hgrow="ALWAYS"/>
 		</HBox>
 
 		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
diff --git a/main/ui/src/main/resources/fxml/recoverykey_create.fxml b/main/ui/src/main/resources/fxml/recoverykey_create.fxml
index c1c7299a1..73775237f 100644
--- a/main/ui/src/main/resources/fxml/recoverykey_create.fxml
+++ b/main/ui/src/main/resources/fxml/recoverykey_create.fxml
@@ -20,7 +20,7 @@
 	</padding>
 	<children>
 		<VBox spacing="6">
-			<FormattedLabel format="%recoveryKey.enterPassword.prompt" arg1="${controller.vault.displayableName}" wrapText="true"/>
+			<FormattedLabel format="%recoveryKey.enterPassword.prompt" arg1="${controller.vault.displayName}" wrapText="true"/>
 			<NiceSecurePasswordField fx:id="passwordField" HBox.hgrow="ALWAYS"/>
 		</VBox>
 
diff --git a/main/ui/src/main/resources/fxml/recoverykey_recover.fxml b/main/ui/src/main/resources/fxml/recoverykey_recover.fxml
index c1c161a0d..c12a5e83e 100644
--- a/main/ui/src/main/resources/fxml/recoverykey_recover.fxml
+++ b/main/ui/src/main/resources/fxml/recoverykey_recover.fxml
@@ -21,7 +21,7 @@
 		<Insets topRightBottomLeft="12"/>
 	</padding>
 	<children>
-		<FormattedLabel format="%recoveryKey.recover.prompt" arg1="${controller.vault.displayableName}" wrapText="true"/>
+		<FormattedLabel format="%recoveryKey.recover.prompt" arg1="${controller.vault.displayName}" wrapText="true"/>
 
 		<TextArea wrapText="true" prefRowCount="4" fx:id="textarea" textFormatter="${controller.recoveryKeyTextFormatter}" onKeyPressed="#onKeyPressed"/>
 		
diff --git a/main/ui/src/main/resources/fxml/unlock_success.fxml b/main/ui/src/main/resources/fxml/unlock_success.fxml
index 8fb568d70..5ad817cf6 100644
--- a/main/ui/src/main/resources/fxml/unlock_success.fxml
+++ b/main/ui/src/main/resources/fxml/unlock_success.fxml
@@ -28,7 +28,7 @@
 				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="CHECK" glyphSize="24"/>
 			</StackPane>
 			<VBox spacing="6">
-				<FormattedLabel format="%unlock.success.message" arg1="${controller.vault.displayableName}" wrapText="true" HBox.hgrow="ALWAYS"/>
+				<FormattedLabel format="%unlock.success.message" arg1="${controller.vault.displayName}" wrapText="true" HBox.hgrow="ALWAYS"/>
 				<CheckBox text="%unlock.success.rememberChoice" fx:id="rememberChoiceCheckbox"/>
 			</VBox>
 		</HBox>
diff --git a/main/ui/src/main/resources/fxml/vault_detail.fxml b/main/ui/src/main/resources/fxml/vault_detail.fxml
index 625ae1e1f..62be6996f 100644
--- a/main/ui/src/main/resources/fxml/vault_detail.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail.fxml
@@ -26,9 +26,9 @@
 			</StackPane>
 			<VBox spacing="4" HBox.hgrow="ALWAYS">
 				<HBox spacing="12">
-					<Label styleClass="label-large" text="${controller.vault.displayableName}">
+					<Label styleClass="label-large" text="${controller.vault.displayName}">
 						<tooltip>
-							<Tooltip text="${controller.vault.displayableName}"/>
+							<Tooltip text="${controller.vault.displayName}"/>
 						</tooltip>
 					</Label>
 					<Region HBox.hgrow="ALWAYS"/>
diff --git a/main/ui/src/main/resources/fxml/vault_list_cell.fxml b/main/ui/src/main/resources/fxml/vault_list_cell.fxml
index 5e583ac2a..ce1df1602 100644
--- a/main/ui/src/main/resources/fxml/vault_list_cell.fxml
+++ b/main/ui/src/main/resources/fxml/vault_list_cell.fxml
@@ -20,7 +20,7 @@
 			<FontAwesome5IconView glyph="${controller.glyph}" HBox.hgrow="NEVER" glyphSize="16"/>
 		</VBox>
 		<VBox spacing="4" HBox.hgrow="ALWAYS">
-			<Label styleClass="header-label" text="${controller.vault.displayableName}"/>
+			<Label styleClass="header-label" text="${controller.vault.displayName}"/>
 			<Label styleClass="detail-label" text="${controller.vault.displayablePath}" textOverrun="CENTER_ELLIPSIS"/>
 		</VBox>
 	</children>

From 6553c04256c33a80db8a1a9d891c863e6f01f292 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 27 Aug 2020 15:53:20 +0200
Subject: [PATCH 086/169] add code to migrate legacy settings.json files to new
 property.

---
 .../common/settings/VaultSettingsJsonAdapter.java   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
index a6dafd9f9..5f8f2a95f 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
@@ -5,6 +5,7 @@
  *******************************************************************************/
 package org.cryptomator.common.settings;
 
+import com.google.common.base.Strings;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import org.slf4j.Logger;
@@ -21,7 +22,7 @@ class VaultSettingsJsonAdapter {
 		out.beginObject();
 		out.name("id").value(value.getId());
 		out.name("path").value(value.path().get().toString());
-		out.name("mountName").value(value.displayName().get());
+		out.name("displayName").value(value.displayName().get());
 		out.name("winDriveLetter").value(value.winDriveLetter().get());
 		out.name("unlockAfterStartup").value(value.unlockAfterStartup().get());
 		out.name("revealAfterMount").value(value.revealAfterMount().get());
@@ -37,6 +38,7 @@ class VaultSettingsJsonAdapter {
 	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;
 		String customMountPath = null;
 		String winDriveLetter = null;
@@ -54,7 +56,8 @@ class VaultSettingsJsonAdapter {
 			switch (name) {
 				case "id" -> id = in.nextString();
 				case "path" -> path = in.nextString();
-				case "mountName" -> displayName = in.nextString(); //YES, this is correct (legacy reasons)
+				case "mountName" -> mountName = in.nextString(); //see https://github.com/cryptomator/cryptomator/pull/1318
+				case "displayName" -> displayName = in.nextString();
 				case "winDriveLetter" -> winDriveLetter = in.nextString();
 				case "unlockAfterStartup" -> unlockAfterStartup = in.nextBoolean();
 				case "revealAfterMount" -> revealAfterMount = in.nextBoolean();
@@ -73,7 +76,11 @@ class VaultSettingsJsonAdapter {
 		in.endObject();
 
 		VaultSettings vaultSettings = (id == null) ? VaultSettings.withRandomId() : new VaultSettings(id);
-		vaultSettings.displayName().set(displayName);
+		if(Strings.isNullOrEmpty(displayName)){ //see https://github.com/cryptomator/cryptomator/pull/1318
+			vaultSettings.displayName().set(mountName);
+		} else {
+			vaultSettings.displayName().set(displayName);
+		}
 		vaultSettings.path().set(Paths.get(path));
 		vaultSettings.winDriveLetter().set(winDriveLetter);
 		vaultSettings.unlockAfterStartup().set(unlockAfterStartup);

From eb6ade49f680e0767816163fe74df0dacda3564c Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 27 Aug 2020 16:02:28 +0200
Subject: [PATCH 087/169] refactor to use parameterized test

---
 .../common/settings/VaultSettingsTest.java    | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsTest.java b/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsTest.java
index 779b017bc..8ec6dc681 100644
--- a/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsTest.java
+++ b/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsTest.java
@@ -8,26 +8,19 @@
  *******************************************************************************/
 package org.cryptomator.common.settings;
 
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class VaultSettingsTest {
 
-	@Test
-	public void testNormalize() {
+	@ParameterizedTest
+	@CsvSource({"a a,a_a", "ä,a", "Ĉ,C", ":,_", "汉语,_"})
+	public void testNormalize(String test, String expected) {
 		VaultSettings settings = new VaultSettings("id");
-		settings.displayName().setValue(" ");
-		assertEquals("_", settings.normalizeDisplayName());
-
-		settings.displayName().setValue("ä");
-		assertEquals("a", settings.normalizeDisplayName());
-		settings.displayName().setValue("Ĉ");
-		assertEquals("C", settings.normalizeDisplayName());
-		settings.displayName().setValue(":");
-		assertEquals("_", settings.normalizeDisplayName());
-		settings.displayName().setValue("汉语");
-		assertEquals("_", settings.normalizeDisplayName());
+		settings.displayName().setValue(test);
+		assertEquals(expected, settings.normalizeDisplayName());
 	}
 
 }

From f49974180b78cf168d03b87adbe9a66e703f83b7 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 28 Aug 2020 11:19:56 +0200
Subject: [PATCH 088/169] Fixing test

---
 .../common/settings/VaultSettingsJsonAdapterTest.java         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java b/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
index 4c684d5d6..a0faee551 100644
--- a/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
+++ b/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
@@ -23,7 +23,7 @@ public class VaultSettingsJsonAdapterTest {
 
 	@Test
 	public void testDeserialize() throws IOException {
-		String json = "{\"id\": \"foo\", \"path\": \"/foo/bar\", \"mountName\": \"test\", \"winDriveLetter\": \"X\", \"shouldBeIgnored\": true, \"individualMountPath\": \"/home/test/crypto\", \"mountFlags\":\"--foo --bar\"}";
+		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);
@@ -55,7 +55,7 @@ public class VaultSettingsJsonAdapterTest {
 		} else {
 			MatcherAssert.assertThat(result, CoreMatchers.containsString("\"path\":\"/foo/bar\""));
 		}
-		MatcherAssert.assertThat(result, CoreMatchers.containsString("\"mountName\":\"mountyMcMountFace\""));
+		MatcherAssert.assertThat(result, CoreMatchers.containsString("\"displayName\":\"mountyMcMountFace\""));
 		MatcherAssert.assertThat(result, CoreMatchers.containsString("\"mountFlags\":\"--foo --bar\""));
 	}
 

From c3141e3601c7d8991ae625698f72ad3e3183c05b Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 28 Aug 2020 11:58:46 +0200
Subject: [PATCH 089/169] minor adjustments

---
 .../org/cryptomator/common/settings/VaultSettings.java     | 1 -
 .../common/settings/VaultSettingsJsonAdapter.java          | 7 +++----
 .../org/cryptomator/common/vaults/VaultListManager.java    | 6 +++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
index 6e2bd3cd8..b5b2ffac6 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
@@ -35,7 +35,6 @@ public class VaultSettings {
 	public static final boolean DEFAULT_USES_INDIVIDUAL_MOUNTPATH = false;
 	public static final boolean DEFAULT_USES_READONLY_MODE = false;
 	public static final String DEFAULT_MOUNT_FLAGS = "";
-	public static final String DEFAULT_MOUNT_NAME = "Vault";
 	public static final int DEFAULT_FILENAME_LENGTH_LIMIT = -1;
 	public static final WhenUnlocked DEFAULT_ACTION_AFTER_UNLOCK = WhenUnlocked.ASK;
 
diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
index 5f8f2a95f..04a352a49 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
@@ -5,7 +5,6 @@
  *******************************************************************************/
 package org.cryptomator.common.settings;
 
-import com.google.common.base.Strings;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import org.slf4j.Logger;
@@ -76,10 +75,10 @@ class VaultSettingsJsonAdapter {
 		in.endObject();
 
 		VaultSettings vaultSettings = (id == null) ? VaultSettings.withRandomId() : new VaultSettings(id);
-		if(Strings.isNullOrEmpty(displayName)){ //see https://github.com/cryptomator/cryptomator/pull/1318
-			vaultSettings.displayName().set(mountName);
-		} else {
+		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.winDriveLetter().set(winDriveLetter);
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
index 85309c0dc..a670acab5 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
@@ -35,13 +35,13 @@ public class VaultListManager {
 	private static final Logger LOG = LoggerFactory.getLogger(VaultListManager.class);
 
 	private final VaultComponent.Builder vaultComponentBuilder;
-	private final ResourceBundle resourceBundle;
 	private final ObservableList<Vault> vaultList;
+	private final String defaultVaultName;
 
 	@Inject
 	public VaultListManager(VaultComponent.Builder vaultComponentBuilder, ResourceBundle resourceBundle, Settings settings) {
 		this.vaultComponentBuilder = vaultComponentBuilder;
-		this.resourceBundle = resourceBundle;
+		this.defaultVaultName = resourceBundle.getString("defaults.vault.vaultName");
 		this.vaultList = FXCollections.observableArrayList(Vault::observables);
 
 		addAll(settings.getDirectories());
@@ -73,7 +73,7 @@ public class VaultListManager {
 		if (path.getFileName() != null) {
 			vaultSettings.displayName().set(path.getFileName().toString());
 		} else {
-			vaultSettings.displayName().set(resourceBundle.getString("defaults.vault.vaultName"));
+			vaultSettings.displayName().set(defaultVaultName);
 		}
 		return vaultSettings;
 	}

From 688993ba3768a636f5e36c4174765c4cff90a369 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Fri, 28 Aug 2020 12:58:50 +0200
Subject: [PATCH 090/169] preparing 1.5.8

---
 main/buildkit/pom.xml | 2 +-
 main/commons/pom.xml  | 2 +-
 main/keychain/pom.xml | 2 +-
 main/launcher/pom.xml | 2 +-
 main/pom.xml          | 2 +-
 main/ui/pom.xml       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml
index 0d1ee6078..db648f3bd 100644
--- a/main/buildkit/pom.xml
+++ b/main/buildkit/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.7</version>
+		<version>1.5.8</version>
 	</parent>
 	<artifactId>buildkit</artifactId>
 	<packaging>pom</packaging>
diff --git a/main/commons/pom.xml b/main/commons/pom.xml
index e1707b3d6..7ff7a22bb 100644
--- a/main/commons/pom.xml
+++ b/main/commons/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.7</version>
+		<version>1.5.8</version>
 	</parent>
 	<artifactId>commons</artifactId>
 	<name>Cryptomator Commons</name>
diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml
index db66faf35..d69d5ba83 100644
--- a/main/keychain/pom.xml
+++ b/main/keychain/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.7</version>
+		<version>1.5.8</version>
 	</parent>
 	<artifactId>keychain</artifactId>
 	<name>System Keychain Access</name>
diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml
index e1d8f1550..c617f4167 100644
--- a/main/launcher/pom.xml
+++ b/main/launcher/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.7</version>
+		<version>1.5.8</version>
 	</parent>
 	<artifactId>launcher</artifactId>
 	<name>Cryptomator Launcher</name>
diff --git a/main/pom.xml b/main/pom.xml
index b29a8b43f..2b1badbab 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
-	<version>1.5.7</version>
+	<version>1.5.8</version>
 	<packaging>pom</packaging>
 	<name>Cryptomator</name>
 
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index cf2750852..b4b41540c 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.7</version>
+		<version>1.5.8</version>
 	</parent>
 	<artifactId>ui</artifactId>
 	<name>Cryptomator GUI</name>

From c92f1aa655a987cc12951a77eceee3ea94c9b2a7 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Fri, 28 Aug 2020 13:34:41 +0200
Subject: [PATCH 091/169] updated third-party licenses

---
 .../main/resources/license/THIRD-PARTY.txt    | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt
index a988029e9..1914c284e 100644
--- a/main/ui/src/main/resources/license/THIRD-PARTY.txt
+++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt
@@ -33,17 +33,17 @@ Cryptomator uses 52 third-party dependencies under the following licenses:
 		- javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/)
 		- Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna)
 		- Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna)
-		- Apache Commons Lang (org.apache.commons:commons-lang3:3.10 - https://commons.apache.org/proper/commons-lang/)
+		- Apache Commons Lang (org.apache.commons:commons-lang3:3.11 - https://commons.apache.org/proper/commons-lang/)
 		- Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.13 - http://hc.apache.org/httpcomponents-core-ga)
-		- Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.21.0 - http://jackrabbit.apache.org/jackrabbit-webdav/)
-		- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.28.v20200408 - http://www.eclipse.org/jetty)
+		- Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.21.3 - http://jackrabbit.apache.org/jackrabbit-webdav/)
+		- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.31.v20200723 - http://www.eclipse.org/jetty)
 	BSD:
 		- asm (org.ow2.asm:asm:7.1 - http://asm.ow2.org/)
 		- asm-analysis (org.ow2.asm:asm-analysis:7.1 - http://asm.ow2.org/)
@@ -51,14 +51,14 @@ Cryptomator uses 52 third-party dependencies under the following licenses:
 		- asm-tree (org.ow2.asm:asm-tree:7.1 - http://asm.ow2.org/)
 		- asm-util (org.ow2.asm:asm-util:7.1 - http://asm.ow2.org/)
 	Eclipse Public License - Version 1.0:
-		- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.28.v20200408 - http://www.eclipse.org/jetty)
-		- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.28.v20200408 - http://www.eclipse.org/jetty)
+		- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+		- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.31.v20200723 - http://www.eclipse.org/jetty)
 	Eclipse Public License - v 2.0:
 		- jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
 	GPLv2:

From 83f9514a4243c0c98a2ceb8efd62a28177b28750 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Fri, 28 Aug 2020 13:41:43 +0200
Subject: [PATCH 092/169] fixed icon views of labels in new password screen
 that could only appear once

(cherry picked from commit 4723416d45464744c877e52d6aaac7cefad602f6)
---
 .../ui/common/NewPasswordController.java         | 16 +++++++++-------
 .../ui/src/main/resources/fxml/new_password.fxml |  8 +++++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
index 24f3ac8db..19e33f7c3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
@@ -24,10 +24,12 @@ public class NewPasswordController implements FxController {
 	public NiceSecurePasswordField passwordField;
 	public NiceSecurePasswordField reenterField;
 	public Label passwordStrengthLabel;
+	public FontAwesome5IconView passwordStrengthCheckmark;
+	public FontAwesome5IconView passwordStrengthWarning;
+	public FontAwesome5IconView passwordStrengthCross;
 	public Label passwordMatchLabel;
-	public FontAwesome5IconView checkmark;
-	public FontAwesome5IconView warning;
-	public FontAwesome5IconView cross;
+	public FontAwesome5IconView passwordMatchCheckmark;
+	public FontAwesome5IconView passwordMatchCross;
 
 	public NewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater, ObjectProperty<CharSequence> password) {
 		this.resourceBundle = resourceBundle;
@@ -45,7 +47,7 @@ public class NewPasswordController implements FxController {
 		BooleanBinding passwordsMatch = Bindings.createBooleanBinding(this::hasSamePasswordInBothFields, passwordField.textProperty(), reenterField.textProperty());
 		BooleanBinding reenterFieldNotEmpty = reenterField.textProperty().isNotEmpty();
 		passwordMatchLabel.visibleProperty().bind(reenterFieldNotEmpty);
-		passwordMatchLabel.graphicProperty().bind(Bindings.when(passwordsMatch.and(reenterFieldNotEmpty)).then(checkmark).otherwise(cross));
+		passwordMatchLabel.graphicProperty().bind(Bindings.when(passwordsMatch.and(reenterFieldNotEmpty)).then(passwordMatchCheckmark).otherwise(passwordMatchCross));
 		passwordMatchLabel.textProperty().bind(Bindings.when(passwordsMatch.and(reenterFieldNotEmpty)).then(resourceBundle.getString("newPassword.passwordsMatch")).otherwise(resourceBundle.getString("newPassword.passwordsDoNotMatch")));
 
 		passwordField.textProperty().addListener(this::passwordsDidChange);
@@ -56,11 +58,11 @@ public class NewPasswordController implements FxController {
 		if (passwordField.getCharacters().length() == 0) {
 			return null;
 		} else if (passwordStrength.intValue() <= -1) {
-			return cross;
+			return passwordStrengthCross;
 		} else if (passwordStrength.intValue() < 3) {
-			return warning;
+			return passwordStrengthWarning;
 		} else {
-			return checkmark;
+			return passwordStrengthCheckmark;
 		}
 	}
 
diff --git a/main/ui/src/main/resources/fxml/new_password.fxml b/main/ui/src/main/resources/fxml/new_password.fxml
index 7593a1ccd..c406b8c70 100644
--- a/main/ui/src/main/resources/fxml/new_password.fxml
+++ b/main/ui/src/main/resources/fxml/new_password.fxml
@@ -12,9 +12,11 @@
 	  spacing="6"
 	  alignment="CENTER_LEFT">
 	<fx:define>
-		<FontAwesome5IconView fx:id="checkmark" styleClass="glyph-icon-primary" glyph="CHECK"/>
-		<FontAwesome5IconView fx:id="warning" styleClass="glyph-icon-orange" glyph="EXCLAMATION_TRIANGLE"/>
-		<FontAwesome5IconView fx:id="cross" styleClass="glyph-icon-red" glyph="TIMES"/>
+		<FontAwesome5IconView fx:id="passwordStrengthCheckmark" styleClass="glyph-icon-primary" glyph="CHECK"/>
+		<FontAwesome5IconView fx:id="passwordStrengthWarning" styleClass="glyph-icon-orange" glyph="EXCLAMATION_TRIANGLE"/>
+		<FontAwesome5IconView fx:id="passwordStrengthCross" styleClass="glyph-icon-red" glyph="TIMES"/>
+		<FontAwesome5IconView fx:id="passwordMatchCheckmark" styleClass="glyph-icon-primary" glyph="CHECK"/>
+		<FontAwesome5IconView fx:id="passwordMatchCross" styleClass="glyph-icon-red" glyph="TIMES"/>
 	</fx:define>
 	<children>
 		<Label text="%newPassword.promptText" labelFor="$passwordField"/>

From 6578ac0121785252477c379aac66ac1ed354dd6d Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Fri, 28 Aug 2020 13:55:17 +0200
Subject: [PATCH 093/169] use mountName in FUSE on macOS instead of displayName

---
 .../java/org/cryptomator/common/vaults/VaultModule.java     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
index d084be7bd..368bd516a 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
@@ -12,9 +12,7 @@ import javafx.beans.binding.StringBinding;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
-import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.StringProperty;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VaultSettings;
@@ -77,7 +75,7 @@ public class VaultModule {
 	@DefaultMountFlags
 	public StringBinding provideDefaultMountFlags(Settings settings, VaultSettings vaultSettings) {
 		ObjectProperty<VolumeImpl> preferredVolumeImpl = settings.preferredVolumeImpl();
-		StringProperty mountName = vaultSettings.displayName();
+		StringBinding mountName = vaultSettings.mountName();
 		BooleanProperty readOnly = vaultSettings.usesReadOnlyMode();
 
 		return Bindings.createStringBinding(() -> {
@@ -95,7 +93,7 @@ public class VaultModule {
 	}
 
 	// see: https://github.com/osxfuse/osxfuse/wiki/Mount-options
-	private String getMacFuseDefaultMountFlags(ReadOnlyStringProperty mountName, ReadOnlyBooleanProperty readOnly) {
+	private String getMacFuseDefaultMountFlags(StringBinding mountName, ReadOnlyBooleanProperty readOnly) {
 		assert SystemUtils.IS_OS_MAC_OSX;
 		StringBuilder flags = new StringBuilder();
 		if (readOnly.get()) {

From 2a335eb7affcc3484d18dabb5672e3696952e475 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Fri, 28 Aug 2020 14:06:09 +0200
Subject: [PATCH 094/169] fixed test

---
 .../org/cryptomator/common/vaults/VaultModuleTest.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java b/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
index 0f4cbd102..dcc2693e1 100644
--- a/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
+++ b/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
@@ -3,7 +3,6 @@ package org.cryptomator.common.vaults;
 import javafx.beans.binding.StringBinding;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.common.settings.VolumeImpl;
@@ -28,7 +27,12 @@ public class VaultModuleTest {
 
 	@BeforeEach
 	public void setup(@TempDir Path tmpDir) {
-		Mockito.when(vaultSettings.displayName()).thenReturn(new SimpleStringProperty("TEST"));
+		Mockito.when(vaultSettings.mountName()).thenReturn(new StringBinding() {
+			@Override
+			protected String computeValue() {
+				return "TEST";
+			}
+		});
 		Mockito.when(vaultSettings.usesReadOnlyMode()).thenReturn(new SimpleBooleanProperty(true));
 		System.setProperty("user.home", tmpDir.toString());
 	}

From f891a9f1a70b17975053249d452c1d2f6650bc19 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Fri, 28 Aug 2020 14:25:26 +0200
Subject: [PATCH 095/169] refactored that fix from
 2a335eb7affcc3484d18dabb5672e3696952e475

---
 .../org/cryptomator/common/vaults/VaultModuleTest.java    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java b/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
index dcc2693e1..e4922963b 100644
--- a/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
+++ b/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
@@ -1,5 +1,6 @@
 package org.cryptomator.common.vaults;
 
+import javafx.beans.binding.Bindings;
 import javafx.beans.binding.StringBinding;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -27,12 +28,7 @@ public class VaultModuleTest {
 
 	@BeforeEach
 	public void setup(@TempDir Path tmpDir) {
-		Mockito.when(vaultSettings.mountName()).thenReturn(new StringBinding() {
-			@Override
-			protected String computeValue() {
-				return "TEST";
-			}
-		});
+		Mockito.when(vaultSettings.mountName()).thenReturn(Bindings.createStringBinding(() -> "TEST"));
 		Mockito.when(vaultSettings.usesReadOnlyMode()).thenReturn(new SimpleBooleanProperty(true));
 		System.setProperty("user.home", tmpDir.toString());
 	}

From cdbcd20241fbcd9f8df368ad6ee7a8af6e590ada Mon Sep 17 00:00:00 2001
From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com>
Date: Sat, 5 Sep 2020 22:15:02 +0200
Subject: [PATCH 096/169] Fixed faulty access introduced by parallel release of
 1.5.8

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

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
index 28aa7527a..39ac77f78 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
@@ -147,7 +147,7 @@ public class VaultModule {
 	// see https://github.com/billziss-gh/winfsp/blob/5d0b10d0b643652c00ebb4704dc2bb28e7244973/src/dll/fuse/fuse_main.c#L53-L62 for syntax guide
 	// see https://github.com/billziss-gh/winfsp/blob/5d0b10d0b643652c00ebb4704dc2bb28e7244973/src/dll/fuse/fuse.c#L295-L319 for options (-o <...>)
 	// see https://github.com/billziss-gh/winfsp/wiki/Frequently-Asked-Questions/5ba00e4be4f5e938eaae6ef1500b331de12dee77 (FUSE 4.) on why the given defaults were choosen
-	private String getWindowsFuseDefaultMountFlags(ReadOnlyStringProperty mountName, ReadOnlyBooleanProperty readOnly) {
+	private String getWindowsFuseDefaultMountFlags(StringBinding mountName, ReadOnlyBooleanProperty readOnly) {
 		assert SystemUtils.IS_OS_WINDOWS;
 		StringBuilder flags = new StringBuilder();
 

From e8d17cfb7b41e3eb8fa3e5083d702d8f01f48087 Mon Sep 17 00:00:00 2001
From: ainiml <ericjaw@gmail.com>
Date: Sun, 6 Sep 2020 19:25:50 -0400
Subject: [PATCH 097/169] allows running launcher-linux.sh from any path

---
 main/buildkit/src/main/resources/launcher-linux.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/buildkit/src/main/resources/launcher-linux.sh b/main/buildkit/src/main/resources/launcher-linux.sh
index 2322870e8..b64d2c1ce 100644
--- a/main/buildkit/src/main/resources/launcher-linux.sh
+++ b/main/buildkit/src/main/resources/launcher-linux.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd $(dirname $0)
 java \
 	-cp "libs/*" \
 	-Dcryptomator.settingsPath="~/.config/Cryptomator/settings.json" \

From 528510eb53be6ffd7989fe67f0b6f5cc56ffa904 Mon Sep 17 00:00:00 2001
From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com>
Date: Mon, 7 Sep 2020 21:48:13 +0200
Subject: [PATCH 098/169] Renamed binding fuseAndWindows to
 restrictToStableFuseOnWindows

Renamed binding fuseAndWindows to restrictToStableFuseOnWindows in MountOptionsController

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r477135521
---
 .../ui/vaultoptions/MountOptionsController.java   | 15 ++++++++-------
 .../main/resources/fxml/vault_options_mount.fxml  |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
index df3cf7039..ff0f178dc 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
@@ -54,7 +54,7 @@ public class MountOptionsController implements FxController {
 
 	//FUSE + Windows -> Disable some (experimental) features for the user because they are unstable
 	//Use argument Dfuse.experimental="true" to override
-	private final BooleanBinding fuseAndWindows;
+	private final BooleanBinding restrictToStableFuseOnWindows;
 
 	@Inject
 	MountOptionsController(@VaultOptionsWindow Stage window, @VaultOptionsWindow Vault vault, Settings settings, WindowsDriveLetters windowsDriveLetters, ResourceBundle resourceBundle, Environment environment) {
@@ -64,7 +64,8 @@ public class MountOptionsController implements FxController {
 		this.windowsDriveLetters = windowsDriveLetters;
 		this.resourceBundle = resourceBundle;
 
-		this.fuseAndWindows = settings.preferredVolumeImpl().isEqualTo(VolumeImpl.FUSE).and(osIsWindows).and(new SimpleBooleanProperty(!environment.useExperimentalFuse()));
+		BooleanBinding isFuseOnWindows = settings.preferredVolumeImpl().isEqualTo(VolumeImpl.FUSE).and(osIsWindows);
+		this.restrictToStableFuseOnWindows = isFuseOnWindows.and(new SimpleBooleanProperty(!environment.useExperimentalFuse())); //Is FUSE on Win and is NOT experimental fuse enabled
 	}
 
 	@FXML
@@ -72,10 +73,10 @@ public class MountOptionsController implements FxController {
 
 		// readonly:
 		readOnlyCheckbox.selectedProperty().bindBidirectional(vault.getVaultSettings().usesReadOnlyMode());
-		if(isFuseAndWindows()) {
+		if(getRestrictToStableFuseOnWindows()) {
 			readOnlyCheckbox.setSelected(false); // to prevent invalid states
 		}
-		readOnlyCheckbox.disableProperty().bind(customMountFlagsCheckbox.selectedProperty().or(fuseAndWindows));
+		readOnlyCheckbox.disableProperty().bind(customMountFlagsCheckbox.selectedProperty().or(restrictToStableFuseOnWindows));
 
 		// custom mount flags:
 		mountFlags.disableProperty().bind(customMountFlagsCheckbox.selectedProperty().not());
@@ -93,7 +94,7 @@ public class MountOptionsController implements FxController {
 		driveLetterSelection.setConverter(new WinDriveLetterLabelConverter(windowsDriveLetters, resourceBundle));
 		driveLetterSelection.setValue(vault.getVaultSettings().winDriveLetter().get());
 
-		if (vault.getVaultSettings().useCustomMountPath().get() && !isFuseAndWindows() /* to prevent invalid states */) {
+		if (vault.getVaultSettings().useCustomMountPath().get() && !getRestrictToStableFuseOnWindows() /* to prevent invalid states */) {
 			mountPoint.selectToggle(mountPointCustomDir);
 		} else if (!Strings.isNullOrEmpty(vault.getVaultSettings().winDriveLetter().get())) {
 			mountPoint.selectToggle(mountPointWinDriveLetter);
@@ -201,8 +202,8 @@ public class MountOptionsController implements FxController {
 		return vault.getVaultSettings().customMountPath().get();
 	}
 
-	public Boolean isFuseAndWindows() {
-		return fuseAndWindows.get();
+	public Boolean getRestrictToStableFuseOnWindows() {
+		return restrictToStableFuseOnWindows.get();
 	}
 
 }
diff --git a/main/ui/src/main/resources/fxml/vault_options_mount.fxml b/main/ui/src/main/resources/fxml/vault_options_mount.fxml
index bf65249a5..3fa3abaa5 100644
--- a/main/ui/src/main/resources/fxml/vault_options_mount.fxml
+++ b/main/ui/src/main/resources/fxml/vault_options_mount.fxml
@@ -44,7 +44,7 @@
 			<ChoiceBox fx:id="driveLetterSelection" disable="${!mountPointWinDriveLetter.selected}"/>
 		</HBox>
 		<HBox spacing="6" alignment="CENTER_LEFT" visible="${!controller.webDavAndWindows}" managed="${!controller.webDavAndWindows}">
-			<RadioButton toggleGroup="${mountPoint}" fx:id="mountPointCustomDir" text="%vaultOptions.mount.mountPoint.custom" disable="${controller.fuseAndWindows}"/>
+			<RadioButton toggleGroup="${mountPoint}" fx:id="mountPointCustomDir" text="%vaultOptions.mount.mountPoint.custom" disable="${controller.restrictToStableFuseOnWindows}"/>
 			<Button text="%vaultOptions.mount.mountPoint.directoryPickerButton" onAction="#chooseCustomMountPoint" contentDisplay="LEFT" disable="${!mountPointCustomDir.selected}">
 				<graphic>
 					<FontAwesome5IconView glyph="FOLDER_OPEN" glyphSize="15"/>

From 8680bd1deecc4a1ebce712d06e7e8083e41e7445 Mon Sep 17 00:00:00 2001
From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com>
Date: Mon, 7 Sep 2020 22:21:45 +0200
Subject: [PATCH 099/169] Updated MountPointChooserModule and MPCs

Updated MountPointChooserModule and MPCs to use bindings (@'Binds) instead of providers (@'Provides)
Updated CustomDriveLetterChooser and TemporaryMountPointChooser  to use VaultSettings instead of Vaults

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472872166
---
 .../AvailableDriveLetterChooser.java          |  2 ++
 .../mountpoint/CustomDriveLetterChooser.java  | 12 ++++----
 .../mountpoint/CustomMountPointChooser.java   |  2 ++
 .../mountpoint/MountPointChooserModule.java   | 28 ++++++-------------
 .../TemporaryMountPointChooser.java           | 14 ++++++----
 5 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
index 04e7c74ff..22fc8f4af 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
@@ -3,6 +3,7 @@ package org.cryptomator.common.mountpoint;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.vaults.WindowsDriveLetters;
 
+import javax.inject.Inject;
 import java.nio.file.Path;
 import java.util.Optional;
 
@@ -12,6 +13,7 @@ public class AvailableDriveLetterChooser implements MountPointChooser {
 
 	private final WindowsDriveLetters windowsDriveLetters;
 
+	@Inject
 	public AvailableDriveLetterChooser(WindowsDriveLetters windowsDriveLetters) {
 		this.windowsDriveLetters = windowsDriveLetters;
 	}
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
index 0c44150d1..0d0eae225 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
@@ -1,8 +1,9 @@
 package org.cryptomator.common.mountpoint;
 
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.common.settings.VaultSettings;
 
+import javax.inject.Inject;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Optional;
@@ -11,10 +12,11 @@ public class CustomDriveLetterChooser implements MountPointChooser {
 
 	public static final int PRIORITY = 100;
 
-	private final Vault vault;
+	private final VaultSettings vaultSettings;
 
-	public CustomDriveLetterChooser(Vault vault) {
-		this.vault = vault;
+	@Inject
+	public CustomDriveLetterChooser(VaultSettings vaultSettings) {
+		this.vaultSettings = vaultSettings;
 	}
 
 	@Override
@@ -24,7 +26,7 @@ public class CustomDriveLetterChooser implements MountPointChooser {
 
 	@Override
 	public Optional<Path> chooseMountPoint() {
-		return this.vault.getVaultSettings().getWinDriveLetter().map(letter -> letter.charAt(0) + ":\\").map(Paths::get);
+		return this.vaultSettings.getWinDriveLetter().map(letter -> letter.charAt(0) + ":\\").map(Paths::get);
 	}
 
 	@Override
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
index 01cb8c568..3cad72e9d 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
@@ -4,6 +4,7 @@ import org.cryptomator.common.vaults.Vault;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
 import java.io.IOException;
 import java.nio.file.DirectoryNotEmptyException;
 import java.nio.file.DirectoryStream;
@@ -23,6 +24,7 @@ public class CustomMountPointChooser implements MountPointChooser {
 
 	private final Vault vault;
 
+	@Inject
 	public CustomMountPointChooser(Vault vault) {
 		this.vault = vault;
 	}
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
index 9a2332c94..22d5fd286 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
@@ -1,13 +1,11 @@
 package org.cryptomator.common.mountpoint;
 
 import com.google.common.collect.ImmutableSet;
+import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoSet;
-import org.cryptomator.common.Environment;
 import org.cryptomator.common.vaults.PerVault;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.common.vaults.WindowsDriveLetters;
 
 import javax.inject.Named;
 import java.util.Set;
@@ -21,33 +19,25 @@ import java.util.Set;
 @Module
 public abstract class MountPointChooserModule {
 
-	@Provides
+	@Binds
 	@IntoSet
 	@PerVault
-	public static MountPointChooser provideCustomMountPointChooser(Vault vault) {
-		return new CustomMountPointChooser(vault);
-	}
+	public abstract MountPointChooser bindCustomMountPointChooser(CustomMountPointChooser chooser);
 
-	@Provides
+	@Binds
 	@IntoSet
 	@PerVault
-	public static MountPointChooser provideCustomDriveLetterChooser(Vault vault) {
-		return new CustomDriveLetterChooser(vault);
-	}
+	public abstract MountPointChooser bindCustomDriveLetterChooser(CustomDriveLetterChooser chooser);
 
-	@Provides
+	@Binds
 	@IntoSet
 	@PerVault
-	public static MountPointChooser provideAvailableDriveLetterChooser(WindowsDriveLetters windowsDriveLetters) {
-		return new AvailableDriveLetterChooser(windowsDriveLetters);
-	}
+	public abstract MountPointChooser bindAvailableDriveLetterChooser(AvailableDriveLetterChooser chooser);
 
-	@Provides
+	@Binds
 	@IntoSet
 	@PerVault
-	public static MountPointChooser provideTemporaryMountPointChooser(Vault vault, Environment environment) {
-		return new TemporaryMountPointChooser(vault, environment);
-	}
+	public abstract MountPointChooser bindTemporaryMountPointChooser(TemporaryMountPointChooser chooser);
 
 	@Provides
 	@PerVault
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index 2638db0b4..bd6dcde43 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -2,10 +2,11 @@ package org.cryptomator.common.mountpoint;
 
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
-import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.common.settings.VaultSettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -20,17 +21,18 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 	private static final Logger LOG = LoggerFactory.getLogger(TemporaryMountPointChooser.class);
 	private static final int MAX_TMPMOUNTPOINT_CREATION_RETRIES = 10;
 
-	private final Vault vault;
+	private final VaultSettings vaultSettings;
 	private final Environment environment;
 
-	public TemporaryMountPointChooser(Vault vault, Environment environment) {
-		this.vault = vault;
+	@Inject
+	public TemporaryMountPointChooser(VaultSettings vaultSettings, Environment environment) {
+		this.vaultSettings = vaultSettings;
 		this.environment = environment;
 	}
 
 	@Override
 	public boolean isApplicable() {
-		if(this.environment.getMountPointsDir().isEmpty()) {
+		if (this.environment.getMountPointsDir().isEmpty()) {
 			LOG.warn("\"cryptomator.mountPointsDir\" is not set to a valid path!");
 			return false;
 		}
@@ -41,7 +43,7 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 	public Optional<Path> chooseMountPoint() {
 		//Shouldn't throw, but let's keep #orElseThrow in case we made a mistake and the check in #isApplicable failed
 		Path parent = this.environment.getMountPointsDir().orElseThrow();
-		String basename = this.vault.getVaultSettings().mountName().get();
+		String basename = this.vaultSettings.mountName().get();
 		for (int i = 0; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) {
 			Path mountPoint = parent.resolve(basename + "_" + i);
 			if (Files.notExists(mountPoint)) {

From f012977aaca0209c635560d6a77156c24c083943 Mon Sep 17 00:00:00 2001
From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com>
Date: Fri, 11 Sep 2020 21:47:30 +0200
Subject: [PATCH 100/169] Fixed spelling

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472825411
---
 .../common/mountpoint/MountPointChooser.java  | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
index 0da0f6b3d..f4b35b7bb 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
@@ -8,7 +8,7 @@ import java.util.SortedSet;
 
 /**
  * Base interface for the Mountpoint-Choosing-Operation that results in the choice and
- * preparation of a Mountpoint or an exception otherwise.<br>
+ * preparation of a mountpoint or an exception otherwise.<br>
  * <p>All <i>MountPointChoosers (MPCs)</i> need to implement this class and must be added to
  * the pool of possible MPCs by the {@link MountPointChooserModule MountPointChooserModule.}
  * The MountPointChooserModule will sort them according to their {@link #getPriority() priority.}
@@ -16,24 +16,24 @@ import java.util.SortedSet;
  * the order of execution of MPCs with equal priority is undefined.
  *
  * <p>MPCs are executed by a {@link Volume} in ascedning order of their priority to find
- * and prepare a suitable Mountpoint for the Volume. The Volume has access to a
+ * and prepare a suitable mountpoint for the volume. The volume has access to a
  * {@link SortedSet} of MPCs in this specific order, that is provided by the Module.
  * The Set only contains Choosers that were deemed {@link #isApplicable() applicable}
  * by the Module.
  *
- * <p>At execution of a MPC {@link #chooseMountPoint()} is called to choose a Mountpoint
+ * <p>At execution of a MPC {@link #chooseMountPoint()} is called to choose a mountpoint
  * according to the MPC's <i>strategy.</i> The <i>strategy</i> can involve reading configs,
  * searching the filesystem, processing user-input or similar operations.
  * If {@code #chooseMountPoint()} returns a non-null path (everthing but
  * {@linkplain Optional#empty()}) the MPC's {@link #prepare(Path)}-Method is called and the
  * MountPoint is verfied and/or prepared. In this case <i>no other MPC's will be called for
- * this Volume, even if {@code #prepare(Path)} fails.</i>
+ * this volume, even if {@code #prepare(Path)} fails.</i>
  *
  * <p>If {@code #chooseMountPoint()} yields no result, the next MPC is executed
  * <i>without</i> first calling the {@code #prepare(Path)}-Method of the current MPC.
  * This is repeated until<br>
  * <ul>
- *     <li><b>either</b> a Mountpoint is returned by {@code #chooseMountPoint()}
+ *     <li><b>either</b> a mountpoint is returned by {@code #chooseMountPoint()}
  *     and {@code #prepare(Path)} succeeds or fails, ending the entire operation</li>
  *     <li><b>or</b> no MPC remains and an {@link InvalidMountPointException} is thrown.</li>
  * </ul>
@@ -57,42 +57,42 @@ public interface MountPointChooser extends Comparable<MountPointChooser> {
 	boolean isApplicable();
 
 	/**
-	 * Called by a {@link Volume} to choose a Mountpoint according to the
+	 * Called by a {@link Volume} to choose a mountpoint according to the
 	 * MountPointChoosers strategy.
 	 *
 	 * <p>This method is only called for MPCs that were deemed {@link #isApplicable() applicable}
 	 * by the {@link MountPointChooserModule MountPointChooserModule.}
-	 * Developers should override this method to find or extract a Mountpoint for
-	 * the Volume <b>without</b> preparing it. Preparation should be done by
+	 * Developers should override this method to find or extract a mountpoint for
+	 * the volume <b>without</b> preparing it. Preparation should be done by
 	 * {@link #prepare(Path)} instead.
 	 * Exceptions in this method should be handled gracefully and result in returning
 	 * {@link Optional#empty()} instead of throwing an exception.
 	 *
 	 * @return the chosen path or {@link Optional#empty()} if an exception occurred
-	 * or no Mountpoint could be found.
+	 * or no mountpoint could be found.
 	 * @see #isApplicable()
 	 * @see #prepare(Path)
 	 */
 	Optional<Path> chooseMountPoint();
 
 	/**
-	 * Called by a {@link Volume} to prepare and/or verify the chosen Mountpoint.<br>
+	 * Called by a {@link Volume} to prepare and/or verify the chosen mountpoint.<br>
 	 * This method is only called if the {@link #chooseMountPoint()}-Method of the same
 	 * MountPointChooser returned a path.
 	 *
-	 * <p>Developers should override this method to prepare the Mountpoint for
-	 * the Volume and check for any obstacles that could hinder the Mount-Operation.
-	 * The Mountpoint is deemed "prepared" if it can be used to mount a Volume
-	 * without any further Filesystemactions or Userinteraction. If this is not possible,
+	 * <p>Developers should override this method to prepare the mountpoint for
+	 * the volume and check for any obstacles that could hinder the mount operation.
+	 * The mountpoint is deemed "prepared" if it can be used to mount a volume
+	 * without any further filesystem actions or user interaction. If this is not possible,
 	 * this method should fail. In other words: This method should not return without
-	 * either failing or finalizing the preparation of the Mountpoint.
+	 * either failing or finalizing the preparation of the mountpoint.
 	 * Generally speaking exceptions should be wrapped as
 	 * {@link InvalidMountPointException} to allow efficient handling by the caller.
 	 *
-	 * <p>Often the preparation of a Mountpoint involves creating files or others
-	 * actions that require cleaning up after the Volume is unmounted.
+	 * <p>Often the preparation of a mountpoint involves creating files or others
+	 * actions that require cleaning up after the volume is unmounted.
 	 * In this case developers should override the {@link #cleanup(Path)}-Method
-	 * and return {@code true} to the Volume to indicate that the
+	 * and return {@code true} to the volume to indicate that the
 	 * {@code #cleanup}-Method of this MPC should be called after unmount.
 	 *
 	 * <p><b>Please note:</b> If this method fails the entire
@@ -100,7 +100,7 @@ public interface MountPointChooser extends Comparable<MountPointChooser> {
 	 * or any other MPCs. Therefore this method should do all necessary cleanup
 	 * before throwing the exception.
 	 *
-	 * @param mountPoint the Mountpoint chosen by {@link #chooseMountPoint()}
+	 * @param mountPoint the mountpoint chosen by {@link #chooseMountPoint()}
 	 * @return a boolean flag; true if cleanup is needed, false otherwise
 	 * @throws InvalidMountPointException if the preparation fails
 	 * @see #chooseMountPoint()
@@ -118,7 +118,7 @@ public interface MountPointChooser extends Comparable<MountPointChooser> {
 	 * delete any files created prior to mount or do similar tasks.<br>
 	 * Exceptions in this method should be handled gracefully.
 	 *
-	 * @param mountPoint the Mountpoint that was prepared by {@link #prepare(Path)}
+	 * @param mountPoint the mountpoint that was prepared by {@link #prepare(Path)}
 	 * @see #prepare(Path)
 	 */
 	default void cleanup(Path mountPoint) {

From d5b8996a393b53c700ec161d55a607a9ce1da47f Mon Sep 17 00:00:00 2001
From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com>
Date: Fri, 11 Sep 2020 22:23:48 +0200
Subject: [PATCH 101/169] Fixed violation of method contract

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472857043
---
 .../common/mountpoint/TemporaryMountPointChooser.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index bd6dcde43..501c7e8f1 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -41,17 +41,19 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 
 	@Override
 	public Optional<Path> chooseMountPoint() {
-		//Shouldn't throw, but let's keep #orElseThrow in case we made a mistake and the check in #isApplicable failed
-		Path parent = this.environment.getMountPointsDir().orElseThrow();
+		return this.environment.getMountPointsDir().map(this::choose);
+	}
+
+	private Path choose(Path parent) {
 		String basename = this.vaultSettings.mountName().get();
 		for (int i = 0; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) {
 			Path mountPoint = parent.resolve(basename + "_" + i);
 			if (Files.notExists(mountPoint)) {
-				return Optional.of(mountPoint);
+				return mountPoint;
 			}
 		}
 		LOG.error("Failed to find feasible mountpoint at {}{}{}_x. Giving up after {} attempts.", parent, File.separator, basename, MAX_TMPMOUNTPOINT_CREATION_RETRIES);
-		return Optional.empty();
+		return null;
 	}
 
 	@Override

From 29a9c7dffe8a15ae5f2c0cc4bd8ef7e7c6901667 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Sun, 13 Sep 2020 11:50:26 +0200
Subject: [PATCH 102/169] auto-close bugs violating the issue template [ci
 skip]

---
 .github/ISSUE_TEMPLATE/bug.md    |  3 +++
 .github/workflows/triageBugs.yml | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 .github/workflows/triageBugs.yml

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index dfabee3e5..4775a0aa2 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -5,6 +5,7 @@ labels: type:bug
 ---
 
 <!--
+⚠️⚠️⚠️ READ CAREFULLY ⚠️⚠️⚠️
 
 Do you want to ask a QUESTION? Are you looking for SUPPORT?
 We're happy to help you via our support channels! Please read: https://github.com/cryptomator/cryptomator/blob/develop/SUPPORT.md
@@ -13,7 +14,9 @@ By filing an issue, you are expected to comply with our code of conduct: https:/
 
 Of course, we also expect you to search for existing similar issues first! ;) https://github.com/cryptomator/cryptomator/issues?q=
 
+⚠️ IMPORTANT: If you don't stick to this template, the issue will get closed. To proof that you read this, please remove the X from the following line:
 -->
+<!-- oooXooo -->
 
 ### Description
 
diff --git a/.github/workflows/triageBugs.yml b/.github/workflows/triageBugs.yml
new file mode 100644
index 000000000..f3354fb11
--- /dev/null
+++ b/.github/workflows/triageBugs.yml
@@ -0,0 +1,25 @@
+name: Bug Report Triage
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  closeTemplateViolation:
+    name: Close bug reports that violate the issue template
+    runs-on: ubuntu-latest
+    steps:
+      - if: |
+          contains(github.event.issue.labels.*.name, 'type:bug')
+          && (
+            !contains(github.event.issue.body, '<!-- oooooo -->')
+            || !contains(github.event.issue.body, '### Description')
+          )
+        name: Close Issue
+        uses: peter-evans/close-issue@v1
+        with:
+          comment: |
+            This bug report did ignore our issue template. 😞
+            Auto-closing this issue, since it is most likely not useful.
+
+            _This decision was made by a bot. If you think the bot is wrong, let us know and we'll reopen this issue._
\ No newline at end of file

From da84133732819f9b83b6c3f9b749d4a7737292e6 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Tue, 15 Sep 2020 16:23:31 +0200
Subject: [PATCH 103/169] allows running launcher-mac.sh from any path

---
 main/buildkit/src/main/resources/launcher-mac.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/buildkit/src/main/resources/launcher-mac.sh b/main/buildkit/src/main/resources/launcher-mac.sh
index 65f8ba10d..2c06efab2 100644
--- a/main/buildkit/src/main/resources/launcher-mac.sh
+++ b/main/buildkit/src/main/resources/launcher-mac.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd $(dirname $0)
 java \
 	-cp "libs/*" \
 	-Dcryptomator.settingsPath="~/Library/Application Support/Cryptomator/settings.json" \

From ae957c2588dcb80b083bf0164a3fbf6a177e9089 Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Mon, 14 Sep 2020 19:53:21 +0200
Subject: [PATCH 104/169] Print error message instead of stacktrace Fixes #1345

---
 .../keychain/LinuxKDEWalletKeychainAccessImpl.java            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
index 120bef435..13f224c99 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
@@ -22,7 +22,7 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
         try {
             connection = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
         } catch (DBusException e) {
-            e.printStackTrace();
+            log.error(e.toString(), e.getCause());
         }
     }
 
@@ -32,7 +32,7 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
             wallet = new KDEWallet(connection);
             return wallet.isEnabled();
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.toString(), e.getCause());
             return false;
         }
     }

From c5a3b295549f55c7f703b3840699707f573548aa Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Wed, 16 Sep 2020 18:56:54 +0200
Subject: [PATCH 105/169] Make logger static

---
 .../LinuxKDEWalletKeychainAccessImpl.java     | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
index 13f224c99..26d85b6d4 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
@@ -10,7 +10,7 @@ import org.slf4j.LoggerFactory;
 
 public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy {
 
-    private final Logger log = LoggerFactory.getLogger(LinuxKDEWalletKeychainAccessImpl.class);
+    private static final Logger LOG = LoggerFactory.getLogger(LinuxKDEWalletKeychainAccessImpl.class);
 
     private final String FOLDER_NAME = "Cryptomator";
     private final String APP_NAME = "Cryptomator";
@@ -22,7 +22,7 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
         try {
             connection = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
         } catch (DBusException e) {
-            log.error(e.toString(), e.getCause());
+            LOG.error(e.toString(), e.getCause());
         }
     }
 
@@ -32,7 +32,7 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
             wallet = new KDEWallet(connection);
             return wallet.isEnabled();
         } catch (Exception e) {
-            log.error(e.toString(), e.getCause());
+            LOG.error(e.toString(), e.getCause());
             return false;
         }
     }
@@ -44,12 +44,12 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
                     !(wallet.hasEntry(handle, FOLDER_NAME, key, APP_NAME)
                             && wallet.entryType(handle, FOLDER_NAME, key, APP_NAME) == 1)
                     && wallet.writePassword(handle, FOLDER_NAME, key, passphrase.toString(), APP_NAME) == 0) {
-                log.debug("Passphrase successfully stored.");
+                LOG.debug("Passphrase successfully stored.");
             } else {
-                log.debug("Passphrase was not stored.");
+                LOG.debug("Passphrase was not stored.");
             }
         } catch (Exception e) {
-            log.error(e.toString(), e.getCause());
+            LOG.error(e.toString(), e.getCause());
             throw new KeychainAccessException(e);
         }
     }
@@ -60,9 +60,9 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
         try {
             if (walletIsOpen()) {
                 password = wallet.readPassword(handle, FOLDER_NAME, key, APP_NAME);
-                log.debug("loadPassphrase: wallet is open.");
+                LOG.debug("loadPassphrase: wallet is open.");
             } else {
-                log.debug("loadPassphrase: wallet is closed.");
+                LOG.debug("loadPassphrase: wallet is closed.");
             }
             return (password.equals("")) ? null : password.toCharArray();
         } catch (Exception e) {
@@ -77,9 +77,9 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
                     && wallet.hasEntry(handle, FOLDER_NAME, key, APP_NAME)
                     && wallet.entryType(handle, FOLDER_NAME, key, APP_NAME) == 1
                     && wallet.removeEntry(handle, FOLDER_NAME, key, APP_NAME) == 0) {
-                log.debug("Passphrase successfully deleted.");
+                LOG.debug("Passphrase successfully deleted.");
             } else {
-                log.debug("Passphrase was not deleted.");
+                LOG.debug("Passphrase was not deleted.");
             }
         } catch (Exception e) {
             throw new KeychainAccessException(e);
@@ -93,9 +93,9 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
                     && wallet.hasEntry(handle, FOLDER_NAME, key, APP_NAME)
                     && wallet.entryType(handle, FOLDER_NAME, key, APP_NAME) == 1
                     && wallet.writePassword(handle, FOLDER_NAME, key, passphrase.toString(), APP_NAME) == 0) {
-                log.debug("Passphrase successfully changed.");
+                LOG.debug("Passphrase successfully changed.");
             } else {
-                log.debug("Passphrase could not be changed.");
+                LOG.debug("Passphrase could not be changed.");
             }
         } catch (Exception e) {
             throw new KeychainAccessException(e);
@@ -112,7 +112,7 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
             wallet.openAsync(Static.DEFAULT_WALLET, 0, APP_NAME, false);
             wallet.getSignalHandler().await(KWallet.walletAsyncOpened.class, Static.ObjectPaths.KWALLETD5, () -> null);
             handle = wallet.getSignalHandler().getLastHandledSignal(KWallet.walletAsyncOpened.class, Static.ObjectPaths.KWALLETD5).handle;
-            log.debug("Wallet successfully initialized.");
+            LOG.debug("Wallet successfully initialized.");
             return handle != -1;
         } catch (Exception e) {
             throw new KeychainAccessException(e);

From 9657a13912d0e68f68f54235dd68cceb7a0c93e0 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Mon, 28 Sep 2020 23:33:39 +0200
Subject: [PATCH 106/169] Updated MPCModule to return a SortedSet and switched
 collector

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r474452898
---
 .../common/mountpoint/MountPointChooserModule.java     | 10 ++++++----
 .../org/cryptomator/common/vaults/AbstractVolume.java  |  8 +++++---
 .../org/cryptomator/common/vaults/DokanyVolume.java    |  4 ++--
 .../java/org/cryptomator/common/vaults/FuseVolume.java |  4 ++--
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
index 22d5fd286..3e29d8265 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
@@ -1,6 +1,6 @@
 package org.cryptomator.common.mountpoint;
 
-import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSortedSet;
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
@@ -8,7 +8,9 @@ import dagger.multibindings.IntoSet;
 import org.cryptomator.common.vaults.PerVault;
 
 import javax.inject.Named;
+import java.util.Comparator;
 import java.util.Set;
+import java.util.SortedSet;
 
 /**
  * Dagger-Module for {@link MountPointChooser MountPointChoosers.}<br>
@@ -42,8 +44,8 @@ public abstract class MountPointChooserModule {
 	@Provides
 	@PerVault
 	@Named("orderedValidMountPointChoosers")
-	public static Set<MountPointChooser> provideOrderedValidMountPointChoosers(Set<MountPointChooser> choosers) {
-		//Sorted Set
-		return choosers.stream().sorted().filter(MountPointChooser::isApplicable).collect(ImmutableSet.toImmutableSet());
+	public static SortedSet<MountPointChooser> provideOrderedValidMountPointChoosers(Set<MountPointChooser> choosers) {
+		//The natural order is defined by MountPointChooser#compareTo
+		return choosers.stream().filter(MountPointChooser::isApplicable).collect(ImmutableSortedSet.toImmutableSortedSet(Comparator.naturalOrder()));
 	}
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
index 8b47ffe07..69b68c7ff 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
@@ -7,11 +7,11 @@ import org.cryptomator.common.mountpoint.MountPointChooser;
 
 import java.nio.file.Path;
 import java.util.Optional;
-import java.util.Set;
+import java.util.SortedSet;
 
 public abstract class AbstractVolume implements Volume {
 
-	private final Set<MountPointChooser> choosers;
+	private final SortedSet<MountPointChooser> choosers;
 
 	protected Path mountPoint;
 
@@ -19,7 +19,7 @@ public abstract class AbstractVolume implements Volume {
 	private boolean cleanupRequired;
 	private MountPointChooser usedChooser;
 
-	public AbstractVolume(Set<MountPointChooser> choosers) {
+	public AbstractVolume(SortedSet<MountPointChooser> choosers) {
 		this.choosers = choosers;
 	}
 
@@ -34,6 +34,8 @@ public abstract class AbstractVolume implements Volume {
 			this.usedChooser = chooser;
 			return chosenPath.get();
 		}
+		//SortedSet#stream() should return a sorted stream (that's what it's docs and the docs of #spliterator() say, even if they are not 100% clear for me.)
+		//We want to keep that order, that's why we use ImmutableSet#toImmutableSet() to collect (even if it doesn't implement SortedSet, it's docs promise use encounter ordering.)
 		String tried = Joiner.on(", ").join(this.choosers.stream().map((mpc) -> mpc.getClass().getTypeName()).collect(ImmutableSet.toImmutableSet()));
 		throw new InvalidMountPointException(String.format("No feasible MountPoint found! Tried %s", tried));
 	}
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
index 20b1e69d3..bafecdac9 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
@@ -12,7 +12,7 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
-import java.util.Set;
+import java.util.SortedSet;
 import java.util.concurrent.ExecutorService;
 
 public class DokanyVolume extends AbstractVolume {
@@ -27,7 +27,7 @@ public class DokanyVolume extends AbstractVolume {
 	private Mount mount;
 
 	@Inject
-	public DokanyVolume(VaultSettings vaultSettings, ExecutorService executorService, @Named("orderedValidMountPointChoosers") Set<MountPointChooser> choosers) {
+	public DokanyVolume(VaultSettings vaultSettings, ExecutorService executorService, @Named("orderedValidMountPointChoosers") SortedSet<MountPointChooser> choosers) {
 		super(choosers);
 		this.vaultSettings = vaultSettings;
 		this.mountFactory = new MountFactory(executorService);
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index 8f1926f4a..400cbc379 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -17,7 +17,7 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import javax.inject.Named;
 import java.nio.file.Path;
-import java.util.Set;
+import java.util.SortedSet;
 
 public class FuseVolume extends AbstractVolume {
 
@@ -26,7 +26,7 @@ public class FuseVolume extends AbstractVolume {
 	private Mount mount;
 
 	@Inject
-	public FuseVolume(@Named("orderedValidMountPointChoosers") Set<MountPointChooser> choosers) {
+	public FuseVolume(@Named("orderedValidMountPointChoosers") SortedSet<MountPointChooser> choosers) {
 		super(choosers);
 	}
 

From 0b7f8d71ed7ce557415c19271b2c0b75b2f87a72 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 29 Sep 2020 12:12:59 +0200
Subject: [PATCH 107/169] closes #1065

---
 .../ui/src/main/resources/css/light_theme.css | 10 ++++++++++
 .../resources/fxml/main_window_title.fxml     | 19 +++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index b650b6e17..c16fbe1a6 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -389,6 +389,16 @@
 	-fx-background-color: MUTED_BG;
 }
 
+/* Note: These values below are kinda random such that it looks ok. I'm pretty sure there is room for improvement. Additionally, fx-text-fill does not work*/
+.badge-debug {
+	-fx-font-family: 'Open Sans Bold';
+	-fx-font-size: 1.0em;
+	-fx-background-radius: 8px;
+	-fx-padding: 0.3em 0.55em 0.3em 0.55em;
+	-fx-background-color: RED_5;
+	-fx-background-radius: 2em;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Password Strength Indicator                                                 *
diff --git a/main/ui/src/main/resources/fxml/main_window_title.fxml b/main/ui/src/main/resources/fxml/main_window_title.fxml
index 031e48b07..54ee8b238 100644
--- a/main/ui/src/main/resources/fxml/main_window_title.fxml
+++ b/main/ui/src/main/resources/fxml/main_window_title.fxml
@@ -1,5 +1,6 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.HBox?>
@@ -20,7 +21,17 @@
 	</padding>
 	<children>
 		<Label text="CRYPTOMATOR"/>
+
 		<Region HBox.hgrow="ALWAYS"/>
+
+		<Hyperlink onAction="#showGeneralPreferences" focusTraversable="false" visible="${controller.debugModeEnabled}" styleClass="badge-debug" text="DEBUG MODE" textFill="white">
+			<tooltip>
+				<Tooltip text="%main.debugModeEnabled.tooltip"/>
+			</tooltip>
+		</Hyperlink>
+
+		<Region HBox.hgrow="ALWAYS"/>
+
 		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#showDonationKeyPreferences" focusTraversable="false" visible="${!controller.licenseHolder.validLicense}">
 			<graphic>
 				<StackPane>
@@ -32,14 +43,6 @@
 				<Tooltip text="%main.donationKeyMissing.tooltip"/>
 			</tooltip>
 		</Button>
-		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#showGeneralPreferences" focusTraversable="false" visible="${controller.debugModeEnabled}">
-			<graphic>
-				<FontAwesome5IconView glyph="BUG" glyphSize="16"/>
-			</graphic>
-			<tooltip>
-				<Tooltip text="%main.debugModeEnabled.tooltip"/>
-			</tooltip>
-		</Button>
 		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#showPreferences" focusTraversable="false">
 			<graphic>
 				<StackPane>

From 354de225edf9a91f5528b12c682c46de6f733bcf Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 30 Sep 2020 14:09:01 +0200
Subject: [PATCH 108/169] Reverted changes to WebDavVolume#getMountPoint()

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472888268
---
 .../main/java/org/cryptomator/common/vaults/WebDavVolume.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
index ddc611649..6f343d000 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
@@ -27,6 +27,7 @@ public class WebDavVolume implements Volume {
 	private WebDavServer server;
 	private WebDavServletController servlet;
 	private Mounter.Mount mount;
+	private Path mountPoint;
 
 	@Inject
 	public WebDavVolume(Provider<WebDavServer> serverProvider, VaultSettings vaultSettings, Settings settings) {
@@ -97,7 +98,7 @@ public class WebDavVolume implements Volume {
 
 	@Override
 	public Optional<Path> getMountPoint() {
-		return Optional.empty(); //TODO
+		return Optional.ofNullable(mountPoint); //TODO
 	}
 
 	@Override

From f9cb438a0bdae245d98cda73c279a2dd722e92f1 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Thu, 1 Oct 2020 18:37:32 +0200
Subject: [PATCH 109/169] Closes #1065 for real by adding missing style in dark
 theme for debug mode

---
 main/ui/src/main/resources/css/dark_theme.css | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index b6ab94b9b..c96527374 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -390,6 +390,17 @@
 	-fx-background-color: MUTED_BG;
 }
 
+
+/* Note: These values below are kinda random such that it looks ok. I'm pretty sure there is room for improvement. Additionally, fx-text-fill does not work*/
+.badge-debug {
+	-fx-font-family: 'Open Sans Bold';
+	-fx-font-size: 1.0em;
+	-fx-background-radius: 8px;
+	-fx-padding: 0.3em 0.55em 0.3em 0.55em;
+	-fx-background-color: RED_5;
+	-fx-background-radius: 2em;
+}
+
 /*******************************************************************************
  *                                                                             *
  * Password Strength Indicator                                                 *

From ab538cd21573de70aa7d100382a8a70c25eeccaf Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 6 Oct 2020 19:31:03 +0200
Subject: [PATCH 110/169] Fixed bug: Dropped MPCs if priorities were equal

Fixed bug that caused MPCs with equal priorities to be dropped (even if they weren't equal).
Added additional criteria (hashCode) for cases were priorities are equal.

See the docs of ImmutableSortedSet for further information.
---
 .../common/mountpoint/MountPointChooser.java  | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
index f4b35b7bb..662eed490 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
@@ -1,5 +1,6 @@
 package org.cryptomator.common.mountpoint;
 
+import org.apache.commons.lang3.Validate;
 import org.cryptomator.common.vaults.Volume;
 
 import java.nio.file.Path;
@@ -147,11 +148,31 @@ public interface MountPointChooser extends Comparable<MountPointChooser> {
 	 * <p>{@inheritDoc}
 	 *
 	 * @implNote This default implementation sorts the MPCs in ascending order
-	 * of their {@link #getPriority() priority.}
+	 * of their {@link #getPriority() priority.} It depends on a correct implementation
+	 * of {@link #hashCode()} and {@link #equals(Object)} for the compared objects.
+	 * For this implementation "the least required correct implementation" maps
+	 * the following relationship correctly:<br>
+	 * If the objects {@code a} and {@code b} are {@code equal} as determined by
+	 * {@code #equals(Object)} then the {@code hashCodes} as determined by {@code #hashCode()}
+	 * of {@code a} and {@code b} must be equal. If the objects are {@code not equal}
+	 * then the {@code hashCodes} must be different.<br>
+	 * The default implementations of those two methods are sufficient.
+	 * @see Object#hashCode()
+	 * @see Object#equals(Object)
 	 */
 	@Override
 	default int compareTo(MountPointChooser other) {
-		//Sort by priority (ascending order)
-		return Integer.compare(this.getPriority(), other.getPriority());
+		Validate.notNull(other, "Other must not be null!");
+
+		//Try to compare by priority and sort in ascending order.
+		//1) Compare the priorities.
+		//2) If the result of the comparison is 0 because the priorities are equal,
+		//   we consider this a failure. In this case sort by hashCode (step 3).
+		//   Else return the result of the comparison.
+		//3) Return the result of the comparison of the hashCodes:
+		//   Either 0 (because they are equal and that's why they had the same priority)
+		//   or a non-null int (because they only share the priority).
+		int compResult = /* 1 */ Integer.compare(this.getPriority(), other.getPriority());
+		return compResult != 0 ? /* 2 */ compResult : /* 3 */ Integer.compare(this.hashCode(), other.hashCode());
 	}
 }

From d29508431242d4793eabc5ff09d7a0b690cc49c7 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 6 Oct 2020 19:28:02 +0200
Subject: [PATCH 111/169] Changed contracts in MPC interface

Added Volume parameter to the method signature of all MPC methods and updated implementations to use the change.

Changed contract of the MPC interface: Validation of the MPC (call to #isApplicable()) moved from the Module to the Volume.
Updated docs to reflect those changes. Fixed typos.
Updated method/qualifier names.
Updated implementation of #provideOrdered(Valid)MountPointChoosers() to reflect this change and to build the set differently.
Updated #determineMountPoint() to work with the new set.
---
 .../AvailableDriveLetterChooser.java          |   5 +-
 .../mountpoint/CustomDriveLetterChooser.java  |   5 +-
 .../mountpoint/CustomMountPointChooser.java   |   7 +-
 .../common/mountpoint/MountPointChooser.java  | 107 ++++++++++--------
 .../mountpoint/MountPointChooserModule.java   |   9 +-
 .../TemporaryMountPointChooser.java           |   9 +-
 .../common/vaults/AbstractVolume.java         |  17 ++-
 .../common/vaults/DokanyVolume.java           |   2 +-
 .../cryptomator/common/vaults/FuseVolume.java |   2 +-
 9 files changed, 90 insertions(+), 73 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
index 22fc8f4af..7634601fa 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/AvailableDriveLetterChooser.java
@@ -1,6 +1,7 @@
 package org.cryptomator.common.mountpoint;
 
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.vaults.Volume;
 import org.cryptomator.common.vaults.WindowsDriveLetters;
 
 import javax.inject.Inject;
@@ -19,12 +20,12 @@ public class AvailableDriveLetterChooser implements MountPointChooser {
 	}
 
 	@Override
-	public boolean isApplicable() {
+	public boolean isApplicable(Volume caller) {
 		return SystemUtils.IS_OS_WINDOWS;
 	}
 
 	@Override
-	public Optional<Path> chooseMountPoint() {
+	public Optional<Path> chooseMountPoint(Volume caller) {
 		return this.windowsDriveLetters.getAvailableDriveLetterPath();
 	}
 
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
index 0d0eae225..ac9e5b716 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomDriveLetterChooser.java
@@ -2,6 +2,7 @@ package org.cryptomator.common.mountpoint;
 
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.settings.VaultSettings;
+import org.cryptomator.common.vaults.Volume;
 
 import javax.inject.Inject;
 import java.nio.file.Path;
@@ -20,12 +21,12 @@ public class CustomDriveLetterChooser implements MountPointChooser {
 	}
 
 	@Override
-	public boolean isApplicable() {
+	public boolean isApplicable(Volume caller) {
 		return SystemUtils.IS_OS_WINDOWS;
 	}
 
 	@Override
-	public Optional<Path> chooseMountPoint() {
+	public Optional<Path> chooseMountPoint(Volume caller) {
 		return this.vaultSettings.getWinDriveLetter().map(letter -> letter.charAt(0) + ":\\").map(Paths::get);
 	}
 
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
index 3cad72e9d..b39baba23 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
@@ -1,6 +1,7 @@
 package org.cryptomator.common.mountpoint;
 
 import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.common.vaults.Volume;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,18 +31,18 @@ public class CustomMountPointChooser implements MountPointChooser {
 	}
 
 	@Override
-	public boolean isApplicable() {
+	public boolean isApplicable(Volume caller) {
 		return true;
 	}
 
 	@Override
-	public Optional<Path> chooseMountPoint() {
+	public Optional<Path> chooseMountPoint(Volume caller) {
 		//VaultSettings#getCustomMountPath already checks whether the saved custom mountpoint should be used
 		return this.vault.getVaultSettings().getCustomMountPath().map(Paths::get);
 	}
 
 	@Override
-	public boolean prepare(Path mountPoint) throws InvalidMountPointException {
+	public boolean prepare(Volume caller, Path mountPoint) throws InvalidMountPointException {
 		switch (this.vault.getMountPointRequirement()) {
 			case PARENT_NO_MOUNT_POINT -> prepareParentNoMountPoint(mountPoint);
 			case EMPTY_MOUNT_POINT -> prepareEmptyMountPoint(mountPoint);
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
index 662eed490..b2e0798ac 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
@@ -16,70 +16,76 @@ import java.util.SortedSet;
  * The priority must be defined by the developer to reflect a useful execution order;
  * the order of execution of MPCs with equal priority is undefined.
  *
- * <p>MPCs are executed by a {@link Volume} in ascedning order of their priority to find
- * and prepare a suitable mountpoint for the volume. The volume has access to a
- * {@link SortedSet} of MPCs in this specific order, that is provided by the Module.
- * The Set only contains Choosers that were deemed {@link #isApplicable() applicable}
- * by the Module.
+ * <p>MPCs are executed by a {@link Volume} in ascending order of their priority
+ * (smaller priorities are tried first) to find and prepare a suitable mountpoint for the volume.
+ * The volume has access to a {@link SortedSet} of MPCs in this specific order,
+ * that is provided by the Module. The Set contains all available Choosers, even if they
+ * are not {@link #isApplicable(Volume) applicable} for the Vault/Volume. The Volume must
+ * check whether a MPC is applicable by invoking {@code #isApplicable(Volume)} on it
+ * <i>before</i> calling {@code #chooseMountPoint(Volume)}.
  *
- * <p>At execution of a MPC {@link #chooseMountPoint()} is called to choose a mountpoint
+ * <p>At execution of a MPC {@link #chooseMountPoint(Volume)} is called to choose a mountpoint
  * according to the MPC's <i>strategy.</i> The <i>strategy</i> can involve reading configs,
  * searching the filesystem, processing user-input or similar operations.
- * If {@code #chooseMountPoint()} returns a non-null path (everthing but
- * {@linkplain Optional#empty()}) the MPC's {@link #prepare(Path)}-Method is called and the
- * MountPoint is verfied and/or prepared. In this case <i>no other MPC's will be called for
- * this volume, even if {@code #prepare(Path)} fails.</i>
+ * If {@code #chooseMountPoint(Volume)} returns a non-null path (everything but
+ * {@linkplain Optional#empty()}) the MPC's {@link #prepare(Volume, Path)} method is called and the
+ * MountPoint is verified and/or prepared. In this case <i>no other MPC's will be called for
+ * this volume, even if {@code #prepare(Volume, Path)} fails.</i>
  *
- * <p>If {@code #chooseMountPoint()} yields no result, the next MPC is executed
- * <i>without</i> first calling the {@code #prepare(Path)}-Method of the current MPC.
+ * <p>If {@code #chooseMountPoint(Volume)} yields no result, the next MPC is executed
+ * <i>without</i> first calling the {@code #prepare(Volume, Path)} method of the current MPC.
  * This is repeated until<br>
  * <ul>
- *     <li><b>either</b> a mountpoint is returned by {@code #chooseMountPoint()}
- *     and {@code #prepare(Path)} succeeds or fails, ending the entire operation</li>
+ *     <li><b>either</b> a mountpoint is returned by {@code #chooseMountPoint(Volume)}
+ *     and {@code #prepare(Volume, Path)} succeeds or fails, ending the entire operation</li>
  *     <li><b>or</b> no MPC remains and an {@link InvalidMountPointException} is thrown.</li>
  * </ul>
- * If the {@code #prepare(Path)}-Method of a MPC fails, the entire Mountpoint-Choosing-Operation
- * is aborted and the method should do all necessary cleanup before throwing the exception.
- * If the preparation succeeds {@link #cleanup(Path)} can be used after unmount to do any
+ * If the {@code #prepare(Volume, Path)} method of a MPC fails, the entire
+ * Mountpoint-Choosing-Operation is aborted and the method should do all necessary cleanup
+ * before throwing the exception.
+ * If the preparation succeeds {@link #cleanup(Volume, Path)} can be used after unmount to do any
  * remaining cleanup.
  */
 public interface MountPointChooser extends Comparable<MountPointChooser> {
 
 	/**
-	 * Called by the {@link MountPointChooserModule} to determine whether this MountPointChooser is
-	 * applicable for the given Systemconfiguration.
+	 * Called by the {@link Volume} to determine whether this MountPointChooser is
+	 * applicable for mounting the Vault/Volume, especially with regard to the
+	 * current system configuration and particularities of the Volume type.
 	 *
-	 * <p>Developers should override this method to
-	 * check for Systemconfigurations that are unsuitable for this MPC.
+	 * <p>Developers should override this method to check for system configurations
+	 * that are unsuitable for this MPC.
 	 *
+	 * @param caller The Volume that is calling the method to determine applicability of the MPC
 	 * @return a boolean flag; true if applicable, else false.
-	 * @see #chooseMountPoint()
+	 * @see #chooseMountPoint(Volume)
 	 */
-	boolean isApplicable();
+	boolean isApplicable(Volume caller);
 
 	/**
 	 * Called by a {@link Volume} to choose a mountpoint according to the
 	 * MountPointChoosers strategy.
 	 *
-	 * <p>This method is only called for MPCs that were deemed {@link #isApplicable() applicable}
-	 * by the {@link MountPointChooserModule MountPointChooserModule.}
+	 * <p>This method must only be called for MPCs that were deemed
+	 * {@link #isApplicable(Volume) applicable} by the {@link Volume Volume.}
 	 * Developers should override this method to find or extract a mountpoint for
 	 * the volume <b>without</b> preparing it. Preparation should be done by
-	 * {@link #prepare(Path)} instead.
+	 * {@link #prepare(Volume, Path)} instead.
 	 * Exceptions in this method should be handled gracefully and result in returning
 	 * {@link Optional#empty()} instead of throwing an exception.
 	 *
+	 * @param caller The Volume that is calling the method to choose a mountpoint
 	 * @return the chosen path or {@link Optional#empty()} if an exception occurred
 	 * or no mountpoint could be found.
-	 * @see #isApplicable()
-	 * @see #prepare(Path)
+	 * @see #isApplicable(Volume)
+	 * @see #prepare(Volume, Path)
 	 */
-	Optional<Path> chooseMountPoint();
+	Optional<Path> chooseMountPoint(Volume caller);
 
 	/**
 	 * Called by a {@link Volume} to prepare and/or verify the chosen mountpoint.<br>
-	 * This method is only called if the {@link #chooseMountPoint()}-Method of the same
-	 * MountPointChooser returned a path.
+	 * This method is only called if the {@link #chooseMountPoint(Volume)} method
+	 * of the same MountPointChooser returned a path.
 	 *
 	 * <p>Developers should override this method to prepare the mountpoint for
 	 * the volume and check for any obstacles that could hinder the mount operation.
@@ -92,37 +98,39 @@ public interface MountPointChooser extends Comparable<MountPointChooser> {
 	 *
 	 * <p>Often the preparation of a mountpoint involves creating files or others
 	 * actions that require cleaning up after the volume is unmounted.
-	 * In this case developers should override the {@link #cleanup(Path)}-Method
-	 * and return {@code true} to the volume to indicate that the
-	 * {@code #cleanup}-Method of this MPC should be called after unmount.
+	 * In this case developers should override the {@link #cleanup(Volume, Path)}
+	 * method and return {@code true} to the volume to indicate that the
+	 * {@code #cleanup} method of this MPC should be called after unmount.
 	 *
 	 * <p><b>Please note:</b> If this method fails the entire
-	 * Mountpoint-Choosing-Operation is aborted without calling {@link #cleanup(Path)}
-	 * or any other MPCs. Therefore this method should do all necessary cleanup
-	 * before throwing the exception.
+	 * Mountpoint-Choosing-Operation is aborted without calling
+	 * {@link #cleanup(Volume, Path)} or any other MPCs. Therefore this method should
+	 * do all necessary cleanup before throwing the exception.
 	 *
-	 * @param mountPoint the mountpoint chosen by {@link #chooseMountPoint()}
+	 * @param caller The Volume that is calling the method to prepare a mountpoint
+	 * @param mountPoint the mountpoint chosen by {@link #chooseMountPoint(Volume)}
 	 * @return a boolean flag; true if cleanup is needed, false otherwise
 	 * @throws InvalidMountPointException if the preparation fails
-	 * @see #chooseMountPoint()
-	 * @see #cleanup(Path)
+	 * @see #chooseMountPoint(Volume)
+	 * @see #cleanup(Volume, Path)
 	 */
-	default boolean prepare(Path mountPoint) throws InvalidMountPointException {
+	default boolean prepare(Volume caller, Path mountPoint) throws InvalidMountPointException {
 		return false; //NO-OP
 	}
 
 	/**
 	 * Called by a {@link Volume} to do any cleanup needed after unmount.
 	 *
-	 * <p>This method is only called if the {@link #prepare(Path)}-Method of the same
-	 * MountPointChooser returned {@code true}. Typically developers want to
+	 * <p>This method is only called if the {@link #prepare(Volume, Path)} method
+	 * of the same MountPointChooser returned {@code true}. Typically developers want to
 	 * delete any files created prior to mount or do similar tasks.<br>
 	 * Exceptions in this method should be handled gracefully.
 	 *
-	 * @param mountPoint the mountpoint that was prepared by {@link #prepare(Path)}
-	 * @see #prepare(Path)
+	 * @param caller The Volume that is calling the method to cleanup the prepared mountpoint
+	 * @param mountPoint the mountpoint that was prepared by {@link #prepare(Volume, Path)}
+	 * @see #prepare(Volume, Path)
 	 */
-	default void cleanup(Path mountPoint) {
+	default void cleanup(Volume caller, Path mountPoint) {
 		//NO-OP
 	}
 
@@ -139,10 +147,9 @@ public interface MountPointChooser extends Comparable<MountPointChooser> {
 	int getPriority();
 
 	/**
-	 * Called by the {@link MountPointChooserModule} to determine the execution order
-	 * of the registered MPCs. <b>Implementations usually should not override this
-	 * method.</b> This default implementation sorts the MPCs in ascending order
-	 * of their {@link #getPriority() priority.}<br>
+	 * Called by the {@link Volume} to determine the execution order of the registered MPCs.
+	 * <b>Implementations usually may not override this method.</b> This default implementation
+	 * sorts the MPCs in ascending order of their {@link #getPriority() priority.}<br>
 	 * <br>
 	 * <b>Original description:</b>
 	 * <p>{@inheritDoc}
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
index 3e29d8265..09789dacb 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooserModule.java
@@ -8,7 +8,6 @@ import dagger.multibindings.IntoSet;
 import org.cryptomator.common.vaults.PerVault;
 
 import javax.inject.Named;
-import java.util.Comparator;
 import java.util.Set;
 import java.util.SortedSet;
 
@@ -43,9 +42,9 @@ public abstract class MountPointChooserModule {
 
 	@Provides
 	@PerVault
-	@Named("orderedValidMountPointChoosers")
-	public static SortedSet<MountPointChooser> provideOrderedValidMountPointChoosers(Set<MountPointChooser> choosers) {
-		//The natural order is defined by MountPointChooser#compareTo
-		return choosers.stream().filter(MountPointChooser::isApplicable).collect(ImmutableSortedSet.toImmutableSortedSet(Comparator.naturalOrder()));
+	@Named("orderedMountPointChoosers")
+	public static SortedSet<MountPointChooser> provideOrderedMountPointChoosers(Set<MountPointChooser> choosers) {
+		//Sort by natural order. The natural order is defined by MountPointChooser#compareTo
+		return ImmutableSortedSet.copyOf(choosers);
 	}
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index 501c7e8f1..fa3ab5ab2 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -3,6 +3,7 @@ package org.cryptomator.common.mountpoint;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.settings.VaultSettings;
+import org.cryptomator.common.vaults.Volume;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,7 +32,7 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 	}
 
 	@Override
-	public boolean isApplicable() {
+	public boolean isApplicable(Volume caller) {
 		if (this.environment.getMountPointsDir().isEmpty()) {
 			LOG.warn("\"cryptomator.mountPointsDir\" is not set to a valid path!");
 			return false;
@@ -40,7 +41,7 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 	}
 
 	@Override
-	public Optional<Path> chooseMountPoint() {
+	public Optional<Path> chooseMountPoint(Volume caller) {
 		return this.environment.getMountPointsDir().map(this::choose);
 	}
 
@@ -57,7 +58,7 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 	}
 
 	@Override
-	public boolean prepare(Path mountPoint) throws InvalidMountPointException {
+	public boolean prepare(Volume caller, Path mountPoint) throws InvalidMountPointException {
 		// https://github.com/osxfuse/osxfuse/issues/306#issuecomment-245114592:
 		// In order to allow non-admin users to mount FUSE volumes in `/Volumes`,
 		// starting with version 3.5.0, FUSE will create non-existent mount points automatically.
@@ -83,7 +84,7 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 	}
 
 	@Override
-	public void cleanup(Path mountPoint) {
+	public void cleanup(Volume caller, Path mountPoint) {
 		try {
 			Files.delete(mountPoint);
 			LOG.debug("Successfully deleted mount point: {}", mountPoint);
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
index 69b68c7ff..199c576db 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
@@ -8,6 +8,7 @@ import org.cryptomator.common.mountpoint.MountPointChooser;
 import java.nio.file.Path;
 import java.util.Optional;
 import java.util.SortedSet;
+import java.util.TreeSet;
 
 public abstract class AbstractVolume implements Volume {
 
@@ -24,25 +25,31 @@ public abstract class AbstractVolume implements Volume {
 	}
 
 	protected Path determineMountPoint() throws InvalidMountPointException {
+		SortedSet<MountPointChooser> checkedChoosers = new TreeSet<>(); //Natural order
 		for (MountPointChooser chooser : this.choosers) {
-			Optional<Path> chosenPath = chooser.chooseMountPoint();
+			if(!chooser.isApplicable(this)) {
+				continue;
+			}
+
+			Optional<Path> chosenPath = chooser.chooseMountPoint(this);
+			checkedChoosers.add(chooser); //Consider a chooser checked if it's #chooseMountPoint() method was called
 			if (chosenPath.isEmpty()) {
 				//Chooser was applicable, but couldn't find a feasible mountpoint
 				continue;
 			}
-			this.cleanupRequired = chooser.prepare(chosenPath.get()); //Fail entirely if an Exception occurs
+			this.cleanupRequired = chooser.prepare(this, chosenPath.get()); //Fail entirely if an Exception occurs
 			this.usedChooser = chooser;
 			return chosenPath.get();
 		}
 		//SortedSet#stream() should return a sorted stream (that's what it's docs and the docs of #spliterator() say, even if they are not 100% clear for me.)
 		//We want to keep that order, that's why we use ImmutableSet#toImmutableSet() to collect (even if it doesn't implement SortedSet, it's docs promise use encounter ordering.)
-		String tried = Joiner.on(", ").join(this.choosers.stream().map((mpc) -> mpc.getClass().getTypeName()).collect(ImmutableSet.toImmutableSet()));
-		throw new InvalidMountPointException(String.format("No feasible MountPoint found! Tried %s", tried));
+		String checked = Joiner.on(", ").join(checkedChoosers.stream().map((mpc) -> mpc.getClass().getTypeName()).collect(ImmutableSet.toImmutableSet()));
+		throw new InvalidMountPointException(String.format("No feasible MountPoint found! Checked %s", checked));
 	}
 
 	protected void cleanupMountPoint() {
 		if (this.cleanupRequired) {
-			this.usedChooser.cleanup(this.mountPoint);
+			this.usedChooser.cleanup(this, this.mountPoint);
 		}
 	}
 
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
index bafecdac9..fce231e40 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
@@ -27,7 +27,7 @@ public class DokanyVolume extends AbstractVolume {
 	private Mount mount;
 
 	@Inject
-	public DokanyVolume(VaultSettings vaultSettings, ExecutorService executorService, @Named("orderedValidMountPointChoosers") SortedSet<MountPointChooser> choosers) {
+	public DokanyVolume(VaultSettings vaultSettings, ExecutorService executorService, @Named("orderedMountPointChoosers") SortedSet<MountPointChooser> choosers) {
 		super(choosers);
 		this.vaultSettings = vaultSettings;
 		this.mountFactory = new MountFactory(executorService);
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index 400cbc379..895e2100a 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -26,7 +26,7 @@ public class FuseVolume extends AbstractVolume {
 	private Mount mount;
 
 	@Inject
-	public FuseVolume(@Named("orderedValidMountPointChoosers") SortedSet<MountPointChooser> choosers) {
+	public FuseVolume(@Named("orderedMountPointChoosers") SortedSet<MountPointChooser> choosers) {
 		super(choosers);
 	}
 

From 22438d1ebae892d303bbb3719b4482f5fde71d55 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 7 Oct 2020 16:46:58 +0200
Subject: [PATCH 112/169] Added api for getting the implemented VolumeImpl
 (type) of a Volume

---
 .../java/org/cryptomator/common/vaults/DokanyVolume.java    | 6 ++++++
 .../main/java/org/cryptomator/common/vaults/FuseVolume.java | 6 ++++++
 .../src/main/java/org/cryptomator/common/vaults/Volume.java | 6 ++++++
 .../java/org/cryptomator/common/vaults/WebDavVolume.java    | 6 ++++++
 4 files changed, 24 insertions(+)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
index 117f888c9..69193277d 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
@@ -2,6 +2,7 @@ package org.cryptomator.common.vaults;
 
 import com.google.common.base.Strings;
 import org.cryptomator.common.settings.VaultSettings;
+import org.cryptomator.common.settings.VolumeImpl;
 import org.cryptomator.cryptofs.CryptoFileSystem;
 import org.cryptomator.frontend.dokany.Mount;
 import org.cryptomator.frontend.dokany.MountFactory;
@@ -44,6 +45,11 @@ public class DokanyVolume implements Volume {
 		return DokanyVolume.isSupportedStatic();
 	}
 
+	@Override
+	public VolumeImpl getImplementationType() {
+		return VolumeImpl.DOKANY;
+	}
+
 	@Override
 	public void mount(CryptoFileSystem fs, String mountFlags) throws VolumeException, IOException {
 		this.mountPoint = determineMountPoint();
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
index 4b6918be9..e3575f855 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/FuseVolume.java
@@ -4,6 +4,7 @@ import com.google.common.base.Splitter;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.settings.VaultSettings;
+import org.cryptomator.common.settings.VolumeImpl;
 import org.cryptomator.cryptofs.CryptoFileSystem;
 import org.cryptomator.frontend.fuse.mount.CommandFailedException;
 import org.cryptomator.frontend.fuse.mount.EnvironmentVariables;
@@ -165,6 +166,11 @@ public class FuseVolume implements Volume {
 		return FuseVolume.isSupportedStatic();
 	}
 
+	@Override
+	public VolumeImpl getImplementationType() {
+		return VolumeImpl.FUSE;
+	}
+
 	@Override
 	public Optional<Path> getMountPoint() {
 		return Optional.ofNullable(mountPoint);
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java
index a0aa11be8..3f350c8a1 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java
@@ -20,6 +20,12 @@ public interface Volume {
 	 */
 	boolean isSupported();
 
+	/**
+	 * Gets the coresponding enum type of the {@link VolumeImpl volume implementation ("VolumeImpl")} that is implemented by this Volume.
+	 * @return the type of implementation as defined by the {@link VolumeImpl VolumeImpl enum}
+	 */
+	VolumeImpl getImplementationType();
+
 	/**
 	 * @param fs
 	 * @throws IOException
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
index 9c59790fa..12e78b825 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
@@ -3,6 +3,7 @@ package org.cryptomator.common.vaults;
 
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VaultSettings;
+import org.cryptomator.common.settings.VolumeImpl;
 import org.cryptomator.cryptofs.CryptoFileSystem;
 import org.cryptomator.frontend.webdav.WebDavServer;
 import org.cryptomator.frontend.webdav.mount.MountParams;
@@ -126,6 +127,11 @@ public class WebDavVolume implements Volume {
 		return WebDavVolume.isSupportedStatic();
 	}
 
+	@Override
+	public VolumeImpl getImplementationType() {
+		return VolumeImpl.WEBDAV;
+	}
+
 	@Override
 	public boolean supportsForcedUnmount() {
 		return mount != null && mount.forced().isPresent();

From 667617b4807c9cd93eea8b7ec88d795011610bfb Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Wed, 7 Oct 2020 18:32:16 +0200
Subject: [PATCH 113/169] Update kdewallet to latest 1.1.1

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

diff --git a/main/pom.xml b/main/pom.xml
index 8702b89d9..aa43cba31 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -34,7 +34,7 @@
 		<javafx.version>14</javafx.version>
 		<commons-lang3.version>3.11</commons-lang3.version>
 		<secret-service.version>1.1.0</secret-service.version>
-		<kdewallet.version>1.0.1</kdewallet.version>
+		<kdewallet.version>1.1.1</kdewallet.version>
 		<jwt.version>3.10.3</jwt.version>
 		<easybind.version>2.1.0</easybind.version>
 		<guava.version>29.0-jre</guava.version>

From cae86cd71fa3b1a6ed2db7541ae9bd786bba1764 Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Wed, 7 Oct 2020 18:55:18 +0200
Subject: [PATCH 114/169] Get more information logged in case something goes
 wrong

---
 .../keychain/KeychainAccessStrategy.java            |  2 +-
 .../keychain/LinuxKDEWalletKeychainAccessImpl.java  | 13 +++++++++----
 main/ui/src/main/resources/license/THIRD-PARTY.txt  |  2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
index abd50287e..553ce4eab 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
@@ -5,7 +5,7 @@
  *******************************************************************************/
 package org.cryptomator.keychain;
 
-interface KeychainAccessStrategy {
+public interface KeychainAccessStrategy {
 
 	/**
 	 * Associates a passphrase with a given key.
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
index 26d85b6d4..8e97dc6d4 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
@@ -18,11 +18,12 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
     private KDEWallet wallet;
     private int handle = -1;
 
-    public LinuxKDEWalletKeychainAccessImpl() {
+    public LinuxKDEWalletKeychainAccessImpl() throws KeychainAccessException {
         try {
             connection = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
         } catch (DBusException e) {
-            LOG.error(e.toString(), e.getCause());
+            LOG.error("Connecting to D-Bus failed:", e);
+            throw new KeychainAccessException(e);
         }
     }
 
@@ -32,7 +33,7 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
             wallet = new KDEWallet(connection);
             return wallet.isEnabled();
         } catch (Exception e) {
-            LOG.error(e.toString(), e.getCause());
+            LOG.error("A KDEWallet could not be created:", e);
             return false;
         }
     }
@@ -49,7 +50,7 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
                 LOG.debug("Passphrase was not stored.");
             }
         } catch (Exception e) {
-            LOG.error(e.toString(), e.getCause());
+            LOG.error("Storing the passphrase failed:", e);
             throw new KeychainAccessException(e);
         }
     }
@@ -66,6 +67,7 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
             }
             return (password.equals("")) ? null : password.toCharArray();
         } catch (Exception e) {
+            LOG.error("Loading the passphrase failed:", e);
             throw new KeychainAccessException(e);
         }
     }
@@ -82,6 +84,7 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
                 LOG.debug("Passphrase was not deleted.");
             }
         } catch (Exception e) {
+            LOG.error("Deleting the passphrase failed:", e);
             throw new KeychainAccessException(e);
         }
     }
@@ -98,6 +101,7 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
                 LOG.debug("Passphrase could not be changed.");
             }
         } catch (Exception e) {
+            LOG.error("Changing the passphrase failed:", e);
             throw new KeychainAccessException(e);
         }
     }
@@ -115,6 +119,7 @@ public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy
             LOG.debug("Wallet successfully initialized.");
             return handle != -1;
         } catch (Exception e) {
+            LOG.error("Asynchronous opening the wallet failed:", e);
             throw new KeychainAccessException(e);
         }
     }
diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt
index 6b1d42e05..3674e5e05 100644
--- a/main/ui/src/main/resources/license/THIRD-PARTY.txt
+++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt
@@ -82,7 +82,7 @@ Cryptomator uses 53 third-party dependencies under the following licenses:
 		- zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - https://github.com/nulab/zxcvbn4j)
 		- secret-service (de.swiesend:secret-service:1.1.0 - https://github.com/swiesend/secret-service)
 		- Checker Qual (org.checkerframework:checker-qual:2.11.1 - https://checkerframework.org)
-		- kdewallet (org.purejava:kdewallet:1.0.1 - https://github.com/purejava/kdewallet)
+		- kdewallet (org.purejava:kdewallet:1.1.1 - https://github.com/purejava/kdewallet)
 		- SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org)
 	The BSD 2-Clause License:
 		- EasyBind (com.tobiasdiez:easybind:2.1.0 - https://github.com/tobiasdiez/EasyBind)

From b5efe39eb88a99c8d3266d36dc63f8fd5036d265 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 7 Oct 2020 18:06:05 +0200
Subject: [PATCH 115/169] Refactored Vault, MPCs, Unlock to integrate better
 with latest changes

Removed delegate to Volume#getMountPointRequirement() from Vault
Added getter for the Vault's Volume (#getVolume())

Changed CustomMountPointChooser to use VaultSettings instead of Vault for the constructor/field declaration
Updated CustomMountPointChooser#isApplicable() to be disabled when using FUSE on Windows (without useExperimentalFuse)
Updated CustomMountPointChooser to call Volume#getMountPointRequirement() directly

Replaced OS-Check in TemporaryMountPointChooser with MPR-Check

Replaced call to Vault#getMountPointRequirement() with call to Vault#getVolume() (and Volume#getMountPointRequirement()) in UnlockInvalidMountPointController and UnlockWorkflow
Cleaned up UnlockWorkflow
---
 .../mountpoint/CustomMountPointChooser.java   | 20 ++++++++-----
 .../TemporaryMountPointChooser.java           | 30 ++++++++++++-------
 .../org/cryptomator/common/vaults/Vault.java  |  5 ++--
 .../UnlockInvalidMountPointController.java    |  2 +-
 .../cryptomator/ui/unlock/UnlockWorkflow.java | 12 ++++----
 5 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
index b39baba23..6a86c654a 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/CustomMountPointChooser.java
@@ -1,6 +1,9 @@
 package org.cryptomator.common.mountpoint;
 
-import org.cryptomator.common.vaults.Vault;
+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.Environment;
+import org.cryptomator.common.settings.VaultSettings;
+import org.cryptomator.common.settings.VolumeImpl;
 import org.cryptomator.common.vaults.Volume;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,27 +26,30 @@ public class CustomMountPointChooser implements MountPointChooser {
 
 	private static final Logger LOG = LoggerFactory.getLogger(CustomMountPointChooser.class);
 
-	private final Vault vault;
+	private final VaultSettings vaultSettings;
+	private final Environment environment;
 
 	@Inject
-	public CustomMountPointChooser(Vault vault) {
-		this.vault = vault;
+	public CustomMountPointChooser(VaultSettings vaultSettings, Environment environment) {
+		this.vaultSettings = vaultSettings;
+		this.environment = environment;
 	}
 
 	@Override
 	public boolean isApplicable(Volume caller) {
-		return true;
+		//Disable if useExperimentalFuse is required (Win + Fuse), but set to false
+		return caller.getImplementationType() != VolumeImpl.FUSE || !SystemUtils.IS_OS_WINDOWS || environment.useExperimentalFuse();
 	}
 
 	@Override
 	public Optional<Path> chooseMountPoint(Volume caller) {
 		//VaultSettings#getCustomMountPath already checks whether the saved custom mountpoint should be used
-		return this.vault.getVaultSettings().getCustomMountPath().map(Paths::get);
+		return this.vaultSettings.getCustomMountPath().map(Paths::get);
 	}
 
 	@Override
 	public boolean prepare(Volume caller, Path mountPoint) throws InvalidMountPointException {
-		switch (this.vault.getMountPointRequirement()) {
+		switch (caller.getMountPointRequirement()) {
 			case PARENT_NO_MOUNT_POINT -> prepareParentNoMountPoint(mountPoint);
 			case EMPTY_MOUNT_POINT -> prepareEmptyMountPoint(mountPoint);
 			case NONE -> {
diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index fa3ab5ab2..60991b97e 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -67,16 +67,26 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 		}
 
 		try {
-			//WinFSP needs the parent, but the actual Mountpoint must not exist...
-			if (SystemUtils.IS_OS_WINDOWS) {
-				Files.createDirectories(mountPoint.getParent());
-				LOG.debug("Successfully created folder for mount point: {}", mountPoint);
-				return false;
-			} else {
-				//For Linux and Mac the actual Mountpoint must exist
-				Files.createDirectories(mountPoint);
-				LOG.debug("Successfully created mount point: {}", mountPoint);
-				return true;
+			switch (caller.getMountPointRequirement()) {
+				case PARENT_NO_MOUNT_POINT -> {
+					Files.createDirectories(mountPoint.getParent());
+					LOG.debug("Successfully created folder for mount point: {}", mountPoint);
+					return false;
+				}
+				case EMPTY_MOUNT_POINT -> {
+					Files.createDirectories(mountPoint);
+					LOG.debug("Successfully created mount point: {}", mountPoint);
+					return true;
+				}
+				case NONE -> {
+					//Requirement "NONE" doesn't make any sense here.
+					//No need to prepare/verify a Mountpoint without requiring one...
+					throw new InvalidMountPointException(new IllegalStateException("Illegal MountPointRequirement"));
+				}
+				default -> {
+					//Currently the case for "PARENT_OPT_MOUNT_POINT"
+					throw new InvalidMountPointException(new IllegalStateException("Not implemented"));
+				}
 			}
 		} catch (IOException exception) {
 			throw new InvalidMountPointException("IOException while preparing mountpoint", exception);
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
index d63ab0330..90e099ae0 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
@@ -39,6 +39,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.EnumSet;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -316,8 +317,8 @@ public class Vault {
 		return vaultSettings.getId();
 	}
 
-	public MountPointRequirement getMountPointRequirement() {
-		return volume.getMountPointRequirement();
+	public Optional<Volume> getVolume() {
+		return Optional.ofNullable(this.volume);
 	}
 
 	// ******************************************************************************
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
index a70f58311..7b0af6042 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
@@ -38,7 +38,7 @@ public class UnlockInvalidMountPointController implements FxController {
 	}
 
 	public boolean getMustExist() {
-		MountPointRequirement requirement = vault.getMountPointRequirement();
+		MountPointRequirement requirement = vault.getVolume().orElseThrow(() -> new IllegalStateException("Invalid Mountpoint without a Volume?!")).getMountPointRequirement();
 		assert requirement != MountPointRequirement.NONE; //An invalid MountPoint with no required MountPoint doesn't seem sensible
 		assert requirement != MountPointRequirement.PARENT_OPT_MOUNT_POINT; //Not implemented anywhere (yet)
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index ea692f783..c339cb344 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -157,7 +157,7 @@ public class UnlockWorkflow extends Task<Boolean> {
 	}
 
 	private void handleInvalidMountPoint(InvalidMountPointException impExc) {
-		MountPointRequirement requirement = vault.getMountPointRequirement();
+		MountPointRequirement requirement = vault.getVolume().orElseThrow(() -> new IllegalStateException("Invalid Mountpoint without a Volume?!", impExc)).getMountPointRequirement();
 		assert requirement != MountPointRequirement.NONE; //An invalid MountPoint with no required MountPoint doesn't seem sensible
 		assert requirement != MountPointRequirement.PARENT_OPT_MOUNT_POINT; //Not implemented anywhere (yet)
 
@@ -165,14 +165,14 @@ public class UnlockWorkflow extends Task<Boolean> {
 		//Cause is either null (cause the IMPE was thrown directly, e.g. because no MPC succeeded)
 		//or the cause was not an Exception (but some other kind of Throwable)
 		//Either way: Handle as generic error
-		if(!(cause instanceof Exception)) {
+		if (!(cause instanceof Exception)) {
 			handleGenericError(impExc);
 			return;
 		}
 
 		//From here on handle the cause, not the caught exception
-		if(cause instanceof NotDirectoryException) {
-			if(requirement == MountPointRequirement.PARENT_NO_MOUNT_POINT) {
+		if (cause instanceof NotDirectoryException) {
+			if (requirement == MountPointRequirement.PARENT_NO_MOUNT_POINT) {
 				LOG.error("Unlock failed. Parent folder is missing: {}", cause.getMessage());
 			} else {
 				LOG.error("Unlock failed. Mountpoint doesn't exist (needs to be a folder): {}", cause.getMessage());
@@ -181,13 +181,13 @@ public class UnlockWorkflow extends Task<Boolean> {
 			return;
 		}
 
-		if(cause instanceof FileAlreadyExistsException) {
+		if (cause instanceof FileAlreadyExistsException) {
 			LOG.error("Unlock failed. Mountpoint already exists: {}", cause.getMessage());
 			showInvalidMountPointScene();
 			return;
 		}
 
-		if(cause instanceof DirectoryNotEmptyException) {
+		if (cause instanceof DirectoryNotEmptyException) {
 			LOG.error("Unlock failed. Mountpoint not an empty directory: {}", cause.getMessage());
 			showInvalidMountPointScene();
 			return;

From 7781572b6de33b2099a2f80d373992b287165de2 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 7 Oct 2020 23:27:08 +0200
Subject: [PATCH 116/169] Replaced call to Validate with call to Preconditions

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r500760560
---
 .../org/cryptomator/common/mountpoint/MountPointChooser.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
index b2e0798ac..565dbe834 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
@@ -1,6 +1,6 @@
 package org.cryptomator.common.mountpoint;
 
-import org.apache.commons.lang3.Validate;
+import com.google.common.base.Preconditions;
 import org.cryptomator.common.vaults.Volume;
 
 import java.nio.file.Path;
@@ -169,7 +169,7 @@ public interface MountPointChooser extends Comparable<MountPointChooser> {
 	 */
 	@Override
 	default int compareTo(MountPointChooser other) {
-		Validate.notNull(other, "Other must not be null!");
+		Preconditions.checkNotNull(other, "Other must not be null!");
 
 		//Try to compare by priority and sort in ascending order.
 		//1) Compare the priorities.

From 92321a7569d3c04daeaec80b2d8d6ce9f64fce7d Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Thu, 8 Oct 2020 12:57:50 +0200
Subject: [PATCH 117/169] Remove unneeded access modifier

---
 .../java/org/cryptomator/keychain/KeychainAccessStrategy.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
index 553ce4eab..abd50287e 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
@@ -5,7 +5,7 @@
  *******************************************************************************/
 package org.cryptomator.keychain;
 
-public interface KeychainAccessStrategy {
+interface KeychainAccessStrategy {
 
 	/**
 	 * Associates a passphrase with a given key.

From 6b6867b826f474e5926afb65c1ce2d3c8a58366d Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Thu, 8 Oct 2020 18:51:03 +0200
Subject: [PATCH 118/169] Reverted ab538cd21573de70aa7d100382a8a70c25eeccaf

---
 .../common/mountpoint/MountPointChooser.java  | 27 +++----------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
index 565dbe834..393d68b20 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
@@ -1,6 +1,5 @@
 package org.cryptomator.common.mountpoint;
 
-import com.google.common.base.Preconditions;
 import org.cryptomator.common.vaults.Volume;
 
 import java.nio.file.Path;
@@ -155,31 +154,11 @@ public interface MountPointChooser extends Comparable<MountPointChooser> {
 	 * <p>{@inheritDoc}
 	 *
 	 * @implNote This default implementation sorts the MPCs in ascending order
-	 * of their {@link #getPriority() priority.} It depends on a correct implementation
-	 * of {@link #hashCode()} and {@link #equals(Object)} for the compared objects.
-	 * For this implementation "the least required correct implementation" maps
-	 * the following relationship correctly:<br>
-	 * If the objects {@code a} and {@code b} are {@code equal} as determined by
-	 * {@code #equals(Object)} then the {@code hashCodes} as determined by {@code #hashCode()}
-	 * of {@code a} and {@code b} must be equal. If the objects are {@code not equal}
-	 * then the {@code hashCodes} must be different.<br>
-	 * The default implementations of those two methods are sufficient.
-	 * @see Object#hashCode()
-	 * @see Object#equals(Object)
+	 * of their {@link #getPriority() priority.}
 	 */
 	@Override
 	default int compareTo(MountPointChooser other) {
-		Preconditions.checkNotNull(other, "Other must not be null!");
-
-		//Try to compare by priority and sort in ascending order.
-		//1) Compare the priorities.
-		//2) If the result of the comparison is 0 because the priorities are equal,
-		//   we consider this a failure. In this case sort by hashCode (step 3).
-		//   Else return the result of the comparison.
-		//3) Return the result of the comparison of the hashCodes:
-		//   Either 0 (because they are equal and that's why they had the same priority)
-		//   or a non-null int (because they only share the priority).
-		int compResult = /* 1 */ Integer.compare(this.getPriority(), other.getPriority());
-		return compResult != 0 ? /* 2 */ compResult : /* 3 */ Integer.compare(this.hashCode(), other.hashCode());
+		//Sort by priority (ascending order)
+		return Integer.compare(this.getPriority(), other.getPriority());
 	}
 }

From 58e2ec4742d5e20e3fd361afe750539a67545a47 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Thu, 8 Oct 2020 19:14:03 +0200
Subject: [PATCH 119/169] Changed contract of priorities in MPC, added
 null-check

See: ab538cd21573de70aa7d100382a8a70c25eeccaf (original commit)
See: 6b6867b826f474e5926afb65c1ce2d3c8a58366d (reverting commit)
---
 .../common/mountpoint/MountPointChooser.java        | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
index 393d68b20..2c40bb74a 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/MountPointChooser.java
@@ -1,5 +1,6 @@
 package org.cryptomator.common.mountpoint;
 
+import com.google.common.base.Preconditions;
 import org.cryptomator.common.vaults.Volume;
 
 import java.nio.file.Path;
@@ -12,8 +13,9 @@ import java.util.SortedSet;
  * <p>All <i>MountPointChoosers (MPCs)</i> need to implement this class and must be added to
  * the pool of possible MPCs by the {@link MountPointChooserModule MountPointChooserModule.}
  * The MountPointChooserModule will sort them according to their {@link #getPriority() priority.}
- * The priority must be defined by the developer to reflect a useful execution order;
- * the order of execution of MPCs with equal priority is undefined.
+ * The priority must be defined by the developer to reflect a useful execution order.<br>
+ * A specific priority <b>must not</b> be assigned to more than one MPC at a time;
+ * the result of having two MPCs with equal priority is undefined.
  *
  * <p>MPCs are executed by a {@link Volume} in ascending order of their priority
  * (smaller priorities are tried first) to find and prepare a suitable mountpoint for the volume.
@@ -138,8 +140,9 @@ public interface MountPointChooser extends Comparable<MountPointChooser> {
 	 * and determine their execution order.
 	 * The priority must be defined by the developer to reflect a useful execution order.
 	 * MPCs with lower priorities will be placed at lower indices in the resulting
-	 * {@link SortedSet} and will be executed with higher probability.
-	 * The order of execution of MPCs with equal priority is undefined.
+	 * {@link SortedSet} and will be executed with higher probability.<br>
+	 * A specific priority <b>must not</b> be assigned to more than one MPC at a time;
+	 * the result of having two MPCs with equal priority is undefined.
 	 *
 	 * @return the priority of this MPC.
 	 */
@@ -158,6 +161,8 @@ public interface MountPointChooser extends Comparable<MountPointChooser> {
 	 */
 	@Override
 	default int compareTo(MountPointChooser other) {
+		Preconditions.checkNotNull(other, "Other must not be null!");
+
 		//Sort by priority (ascending order)
 		return Integer.compare(this.getPriority(), other.getPriority());
 	}

From 21f4fab9ed08a40ec065b9199bf7c065c87b0be1 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Fri, 9 Oct 2020 18:40:50 +0200
Subject: [PATCH 120/169] Fixed bug: Strange error message if no MPC was
 applicable

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

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
index 199c576db..738118608 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
@@ -44,7 +44,7 @@ public abstract class AbstractVolume implements Volume {
 		//SortedSet#stream() should return a sorted stream (that's what it's docs and the docs of #spliterator() say, even if they are not 100% clear for me.)
 		//We want to keep that order, that's why we use ImmutableSet#toImmutableSet() to collect (even if it doesn't implement SortedSet, it's docs promise use encounter ordering.)
 		String checked = Joiner.on(", ").join(checkedChoosers.stream().map((mpc) -> mpc.getClass().getTypeName()).collect(ImmutableSet.toImmutableSet()));
-		throw new InvalidMountPointException(String.format("No feasible MountPoint found! Checked %s", checked));
+		throw new InvalidMountPointException(String.format("No feasible MountPoint found! Checked %s", checked.isBlank() ? "<No applicable MPC>" : checked));
 	}
 
 	protected void cleanupMountPoint() {

From 0e5d72c22a2d29316a20ff3739d7aef7c153d37c Mon Sep 17 00:00:00 2001
From: Reid Rankin <reidrankin@gmail.com>
Date: Mon, 12 Oct 2020 08:12:09 -0400
Subject: [PATCH 121/169] shorten FS_TYPE_NAME  to "CryptomatorFS" (#1371)

This fixes part of #1033 by shortening the FS_TYPE_NAME so that it can be returned inside a 48-byte-long FILE_FS_ATTRIBUTE_INFORMATION buffer, which only has room for up to 17 UTF-16 characters in the file system name field.
---
 .../main/java/org/cryptomator/common/vaults/DokanyVolume.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
index 117f888c9..a357cb559 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DokanyVolume.java
@@ -24,7 +24,7 @@ public class DokanyVolume implements Volume {
 
 	private static final Logger LOG = LoggerFactory.getLogger(DokanyVolume.class);
 
-	private static final String FS_TYPE_NAME = "Cryptomator File System";
+	private static final String FS_TYPE_NAME = "CryptomatorFS";
 
 	private final VaultSettings vaultSettings;
 	private final MountFactory mountFactory;

From 598bec305038d87803e5a35d3e748d88f1880ddc Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Mon, 12 Oct 2020 21:34:23 +0200
Subject: [PATCH 122/169] Finished feature: Fuse on Win

Bumped required version of fuse-nio-adapter to 1.2.4
Added comments
Changed log messages to be more descriptive
---
 .../mountpoint/TemporaryMountPointChooser.java      | 13 ++++++++++---
 main/pom.xml                                        |  2 +-
 .../unlock/UnlockInvalidMountPointController.java   |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index 60991b97e..f9a01e028 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -69,13 +69,20 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 		try {
 			switch (caller.getMountPointRequirement()) {
 				case PARENT_NO_MOUNT_POINT -> {
-					Files.createDirectories(mountPoint.getParent());
-					LOG.debug("Successfully created folder for mount point: {}", mountPoint);
+					//Create everything up to the parent (but not the actual mountpoint)
+					Path parent = mountPoint.getParent();
+					Files.createDirectories(parent);
+
+					//Get the name of the parent directory (#getFileName())
+					//or just use the parent if the name is null (that's the case if parent is the root)
+					Path parentName = parent.getFileName() != null ? parent.getFileName() : parent;
+					LOG.debug("Successfully created/checked parent folder (\"{}\") for mount point: {}", parentName, mountPoint);
 					return false;
 				}
 				case EMPTY_MOUNT_POINT -> {
+					//Create everything up to the mountpoint (including the actual mountpoint)
 					Files.createDirectories(mountPoint);
-					LOG.debug("Successfully created mount point: {}", mountPoint);
+					LOG.debug("Successfully created/checked mount point: {}", mountPoint);
 					return true;
 				}
 				case NONE -> {
diff --git a/main/pom.xml b/main/pom.xml
index 8702b89d9..d6e7fcadc 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -26,7 +26,7 @@
 		<!-- cryptomator dependencies -->
 		<cryptomator.cryptofs.version>1.9.12</cryptomator.cryptofs.version>
 		<cryptomator.jni.version>2.2.3</cryptomator.jni.version>
-		<cryptomator.fuse.version>1.2.3</cryptomator.fuse.version>
+		<cryptomator.fuse.version>1.2.4</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.1.15</cryptomator.dokany.version>
 		<cryptomator.webdav.version>1.0.12</cryptomator.webdav.version>
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
index 7b0af6042..792edbf91 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
@@ -12,6 +12,7 @@ import org.cryptomator.ui.common.FxmlScene;
 
 import javax.inject.Inject;
 
+//At the current point in time only the CustomMountPointChooser may cause this window to be shown.
 @UnlockScoped
 public class UnlockInvalidMountPointController implements FxController {
 

From 06b3343a6d81c99e7c8b024eda2fbb8bda23aa6c Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 13 Oct 2020 18:30:00 +0200
Subject: [PATCH 123/169] Partly Revert "Finished feature: Fuse on Win"

Revert changes to TemporaryMountPointChooser introduced by 598bec305038d87803e5a35d3e748d88f1880ddc
---
 .../mountpoint/TemporaryMountPointChooser.java      | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index f9a01e028..60991b97e 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -69,20 +69,13 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 		try {
 			switch (caller.getMountPointRequirement()) {
 				case PARENT_NO_MOUNT_POINT -> {
-					//Create everything up to the parent (but not the actual mountpoint)
-					Path parent = mountPoint.getParent();
-					Files.createDirectories(parent);
-
-					//Get the name of the parent directory (#getFileName())
-					//or just use the parent if the name is null (that's the case if parent is the root)
-					Path parentName = parent.getFileName() != null ? parent.getFileName() : parent;
-					LOG.debug("Successfully created/checked parent folder (\"{}\") for mount point: {}", parentName, mountPoint);
+					Files.createDirectories(mountPoint.getParent());
+					LOG.debug("Successfully created folder for mount point: {}", mountPoint);
 					return false;
 				}
 				case EMPTY_MOUNT_POINT -> {
-					//Create everything up to the mountpoint (including the actual mountpoint)
 					Files.createDirectories(mountPoint);
-					LOG.debug("Successfully created/checked mount point: {}", mountPoint);
+					LOG.debug("Successfully created mount point: {}", mountPoint);
 					return true;
 				}
 				case NONE -> {

From 0206fc0b8fd1242330d51c263553c19ff12ba927 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 14 Oct 2020 15:26:28 +0200
Subject: [PATCH 124/169] Bumped required version of fuse-nio-adapter to 1.2.5

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

diff --git a/main/pom.xml b/main/pom.xml
index d6e7fcadc..6dd36fca7 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -26,7 +26,7 @@
 		<!-- cryptomator dependencies -->
 		<cryptomator.cryptofs.version>1.9.12</cryptomator.cryptofs.version>
 		<cryptomator.jni.version>2.2.3</cryptomator.jni.version>
-		<cryptomator.fuse.version>1.2.4</cryptomator.fuse.version>
+		<cryptomator.fuse.version>1.2.5</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.1.15</cryptomator.dokany.version>
 		<cryptomator.webdav.version>1.0.12</cryptomator.webdav.version>
 

From 0a32de2c92bf6cd7c7aea56d93b0f4efc07ba3eb Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Fri, 16 Oct 2020 22:38:39 +0200
Subject: [PATCH 125/169] Addded dev run configs, removed fuse-setting from win
 prod config

---
 .idea/runConfigurations/Cryptomator_Linux_Dev.xml   | 10 ++++++++++
 .idea/runConfigurations/Cryptomator_Windows.xml     |  2 +-
 .idea/runConfigurations/Cryptomator_Windows_Dev.xml | 10 ++++++++++
 .idea/runConfigurations/Cryptomator_macOS_Dev.xml   | 13 +++++++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 .idea/runConfigurations/Cryptomator_Linux_Dev.xml
 create mode 100644 .idea/runConfigurations/Cryptomator_Windows_Dev.xml
 create mode 100644 .idea/runConfigurations/Cryptomator_macOS_Dev.xml

diff --git a/.idea/runConfigurations/Cryptomator_Linux_Dev.xml b/.idea/runConfigurations/Cryptomator_Linux_Dev.xml
new file mode 100644
index 000000000..945c99d68
--- /dev/null
+++ b/.idea/runConfigurations/Cryptomator_Linux_Dev.xml
@@ -0,0 +1,10 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Cryptomator Linux Dev" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
+    <module name="launcher" />
+    <option name="VM_PARAMETERS" value="-Djdk.gtk.version=2 -Duser.language=en -Dcryptomator.settingsPath=&quot;~/.config/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/.config/Cryptomator-Dev/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/.local/share/Cryptomator-Dev/logs&quot; -Dcryptomator.mountPointsDir=&quot;~/.local/share/Cryptomator-Dev/mnt&quot; -Dfuse.experimental=&quot;true&quot; -Xss20m -Xmx512m" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Cryptomator_Windows.xml b/.idea/runConfigurations/Cryptomator_Windows.xml
index 0e2b00d8f..c1143a530 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="launcher" />
-    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/AppData/Roaming/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator&quot; -Dfuse.experimental=&quot;true&quot; -Xss2m -Xmx512m" />
+    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/AppData/Roaming/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator&quot; -Xss2m -Xmx512m" />
     <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
new file mode 100644
index 000000000..1cea10200
--- /dev/null
+++ b/.idea/runConfigurations/Cryptomator_Windows_Dev.xml
@@ -0,0 +1,10 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Cryptomator Windows Dev" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
+    <module name="launcher" />
+    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/AppData/Roaming/Cryptomator-Dev/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator-Dev&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator-Dev/keychain.json&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator-Dev&quot; -Dfuse.experimental=&quot;true&quot; -Xss2m -Xmx512m" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Cryptomator_macOS_Dev.xml b/.idea/runConfigurations/Cryptomator_macOS_Dev.xml
new file mode 100644
index 000000000..bda578f65
--- /dev/null
+++ b/.idea/runConfigurations/Cryptomator_macOS_Dev.xml
@@ -0,0 +1,13 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Cryptomator macOS Dev" type="Application" factoryName="Application">
+    <envs>
+      <env name="LD_LIBRARY_PATH" value="/usr/local/lib" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
+    <module name="launcher" />
+    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/Library/Application Support/Cryptomator-Dev/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator-Dev&quot; -Dcryptomator.mountPointsDir=&quot;/Volumes/&quot; -Dfuse.experimental=&quot;true&quot; -Xss2m -Xmx512m -ea" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file

From 022ba81f2f6974ac12788d801d9e94e76be2c942 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Mon, 19 Oct 2020 19:14:01 +0200
Subject: [PATCH 126/169] Reformatted classes ErrorComponent and Tasks

---
 .../org/cryptomator/ui/common/ErrorComponent.java | 10 +++++-----
 .../java/org/cryptomator/ui/common/Tasks.java     | 15 ++++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java
index 0ba4e4d47..54f32c07e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java
@@ -20,21 +20,21 @@ public interface ErrorComponent {
 		stage.setScene(scene());
 		stage.show();
 	}
-	
+
 	@Subcomponent.Builder
 	interface Builder {
-		
+
 		@BindsInstance
 		Builder cause(Throwable cause);
-		
+
 		@BindsInstance
 		Builder window(Stage window);
-		
+
 		@BindsInstance
 		Builder returnToScene(@Nullable Scene previousScene);
 
 		ErrorComponent build();
-		
+
 	}
 
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/Tasks.java b/main/ui/src/main/java/org/cryptomator/ui/common/Tasks.java
index a7a61d862..ab0a80d47 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/Tasks.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/Tasks.java
@@ -5,6 +5,13 @@
  *******************************************************************************/
 package org.cryptomator.ui.common;
 
+import javafx.application.Platform;
+import javafx.concurrent.ScheduledService;
+import javafx.concurrent.Task;
+import javafx.util.Duration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -14,16 +21,10 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import javafx.application.Platform;
-import javafx.concurrent.ScheduledService;
-import javafx.concurrent.Task;
-import javafx.util.Duration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class Tasks {
 
 	private static final Logger LOG = LoggerFactory.getLogger(Tasks.class);
+
 	public static <T> TaskBuilder<T> create(Callable<T> callable) {
 		return new TaskBuilder<>(callable);
 	}

From 253abd493036ef940ced24942f2c84fd64695972 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Thu, 22 Oct 2020 18:32:15 +0200
Subject: [PATCH 127/169] Refactored UnlockWorkflow

Replaced protected state methods (scheduled, etc.) with lambdas in the constructor
Replaced try-multi-catch with if-instanceof in onFailed-lambda
---
 .../cryptomator/ui/unlock/UnlockWorkflow.java | 41 +++++++------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index c339cb344..4db0836a4 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -73,6 +73,20 @@ public class UnlockWorkflow extends Task<Boolean> {
 		this.successScene = successScene;
 		this.invalidMountPointScene = invalidMountPointScene;
 		this.errorComponent = errorComponent;
+
+		setOnScheduled(event -> vault.setState(VaultState.PROCESSING));
+		setOnSucceeded(event -> vault.setState(VaultState.UNLOCKED));
+		setOnCancelled(event -> vault.setState(VaultState.LOCKED));
+
+		setOnFailed(event -> {
+			vault.setState(VaultState.LOCKED);
+			Throwable throwable = event.getSource().getException();
+			if (throwable instanceof InvalidMountPointException) {
+				handleInvalidMountPoint((InvalidMountPointException) throwable);
+			} else {
+				handleGenericError(throwable);
+			}
+		});
 	}
 
 	@Override
@@ -85,12 +99,6 @@ public class UnlockWorkflow extends Task<Boolean> {
 				cancel(false); // set Tasks state to cancelled
 				return false;
 			}
-		} catch (InvalidMountPointException e) {
-			handleInvalidMountPoint(e);
-			throw e; // rethrow to trigger correct exception handling in Task
-		} catch (Exception e) {
-			handleGenericError(e);
-			throw e; // rethrow to trigger correct exception handling in Task
 		} finally {
 			wipePassword(password.get());
 			wipePassword(savedPassword.orElse(null));
@@ -216,25 +224,4 @@ public class UnlockWorkflow extends Task<Boolean> {
 			Arrays.fill(pw, ' ');
 		}
 	}
-
-	@Override
-	protected void scheduled() {
-		vault.setState(VaultState.PROCESSING);
-	}
-
-	@Override
-	protected void succeeded() {
-		vault.setState(VaultState.UNLOCKED);
-	}
-
-	@Override
-	protected void failed() {
-		vault.setState(VaultState.LOCKED);
-	}
-
-	@Override
-	protected void cancelled() {
-		vault.setState(VaultState.LOCKED);
-	}
-
 }

From 9531d44ab542b807e5ee76bcb0f5a7901a3d2430 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Sat, 24 Oct 2020 01:50:58 +0000
Subject: [PATCH 128/169] fix: main/pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415
---
 main/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/pom.xml b/main/pom.xml
index 61e206686..9dfedcd3f 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -37,7 +37,7 @@
 		<kdewallet.version>1.1.1</kdewallet.version>
 		<jwt.version>3.10.3</jwt.version>
 		<easybind.version>2.1.0</easybind.version>
-		<guava.version>29.0-jre</guava.version>
+		<guava.version>30.0-android</guava.version>
 		<dagger.version>2.22</dagger.version>
 		<gson.version>2.8.6</gson.version>
 		<slf4j.version>1.7.30</slf4j.version>

From 7f63153bc1649317bc6138147f5f93ded25dd478 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
Date: Sat, 24 Oct 2020 09:47:09 +0200
Subject: [PATCH 129/169] Update main/pom.xml

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

diff --git a/main/pom.xml b/main/pom.xml
index 9dfedcd3f..87281805e 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -37,7 +37,7 @@
 		<kdewallet.version>1.1.1</kdewallet.version>
 		<jwt.version>3.10.3</jwt.version>
 		<easybind.version>2.1.0</easybind.version>
-		<guava.version>30.0-android</guava.version>
+		<guava.version>30.0-jre</guava.version>
 		<dagger.version>2.22</dagger.version>
 		<gson.version>2.8.6</gson.version>
 		<slf4j.version>1.7.30</slf4j.version>

From 265212cc0f1c12a284b31e227dc08b8874f304da Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
Date: Mon, 26 Oct 2020 10:00:58 +0100
Subject: [PATCH 130/169] New Crowdin updates (#1302)

* New translations strings.properties [ci skip]
---
 .../main/resources/i18n/strings_ar.properties |  12 +-
 .../main/resources/i18n/strings_bs.properties | 110 +++++++++++++++
 .../main/resources/i18n/strings_ca.properties |   7 +-
 .../main/resources/i18n/strings_cs.properties |   9 +-
 .../main/resources/i18n/strings_de.properties |  18 ++-
 .../main/resources/i18n/strings_el.properties |   9 +-
 .../main/resources/i18n/strings_es.properties |   9 +-
 .../main/resources/i18n/strings_fr.properties |   9 +-
 .../main/resources/i18n/strings_hi.properties |   3 +
 .../main/resources/i18n/strings_hr.properties |   2 +
 .../main/resources/i18n/strings_id.properties | 131 ++++++++++++++++++
 .../main/resources/i18n/strings_it.properties |   9 +-
 .../main/resources/i18n/strings_ja.properties |  10 +-
 .../main/resources/i18n/strings_ko.properties |   9 +-
 .../main/resources/i18n/strings_lv.properties |   5 +-
 .../main/resources/i18n/strings_nb.properties |  11 +-
 .../main/resources/i18n/strings_nl.properties |   6 +-
 .../main/resources/i18n/strings_nn.properties |   5 +-
 .../main/resources/i18n/strings_pl.properties |  15 +-
 .../main/resources/i18n/strings_pt.properties |   4 +-
 .../resources/i18n/strings_pt_BR.properties   |  13 +-
 .../main/resources/i18n/strings_ro.properties |   2 +
 .../main/resources/i18n/strings_ru.properties |  17 ++-
 .../main/resources/i18n/strings_sk.properties |   7 +
 .../main/resources/i18n/strings_sv.properties |  12 +-
 .../main/resources/i18n/strings_tr.properties |   6 +-
 .../main/resources/i18n/strings_zh.properties |  11 +-
 .../resources/i18n/strings_zh_TW.properties   |   7 +-
 28 files changed, 412 insertions(+), 56 deletions(-)
 create mode 100644 main/ui/src/main/resources/i18n/strings_bs.properties
 create mode 100644 main/ui/src/main/resources/i18n/strings_id.properties

diff --git a/main/ui/src/main/resources/i18n/strings_ar.properties b/main/ui/src/main/resources/i18n/strings_ar.properties
index 959bee104..65243a92b 100644
--- a/main/ui/src/main/resources/i18n/strings_ar.properties
+++ b/main/ui/src/main/resources/i18n/strings_ar.properties
@@ -16,6 +16,9 @@ generic.button.print=طباعة
 generic.error.title=حدث خطأ غير متوقع
 generic.error.instruction=ما كان ينبغي أن يحدث هذا. يرجى الإبلاغ عن نص الخطأ أدناه وإدراج وصف للخطوات التي أدت إلى هذا الخطأ.
 
+# Defaults
+defaults.vault.vaultName=خزنة
+
 # Tray Menu
 traymenu.showMainWindow=اظهار
 traymenu.showPreferencesWindow=تفضيلات
@@ -99,7 +102,8 @@ unlock.success.message=تم فتح المخزن "%s" بنجاح! يمكنك ال
 unlock.success.rememberChoice=تذكر اختياري ولا تظهر هذا مرة أخرى
 unlock.success.revealBtn=افتح الحافظة
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=نقطة الوصول ليست مجلد فارغ: %s
+unlock.error.invalidMountPoint.notExisting=نقطة التحميل ليست مجلد فارغ أو غير موجودة: %s
+unlock.error.invalidMountPoint.existing=نقطة/مجلد التحميل موجود بالفعل أو المجلد الأصل مفقود: %s
 
 # Migration
 migration.title=ترقية الحافظة
@@ -130,6 +134,7 @@ preferences.title=تفضيلات
 ## General
 preferences.general=عام
 preferences.general.theme=الشكل والمظهر
+preferences.general.theme.automatic=تلقائي
 preferences.general.theme.light=فاتح (أبيض)
 preferences.general.theme.dark=مظلم (أسود)
 preferences.general.unlockThemes=تفعيل الوضع المظلم
@@ -163,12 +168,14 @@ preferences.about=حول البرنامج
 main.closeBtn.tooltip=إغلاق
 main.minimizeBtn.tooltip=تصغير
 main.preferencesBtn.tooltip=تفضيلات
+main.debugModeEnabled.tooltip=تم تمكين وضع التصحيح
 main.donationKeyMissing.tooltip=يرجى النظر في تقديم تبرعات
 ## Drag 'n' Drop
 main.dropZone.dropVault=أضف هذا المخزن
 main.dropZone.unknownDragboardContent=إذا كنت ترغب في إضافة مخزن، قم بسحبه إلى هذه النافذة
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=انقر هنا لإضافة خزنة
+main.vaultlist.contextMenu.remove=حذف الخزنة…
 main.vaultlist.addVaultBtn=أضِف مخزنًا
 ## Vault Detail
 ### Welcome
@@ -192,6 +199,7 @@ main.vaultDetail.throughput.mbps=%.1f ميجابايت/ث
 ### Missing
 main.vaultDetail.missing.info=لم يتمكن Cryptomator من العثور على خزنة في هذا المسار.
 main.vaultDetail.missing.recheck=إعادة الفحص
+main.vaultDetail.missing.remove=حذف من قائمة الخزنات…
 main.vaultDetail.missing.changeLocation=تغيير موقع الخزنة…
 ### Needs Migration
 main.vaultDetail.migrateButton=ترقية الحافظة
@@ -210,6 +218,7 @@ wrongFileAlert.link=لمزيد من المساعدة، قم بزيارة
 # Vault Options
 ## General
 vaultOptions.general=عام
+vaultOptions.general.vaultName=اسم المخزن
 vaultOptions.general.unlockAfterStartup=فتح قفل المخزن عند بدء تشغيل Cryptomator
 vaultOptions.general.actionAfterUnlock=بعد فتح القفل بنجاح
 vaultOptions.general.actionAfterUnlock.ignore=‮لا تفعل شيئاً
@@ -218,7 +227,6 @@ vaultOptions.general.actionAfterUnlock.ask=اسأل
 ## Mount
 vaultOptions.mount=القرص الوهمي
 vaultOptions.mount.readonly=للقراءة فقط
-vaultOptions.mount.driveName=اسم القرص
 vaultOptions.mount.customMountFlags=الأعلام المخصصة
 vaultOptions.mount.winDriveLetterOccupied=مشغول
 vaultOptions.mount.mountPoint=موقع التحميل الوهمي
diff --git a/main/ui/src/main/resources/i18n/strings_bs.properties b/main/ui/src/main/resources/i18n/strings_bs.properties
new file mode 100644
index 000000000..c284818ba
--- /dev/null
+++ b/main/ui/src/main/resources/i18n/strings_bs.properties
@@ -0,0 +1,110 @@
+# Locale Specific CSS files such as CJK, RTL,...
+
+# Generics
+## Button
+generic.button.apply=Primjeni
+generic.button.back=Nazad
+generic.button.cancel=Odustani
+generic.button.change=Izmjeni
+generic.button.close=Zatvori
+generic.button.copy=Kopiraj
+generic.button.copied=Kopirano!
+generic.button.done=Gotovo
+generic.button.next=Sljedeće
+generic.button.print=Ispis
+## Error
+generic.error.title=Došlo je do neočekivane greške
+generic.error.instruction=Ovo se nije trebalo dogoditi. Molimo da prijavite opis greške ispod, kao i korake koji su do greške doveli.
+
+# Defaults
+defaults.vault.vaultName=Sef
+
+# Tray Menu
+traymenu.showMainWindow=Pokaži
+traymenu.showPreferencesWindow=Postavke
+traymenu.lockAllVaults=Zaključaj sve
+traymenu.quitApplication=Odustani
+traymenu.vault.unlock=Otključaj
+traymenu.vault.lock=Zaključaj
+traymenu.vault.reveal=Otkrij
+
+# Add Vault Wizard
+addvaultwizard.title=Dodaj sef
+## Welcome
+addvaultwizard.welcome.newButton=Kreiraj novi sef
+addvaultwizard.welcome.existingButton=Otvori postojeći sef
+## New
+### Name
+addvaultwizard.new.nameInstruction=Izaberi naziv za sef
+addvaultwizard.new.namePrompt=Ime sefa
+### Location
+addvaultwizard.new.locationInstruction=Gdje bi Cryptomator trebao pohraniti enkriptovane fajlove iz vaseg sefa?
+addvaultwizard.new.locationLabel=Mjesto pohrane
+addvaultwizard.new.locationPrompt=…
+addvaultwizard.new.directoryPickerLabel=Prilagođena lokacija
+addvaultwizard.new.directoryPickerButton=Odaberi…
+addvaultwizard.new.directoryPickerTitle=Izaberi folder
+addvaultwizard.new.fileAlreadyExists=Sef ne može biti kreiran na odabranoj lokaciji jer neki objekti tu već postoje.
+addvaultwizard.new.locationDoesNotExist=Sef ne može biti kreiran na odabranoj lokaciji jer najmanje jedna komponenta lokacije ne postoji.
+addvaultwizard.new.invalidName=Naziv sefa neispravan. Molimo razmislite o drugom nazivu.
+### Password
+addvaultwizard.new.createVaultBtn=Kreiraj novi sef
+### Information
+## Existing
+addvaultwizard.existing.chooseBtn=Odaberi…
+## Success
+
+# Remove Vault
+
+# Change Password
+
+# Forget Password
+
+# Unlock
+unlock.unlockBtn=Otključaj
+## Success
+## Invalid Mount Point
+
+# Migration
+## Start
+## Run
+## Sucess
+## Missing file system capabilities
+## Impossible
+
+# Preferences
+preferences.title=Postavke
+## General
+## Volume
+## Updates
+## Donation Key
+## About
+
+# Main Window
+main.closeBtn.tooltip=Zatvori
+main.preferencesBtn.tooltip=Postavke
+## Drag 'n' Drop
+## Vault List
+main.vaultlist.addVaultBtn=Dodaj sef
+## Vault Detail
+### Welcome
+### Locked
+### Unlocked
+main.vaultDetail.lockBtn=Zaključaj
+### Missing
+### Needs Migration
+
+# Wrong File Alert
+
+# Vault Options
+## General
+vaultOptions.general.vaultName=Ime sefa
+## Mount
+vaultOptions.mount.mountPoint.directoryPickerButton=Odaberi…
+## Master Key
+
+# Recovery Key
+
+# New Password
+
+# Quit
diff --git a/main/ui/src/main/resources/i18n/strings_ca.properties b/main/ui/src/main/resources/i18n/strings_ca.properties
index 87a6fa52e..9da150de3 100644
--- a/main/ui/src/main/resources/i18n/strings_ca.properties
+++ b/main/ui/src/main/resources/i18n/strings_ca.properties
@@ -16,6 +16,8 @@ generic.button.print=Imprimeix
 generic.error.title=S'ha produït un error inesperat
 generic.error.instruction=Això no hauria d'haver passat. Si us plau, informeu del text de l'error i inclogueu una descripció de quins passos han dut a aquest error.
 
+# Defaults
+
 # Tray Menu
 traymenu.showMainWindow=Mostra
 traymenu.showPreferencesWindow=Preferències
@@ -98,7 +100,8 @@ unlock.success.message="%s" s'ha desbloquejat correctament! Ja es pot accedir a
 unlock.success.rememberChoice=Recorda l'elecció. No ho tornis a mostrar.
 unlock.success.revealBtn=Mostra la caixa forta
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=El punt de muntatge no és un directori buit: %s
+unlock.error.invalidMountPoint.notExisting=El punt de muntatge no és un directori buit, o no existeix: %s
+unlock.error.invalidMountPoint.existing=El punt de muntatge o la carpeta ja existeix, o no es pot accedir al directori superior: %s
 
 # Migration
 migration.title=Actualitza la caixa forta
@@ -205,6 +208,7 @@ wrongFileAlert.link=Per rebre assistència, visiteu
 # Vault Options
 ## General
 vaultOptions.general=General
+vaultOptions.general.vaultName=Nom de la caixa forta
 vaultOptions.general.unlockAfterStartup=Desbloqueja la caixa forta al iniciar Cryptomator
 vaultOptions.general.actionAfterUnlock=Després d'un desbloqueig correcte
 vaultOptions.general.actionAfterUnlock.ignore=No facis res
@@ -213,7 +217,6 @@ vaultOptions.general.actionAfterUnlock.ask=Pregunta
 ## Mount
 vaultOptions.mount=Muntatge
 vaultOptions.mount.readonly=Només lectura
-vaultOptions.mount.driveName=Nom de la unitat
 vaultOptions.mount.customMountFlags=Senyaladors de muntatge personalitzats
 vaultOptions.mount.winDriveLetterOccupied=ocupat
 vaultOptions.mount.mountPoint=Punt de muntatge
diff --git a/main/ui/src/main/resources/i18n/strings_cs.properties b/main/ui/src/main/resources/i18n/strings_cs.properties
index 30c550120..7a4c2d5c5 100644
--- a/main/ui/src/main/resources/i18n/strings_cs.properties
+++ b/main/ui/src/main/resources/i18n/strings_cs.properties
@@ -16,6 +16,9 @@ generic.button.print=Vytisknout
 generic.error.title=Došlo k neočekávané chybě
 generic.error.instruction=Tohle se nemělo stát. Prosím, nahlaste níže uvedený chybový text a popište, jaké kroky vedly k této chybě.
 
+# Defaults
+defaults.vault.vaultName=Trezor
+
 # Tray Menu
 traymenu.showMainWindow=Zobrazit
 traymenu.showPreferencesWindow=Nastavení
@@ -99,7 +102,8 @@ unlock.success.message=Trezor "%s" byl úspěšně odemčen a nyní je dostupný
 unlock.success.rememberChoice=Pamatovat si volbu, nezobrazovat to znovu
 unlock.success.revealBtn=Zobrazit trezor
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=Připojovací bod není prázdný adresář: %s
+unlock.error.invalidMountPoint.notExisting=Připojovací bod není prázdnou složkou nebo neexistuje: %s
+unlock.error.invalidMountPoint.existing=Připojovací bod/složka již existuje nebo nadřazená složka chybí: %s
 
 # Migration
 migration.title=Upgrade trezoru
@@ -164,6 +168,7 @@ preferences.about=O aplikaci
 main.closeBtn.tooltip=Zavřít
 main.minimizeBtn.tooltip=Minimalizovat
 main.preferencesBtn.tooltip=Nastavení
+main.debugModeEnabled.tooltip=Režim ladění je povolen
 main.donationKeyMissing.tooltip=Prosím, zvažte darování
 ## Drag 'n' Drop
 main.dropZone.dropVault=Přidat tento trezor
@@ -213,6 +218,7 @@ wrongFileAlert.link=Pro další informace navštivte
 # Vault Options
 ## General
 vaultOptions.general=Obecné
+vaultOptions.general.vaultName=Název trezoru
 vaultOptions.general.unlockAfterStartup=Odemknout trezor při spuštění Cryptomator
 vaultOptions.general.actionAfterUnlock=Po úspěšném odemčení
 vaultOptions.general.actionAfterUnlock.ignore=Nedělat nic
@@ -221,7 +227,6 @@ vaultOptions.general.actionAfterUnlock.ask=Zeptat se
 ## Mount
 vaultOptions.mount=Připojení
 vaultOptions.mount.readonly=Pouze pro čtení
-vaultOptions.mount.driveName=Jméno jednotky
 vaultOptions.mount.customMountFlags=Vlastní parametry
 vaultOptions.mount.winDriveLetterOccupied=obsazeno
 vaultOptions.mount.mountPoint=Přípojný bod
diff --git a/main/ui/src/main/resources/i18n/strings_de.properties b/main/ui/src/main/resources/i18n/strings_de.properties
index a2f1f6afc..9ea4b7646 100644
--- a/main/ui/src/main/resources/i18n/strings_de.properties
+++ b/main/ui/src/main/resources/i18n/strings_de.properties
@@ -14,7 +14,10 @@ generic.button.next=Weiter
 generic.button.print=Drucken
 ## Error
 generic.error.title=Ein unerwarteter Fehler ist aufgetreten
-generic.error.instruction=Dies hätte nicht passieren dürfen. Bitte melde den Fehlertext unten und füge eine Beschreibung hinzu, welche Schritte zu diesem Fehler geführt haben.
+generic.error.instruction=Das hätte nicht passieren dürfen. Bitte melde die folgende Fehlermeldung und beschreibe kurz, durch welche Schritte er aufgetreten ist.
+
+# Defaults
+defaults.vault.vaultName=Tresor
 
 # Tray Menu
 traymenu.showMainWindow=Anzeigen
@@ -41,12 +44,12 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=Eigener Ort
 addvaultwizard.new.directoryPickerButton=Durchsuchen …
 addvaultwizard.new.directoryPickerTitle=Verzeichnis auswählen
-addvaultwizard.new.fileAlreadyExists=Der Tresor konnte nicht erstellt werden, da der Speicherort bereits belegt ist.
-addvaultwizard.new.locationDoesNotExist=Der Tresor kann mit diesem Pfad nicht erstellt werden, da mindestens ein Pfadbestandteil nicht existiert.
-addvaultwizard.new.invalidName=Ungültiger Tresorname. Tresore müssen wie Verzeichnisse benannt werden.
+addvaultwizard.new.fileAlreadyExists=Der Tresor konnte nicht erstellt werden, da am Speicherort so eine Datei bereits existiert.
+addvaultwizard.new.locationDoesNotExist=Der Tresor kann nicht erstellt werden, da mindestens ein Speicherort nicht existiert.
+addvaultwizard.new.invalidName=Ungültiger Tresorname. Bitte wähle einen regulären Namen, mit dem auch Verzeichnisse erstellt werden können.
 ### Password
 addvaultwizard.new.createVaultBtn=Tresor erstellen
-addvaultwizard.new.generateRecoveryKeyChoice=Ohne dieses Passwort kannst du auf deine Daten nicht mehr zugreifen. Möchtest du für den Fall eines Passwortverlusts einen Wiederherstellungsschlüssel erstellen?
+addvaultwizard.new.generateRecoveryKeyChoice=Ohne deinem Passwort kannst du nicht mehr auf deine Daten zugreifen. Möchtest du für den Fall eines Passwortverlusts einen Wiederherstellungsschlüssel erstellen?
 addvaultwizard.new.generateRecoveryKeyChoice.yes=Ja bitte, sicher ist sicher
 addvaultwizard.new.generateRecoveryKeyChoice.no=Nein danke, ich werde mein Passwort nicht verlieren
 ### Information
@@ -100,7 +103,7 @@ unlock.success.rememberChoice=Auswahl speichern und nicht mehr anzeigen
 unlock.success.revealBtn=Tresor anzeigen
 ## Invalid Mount Point
 unlock.error.invalidMountPoint.notExisting=Einhängepunkt ist kein leeres Verzeichnis oder existiert nicht: %s
-unlock.error.invalidMountPoint.existing=Einhängepunkt/-ordner existiert bereits oder das darüber liegende Verzeichnis existiert nicht: %s
+unlock.error.invalidMountPoint.existing=Einhängepunkt/Ordner bereits vorhanden oder übergeordneter Ordner fehlt: %s
 
 # Migration
 migration.title=Tresor aktualisieren
@@ -165,6 +168,7 @@ preferences.about=Über
 main.closeBtn.tooltip=Schließen
 main.minimizeBtn.tooltip=Minimieren
 main.preferencesBtn.tooltip=Einstellungen
+main.debugModeEnabled.tooltip=Im Debug-Modus
 main.donationKeyMissing.tooltip=Zieh bitte eine Spende in Betracht
 ## Drag 'n' Drop
 main.dropZone.dropVault=Diesen Tresor hinzufügen
@@ -214,6 +218,7 @@ wrongFileAlert.link=Für weitere Unterstützung besuche
 # Vault Options
 ## General
 vaultOptions.general=Allgemein
+vaultOptions.general.vaultName=Tresorname
 vaultOptions.general.unlockAfterStartup=Tresor beim Start von Cryptomator entsperren
 vaultOptions.general.actionAfterUnlock=Nach erfolgreichem Entsperren
 vaultOptions.general.actionAfterUnlock.ignore=Nichts tun
@@ -222,7 +227,6 @@ vaultOptions.general.actionAfterUnlock.ask=Nachfragen
 ## Mount
 vaultOptions.mount=Laufwerk
 vaultOptions.mount.readonly=Schreibgeschützt
-vaultOptions.mount.driveName=Laufwerksname
 vaultOptions.mount.customMountFlags=Benutzerdefinierte Mount-Flags
 vaultOptions.mount.winDriveLetterOccupied=belegt
 vaultOptions.mount.mountPoint=Einhängepunkt
diff --git a/main/ui/src/main/resources/i18n/strings_el.properties b/main/ui/src/main/resources/i18n/strings_el.properties
index 0dbee5286..df14f314f 100644
--- a/main/ui/src/main/resources/i18n/strings_el.properties
+++ b/main/ui/src/main/resources/i18n/strings_el.properties
@@ -16,6 +16,9 @@ generic.button.print=Εκτύπωση
 generic.error.title=Παρουσιάστηκε ένα απροσδόκητο σφάλμα
 generic.error.instruction=Αυτό δεν έπρεπε να συμβεί. Παρακαλώ αντιγράψτε το κείμενο του σφάλματος και επισυνάψτε μια περιγραφή των βημάτων που οδήγησαν σε αυτό το σφάλμα.
 
+# Defaults
+defaults.vault.vaultName=Vault
+
 # Tray Menu
 traymenu.showMainWindow=Εμφάνιση
 traymenu.showPreferencesWindow=Προτιμήσεις
@@ -99,7 +102,8 @@ unlock.success.message="%s" ξεκλειδώθηκε επιτυχώς! Το vaul
 unlock.success.rememberChoice=Απομνημόνευση επιλογής, μην ρωτήσεις ξανά
 unlock.success.revealBtn=Αποκάλυψη Vault
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=Το σημείο προσάρτησης δεν είναι κενός φάκελος: %s
+unlock.error.invalidMountPoint.notExisting=Το σημείο προσάρτησης δεν είναι κενός φάκελος ή δεν υπάρχει: %s
+unlock.error.invalidMountPoint.existing=Το σημείο/φάκελος προσάρτησης υπάρχει ήδη ή ο γονικός φάκελος λείπει: %s
 
 # Migration
 migration.title=Αναβάθμιση Vault
@@ -164,6 +168,7 @@ preferences.about=Σχετικά με
 main.closeBtn.tooltip=Κλείσιμο
 main.minimizeBtn.tooltip=Ελαχιστοποίηση
 main.preferencesBtn.tooltip=Προτιμήσεις
+main.debugModeEnabled.tooltip=Έχει ενεργοποιηθεί η λειτουργία αποσφαλμάτωσης
 main.donationKeyMissing.tooltip=Παρακαλώ σκεφτείτε τη δωρεά
 ## Drag 'n' Drop
 main.dropZone.dropVault=Προσθήκη vault
@@ -213,6 +218,7 @@ wrongFileAlert.link=Για παραπάνω βοήθεια, επισκεφτεί
 # Vault Options
 ## General
 vaultOptions.general=Γενικά
+vaultOptions.general.vaultName=Όνομα Vault
 vaultOptions.general.unlockAfterStartup=Ξεκλείδωμα vault όταν ξεκινά το Cryptomator
 vaultOptions.general.actionAfterUnlock=Μετά το επιτυχές ξεκλείδωμα
 vaultOptions.general.actionAfterUnlock.ignore=Να μην γίνει τίποτα
@@ -221,7 +227,6 @@ vaultOptions.general.actionAfterUnlock.ask=Ρώτα
 ## Mount
 vaultOptions.mount=Προσάρτηση
 vaultOptions.mount.readonly=Μόνο για ανάγνωση
-vaultOptions.mount.driveName=Όνομα Δίσκου
 vaultOptions.mount.customMountFlags=Προσαρμοσμένες ετικέτες προσάρτησης
 vaultOptions.mount.winDriveLetterOccupied=κατειλημμένο
 vaultOptions.mount.mountPoint=Σημείο προσάρτησης
diff --git a/main/ui/src/main/resources/i18n/strings_es.properties b/main/ui/src/main/resources/i18n/strings_es.properties
index 58095b4e1..e284b64af 100644
--- a/main/ui/src/main/resources/i18n/strings_es.properties
+++ b/main/ui/src/main/resources/i18n/strings_es.properties
@@ -16,6 +16,9 @@ generic.button.print=Imprimir
 generic.error.title=Ocurrió un error inesperado
 generic.error.instruction=Esto no debió suceder. Notifique el error de abajo e incluya una descripción de los pasos que llevaron a este error.
 
+# Defaults
+defaults.vault.vaultName=Bóveda
+
 # Tray Menu
 traymenu.showMainWindow=Mostrar
 traymenu.showPreferencesWindow=Preferencias
@@ -99,7 +102,8 @@ unlock.success.message=¡"%s" se desbloqueó con éxito! La bóveda ya es accesi
 unlock.success.rememberChoice=Recordar opción y no mostrar de nuevo
 unlock.success.revealBtn=Revelar bóveda
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=El punto de montaje no es un directorio vacío: %s
+unlock.error.invalidMountPoint.notExisting=El punto de montaje no es un directorio vacío o no existe: %s
+unlock.error.invalidMountPoint.existing=El punto de montaje/carpeta ya existe o falta la carpeta padre: %s
 
 # Migration
 migration.title=Mejorar bóveda
@@ -164,6 +168,7 @@ preferences.about=Acerca de
 main.closeBtn.tooltip=Cerrar
 main.minimizeBtn.tooltip=Minimizar
 main.preferencesBtn.tooltip=Preferencias
+main.debugModeEnabled.tooltip=Modo de depuración activado
 main.donationKeyMissing.tooltip=Por favor, considera donar
 ## Drag 'n' Drop
 main.dropZone.dropVault=Añadir esta bóveda
@@ -213,6 +218,7 @@ wrongFileAlert.link=Para más ayuda, visite
 # Vault Options
 ## General
 vaultOptions.general=General
+vaultOptions.general.vaultName=Nombre de la bóveda
 vaultOptions.general.unlockAfterStartup=Desbloquear bóveda al iniciar Cryptomator
 vaultOptions.general.actionAfterUnlock=Después de desbloquear exitosamente
 vaultOptions.general.actionAfterUnlock.ignore=No hacer nada
@@ -221,7 +227,6 @@ vaultOptions.general.actionAfterUnlock.ask=Preguntar
 ## Mount
 vaultOptions.mount=Montaje
 vaultOptions.mount.readonly=Sólo lectura
-vaultOptions.mount.driveName=Nombre de la unidad
 vaultOptions.mount.customMountFlags=Opciones de montaje personalizadas
 vaultOptions.mount.winDriveLetterOccupied=ocupado
 vaultOptions.mount.mountPoint=Punto de montaje
diff --git a/main/ui/src/main/resources/i18n/strings_fr.properties b/main/ui/src/main/resources/i18n/strings_fr.properties
index ddd560419..09dd3e13f 100644
--- a/main/ui/src/main/resources/i18n/strings_fr.properties
+++ b/main/ui/src/main/resources/i18n/strings_fr.properties
@@ -16,6 +16,9 @@ generic.button.print=Imprimer
 generic.error.title=Une erreur inattendue est survenue
 generic.error.instruction=Cela n'aurait pas dû se produire. Veuillez reporter le texte d'erreur ci-dessous et inclure une description des étapes qui ont conduit à cette erreur.
 
+# Defaults
+defaults.vault.vaultName=Coffre
+
 # Tray Menu
 traymenu.showMainWindow=Montrer
 traymenu.showPreferencesWindow=Préférences
@@ -99,7 +102,8 @@ unlock.success.message=“%s” déverrouillé ! Le contenu de votre coffre est
 unlock.success.rememberChoice=Se souvenir de mon choix et ne plus me demander
 unlock.success.revealBtn=Révéler le coffre
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=Le point de montage n'est pas un répertoire vide : %s
+unlock.error.invalidMountPoint.notExisting=Le point de montage %s n'est pas un répertoire vide ou n'existe pas
+unlock.error.invalidMountPoint.existing=Le point de montage/le répertoire existe déjà ou le répertoire parent est manquant: %s
 
 # Migration
 migration.title=Mettre à jour le coffre
@@ -164,6 +168,7 @@ preferences.about=A propos
 main.closeBtn.tooltip=Fermer
 main.minimizeBtn.tooltip=Réduire
 main.preferencesBtn.tooltip=Préférences
+main.debugModeEnabled.tooltip=Le mode débogage est activé
 main.donationKeyMissing.tooltip=Merci d'envisager un don
 ## Drag 'n' Drop
 main.dropZone.dropVault=Ajouter ce coffre
@@ -213,6 +218,7 @@ wrongFileAlert.link=Pour toute aide supplémentaire, visitez
 # Vault Options
 ## General
 vaultOptions.general=Général
+vaultOptions.general.vaultName=Nom de voûte
 vaultOptions.general.unlockAfterStartup=Déverrouiller le coffre au démarrage
 vaultOptions.general.actionAfterUnlock=Après un déverrouillage réussi
 vaultOptions.general.actionAfterUnlock.ignore=Ne rien faire
@@ -221,7 +227,6 @@ vaultOptions.general.actionAfterUnlock.ask=Demander
 ## Mount
 vaultOptions.mount=Montage
 vaultOptions.mount.readonly=Lecture seule
-vaultOptions.mount.driveName=Nom du lecteur
 vaultOptions.mount.customMountFlags=Drapeau de montage personnalisé
 vaultOptions.mount.winDriveLetterOccupied=occupé
 vaultOptions.mount.mountPoint=Point de montage
diff --git a/main/ui/src/main/resources/i18n/strings_hi.properties b/main/ui/src/main/resources/i18n/strings_hi.properties
index 1a1f50f95..560842254 100644
--- a/main/ui/src/main/resources/i18n/strings_hi.properties
+++ b/main/ui/src/main/resources/i18n/strings_hi.properties
@@ -16,6 +16,8 @@ generic.button.print=प्रिंट करें
 generic.error.title=कोई अनपेक्षित त्रुटि हो गई है
 generic.error.instruction=ऐसा नहीं होना चाहिए था। कृपया नीचे त्रुटि पाठ की रिपोर्ट करें और इस त्रुटि के लिए क्या कदम उठाए, इसका विवरण शामिल करें।
 
+# Defaults
+
 # Tray Menu
 traymenu.showMainWindow=दिखाएँ
 traymenu.lockAllVaults=सभी को लॉक करें
@@ -98,6 +100,7 @@ wrongFileAlert.link=और मदद के लिए, यह जाएं
 # Vault Options
 ## General
 vaultOptions.general=सामान्य
+vaultOptions.general.vaultName=वॉल्ट का नाम
 ## Mount
 vaultOptions.mount=माउंट हो रहा है
 vaultOptions.mount.winDriveLetterOccupied=इसका इस्तेमाल किया जा रहा है
diff --git a/main/ui/src/main/resources/i18n/strings_hr.properties b/main/ui/src/main/resources/i18n/strings_hr.properties
index 74d4117b5..00cd8c159 100644
--- a/main/ui/src/main/resources/i18n/strings_hr.properties
+++ b/main/ui/src/main/resources/i18n/strings_hr.properties
@@ -4,6 +4,8 @@
 ## Button
 ## Error
 
+# Defaults
+
 # Tray Menu
 
 # Add Vault Wizard
diff --git a/main/ui/src/main/resources/i18n/strings_id.properties b/main/ui/src/main/resources/i18n/strings_id.properties
new file mode 100644
index 000000000..027f2f4b7
--- /dev/null
+++ b/main/ui/src/main/resources/i18n/strings_id.properties
@@ -0,0 +1,131 @@
+# Locale Specific CSS files such as CJK, RTL,...
+
+# Generics
+## Button
+generic.button.apply=Terapkan
+generic.button.back=Kembali
+generic.button.cancel=Batalkan
+generic.button.change=Ganti
+generic.button.close=Tutup
+generic.button.copy=Salin
+generic.button.copied=Tersalin!
+generic.button.done=Selesai
+generic.button.next=Lanjut
+generic.button.print=Cetak
+## Error
+generic.error.title=Telah terjadi kesalahan tak terduga
+generic.error.instruction=Ini harusnya tidak terjadi. Harap laporkan pesan kesalahan dibawah dan tulis deskripsi kenapa ini bisa terjadi.
+
+# Defaults
+defaults.vault.vaultName=Brankas
+
+# Tray Menu
+traymenu.showMainWindow=Tampilkan
+traymenu.showPreferencesWindow=Preferensi
+traymenu.lockAllVaults=Gembok Semua
+traymenu.quitApplication=Keluar
+traymenu.vault.unlock=Buka Gembok
+traymenu.vault.lock=Gembok
+traymenu.vault.reveal=Perlihatkan
+
+# Add Vault Wizard
+addvaultwizard.title=Tambah Brankas
+## Welcome
+addvaultwizard.welcome.newButton=Buat Brankas Baru
+addvaultwizard.welcome.existingButton=Buka Brankas yg Sudah Ada
+## New
+### Name
+addvaultwizard.new.nameInstruction=Buat sebuah nama untuk brankas
+addvaultwizard.new.namePrompt=Nama Brankas
+### Location
+addvaultwizard.new.locationInstruction=Dimana Cryptomator seharusnya menyimpan brankas berkas terenkripsi kamu?
+addvaultwizard.new.locationLabel=Lokasi penyimpanan
+addvaultwizard.new.locationPrompt=…
+addvaultwizard.new.directoryPickerLabel=Sesuaikan Lokasi
+addvaultwizard.new.directoryPickerButton=Pilih…
+addvaultwizard.new.directoryPickerTitle=Pilih Folder
+addvaultwizard.new.fileAlreadyExists=Brankas tidak dibuat disini karena beberapa item telah ada disini.
+addvaultwizard.new.locationDoesNotExist=Brankas tidak bisa dibuat disini karena setidaknya satu jalur komponen tidak ada.
+addvaultwizard.new.invalidName=Nama brankas salah. Harap pilih nama folder yang umum.
+### Password
+addvaultwizard.new.createVaultBtn=Buat Brankas
+addvaultwizard.new.generateRecoveryKeyChoice=Kamu tidak dapat mengakses data tanpa kata sandi kamu. Apa kamu ingin sebuah kunci pemulihan buat jaga-jaga?
+addvaultwizard.new.generateRecoveryKeyChoice.yes=Ya, sedia payung sebelum hujan
+addvaultwizard.new.generateRecoveryKeyChoice.no=Tidak, terima kasih, Saya tidak akan kehilangan kata sandi saya
+### Information
+addvault.new.readme.storageLocation.fileName=PENTING.rtf
+addvault.new.readme.storageLocation.1=⚠️  BERKAS BRANKAS  ⚠️
+addvault.new.readme.storageLocation.2=Ini adalah lokasi penyimpanan brankas kamu.
+addvault.new.readme.storageLocation.3=JANGAN
+addvault.new.readme.storageLocation.6=Jika kamu ingin mengenkripsi berkas dan melihat isi brankas, lakukan hal berikut:
+addvault.new.readme.storageLocation.7=1. Tambahkan brankas ini ke Cryptomator.
+addvault.new.readme.storageLocation.8=2. Buka gembok brankas di Cryptomator.
+addvault.new.readme.storageLocation.9=3. Buka akses lokasi dengan mengklik tombol "Perlihatkan".
+addvault.new.readme.storageLocation.10=Jika kamu butuh bantuan, kunjungi dokumentasi: %s
+addvault.new.readme.accessLocation.fileName=SELAMAT_DATANG.rtf
+addvault.new.readme.accessLocation.1=🔐️  ISI TERENKRIPSI  🔐️
+addvault.new.readme.accessLocation.2=Ini adalah lokasi akses brankas kamu.
+## Existing
+addvaultwizard.existing.chooseBtn=Pilih…
+## Success
+
+# Remove Vault
+
+# Change Password
+
+# Forget Password
+
+# Unlock
+unlock.unlockBtn=Buka Gembok
+## Success
+## Invalid Mount Point
+
+# Migration
+## Start
+## Run
+## Sucess
+## Missing file system capabilities
+## Impossible
+
+# Preferences
+preferences.title=Preferensi
+## General
+## Volume
+## Updates
+## Donation Key
+## About
+
+# Main Window
+main.preferencesBtn.tooltip=Preferensi
+## Drag 'n' Drop
+## Vault List
+main.vaultlist.addVaultBtn=Tambah Brankas
+## Vault Detail
+### Welcome
+### Locked
+### Unlocked
+main.vaultDetail.lockBtn=Gembok
+### Missing
+### Needs Migration
+
+# Wrong File Alert
+
+# Vault Options
+## General
+vaultOptions.general.vaultName=Nama Brankas
+## Mount
+vaultOptions.mount.mountPoint.directoryPickerButton=Pilih…
+## Master Key
+
+# Recovery Key
+
+# New Password
+passwordStrength.messageLabel.0=Sangat lemah
+passwordStrength.messageLabel.1=Lemah
+passwordStrength.messageLabel.2=Cukup
+passwordStrength.messageLabel.3=Kuat
+passwordStrength.messageLabel.4=Sangat kuat
+
+# Quit
+quit.prompt=Keluar aplikasi? Terdapat brankas yg belum digembok.
+quit.lockAndQuit=Gembok dan Keluar
diff --git a/main/ui/src/main/resources/i18n/strings_it.properties b/main/ui/src/main/resources/i18n/strings_it.properties
index 674171dc9..6dc6ce424 100644
--- a/main/ui/src/main/resources/i18n/strings_it.properties
+++ b/main/ui/src/main/resources/i18n/strings_it.properties
@@ -16,6 +16,9 @@ generic.button.print=Stampa
 generic.error.title=Si è verificato un errore inatteso
 generic.error.instruction=Questo non dovrebbe essere accaduto. Si prega di segnalare il testo dell'errore qui sotto e includere una descrizione delle fasi che hanno portato a questo errore.
 
+# Defaults
+defaults.vault.vaultName=Cassaforte
+
 # Tray Menu
 traymenu.showMainWindow=Visualizza
 traymenu.showPreferencesWindow=Impostazioni
@@ -99,7 +102,8 @@ unlock.success.message=Sbloccato "%s" con successo! La tua cassaforte è ora acc
 unlock.success.rememberChoice=Ricorda la scelta, non mostrare ancora
 unlock.success.revealBtn=Rivela Cassaforte
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=Il punto di mount non è una cartella vuota: %s
+unlock.error.invalidMountPoint.notExisting=Il punto di montaggio non è una directory vuota o non esiste: %s
+unlock.error.invalidMountPoint.existing=Il punto di Mount/cartella esiste già o la cartella superiore è mancante: %s
 
 # Migration
 migration.title=Aggiorna Cassaforte
@@ -164,6 +168,7 @@ preferences.about=Informazioni
 main.closeBtn.tooltip=Chiudi
 main.minimizeBtn.tooltip=Minimizza
 main.preferencesBtn.tooltip=Impostazioni
+main.debugModeEnabled.tooltip=La modalità di debug è abilitata
 main.donationKeyMissing.tooltip=Per favore considera una donazione
 ## Drag 'n' Drop
 main.dropZone.dropVault=Aggiungi questa cassaforte
@@ -213,6 +218,7 @@ wrongFileAlert.link=Per ulteriore assistenza, visita
 # Vault Options
 ## General
 vaultOptions.general=Generali
+vaultOptions.general.vaultName=Nome Cassaforte
 vaultOptions.general.unlockAfterStartup=Sblocca vault all'avvio di Cryptomator
 vaultOptions.general.actionAfterUnlock=Dopo aver sbloccato con successo
 vaultOptions.general.actionAfterUnlock.ignore=Non fare nulla
@@ -221,7 +227,6 @@ vaultOptions.general.actionAfterUnlock.ask=Chiedi
 ## Mount
 vaultOptions.mount=Montaggio
 vaultOptions.mount.readonly=Sola lettura
-vaultOptions.mount.driveName=Nome drive
 vaultOptions.mount.customMountFlags=Opzioni personalizzate
 vaultOptions.mount.winDriveLetterOccupied=occupato
 vaultOptions.mount.mountPoint=Punto di mount
diff --git a/main/ui/src/main/resources/i18n/strings_ja.properties b/main/ui/src/main/resources/i18n/strings_ja.properties
index 4c2e2985a..2231d40c9 100644
--- a/main/ui/src/main/resources/i18n/strings_ja.properties
+++ b/main/ui/src/main/resources/i18n/strings_ja.properties
@@ -16,6 +16,9 @@ generic.button.print=印刷
 generic.error.title=予期しないエラーが発生しました
 generic.error.instruction=予期しないことが発生しました。下部のエラーテキストとエラーに至った経緯の説明を報告していただけると幸いです。
 
+# Defaults
+defaults.vault.vaultName=金庫
+
 # Tray Menu
 traymenu.showMainWindow=表示
 traymenu.showPreferencesWindow=設定
@@ -99,7 +102,7 @@ unlock.success.message="%s" の解錠に成功しました! 金庫にアクセ
 unlock.success.rememberChoice=選択を記憶させて、再度表示しない
 unlock.success.revealBtn=金庫を表示
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=マウントポイントが空のディレクトリではありません: %s
+unlock.error.invalidMountPoint.notExisting=マウントポイントが空のディレクトリか存在していません: %s
 
 # Migration
 migration.title=金庫をアップグレード
@@ -164,12 +167,14 @@ preferences.about=詳細情報
 main.closeBtn.tooltip=閉じる
 main.minimizeBtn.tooltip=最小化
 main.preferencesBtn.tooltip=設定
+main.debugModeEnabled.tooltip=デバッグモードが有効です
 main.donationKeyMissing.tooltip=寄付をお願いします
 ## Drag 'n' Drop
 main.dropZone.dropVault=この金庫を追加
 main.dropZone.unknownDragboardContent=このウィンドウにドラッグして、金庫を追加
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=ここをクリックして金庫を追加
+main.vaultlist.contextMenu.remove=金庫を削除...
 main.vaultlist.addVaultBtn=金庫を追加
 ## Vault Detail
 ### Welcome
@@ -193,6 +198,7 @@ main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator はこのパスの金庫を見つけることができませんでした。
 main.vaultDetail.missing.recheck=再確認
+main.vaultDetail.missing.remove=金庫のリストから削除...
 main.vaultDetail.missing.changeLocation=金庫の場所を変更...
 ### Needs Migration
 main.vaultDetail.migrateButton=金庫をアップグレード
@@ -211,6 +217,7 @@ wrongFileAlert.link=より詳細な手順については、次のページをご
 # Vault Options
 ## General
 vaultOptions.general=基本設定
+vaultOptions.general.vaultName=金庫の名前
 vaultOptions.general.unlockAfterStartup=Cryptomatorの起動時に金庫を解錠する
 vaultOptions.general.actionAfterUnlock=解錠に成功したあと
 vaultOptions.general.actionAfterUnlock.ignore=何もしない
@@ -219,7 +226,6 @@ vaultOptions.general.actionAfterUnlock.ask=尋ねる
 ## Mount
 vaultOptions.mount=マウント
 vaultOptions.mount.readonly=読み取り専用
-vaultOptions.mount.driveName=ドライブ名
 vaultOptions.mount.customMountFlags=カスタム マウント フラグ
 vaultOptions.mount.winDriveLetterOccupied=使用中
 vaultOptions.mount.mountPoint=マウントポイント
diff --git a/main/ui/src/main/resources/i18n/strings_ko.properties b/main/ui/src/main/resources/i18n/strings_ko.properties
index 55a733504..22fa0c37d 100644
--- a/main/ui/src/main/resources/i18n/strings_ko.properties
+++ b/main/ui/src/main/resources/i18n/strings_ko.properties
@@ -16,6 +16,9 @@ generic.button.print=인쇄
 generic.error.title=예기치 않은 오류가 발생되었습니다.
 generic.error.instruction=이러한 일은 일어나지 말아야 합니다. 아래의 텍스트와 이 오류를 발생시킨 단계에 대한 설명을 포함하여 제출하여 주십시요.
 
+# Defaults
+defaults.vault.vaultName=Vault
+
 # Tray Menu
 traymenu.showMainWindow=보기
 traymenu.showPreferencesWindow=환경설정
@@ -99,7 +102,8 @@ unlock.success.message="%s"의 잠금해제가 성공적으로 수행되었습
 unlock.success.rememberChoice=선택 기억함, 다시 묻지 않음
 unlock.success.revealBtn=Vault 표시
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=구성지점의 디렉터리가 비어있지 않습니다: %s
+unlock.error.invalidMountPoint.notExisting=구성지점이 존재하지 않거나 빈 디렉터리가 아닙니다: %s
+unlock.error.invalidMountPoint.existing=구성지점/폴더가 이미 존재하거나 부모 폴더가 없습니다: %s
 
 # Migration
 migration.title=Vault 업그레이드
@@ -164,6 +168,7 @@ preferences.about=제품 정보
 main.closeBtn.tooltip=닫기
 main.minimizeBtn.tooltip=최소화
 main.preferencesBtn.tooltip=환경설정
+main.debugModeEnabled.tooltip=디버그 모드가 활성화됨.
 main.donationKeyMissing.tooltip=기부를 부탁드립니다.
 ## Drag 'n' Drop
 main.dropZone.dropVault=이 Vault를 추가
@@ -213,6 +218,7 @@ wrongFileAlert.link=추후 지원을 위해, 다음을 방문하십시요
 # Vault Options
 ## General
 vaultOptions.general=일반
+vaultOptions.general.vaultName=Vault 이름
 vaultOptions.general.unlockAfterStartup=Cryptomator를 시작할 때 Vault 잠금 해제
 vaultOptions.general.actionAfterUnlock=성공적으로 잠금해제 후
 vaultOptions.general.actionAfterUnlock.ignore=아무 것도 하지 않음
@@ -221,7 +227,6 @@ vaultOptions.general.actionAfterUnlock.ask=요청
 ## Mount
 vaultOptions.mount=드라이브 구성
 vaultOptions.mount.readonly=읽기 전용
-vaultOptions.mount.driveName=드라이브 이름
 vaultOptions.mount.customMountFlags=사용자 정의 매개변수 사용
 vaultOptions.mount.winDriveLetterOccupied=사용됨
 vaultOptions.mount.mountPoint=구성 지점
diff --git a/main/ui/src/main/resources/i18n/strings_lv.properties b/main/ui/src/main/resources/i18n/strings_lv.properties
index 8882ac5b7..b5bdcca8f 100644
--- a/main/ui/src/main/resources/i18n/strings_lv.properties
+++ b/main/ui/src/main/resources/i18n/strings_lv.properties
@@ -16,6 +16,8 @@ generic.button.print=Drukāt
 generic.error.title=Radās neparedzēta kļūda
 generic.error.instruction=Šis vēl nav atgadījies. Lūdzu ziņo zemāk redzamo kļūdas tekstu un iekļauj aprakstu, kas noveda pie šīs kļūdas.
 
+# Defaults
+
 # Tray Menu
 traymenu.showMainWindow=Rādīt
 traymenu.showPreferencesWindow=Iestatījumi
@@ -97,7 +99,6 @@ unlock.unlockBtn=Atslēgt
 unlock.success.message="%s" sekmīgi atslēgts! Jūsu glabātuve tagad ir pieejama.
 unlock.success.revealBtn=Atklāt glabātuvi
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=Montēšanas vieta nav tukša mape: %s
 
 # Migration
 migration.title=Jaunināt glabātuvi
@@ -199,12 +200,12 @@ wrongFileAlert.link=Lai iegūtu turpmāku palīdzību, apmeklējiet
 # Vault Options
 ## General
 vaultOptions.general=Vispārēji
+vaultOptions.general.vaultName=Glabātuves nosaukums
 vaultOptions.general.unlockAfterStartup=Atslēgt glabātuvi startējot Cryptomator
 vaultOptions.general.actionAfterUnlock.reveal=Atklāt disku
 ## Mount
 vaultOptions.mount=Montē
 vaultOptions.mount.readonly=Tikai lasīt
-vaultOptions.mount.driveName=Diska nosaukums
 vaultOptions.mount.customMountFlags=Pielāgoti montēšanas parametri
 vaultOptions.mount.winDriveLetterOccupied=aizņemts
 vaultOptions.mount.mountPoint=Montēšanas vieta
diff --git a/main/ui/src/main/resources/i18n/strings_nb.properties b/main/ui/src/main/resources/i18n/strings_nb.properties
index 99ab81a8a..9e0bb5c4a 100644
--- a/main/ui/src/main/resources/i18n/strings_nb.properties
+++ b/main/ui/src/main/resources/i18n/strings_nb.properties
@@ -16,6 +16,9 @@ generic.button.print=Skriv ut
 generic.error.title=Det oppstod en uventet feil
 generic.error.instruction=Dette skulle ikke ha skjedd. Rapporter feilteksten nedenfor og legg inn en beskrivelse av hvilke trinn som førte til denne feilen.
 
+# Defaults
+defaults.vault.vaultName=Hvelv
+
 # Tray Menu
 traymenu.showMainWindow=Vis
 traymenu.showPreferencesWindow=Innstillinger
@@ -99,7 +102,6 @@ unlock.success.message=Vellykket opplåsning av "%s"! Hvelvet ditt er nå tilgje
 unlock.success.rememberChoice=Husk valget - ikke vis dette igjen
 unlock.success.revealBtn=Gjør hvelvet synlig
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=Monteringspunktet er ikke en tom mappe: %s
 
 # Migration
 migration.title=Oppgrader hvelv
@@ -130,6 +132,7 @@ preferences.title=Innstillinger
 ## General
 preferences.general=Generelt
 preferences.general.theme=Grafisk utseende
+preferences.general.theme.automatic=Automatisk
 preferences.general.theme.light=Lys
 preferences.general.theme.dark=Mørk
 preferences.general.unlockThemes=Lås opp mørk modus
@@ -163,12 +166,14 @@ preferences.about=Om
 main.closeBtn.tooltip=Lukk
 main.minimizeBtn.tooltip=Minimer
 main.preferencesBtn.tooltip=Innstillinger
+main.debugModeEnabled.tooltip=Feilsøkingsmodus er aktivert
 main.donationKeyMissing.tooltip=Vennligst vurder å donere
 ## Drag 'n' Drop
 main.dropZone.dropVault=Legg til dette hvelvet
 main.dropZone.unknownDragboardContent=Hvis du vil legge til et hvelv, kan du dra det til dette vinduet
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Klikk her for å legge til et hvelv
+main.vaultlist.contextMenu.remove=Fjern hvelvet…
 main.vaultlist.addVaultBtn=Legg til hvelv
 ## Vault Detail
 ### Welcome
@@ -192,6 +197,8 @@ main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator kunne ikke finne et hvelv på denne søkestien.
 main.vaultDetail.missing.recheck=Kontroller igjen
+main.vaultDetail.missing.remove=Fjern fra hvelvlisten…
+main.vaultDetail.missing.changeLocation=Endre hvelvplassering…
 ### Needs Migration
 main.vaultDetail.migrateButton=Oppgrader hvelv
 main.vaultDetail.migratePrompt=Hvelvet ditt må oppgraderes til et nytt format før du kan få tilgang til det
@@ -209,6 +216,7 @@ wrongFileAlert.link=For ytterligere hjelp, besøk
 # Vault Options
 ## General
 vaultOptions.general=Generelt
+vaultOptions.general.vaultName=Navn på hvelvet
 vaultOptions.general.unlockAfterStartup=Lås opp hvelvet når du starter Cryptomator
 vaultOptions.general.actionAfterUnlock=Etter vellykket opplåsing
 vaultOptions.general.actionAfterUnlock.ignore=Ikke gjør noe
@@ -217,7 +225,6 @@ vaultOptions.general.actionAfterUnlock.ask=Spør
 ## Mount
 vaultOptions.mount=Montering
 vaultOptions.mount.readonly=Skrivebeskyttet
-vaultOptions.mount.driveName=Enhetsnavn
 vaultOptions.mount.customMountFlags=Tilpassede moteringsparametre
 vaultOptions.mount.winDriveLetterOccupied=opptatt
 vaultOptions.mount.mountPoint=Monteringspunkt
diff --git a/main/ui/src/main/resources/i18n/strings_nl.properties b/main/ui/src/main/resources/i18n/strings_nl.properties
index 7c54b5362..aaa41e3a4 100644
--- a/main/ui/src/main/resources/i18n/strings_nl.properties
+++ b/main/ui/src/main/resources/i18n/strings_nl.properties
@@ -16,6 +16,9 @@ generic.button.print=Afdrukken
 generic.error.title=Er is een onverwachte fout opgetreden
 generic.error.instruction=Dit had niet moeten gebeuren. Rapporteer de onderstaande fouttekst en voeg een beschrijving toe van de stappen die tot deze fout hebben geleid.
 
+# Defaults
+defaults.vault.vaultName=Kluis
+
 # Tray Menu
 traymenu.showMainWindow=Toon
 traymenu.showPreferencesWindow=Voorkeuren
@@ -97,7 +100,6 @@ unlock.unlockBtn=Ontgrendel
 unlock.success.message="%s" is met succes ontgrendeld! Uw kluis is nu toegankelijk.
 unlock.success.revealBtn=Toon kluis
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=Koppelpunt is geen lege map: %s
 
 # Migration
 migration.title=Kluis upgraden
@@ -195,12 +197,12 @@ wrongFileAlert.link=Voor verdere ondersteuning, bezoek
 # Vault Options
 ## General
 vaultOptions.general=Algemeen
+vaultOptions.general.vaultName=Kluisnaam
 vaultOptions.general.unlockAfterStartup=Ontgrendel kluis bij het starten van Cryptomator
 vaultOptions.general.actionAfterUnlock.reveal=Toon Schijf
 ## Mount
 vaultOptions.mount=Aankoppelen
 vaultOptions.mount.readonly=Alleen-Lezen
-vaultOptions.mount.driveName=Schijfnaam
 vaultOptions.mount.customMountFlags=Aangepaste Aankoppel Parameters
 vaultOptions.mount.winDriveLetterOccupied=in gebruik
 vaultOptions.mount.mountPoint=Koppelpunt
diff --git a/main/ui/src/main/resources/i18n/strings_nn.properties b/main/ui/src/main/resources/i18n/strings_nn.properties
index e760ae3ab..cea15cadd 100644
--- a/main/ui/src/main/resources/i18n/strings_nn.properties
+++ b/main/ui/src/main/resources/i18n/strings_nn.properties
@@ -16,6 +16,8 @@ generic.button.print=Skriv ut
 generic.error.title=Eit uventa problem oppstod
 generic.error.instruction=Dette skulle ikkje ha skjedd. Rapporter feilteksten nedanfor og legg inn ei skildring av kva trinn som førte til denne feilen.
 
+# Defaults
+
 # Tray Menu
 traymenu.showMainWindow=Vis
 traymenu.showPreferencesWindow=Innstillingar
@@ -99,7 +101,6 @@ unlock.success.message=Vellykka opplåsning av "%s"! Kvelven din er no tilgjenge
 unlock.success.rememberChoice=Hugs valet - ikkje vis dette igjen
 unlock.success.revealBtn=Gjer kvelven synleg
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=Monteringspunktet er ikkje ei tom mappe: %s
 
 # Migration
 migration.title=Oppgrader kvelv
@@ -209,6 +210,7 @@ wrongFileAlert.link=For ytterlegare hjelp, besøk
 # Vault Options
 ## General
 vaultOptions.general=Generelt
+vaultOptions.general.vaultName=Namn på kvelven
 vaultOptions.general.unlockAfterStartup=Lås opp kvelven når du startar Cryptomator
 vaultOptions.general.actionAfterUnlock=Etter vellykka opplåsing
 vaultOptions.general.actionAfterUnlock.ignore=Ikkje gjer noko
@@ -217,7 +219,6 @@ vaultOptions.general.actionAfterUnlock.ask=Spør
 ## Mount
 vaultOptions.mount=Montering
 vaultOptions.mount.readonly=Skriveverna
-vaultOptions.mount.driveName=Einingsnamn
 vaultOptions.mount.customMountFlags=Tilpassa moteringparametrar
 vaultOptions.mount.winDriveLetterOccupied=opptatt
 vaultOptions.mount.mountPoint=Monteringspunkt
diff --git a/main/ui/src/main/resources/i18n/strings_pl.properties b/main/ui/src/main/resources/i18n/strings_pl.properties
index 9ae689c66..e94141427 100644
--- a/main/ui/src/main/resources/i18n/strings_pl.properties
+++ b/main/ui/src/main/resources/i18n/strings_pl.properties
@@ -16,6 +16,9 @@ generic.button.print=Drukuj
 generic.error.title=Wystąpił nieoczekiwany błąd
 generic.error.instruction=To nie powinno było się zdarzyć. Proszę zgłosić poniższy tekst z błędem i zamieścić opis kroków, które doprowadziły do tego błędu.
 
+# Defaults
+defaults.vault.vaultName=Sejf
+
 # Tray Menu
 traymenu.showMainWindow=Wyświetl
 traymenu.showPreferencesWindow=Ustawienia
@@ -99,7 +102,8 @@ unlock.success.message="%s" został odblokowany! Twój sejf jest teraz dostępny
 unlock.success.rememberChoice=Zapamiętaj wybór, nie pokazuj tego ponownie
 unlock.success.revealBtn=Otwórz sejf
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=Punkt montowania nie jest pustym katalogiem: %s
+unlock.error.invalidMountPoint.notExisting=Punkt montowania nie jest pustym katalogiem lub nie istnieje: %s
+unlock.error.invalidMountPoint.existing=Punkt montowania już istnieje lub brakuje katalogu nadrzędnego: %s
 
 # Migration
 migration.title=Aktualizuj sejf
@@ -155,8 +159,8 @@ preferences.updates.updateAvailable=Dostępna jest aktualizacja do wersji %s.
 ## Donation Key
 preferences.donationKey=Dotacja
 preferences.donationKey.registeredFor=Zarejestrowano dla %s
-preferences.donationKey.noDonationKey=Nie znaleziono aktualnego klucza dotacji. To taki klucz licencyjny, ale dla niesamowitych ludzi używających darmowego oprogramowania. ;-)
-preferences.donationKey.getDonationKey=Zdobądź klucz dotacji
+preferences.donationKey.noDonationKey=Nie znaleziono aktualnego klucza donacji. To taki klucz licencyjny, ale dla niesamowitych ludzi używających darmowego softu. ;-)
+preferences.donationKey.getDonationKey=Zdobądź klucz donacji
 ## About
 preferences.about=O programie
 
@@ -164,7 +168,8 @@ preferences.about=O programie
 main.closeBtn.tooltip=Zamknij
 main.minimizeBtn.tooltip=Minimalizuj
 main.preferencesBtn.tooltip=Ustawienia
-main.donationKeyMissing.tooltip=Rozważ przekazanie dotacji
+main.debugModeEnabled.tooltip=Tryb debugowania jest włączony
+main.donationKeyMissing.tooltip=Rozważ proszę donację
 ## Drag 'n' Drop
 main.dropZone.dropVault=Dodaj ten sejf
 main.dropZone.unknownDragboardContent=Jeśli chcesz dodać sejf, przeciągnij go do tego okna
@@ -213,6 +218,7 @@ wrongFileAlert.link=Aby uzyskać pomoc, wejdź na
 # Vault Options
 ## General
 vaultOptions.general=Ogólne
+vaultOptions.general.vaultName=Nazwa sejfu
 vaultOptions.general.unlockAfterStartup=Odblokuj sejf podczas uruchamiania programu Cryptomator
 vaultOptions.general.actionAfterUnlock=Po udanym odblokowaniu
 vaultOptions.general.actionAfterUnlock.ignore=Nic nie rób
@@ -221,7 +227,6 @@ vaultOptions.general.actionAfterUnlock.ask=Zapytaj
 ## Mount
 vaultOptions.mount=Montowanie
 vaultOptions.mount.readonly=Tylko do odczytu
-vaultOptions.mount.driveName=Nazwa udziału
 vaultOptions.mount.customMountFlags=Własne flagi montowania udziału
 vaultOptions.mount.winDriveLetterOccupied=zajęty
 vaultOptions.mount.mountPoint=Punkt montowania
diff --git a/main/ui/src/main/resources/i18n/strings_pt.properties b/main/ui/src/main/resources/i18n/strings_pt.properties
index d3c42e9a9..dcb8d5424 100644
--- a/main/ui/src/main/resources/i18n/strings_pt.properties
+++ b/main/ui/src/main/resources/i18n/strings_pt.properties
@@ -16,6 +16,8 @@ generic.button.print=Imprimir
 generic.error.title=Ocorreu um erro inesperado
 generic.error.instruction=Isto não devia ter acontecido. Por favor reporte o texto do erro abaixo e descreva os passos que levaram a este problema.
 
+# Defaults
+
 # Tray Menu
 traymenu.showMainWindow=Mostrar
 traymenu.showPreferencesWindow=Preferências
@@ -157,12 +159,12 @@ wrongFileAlert.link=Para obter assistência, visite
 # Vault Options
 ## General
 vaultOptions.general=Geral
+vaultOptions.general.vaultName=Nome do Cofre
 vaultOptions.general.unlockAfterStartup=Destrancar o cofre ao iniciar o Cryptomator
 vaultOptions.general.actionAfterUnlock=Após destrancar com sucesso
 vaultOptions.general.actionAfterUnlock.ask=Perguntar
 ## Mount
 vaultOptions.mount.readonly=Somente leitura
-vaultOptions.mount.driveName=Nome da unidade
 vaultOptions.mount.mountPoint.directoryPickerButton=Escolher…
 ## Master Key
 vaultOptions.masterkey=Senha
diff --git a/main/ui/src/main/resources/i18n/strings_pt_BR.properties b/main/ui/src/main/resources/i18n/strings_pt_BR.properties
index 56daf33fe..512b7e866 100644
--- a/main/ui/src/main/resources/i18n/strings_pt_BR.properties
+++ b/main/ui/src/main/resources/i18n/strings_pt_BR.properties
@@ -16,6 +16,9 @@ generic.button.print=Imprimir
 generic.error.title=Ocorreu um erro inesperado
 generic.error.instruction=Isso não deveria ter ocorrido. Por favor, reporte o texto do erro abaixo e inclua uma descrição dos passos que levaram a este erro.
 
+# Defaults
+defaults.vault.vaultName=Cofre
+
 # Tray Menu
 traymenu.showMainWindow=Exibir
 traymenu.showPreferencesWindow=Preferências
@@ -42,6 +45,7 @@ addvaultwizard.new.directoryPickerLabel=Local Personalizado
 addvaultwizard.new.directoryPickerButton=Escolher…
 addvaultwizard.new.directoryPickerTitle=Selecionar Diretório
 addvaultwizard.new.fileAlreadyExists=O cofre não pode ser criado neste local porque algum objeto já existe.
+addvaultwizard.new.locationDoesNotExist=O cofre não pode ser criado neste caminho porque pelo menos um componente do caminho não existe.
 addvaultwizard.new.invalidName=Nome de cofre inválido. Por favor considere usar um nome de diretório comum.
 ### Password
 addvaultwizard.new.createVaultBtn=Criar Cofre
@@ -98,7 +102,8 @@ unlock.success.message="%s" foi desbloqueado com sucesso! Seu cofre agora está
 unlock.success.rememberChoice=Lembrar opção escolhida, não mostrar isto novamente
 unlock.success.revealBtn=Revelar Cofre
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=O ponto de montagem não é um diretório vazio: %s
+unlock.error.invalidMountPoint.notExisting=O ponto de montagem não é um diretório vazio ou não existe: %s
+unlock.error.invalidMountPoint.existing=Ponto de montagem/pasta já existe ou a pasta pai está faltando: %s
 
 # Migration
 migration.title=Atualizar Cofre
@@ -163,6 +168,7 @@ preferences.about=Sobre
 main.closeBtn.tooltip=Fechar
 main.minimizeBtn.tooltip=Minimizar
 main.preferencesBtn.tooltip=Preferências
+main.debugModeEnabled.tooltip=Modo de depuração ativado
 main.donationKeyMissing.tooltip=Por favor, considere uma doação
 ## Drag 'n' Drop
 main.dropZone.dropVault=Adicionar este cofre
@@ -176,8 +182,10 @@ main.vaultlist.addVaultBtn=Adicionar Cofre
 main.vaultDetail.welcomeOnboarding=Obrigado por escolher o Cryptomator para proteger seus arquivos. Se precisar de ajuda, confira nossos guias de introdução:
 ### Locked
 main.vaultDetail.lockedStatus=BLOQUEADO
+main.vaultDetail.unlockBtn=Desbloquear…
 main.vaultDetail.unlockNowBtn=Desbloquear Agora
 main.vaultDetail.optionsBtn=Opções de Cofre
+main.vaultDetail.passwordSavedInKeychain=Senha salva
 ### Unlocked
 main.vaultDetail.unlockedStatus=DESBLOQUEADO
 main.vaultDetail.accessLocation=O conteúdo do seu cofre está disponível aqui:
@@ -210,6 +218,7 @@ wrongFileAlert.link=Para obter assistência, visite
 # Vault Options
 ## General
 vaultOptions.general=Geral
+vaultOptions.general.vaultName=Nome do Cofre
 vaultOptions.general.unlockAfterStartup=Desbloqueie o cofre ao iniciar o Cryptomator
 vaultOptions.general.actionAfterUnlock=Após desbloquear com sucesso
 vaultOptions.general.actionAfterUnlock.ignore=Não fazer nada
@@ -218,7 +227,6 @@ vaultOptions.general.actionAfterUnlock.ask=Perguntar
 ## Mount
 vaultOptions.mount=Montagem
 vaultOptions.mount.readonly=Somente Leitura
-vaultOptions.mount.driveName=Nome do Volume
 vaultOptions.mount.customMountFlags=Flags Personalizadas de Montagem
 vaultOptions.mount.winDriveLetterOccupied=ocupado
 vaultOptions.mount.mountPoint=Ponto de Montagem
@@ -230,6 +238,7 @@ vaultOptions.mount.mountPoint.directoryPickerTitle=Escolha um diretório vazio
 ## Master Key
 vaultOptions.masterkey=Senha
 vaultOptions.masterkey.changePasswordBtn=Alterar Senha
+vaultOptions.masterkey.forgetSavedPasswordBtn=Esquecer a senha salva
 vaultOptions.masterkey.recoveryKeyExpanation=Se você perder a sua senha, a única forma de restaurar acesso a um cofre é através de uma chave de recuperação.
 vaultOptions.masterkey.showRecoveryKeyBtn=Exibir chave de recuperação
 vaultOptions.masterkey.recoverPasswordBtn=Recuperar Senha
diff --git a/main/ui/src/main/resources/i18n/strings_ro.properties b/main/ui/src/main/resources/i18n/strings_ro.properties
index 74d4117b5..00cd8c159 100644
--- a/main/ui/src/main/resources/i18n/strings_ro.properties
+++ b/main/ui/src/main/resources/i18n/strings_ro.properties
@@ -4,6 +4,8 @@
 ## Button
 ## Error
 
+# Defaults
+
 # Tray Menu
 
 # Add Vault Wizard
diff --git a/main/ui/src/main/resources/i18n/strings_ru.properties b/main/ui/src/main/resources/i18n/strings_ru.properties
index 842b33429..8d757661a 100644
--- a/main/ui/src/main/resources/i18n/strings_ru.properties
+++ b/main/ui/src/main/resources/i18n/strings_ru.properties
@@ -7,7 +7,7 @@ generic.button.back=Назад
 generic.button.cancel=Отмена
 generic.button.change=Изменить
 generic.button.close=Закрыть
-generic.button.copy=Копировать
+generic.button.copy=Скопировать
 generic.button.copied=Скопировано!
 generic.button.done=Готово
 generic.button.next=Далее
@@ -16,6 +16,9 @@ generic.button.print=Распечатать
 generic.error.title=Неизвестная ошибка
 generic.error.instruction=Этого не должно было произойти. Создайте отчёт об ошибке ниже и опишите, какие шаги к ней привели.
 
+# Defaults
+defaults.vault.vaultName=Хранилище
+
 # Tray Menu
 traymenu.showMainWindow=Показать
 traymenu.showPreferencesWindow=Настройки
@@ -38,7 +41,7 @@ addvaultwizard.new.namePrompt=Имя хранилища
 addvaultwizard.new.locationInstruction=Где Cryptomator должен хранить зашифрованные файлы вашего хранилища?
 addvaultwizard.new.locationLabel=Место хранения
 addvaultwizard.new.locationPrompt=…
-addvaultwizard.new.directoryPickerLabel=Своё расположение
+addvaultwizard.new.directoryPickerLabel=Своё место
 addvaultwizard.new.directoryPickerButton=Выбрать…
 addvaultwizard.new.directoryPickerTitle=Выберите папку
 addvaultwizard.new.fileAlreadyExists=Хранилище не может быть создано по этому пути, потому что некоторые объекты уже существуют.
@@ -99,7 +102,8 @@ unlock.success.message=Разблокировка "%s" успешно выпол
 unlock.success.rememberChoice=Запомнить выбор и больше не спрашивать
 unlock.success.revealBtn=Показать хранилище
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=Точка монтирования - не пустая папка: %s
+unlock.error.invalidMountPoint.notExisting=Точка монтирования - не пустая папка или не существует: %s
+unlock.error.invalidMountPoint.existing=Точка монтирования/папка уже существует, либо отсутствует родительская папка: %s
 
 # Migration
 migration.title=Обновить хранилище
@@ -129,7 +133,7 @@ migration.impossible.moreInfo=Хранилище по-прежнему можн
 preferences.title=Настройки
 ## General
 preferences.general=Общие
-preferences.general.theme=Внешний вид
+preferences.general.theme=Тема
 preferences.general.theme.automatic=Автоматически
 preferences.general.theme.light=Светлая
 preferences.general.theme.dark=Тёмная
@@ -164,6 +168,7 @@ preferences.about=О программе
 main.closeBtn.tooltip=Закрыть
 main.minimizeBtn.tooltip=Свернуть
 main.preferencesBtn.tooltip=Настройки
+main.debugModeEnabled.tooltip=Включён режим отладки
 main.donationKeyMissing.tooltip=Мы будем рады финансовой помощи
 ## Drag 'n' Drop
 main.dropZone.dropVault=Добавить это хранилище
@@ -213,6 +218,7 @@ wrongFileAlert.link=Если нужна помощь, посетите
 # Vault Options
 ## General
 vaultOptions.general=Общие
+vaultOptions.general.vaultName=Имя хранилища
 vaultOptions.general.unlockAfterStartup=Разблокировать хранилище при запуске Cryptomator
 vaultOptions.general.actionAfterUnlock=После успешной разблокировки
 vaultOptions.general.actionAfterUnlock.ignore=Ничего не делать
@@ -221,7 +227,6 @@ vaultOptions.general.actionAfterUnlock.ask=Спрашивать
 ## Mount
 vaultOptions.mount=Монтирование
 vaultOptions.mount.readonly=Только чтение
-vaultOptions.mount.driveName=Имя диска
 vaultOptions.mount.customMountFlags=Свои флаги монтирования
 vaultOptions.mount.winDriveLetterOccupied=занято
 vaultOptions.mount.mountPoint=Точка монтирования
@@ -233,7 +238,7 @@ vaultOptions.mount.mountPoint.directoryPickerTitle=Выберите пустую
 ## Master Key
 vaultOptions.masterkey=Пароль
 vaultOptions.masterkey.changePasswordBtn=Изменить пароль
-vaultOptions.masterkey.forgetSavedPasswordBtn=Забыть сохраненный пароль
+vaultOptions.masterkey.forgetSavedPasswordBtn=Забыть сохранённый пароль
 vaultOptions.masterkey.recoveryKeyExpanation=Ключ восстановления - это единственный способ восстановить доступ к хранилищу при утере пароля.
 vaultOptions.masterkey.showRecoveryKeyBtn=Показать ключ восстановления
 vaultOptions.masterkey.recoverPasswordBtn=Восстановить пароль
diff --git a/main/ui/src/main/resources/i18n/strings_sk.properties b/main/ui/src/main/resources/i18n/strings_sk.properties
index 3c0b6fc93..2f2c9ae5d 100644
--- a/main/ui/src/main/resources/i18n/strings_sk.properties
+++ b/main/ui/src/main/resources/i18n/strings_sk.properties
@@ -16,6 +16,9 @@ generic.button.print=Tlač
 generic.error.title=Vyskytla sa neočakávaná chyba
 generic.error.instruction=Toto sa nemalo stať. Nahláste text chyby uvedený nižšie a uveďte popis krokov, ktoré viedli k tejto chybe.
 
+# Defaults
+defaults.vault.vaultName=Trezor
+
 # Tray Menu
 traymenu.showMainWindow=Zobraziť
 traymenu.showPreferencesWindow=Predvoľby
@@ -96,6 +99,8 @@ unlock.unlockBtn=Odomknúť
 unlock.success.message=Úspešne sa odomkol "%s"! Váš trezor je teraz prístupný.
 unlock.success.revealBtn=Odhaliť trezor
 ## Invalid Mount Point
+unlock.error.invalidMountPoint.notExisting=# Neplatný bod pripojenia
+unlock.error.invalidMountPoint.existing=Chyba odblokovania
 
 # Migration
 ## Start
@@ -117,6 +122,7 @@ preferences.general.theme.automatic=Automaticky
 # Main Window
 main.closeBtn.tooltip=Zavrieť
 main.preferencesBtn.tooltip=Predvoľby
+main.debugModeEnabled.tooltip=Debagovací mód je aktivovaný
 ## Drag 'n' Drop
 ## Vault List
 main.vaultlist.contextMenu.remove=Odstrániť peňaženku…
@@ -138,6 +144,7 @@ main.vaultDetail.missing.remove=Odstrániť zo zoznamu peňaženky…
 
 # Vault Options
 ## General
+vaultOptions.general.vaultName=Názov trezoru
 ## Mount
 vaultOptions.mount.mountPoint.directoryPickerButton=Vybrať…
 ## Master Key
diff --git a/main/ui/src/main/resources/i18n/strings_sv.properties b/main/ui/src/main/resources/i18n/strings_sv.properties
index 75a63ee88..fe7290c4e 100644
--- a/main/ui/src/main/resources/i18n/strings_sv.properties
+++ b/main/ui/src/main/resources/i18n/strings_sv.properties
@@ -16,6 +16,9 @@ generic.button.print=Skriv ut
 generic.error.title=Ett oväntat fel uppstod
 generic.error.instruction=Det här borde inte ha hänt. Vänligen rapportera feltexten nedan och inkludera en beskrivning av vilka steg som ledde till detta fel.
 
+# Defaults
+defaults.vault.vaultName=Valv
+
 # Tray Menu
 traymenu.showMainWindow=Visa
 traymenu.showPreferencesWindow=Inställningar
@@ -33,7 +36,7 @@ addvaultwizard.welcome.existingButton=Öppna befintligt valv
 ## New
 ### Name
 addvaultwizard.new.nameInstruction=Ange namn för valvet
-addvaultwizard.new.namePrompt=Valvets namn
+addvaultwizard.new.namePrompt=Valvnamn
 ### Location
 addvaultwizard.new.locationInstruction=Var ska Cryptomator lagra de krypterade filerna för ditt valv?
 addvaultwizard.new.locationLabel=Lagringsplats
@@ -99,7 +102,6 @@ unlock.success.message="%s" upplåst! Ditt valv är nu åtkomligt.
 unlock.success.rememberChoice=Kom ihåg valet, visa inte detta igen
 unlock.success.revealBtn=Visa valv
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=Monteringspunkten är inte en tom katalog: %s
 
 # Migration
 migration.title=Uppgradera valv
@@ -130,6 +132,7 @@ preferences.title=Inställningar
 ## General
 preferences.general=Allmänt
 preferences.general.theme=Utseende
+preferences.general.theme.automatic=Automatiskt
 preferences.general.theme.light=Ljust
 preferences.general.theme.dark=Mörkt
 preferences.general.unlockThemes=Lås upp mörkt läge
@@ -163,12 +166,14 @@ preferences.about=Om
 main.closeBtn.tooltip=Stäng
 main.minimizeBtn.tooltip=Minimera
 main.preferencesBtn.tooltip=Inställningar
+main.debugModeEnabled.tooltip=Felsökningsläget är aktiverat
 main.donationKeyMissing.tooltip=Överväg gärna en donation
 ## Drag 'n' Drop
 main.dropZone.dropVault=Lägg till detta valv
 main.dropZone.unknownDragboardContent=Om du vill lägga till ett valv, dra in det till detta fönster
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Klicka här för att lägga till valv
+main.vaultlist.contextMenu.remove=Ta bort valv…
 main.vaultlist.addVaultBtn=Lägg till valv
 ## Vault Detail
 ### Welcome
@@ -192,6 +197,7 @@ main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator kunde inte hitta ett valv i denna sökväg.
 main.vaultDetail.missing.recheck=Kontrollera igen
+main.vaultDetail.missing.remove=Ta bort från listan…
 main.vaultDetail.missing.changeLocation=Ändra valvets plats…
 ### Needs Migration
 main.vaultDetail.migrateButton=Uppgradera valv
@@ -210,6 +216,7 @@ wrongFileAlert.link=För ytterligare hjälp, besök
 # Vault Options
 ## General
 vaultOptions.general=Allmänt
+vaultOptions.general.vaultName=Valvnamn
 vaultOptions.general.unlockAfterStartup=Lås upp valvet när Cryptomator startas
 vaultOptions.general.actionAfterUnlock=Efter lyckad upplåsning
 vaultOptions.general.actionAfterUnlock.ignore=Gör ingenting
@@ -218,7 +225,6 @@ vaultOptions.general.actionAfterUnlock.ask=Fråga
 ## Mount
 vaultOptions.mount=Montering
 vaultOptions.mount.readonly=Skrivskyddad
-vaultOptions.mount.driveName=Enhetsnamn
 vaultOptions.mount.customMountFlags=Egna monterings-flaggor
 vaultOptions.mount.winDriveLetterOccupied=upptagen
 vaultOptions.mount.mountPoint=Monteringspunkt
diff --git a/main/ui/src/main/resources/i18n/strings_tr.properties b/main/ui/src/main/resources/i18n/strings_tr.properties
index 2abb261eb..c0c69d90d 100644
--- a/main/ui/src/main/resources/i18n/strings_tr.properties
+++ b/main/ui/src/main/resources/i18n/strings_tr.properties
@@ -16,6 +16,9 @@ generic.button.print=Yazdır
 generic.error.title=Beklenmedik bir hata oluştu
 generic.error.instruction=Bu olmamalıydı. Lütfen aşağıdaki hata metnini ve bu hatayı aldığınızda hangi adımları uyguladığınızı rapor edin.
 
+# Defaults
+defaults.vault.vaultName=Kasa
+
 # Tray Menu
 traymenu.showMainWindow=Göster
 traymenu.showPreferencesWindow=Seçenekler
@@ -99,7 +102,6 @@ unlock.success.message="%s" 'nin kilidi başarıyla açıldı! Kasanız şimdi e
 unlock.success.rememberChoice=Seçimi hatırla, bunu bir daha gösterme
 unlock.success.revealBtn=Kasayı Göster
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=Bağlantı noktası boş bir dizin değil: %s
 
 # Migration
 migration.title=Kasayı Güncelle
@@ -213,6 +215,7 @@ wrongFileAlert.link=Daha fazla yardım için, ziyaret edin:
 # Vault Options
 ## General
 vaultOptions.general=Genel
+vaultOptions.general.vaultName=Kasa Adı
 vaultOptions.general.unlockAfterStartup=Cryptomator başlatıldığında kasayı aç
 vaultOptions.general.actionAfterUnlock=Başarılı kilit açmanın ardından
 vaultOptions.general.actionAfterUnlock.ignore=Hiçbir şey yapma
@@ -221,7 +224,6 @@ vaultOptions.general.actionAfterUnlock.ask=Sor
 ## Mount
 vaultOptions.mount=Bağlantı
 vaultOptions.mount.readonly=Salt-Okunur
-vaultOptions.mount.driveName=Sürücü Adı
 vaultOptions.mount.customMountFlags=Özel Bağlantı Parametreleri
 vaultOptions.mount.winDriveLetterOccupied=meşgul
 vaultOptions.mount.mountPoint=Bağlantı Noktası
diff --git a/main/ui/src/main/resources/i18n/strings_zh.properties b/main/ui/src/main/resources/i18n/strings_zh.properties
index 90fe3c4ba..309754324 100644
--- a/main/ui/src/main/resources/i18n/strings_zh.properties
+++ b/main/ui/src/main/resources/i18n/strings_zh.properties
@@ -16,6 +16,9 @@ generic.button.print=打印
 generic.error.title=发生一个未知错误
 generic.error.instruction=这本不该发生的，请报告下面的错误文本，并包含导致该错误的操作步骤的描述信息。
 
+# Defaults
+defaults.vault.vaultName=保险库
+
 # Tray Menu
 traymenu.showMainWindow=显示
 traymenu.showPreferencesWindow=首选项
@@ -99,7 +102,8 @@ unlock.success.message=已成功解锁 "%s"! 您现在可以访问该保险库
 unlock.success.rememberChoice=记住该选择，不要再显示
 unlock.success.revealBtn=显示保险库
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=挂载点不是一个空目录： %s
+unlock.error.invalidMountPoint.notExisting=挂载点非空目录或不存在：%s
+unlock.error.invalidMountPoint.existing=挂载点/文件夹已存在或缺少父文件夹：%s
 
 # Migration
 migration.title=升级保险库
@@ -164,12 +168,14 @@ preferences.about=关于
 main.closeBtn.tooltip=关闭
 main.minimizeBtn.tooltip=最小化
 main.preferencesBtn.tooltip=首选项
+main.debugModeEnabled.tooltip=调试模式已开启
 main.donationKeyMissing.tooltip=请考虑捐赠
 ## Drag 'n' Drop
 main.dropZone.dropVault=添加此保险库
 main.dropZone.unknownDragboardContent=如果您想要添加一个保险库，将其拖动到此窗口
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=点击此处添加一个保险库
+main.vaultlist.contextMenu.remove=删除保险库…
 main.vaultlist.addVaultBtn=添加保险库
 ## Vault Detail
 ### Welcome
@@ -193,6 +199,7 @@ main.vaultDetail.throughput.mbps=%.1f MiB/s
 ### Missing
 main.vaultDetail.missing.info=Cryptomator在此路径找不到保险库
 main.vaultDetail.missing.recheck=重新检查
+main.vaultDetail.missing.remove=从保险库列表中移除...
 main.vaultDetail.missing.changeLocation=更改保险库位置…
 ### Needs Migration
 main.vaultDetail.migrateButton=升级保险库
@@ -211,6 +218,7 @@ wrongFileAlert.link=如需进一步帮助，请访问
 # Vault Options
 ## General
 vaultOptions.general=常规​​​​​
+vaultOptions.general.vaultName=保险库名称
 vaultOptions.general.unlockAfterStartup=启动 Cryptomator 时解锁保险库 (此功能需先勾选保存密码)
 vaultOptions.general.actionAfterUnlock=解锁成功后的操作
 vaultOptions.general.actionAfterUnlock.ignore=什么也不做
@@ -219,7 +227,6 @@ vaultOptions.general.actionAfterUnlock.ask=询问
 ## Mount
 vaultOptions.mount=挂载
 vaultOptions.mount.readonly=只读
-vaultOptions.mount.driveName=驱动器名称
 vaultOptions.mount.customMountFlags=自定义挂载标志
 vaultOptions.mount.winDriveLetterOccupied=已占用
 vaultOptions.mount.mountPoint=挂载点
diff --git a/main/ui/src/main/resources/i18n/strings_zh_TW.properties b/main/ui/src/main/resources/i18n/strings_zh_TW.properties
index de0bf6e3d..d52cfee06 100644
--- a/main/ui/src/main/resources/i18n/strings_zh_TW.properties
+++ b/main/ui/src/main/resources/i18n/strings_zh_TW.properties
@@ -16,6 +16,9 @@ generic.button.print=列印
 generic.error.title=發生未知錯誤
 generic.error.instruction=這不應該發生。請回報下方的錯誤訊息，並附上造成這個錯誤的步驟。
 
+# Defaults
+defaults.vault.vaultName=加密檔案庫
+
 # Tray Menu
 traymenu.showMainWindow=顯示
 traymenu.showPreferencesWindow=偏好
@@ -99,7 +102,6 @@ unlock.success.message=成功解鎖 "%s"！您現在可以存取您的加密檔
 unlock.success.rememberChoice=記得這個決定，不要再顯示
 unlock.success.revealBtn=顯示加密檔案庫
 ## Invalid Mount Point
-unlock.error.invalidMountPoint=掛載點不是空資料夾：%s
 
 # Migration
 migration.title=升級加密檔案庫
@@ -164,6 +166,7 @@ preferences.about=關於
 main.closeBtn.tooltip=關閉
 main.minimizeBtn.tooltip=最小化
 main.preferencesBtn.tooltip=偏好
+main.debugModeEnabled.tooltip=已啟用除錯模式
 main.donationKeyMissing.tooltip=請考慮贊助
 ## Drag 'n' Drop
 main.dropZone.dropVault=加入這個加密檔案庫
@@ -213,6 +216,7 @@ wrongFileAlert.link=如需進一步協助協助，請參照
 # Vault Options
 ## General
 vaultOptions.general=一般
+vaultOptions.general.vaultName=加密檔案庫名稱
 vaultOptions.general.unlockAfterStartup=啟動 Cryptomator 時解鎖加密檔案庫
 vaultOptions.general.actionAfterUnlock=成功解鎖後
 vaultOptions.general.actionAfterUnlock.ignore=無動作
@@ -221,7 +225,6 @@ vaultOptions.general.actionAfterUnlock.ask=詢問
 ## Mount
 vaultOptions.mount=掛載
 vaultOptions.mount.readonly=唯讀
-vaultOptions.mount.driveName=磁碟代號
 vaultOptions.mount.customMountFlags=自訂掛載參數
 vaultOptions.mount.winDriveLetterOccupied=已使用
 vaultOptions.mount.mountPoint=掛載點

From 9c22adc97d63f0ffce15b2f594400dbd2ab25a0d Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Mon, 26 Oct 2020 21:15:37 +0100
Subject: [PATCH 131/169] Added/Fixed error logging

Added error logging to VaultStats and GeneralPreferencesController
Fixed possible missing error logging in VaultService
---
 .../main/java/org/cryptomator/common/vaults/VaultStats.java  | 1 +
 .../main/java/org/cryptomator/ui/common/VaultService.java    | 3 ++-
 .../ui/preferences/GeneralPreferencesController.java         | 5 ++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
index 69564b876..2da8fa288 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
@@ -36,6 +36,7 @@ public class VaultStats {
 		this.updateService = new UpdateStatsService();
 		updateService.setExecutor(executor);
 		updateService.setPeriod(Duration.seconds(1));
+		updateService.setOnFailed(event -> LOG.error("Error in UpdateStateService.", event.getSource().getException()));
 
 		state.addListener(this::vaultStateChanged);
 	}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java
index 8aadd8c98..da9f58ecb 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java
@@ -69,7 +69,6 @@ public class VaultService {
 	public Task<Vault> createLockTask(Vault vault, boolean forced) {
 		Task<Vault> task = new LockVaultTask(vault, forced);
 		task.setOnSucceeded(evt -> LOG.info("Locked {}", vault.getDisplayName()));
-		task.setOnFailed(evt -> LOG.error("Failed to lock " + vault.getDisplayName(), evt.getSource().getException()));
 		return task;
 	}
 
@@ -165,6 +164,8 @@ public class VaultService {
 		public LockVaultTask(Vault vault, boolean forced) {
 			this.vault = vault;
 			this.forced = forced;
+
+			setOnFailed(event -> LOG.error("Failed to lock " + vault.getDisplayName(), event.getSource().getException()));
 		}
 
 		@Override
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index fdec00d62..926749dfa 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -109,7 +109,10 @@ public class GeneralPreferencesController implements FxController {
 		autoStartStrategy.ifPresent(autoStart -> {
 			boolean enableAutoStart = autoStartCheckbox.isSelected();
 			Task<Void> toggleTask = new ToggleAutoStartTask(autoStart, enableAutoStart);
-			toggleTask.setOnFailed(evt -> autoStartCheckbox.setSelected(!enableAutoStart)); // restore previous state
+			toggleTask.setOnFailed(event -> {
+				autoStartCheckbox.setSelected(!enableAutoStart); // restore previous state
+				LOG.error("Failed to toggle autostart.", event.getSource().getException());
+			});
 			executor.execute(toggleTask);
 		});
 	}

From eb8f5f523d7762ee75ce3288ec027b40de4cc69f Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Mon, 26 Oct 2020 21:19:24 +0100
Subject: [PATCH 132/169] Added UI error messages

Added UI error message to GeneralPreferencesController for ToggleAutoStartTask
Added UI error message to RecoveryKeyCreationController
---
 .../preferences/GeneralPreferencesController.java | 15 ++++++++++++++-
 .../RecoveryKeyCreationController.java            |  8 +++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index 926749dfa..678a740c9 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.preferences;
 
+import dagger.Lazy;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
@@ -7,17 +8,22 @@ import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.geometry.NodeOrientation;
+import javafx.scene.Scene;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
+import javafx.stage.Stage;
 import javafx.util.StringConverter;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
+import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,6 +38,7 @@ public class GeneralPreferencesController implements FxController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(GeneralPreferencesController.class);
 
+	private final Stage window;
 	private final Settings settings;
 	private final boolean trayMenuSupported;
 	private final Optional<AutoStartStrategy> autoStartStrategy;
@@ -41,6 +48,8 @@ public class GeneralPreferencesController implements FxController {
 	private final ResourceBundle resourceBundle;
 	private final Application application;
 	private final Environment environment;
+	private final Lazy<Scene> preferencesScene;
+	private final ErrorComponent.Builder errorComponent;
 	public ChoiceBox<UiTheme> themeChoiceBox;
 	public CheckBox startHiddenCheckbox;
 	public CheckBox debugModeCheckbox;
@@ -50,7 +59,8 @@ public class GeneralPreferencesController implements FxController {
 	public RadioButton nodeOrientationRtl;
 
 	@Inject
-	GeneralPreferencesController(Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment) {
+	GeneralPreferencesController(@PreferencesWindow Stage window, Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment, @FxmlScene(FxmlFile.PREFERENCES) Lazy<Scene> preferencesScene, ErrorComponent.Builder errorComponent) {
+		this.window = window;
 		this.settings = settings;
 		this.trayMenuSupported = trayMenuSupported;
 		this.autoStartStrategy = autoStartStrategy;
@@ -60,6 +70,8 @@ public class GeneralPreferencesController implements FxController {
 		this.resourceBundle = resourceBundle;
 		this.application = application;
 		this.environment = environment;
+		this.preferencesScene = preferencesScene;
+		this.errorComponent = errorComponent;
 	}
 
 	@FXML
@@ -112,6 +124,7 @@ public class GeneralPreferencesController implements FxController {
 			toggleTask.setOnFailed(event -> {
 				autoStartCheckbox.setSelected(!enableAutoStart); // restore previous state
 				LOG.error("Failed to toggle autostart.", event.getSource().getException());
+				errorComponent.cause(event.getSource().getException()).window(window).returnToScene(preferencesScene.get()).build().showErrorScene();
 			});
 			executor.execute(toggleTask);
 		});
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
index 6bb6a9f80..b0d622efa 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
@@ -9,6 +9,7 @@ import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
 import org.cryptomator.ui.common.Animations;
+import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
@@ -31,16 +32,20 @@ public class RecoveryKeyCreationController implements FxController {
 	private final ExecutorService executor;
 	private final RecoveryKeyFactory recoveryKeyFactory;
 	private final StringProperty recoveryKeyProperty;
+	private final Lazy<Scene> createScene;
+	private final ErrorComponent.Builder errorComponent;
 	public NiceSecurePasswordField passwordField;
 
 	@Inject
-	public RecoveryKeyCreationController(@RecoveryKeyWindow Stage window, @FxmlScene(FxmlFile.RECOVERYKEY_SUCCESS) Lazy<Scene> successScene, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey) {
+	public RecoveryKeyCreationController(@RecoveryKeyWindow Stage window, @FxmlScene(FxmlFile.RECOVERYKEY_SUCCESS) Lazy<Scene> successScene, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @FxmlScene(FxmlFile.RECOVERYKEY_CREATE) Lazy<Scene> createScene, ErrorComponent.Builder errorComponent) {
 		this.window = window;
 		this.successScene = successScene;
 		this.vault = vault;
 		this.executor = executor;
 		this.recoveryKeyFactory = recoveryKeyFactory;
 		this.recoveryKeyProperty = recoveryKey;
+		this.createScene = createScene;
+		this.errorComponent = errorComponent;
 	}
 
 	@FXML
@@ -59,6 +64,7 @@ public class RecoveryKeyCreationController implements FxController {
 				Animations.createShakeWindowAnimation(window).play();
 			} else {
 				LOG.error("Creation of recovery key failed.", task.getException());
+				errorComponent.cause(task.getException()).window(window).returnToScene(createScene.get()).build().showErrorScene();
 			}
 		});
 		executor.submit(task);

From 786365c0956d085d0037dcd1f02c3f5af6213cee Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 27 Oct 2020 15:56:09 +0100
Subject: [PATCH 133/169] Added ability to skip CI

Added check for "Skip CI", added comment
Added filter for skipping CI
---
 .github/workflows/build.yml                  | 2 ++
 .idea/inspectionProfiles/Project_Default.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c38d20dc5..8009aeb06 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,6 +7,8 @@ jobs:
   build:
     name: Build and Test
     runs-on: ubuntu-latest
+    #This check is case insensitive
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 146ab09b7..0634be039 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,7 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+    <inspection_tool class="SpellCheckingInspection" enabled="true" level="TYPO" enabled_by_default="true">
       <option name="processCode" value="true" />
       <option name="processLiterals" value="true" />
       <option name="processComments" value="true" />

From 8904df91b495fa959f2d271a669750d9f2447bee Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 27 Oct 2020 16:18:55 +0100
Subject: [PATCH 134/169] Reverted accidental changes to Project_Default.xml
 [Skip CI]

---
 .idea/inspectionProfiles/Project_Default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 0634be039..146ab09b7 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,7 +1,7 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <inspection_tool class="SpellCheckingInspection" enabled="true" level="TYPO" enabled_by_default="true">
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
       <option name="processCode" value="true" />
       <option name="processLiterals" value="true" />
       <option name="processComments" value="true" />

From d331c3022489c7d0651a588e0c58f877064d55a8 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 28 Oct 2020 15:21:59 +0100
Subject: [PATCH 135/169] Revert "Added UI error messages"

This reverts commit eb8f5f523d7762ee75ce3288ec027b40de4cc69f.
---
 .../preferences/GeneralPreferencesController.java | 15 +--------------
 .../RecoveryKeyCreationController.java            |  8 +-------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index 678a740c9..926749dfa 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.preferences;
 
-import dagger.Lazy;
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
@@ -8,22 +7,17 @@ import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.geometry.NodeOrientation;
-import javafx.scene.Scene;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
-import javafx.stage.Stage;
 import javafx.util.StringConverter;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
-import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,7 +32,6 @@ public class GeneralPreferencesController implements FxController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(GeneralPreferencesController.class);
 
-	private final Stage window;
 	private final Settings settings;
 	private final boolean trayMenuSupported;
 	private final Optional<AutoStartStrategy> autoStartStrategy;
@@ -48,8 +41,6 @@ public class GeneralPreferencesController implements FxController {
 	private final ResourceBundle resourceBundle;
 	private final Application application;
 	private final Environment environment;
-	private final Lazy<Scene> preferencesScene;
-	private final ErrorComponent.Builder errorComponent;
 	public ChoiceBox<UiTheme> themeChoiceBox;
 	public CheckBox startHiddenCheckbox;
 	public CheckBox debugModeCheckbox;
@@ -59,8 +50,7 @@ public class GeneralPreferencesController implements FxController {
 	public RadioButton nodeOrientationRtl;
 
 	@Inject
-	GeneralPreferencesController(@PreferencesWindow Stage window, Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment, @FxmlScene(FxmlFile.PREFERENCES) Lazy<Scene> preferencesScene, ErrorComponent.Builder errorComponent) {
-		this.window = window;
+	GeneralPreferencesController(Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment) {
 		this.settings = settings;
 		this.trayMenuSupported = trayMenuSupported;
 		this.autoStartStrategy = autoStartStrategy;
@@ -70,8 +60,6 @@ public class GeneralPreferencesController implements FxController {
 		this.resourceBundle = resourceBundle;
 		this.application = application;
 		this.environment = environment;
-		this.preferencesScene = preferencesScene;
-		this.errorComponent = errorComponent;
 	}
 
 	@FXML
@@ -124,7 +112,6 @@ public class GeneralPreferencesController implements FxController {
 			toggleTask.setOnFailed(event -> {
 				autoStartCheckbox.setSelected(!enableAutoStart); // restore previous state
 				LOG.error("Failed to toggle autostart.", event.getSource().getException());
-				errorComponent.cause(event.getSource().getException()).window(window).returnToScene(preferencesScene.get()).build().showErrorScene();
 			});
 			executor.execute(toggleTask);
 		});
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
index b0d622efa..6bb6a9f80 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
@@ -9,7 +9,6 @@ import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
 import org.cryptomator.ui.common.Animations;
-import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
@@ -32,20 +31,16 @@ public class RecoveryKeyCreationController implements FxController {
 	private final ExecutorService executor;
 	private final RecoveryKeyFactory recoveryKeyFactory;
 	private final StringProperty recoveryKeyProperty;
-	private final Lazy<Scene> createScene;
-	private final ErrorComponent.Builder errorComponent;
 	public NiceSecurePasswordField passwordField;
 
 	@Inject
-	public RecoveryKeyCreationController(@RecoveryKeyWindow Stage window, @FxmlScene(FxmlFile.RECOVERYKEY_SUCCESS) Lazy<Scene> successScene, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @FxmlScene(FxmlFile.RECOVERYKEY_CREATE) Lazy<Scene> createScene, ErrorComponent.Builder errorComponent) {
+	public RecoveryKeyCreationController(@RecoveryKeyWindow Stage window, @FxmlScene(FxmlFile.RECOVERYKEY_SUCCESS) Lazy<Scene> successScene, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey) {
 		this.window = window;
 		this.successScene = successScene;
 		this.vault = vault;
 		this.executor = executor;
 		this.recoveryKeyFactory = recoveryKeyFactory;
 		this.recoveryKeyProperty = recoveryKey;
-		this.createScene = createScene;
-		this.errorComponent = errorComponent;
 	}
 
 	@FXML
@@ -64,7 +59,6 @@ public class RecoveryKeyCreationController implements FxController {
 				Animations.createShakeWindowAnimation(window).play();
 			} else {
 				LOG.error("Creation of recovery key failed.", task.getException());
-				errorComponent.cause(task.getException()).window(window).returnToScene(createScene.get()).build().showErrorScene();
 			}
 		});
 		executor.submit(task);

From f0e1bcb899e9b488ee271f5e3c4419c87a3e5896 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 28 Oct 2020 15:40:59 +0100
Subject: [PATCH 136/169] Moved call to #setOnFailed() to UpdateStatsService
 implementation

---
 .../main/java/org/cryptomator/common/vaults/VaultStats.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
index 2da8fa288..c23682008 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
@@ -36,7 +36,6 @@ public class VaultStats {
 		this.updateService = new UpdateStatsService();
 		updateService.setExecutor(executor);
 		updateService.setPeriod(Duration.seconds(1));
-		updateService.setOnFailed(event -> LOG.error("Error in UpdateStateService.", event.getSource().getException()));
 
 		state.addListener(this::vaultStateChanged);
 	}
@@ -60,6 +59,10 @@ public class VaultStats {
 
 	private class UpdateStatsService extends ScheduledService<Optional<CryptoFileSystemStats>> {
 
+		private UpdateStatsService() {
+			setOnFailed(event -> LOG.error("Error in UpdateStateService.", getException()));
+		}
+
 		@Override
 		protected Task<Optional<CryptoFileSystemStats>> createTask() {
 			return new Task<>() {

From 0acc8ddb0a667930a98caacac4ecac8426a83c53 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 28 Oct 2020 15:48:20 +0100
Subject: [PATCH 137/169] Fixed UnlockWorkflow

Partly reverted 253abd493036ef940ced24942f2c84fd64695972
---
 .../cryptomator/ui/unlock/UnlockWorkflow.java | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index 4db0836a4..12633452a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -74,12 +74,7 @@ public class UnlockWorkflow extends Task<Boolean> {
 		this.invalidMountPointScene = invalidMountPointScene;
 		this.errorComponent = errorComponent;
 
-		setOnScheduled(event -> vault.setState(VaultState.PROCESSING));
-		setOnSucceeded(event -> vault.setState(VaultState.UNLOCKED));
-		setOnCancelled(event -> vault.setState(VaultState.LOCKED));
-
 		setOnFailed(event -> {
-			vault.setState(VaultState.LOCKED);
 			Throwable throwable = event.getSource().getException();
 			if (throwable instanceof InvalidMountPointException) {
 				handleInvalidMountPoint((InvalidMountPointException) throwable);
@@ -224,4 +219,25 @@ public class UnlockWorkflow extends Task<Boolean> {
 			Arrays.fill(pw, ' ');
 		}
 	}
+
+	@Override
+	protected void scheduled() {
+		vault.setState(VaultState.PROCESSING);
+	}
+
+	@Override
+	protected void succeeded() {
+		vault.setState(VaultState.UNLOCKED);
+	}
+
+	@Override
+	protected void failed() {
+		vault.setState(VaultState.LOCKED);
+	}
+
+	@Override
+	protected void cancelled() {
+		vault.setState(VaultState.LOCKED);
+	}
+
 }

From 551d9d1af1e01c81596fd240769179295a1e03c3 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 28 Oct 2020 16:21:14 +0100
Subject: [PATCH 138/169] Added default Errorhandler to all Tasks and Services

---
 main/ui/src/main/java/org/cryptomator/ui/common/Tasks.java  | 2 ++
 .../main/java/org/cryptomator/ui/common/VaultService.java   | 4 ++++
 .../java/org/cryptomator/ui/fxapp/UpdateCheckerModule.java  | 5 +++++
 .../java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java    | 6 ++++++
 .../ui/preferences/GeneralPreferencesController.java        | 2 ++
 .../ui/recoverykey/RecoveryKeyCreationController.java       | 4 ++++
 .../ui/recoverykey/RecoveryKeyResetPasswordController.java  | 4 ++++
 7 files changed, 27 insertions(+)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/Tasks.java b/main/ui/src/main/java/org/cryptomator/ui/common/Tasks.java
index ab0a80d47..164ee41e3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/Tasks.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/Tasks.java
@@ -174,6 +174,8 @@ public class Tasks {
 
 		RestartingService(Supplier<Task<T>> taskFactory) {
 			this.taskFactory = taskFactory;
+
+			setOnFailed(event -> LOG.error("Failed to execute service", getException()));
 		}
 
 		@Override
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java
index da9f58ecb..a6b7dc425 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java
@@ -108,6 +108,8 @@ public class VaultService {
 		 */
 		public RevealVaultTask(Vault vault) {
 			this.vault = vault;
+
+			setOnFailed(evt -> LOG.error("Failed to reveal " + vault.getDisplayName(), getException()));
 		}
 
 		@Override
@@ -126,6 +128,8 @@ public class VaultService {
 
 		public WaitForTasksTask(Collection<Task<Vault>> tasks) {
 			this.startedTasks = List.copyOf(tasks);
+
+			setOnFailed(event -> LOG.error("Failed to lock multiple vaults", getException()));
 		}
 
 		@Override
diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerModule.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerModule.java
index 7784bd89e..a15b81044 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerModule.java
@@ -11,6 +11,8 @@ import javafx.concurrent.Task;
 import javafx.util.Duration;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.settings.Settings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.inject.Named;
 import java.net.URI;
@@ -22,6 +24,8 @@ import java.util.concurrent.ExecutorService;
 @Module
 public abstract class UpdateCheckerModule {
 
+	private static final Logger LOG = LoggerFactory.getLogger(UpdateCheckerModule.class);
+
 	private static final URI LATEST_VERSION_URI = URI.create("https://api.cryptomator.org/updates/latestVersion.json");
 	private static final Duration UPDATE_CHECK_INTERVAL = Duration.hours(3);
 	private static final Duration DISABLED_UPDATE_CHECK_INTERVAL = Duration.hours(100000); // Duration.INDEFINITE leads to overflows...
@@ -69,6 +73,7 @@ public abstract class UpdateCheckerModule {
 				return new UpdateCheckerTask(httpClient, checkForUpdatesRequest);
 			}
 		};
+		service.setOnFailed(event -> LOG.error("Failed to execute update service", service.getException()));
 		service.setExecutor(executor);
 		service.periodProperty().bind(period);
 		return service;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java
index 4d077a24c..8fec56b64 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java
@@ -6,6 +6,8 @@ import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import javafx.concurrent.Task;
 import org.apache.commons.lang3.SystemUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -19,6 +21,8 @@ import java.util.Map;
 
 public class UpdateCheckerTask extends Task<String> {
 
+	private static final Logger LOG = LoggerFactory.getLogger(UpdateCheckerTask.class);
+
 	private static final long MAX_RESPONSE_SIZE = 10 * 1024; // 10kb should be sufficient. protect against flooding
 	private static final Gson GSON = new GsonBuilder().setLenient().create();
 
@@ -28,6 +32,8 @@ public class UpdateCheckerTask extends Task<String> {
 	UpdateCheckerTask(HttpClient httpClient, HttpRequest checkForUpdatesRequest) {
 		this.httpClient = httpClient;
 		this.checkForUpdatesRequest = checkForUpdatesRequest;
+
+		setOnFailed(event -> LOG.error("Failed to check for updates", getException()));
 	}
 
 	@Override
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index 926749dfa..3cf94d22e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -161,6 +161,8 @@ public class GeneralPreferencesController implements FxController {
 		public ToggleAutoStartTask(AutoStartStrategy autoStart, boolean enable) {
 			this.autoStart = autoStart;
 			this.enable = enable;
+
+			setOnFailed(event -> LOG.error("Failed to toggle Autostart", getException()));
 		}
 
 		@Override
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
index 6bb6a9f80..f5b002cbf 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
@@ -71,6 +71,10 @@ public class RecoveryKeyCreationController implements FxController {
 
 	private class RecoveryKeyCreationTask extends Task<String> {
 
+		private RecoveryKeyCreationTask() {
+			setOnFailed(event -> LOG.error("Failed to create recovery key", getException()));
+		}
+
 		@Override
 		protected String call() throws IOException {
 			return recoveryKeyFactory.createRecoveryKey(vault.getPath(), passwordField.getCharacters());
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
index 87d916492..8f626a652 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
@@ -77,6 +77,10 @@ public class RecoveryKeyResetPasswordController implements FxController {
 
 	private class ResetPasswordTask extends Task<Void> {
 
+		private ResetPasswordTask() {
+			setOnFailed(event -> LOG.error("Failed to reset password", getException()));
+		}
+
 		@Override
 		protected Void call() throws IOException, IllegalArgumentException {
 			recoveryKeyFactory.resetPasswordWithRecoveryKey(vault.getPath(), recoveryKey.get(), newPassword.get());

From f675bd50173f99fdcf62441e9c6e337d82a32bba Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Mon, 2 Nov 2020 08:19:26 +0100
Subject: [PATCH 139/169] Feature/change password backend 2 (#1375)

* Add option to choose from available password backends on Linux
Implements #1301
---
 .../common/settings/KeychainBackend.java      | 39 +++++++++++++
 .../cryptomator/common/settings/Settings.java |  5 ++
 .../common/settings/SettingsJsonAdapter.java  | 11 ++++
 .../keychain/KeychainAccessStrategy.java      |  2 +-
 .../keychain/LinuxSystemKeychainAccess.java   | 58 ++++++++++++++++---
 .../GeneralPreferencesController.java         | 53 ++++++++++++++++-
 .../resources/fxml/preferences_general.fxml   |  5 ++
 .../main/resources/i18n/strings.properties    |  5 ++
 8 files changed, 169 insertions(+), 9 deletions(-)
 create mode 100644 main/commons/src/main/java/org/cryptomator/common/settings/KeychainBackend.java

diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/KeychainBackend.java b/main/commons/src/main/java/org/cryptomator/common/settings/KeychainBackend.java
new file mode 100644
index 000000000..a54c81b08
--- /dev/null
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/KeychainBackend.java
@@ -0,0 +1,39 @@
+package org.cryptomator.common.settings;
+
+import org.apache.commons.lang3.SystemUtils;
+
+import java.util.Arrays;
+
+public enum KeychainBackend {
+	GNOME("preferences.general.keychainBackend.gnome", SystemUtils.IS_OS_LINUX), //
+	KDE("preferences.general.keychainBackend.kde", SystemUtils.IS_OS_LINUX), //
+	MAC_SYSTEM_KEYCHAIN("preferences.general.keychainBackend.macSystemKeychain", SystemUtils.IS_OS_MAC), //
+	WIN_SYSTEM_KEYCHAIN("preferences.general.keychainBackend.winSystemKeychain", SystemUtils.IS_OS_WINDOWS);
+
+	public static KeychainBackend[] supportedBackends() {
+		return Arrays.stream(values()).filter(KeychainBackend::isSupported).toArray(KeychainBackend[]::new);
+	}
+
+	public static KeychainBackend defaultBackend() {
+		if (SystemUtils.IS_OS_LINUX) {
+			return KeychainBackend.GNOME;
+		} else { // SystemUtils.IS_OS_MAC || SystemUtils.IS_OS_WINDOWS
+			return Arrays.stream(KeychainBackend.supportedBackends()).findFirst().orElseThrow(IllegalStateException::new);
+		}
+	}
+
+	private final String configName;
+	private final boolean isSupported;
+
+	KeychainBackend(String configName, boolean isSupported) {
+		this.configName = configName;
+		this.isSupported = isSupported;
+	}
+
+	public String getDisplayName() {
+		return configName;
+	}
+
+	public boolean isSupported() { return isSupported; }
+
+}
diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java b/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java
index 16d16b01d..3a6cb1f25 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java
@@ -36,6 +36,7 @@ public class Settings {
 	public static final boolean DEFAULT_DEBUG_MODE = false;
 	public static final VolumeImpl DEFAULT_PREFERRED_VOLUME_IMPL = System.getProperty("os.name").toLowerCase().contains("windows") ? VolumeImpl.DOKANY : VolumeImpl.FUSE;
 	public static final UiTheme DEFAULT_THEME = UiTheme.LIGHT;
+	public static final KeychainBackend DEFAULT_KEYCHAIN_BACKEND = KeychainBackend.defaultBackend();
 	public static final NodeOrientation DEFAULT_USER_INTERFACE_ORIENTATION = NodeOrientation.LEFT_TO_RIGHT;
 	private static final String DEFAULT_LICENSE_KEY = "";
 
@@ -49,6 +50,7 @@ public class Settings {
 	private final BooleanProperty debugMode = new SimpleBooleanProperty(DEFAULT_DEBUG_MODE);
 	private final ObjectProperty<VolumeImpl> preferredVolumeImpl = new SimpleObjectProperty<>(DEFAULT_PREFERRED_VOLUME_IMPL);
 	private final ObjectProperty<UiTheme> theme = new SimpleObjectProperty<>(DEFAULT_THEME);
+	private final ObjectProperty<KeychainBackend> keychainBackend = new SimpleObjectProperty<>(DEFAULT_KEYCHAIN_BACKEND);
 	private final ObjectProperty<NodeOrientation> userInterfaceOrientation = new SimpleObjectProperty<>(DEFAULT_USER_INTERFACE_ORIENTATION);
 	private final StringProperty licenseKey = new SimpleStringProperty(DEFAULT_LICENSE_KEY);
 
@@ -68,6 +70,7 @@ public class Settings {
 		debugMode.addListener(this::somethingChanged);
 		preferredVolumeImpl.addListener(this::somethingChanged);
 		theme.addListener(this::somethingChanged);
+		keychainBackend.addListener(this::somethingChanged);
 		userInterfaceOrientation.addListener(this::somethingChanged);
 		licenseKey.addListener(this::somethingChanged);
 	}
@@ -128,6 +131,8 @@ public class Settings {
 		return theme;
 	}
 
+	public ObjectProperty<KeychainBackend> keychainBackend() { return keychainBackend; }
+
 	public ObjectProperty<NodeOrientation> userInterfaceOrientation() {
 		return userInterfaceOrientation;
 	}
diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java b/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
index 395034f56..b1ff100c9 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
@@ -38,6 +38,7 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 		out.name("preferredVolumeImpl").value(value.preferredVolumeImpl().get().name());
 		out.name("theme").value(value.theme().get().name());
 		out.name("uiOrientation").value(value.userInterfaceOrientation().get().name());
+		out.name("keychainBackend").value(value.keychainBackend().get().name());
 		out.name("licenseKey").value(value.licenseKey().get());
 		out.endObject();
 	}
@@ -69,6 +70,7 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 				case "preferredVolumeImpl" -> settings.preferredVolumeImpl().set(parsePreferredVolumeImplName(in.nextString()));
 				case "theme" -> settings.theme().set(parseUiTheme(in.nextString()));
 				case "uiOrientation" -> settings.userInterfaceOrientation().set(parseUiOrientation(in.nextString()));
+				case "keychainBackend" -> settings.keychainBackend().set(parseKeychainBackend(in.nextString()));
 				case "licenseKey" -> settings.licenseKey().set(in.nextString());
 				default -> {
 					LOG.warn("Unsupported vault setting found in JSON: " + name);
@@ -108,6 +110,15 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 		}
 	}
 
+	private KeychainBackend parseKeychainBackend(String backendName) {
+		try {
+			return KeychainBackend.valueOf(backendName.toUpperCase());
+		} catch (IllegalArgumentException e) {
+			LOG.warn("Invalid keychain backend {}. Defaulting to {}.", backendName, Settings.DEFAULT_KEYCHAIN_BACKEND);
+			return Settings.DEFAULT_KEYCHAIN_BACKEND;
+		}
+	}
+
 	private NodeOrientation parseUiOrientation(String uiOrientationName) {
 		try {
 			return NodeOrientation.valueOf(uiOrientationName.toUpperCase());
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
index abd50287e..553ce4eab 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
@@ -5,7 +5,7 @@
  *******************************************************************************/
 package org.cryptomator.keychain;
 
-interface KeychainAccessStrategy {
+public interface KeychainAccessStrategy {
 
 	/**
 	 * Associates a passphrase with a given key.
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSystemKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSystemKeychainAccess.java
index e75d387cb..f49ea5d1d 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSystemKeychainAccess.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSystemKeychainAccess.java
@@ -1,9 +1,13 @@
 package org.cryptomator.keychain;
 
+import javafx.beans.property.ObjectProperty;
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.settings.KeychainBackend;
+import org.cryptomator.common.settings.Settings;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import java.util.EnumSet;
 import java.util.Optional;
 
 /**
@@ -16,25 +20,65 @@ public class LinuxSystemKeychainAccess implements KeychainAccessStrategy {
 	// the actual implementation is hidden in this delegate objects which are loaded via reflection,
 	// as it depends on libraries that aren't necessarily available:
 	private final Optional<KeychainAccessStrategy> delegate;
+	private final Settings settings;
+	private static EnumSet<KeychainBackend> availableKeychainBackends = EnumSet.noneOf(KeychainBackend.class);
+	private static KeychainBackend backendActivated = null;
+	private static boolean isGnomeKeyringAvailable;
+	private static boolean isKdeWalletAvailable;
 
 	@Inject
-	public LinuxSystemKeychainAccess() {
+	public LinuxSystemKeychainAccess(Settings settings) {
+		this.settings = settings;
 		this.delegate = constructKeychainAccess();
 	}
 
-	private static Optional<KeychainAccessStrategy> constructKeychainAccess() {
-		try { // is gnome-keyring or kwallet installed?
+	private Optional<KeychainAccessStrategy> constructKeychainAccess() {
+		try { // find out which backends are available
 			Class<?> clazz = Class.forName("org.cryptomator.keychain.LinuxSecretServiceKeychainAccessImpl");
-			KeychainAccessStrategy instance = (KeychainAccessStrategy) clazz.getDeclaredConstructor().newInstance();
-			if (instance.isSupported()) return Optional.of(instance);
+			KeychainAccessStrategy gnomeKeyring = (KeychainAccessStrategy) clazz.getDeclaredConstructor().newInstance();
+			if (gnomeKeyring.isSupported()) {
+				LinuxSystemKeychainAccess.availableKeychainBackends.add(KeychainBackend.GNOME);
+				LinuxSystemKeychainAccess.isGnomeKeyringAvailable = true;
+			}
 			clazz = Class.forName("org.cryptomator.keychain.LinuxKDEWalletKeychainAccessImpl");
-			instance = (KeychainAccessStrategy) clazz.getDeclaredConstructor().newInstance();
-			return Optional.of(instance);
+			KeychainAccessStrategy kdeWallet = (KeychainAccessStrategy) clazz.getDeclaredConstructor().newInstance();
+			if (kdeWallet.isSupported()) {
+				LinuxSystemKeychainAccess.availableKeychainBackends.add(KeychainBackend.KDE);
+				LinuxSystemKeychainAccess.isKdeWalletAvailable = true;
+			}
+
+			// load password backend setting as the preferred backend
+			ObjectProperty<KeychainBackend> pwSetting =  settings.keychainBackend();
+
+			// check for GNOME keyring first, as this gets precedence over
+			// KDE wallet as the former was implemented first
+			if (isGnomeKeyringAvailable && pwSetting.get().equals(KeychainBackend.GNOME)) {
+					pwSetting.setValue(KeychainBackend.GNOME);
+					LinuxSystemKeychainAccess.backendActivated = KeychainBackend.GNOME;
+					return Optional.of(gnomeKeyring);
+			}
+
+			if (isKdeWalletAvailable && pwSetting.get().equals(KeychainBackend.KDE)) {
+					pwSetting.setValue(KeychainBackend.KDE);
+					LinuxSystemKeychainAccess.backendActivated = KeychainBackend.KDE;
+					return Optional.of(kdeWallet);
+			}
+			return Optional.empty();
 		} catch (Exception e) {
 			return Optional.empty();
 		}
 	}
 
+	/* Getter/Setter */
+
+	public static EnumSet<KeychainBackend> getAvailableKeychainBackends() {
+		return availableKeychainBackends;
+	}
+
+	public static KeychainBackend getBackendActivated() {
+		return backendActivated;
+	}
+
 	@Override
 	public boolean isSupported() {
 		return SystemUtils.IS_OS_LINUX && delegate.map(KeychainAccessStrategy::isSupported).orElse(false);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index 3cf94d22e..0cdfd4a5a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -13,16 +13,22 @@ import javafx.scene.control.RadioButton;
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
 import javafx.util.StringConverter;
+import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.LicenseHolder;
+import org.cryptomator.common.settings.KeychainBackend;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
+import org.cryptomator.keychain.KeychainAccessStrategy;
+import org.cryptomator.keychain.LinuxSystemKeychainAccess;
 import org.cryptomator.ui.common.FxController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import java.util.Arrays;
+import java.util.EnumSet;
 import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.concurrent.ExecutorService;
@@ -41,7 +47,9 @@ public class GeneralPreferencesController implements FxController {
 	private final ResourceBundle resourceBundle;
 	private final Application application;
 	private final Environment environment;
+	private Optional<KeychainAccessStrategy> keychain;
 	public ChoiceBox<UiTheme> themeChoiceBox;
+	public ChoiceBox<KeychainBackend> keychainBackendChoiceBox;
 	public CheckBox startHiddenCheckbox;
 	public CheckBox debugModeCheckbox;
 	public CheckBox autoStartCheckbox;
@@ -50,10 +58,11 @@ public class GeneralPreferencesController implements FxController {
 	public RadioButton nodeOrientationRtl;
 
 	@Inject
-	GeneralPreferencesController(Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment) {
+	GeneralPreferencesController(Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, Optional<KeychainAccessStrategy> keychain, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment) {
 		this.settings = settings;
 		this.trayMenuSupported = trayMenuSupported;
 		this.autoStartStrategy = autoStartStrategy;
+		this.keychain = keychain;
 		this.selectedTabProperty = selectedTabProperty;
 		this.licenseHolder = licenseHolder;
 		this.executor = executor;
@@ -84,6 +93,16 @@ public class GeneralPreferencesController implements FxController {
 		nodeOrientationLtr.setSelected(settings.userInterfaceOrientation().get() == NodeOrientation.LEFT_TO_RIGHT);
 		nodeOrientationRtl.setSelected(settings.userInterfaceOrientation().get() == NodeOrientation.RIGHT_TO_LEFT);
 		nodeOrientation.selectedToggleProperty().addListener(this::toggleNodeOrientation);
+
+		keychainBackendChoiceBox.getItems().addAll(getAvailableBackends());
+		if (keychain.isPresent() && SystemUtils.IS_OS_LINUX) {
+			keychainBackendChoiceBox.setValue(LinuxSystemKeychainAccess.getBackendActivated());
+		}
+		if (keychain.isPresent() && (SystemUtils.IS_OS_MAC || SystemUtils.IS_OS_WINDOWS)) {
+			keychainBackendChoiceBox.setValue(Arrays.stream(KeychainBackend.supportedBackends()).findFirst().orElseThrow(IllegalStateException::new));
+		}
+		keychainBackendChoiceBox.setConverter(new KeychainBackendConverter(resourceBundle));
+		keychainBackendChoiceBox.valueProperty().bindBidirectional(settings.keychainBackend());
 	}
 
 	public boolean isTrayMenuSupported() {
@@ -153,6 +172,25 @@ public class GeneralPreferencesController implements FxController {
 		}
 	}
 
+	private static class KeychainBackendConverter extends StringConverter<KeychainBackend> {
+
+		private final ResourceBundle resourceBundle;
+
+		KeychainBackendConverter(ResourceBundle resourceBundle) {
+			this.resourceBundle = resourceBundle;
+		}
+
+		@Override
+		public String toString(KeychainBackend impl) {
+			return resourceBundle.getString(impl.getDisplayName());
+		}
+
+		@Override
+		public KeychainBackend fromString(String string) {
+			throw new UnsupportedOperationException();
+		}
+	}
+
 	private static class ToggleAutoStartTask extends Task<Void> {
 
 		private final AutoStartStrategy autoStart;
@@ -176,4 +214,17 @@ public class GeneralPreferencesController implements FxController {
 		}
 	}
 
+	private KeychainBackend[] getAvailableBackends() {
+		if (!keychain.isPresent()) {
+			return new KeychainBackend[]{};
+		}
+		if (SystemUtils.IS_OS_LINUX) {
+			EnumSet<KeychainBackend> backends = LinuxSystemKeychainAccess.getAvailableKeychainBackends();
+			return backends.toArray(KeychainBackend[]::new);
+		}
+		if (SystemUtils.IS_OS_MAC || SystemUtils.IS_OS_WINDOWS) {
+			return KeychainBackend.supportedBackends();
+		}
+		return new KeychainBackend[]{};
+	}
 }
diff --git a/main/ui/src/main/resources/fxml/preferences_general.fxml b/main/ui/src/main/resources/fxml/preferences_general.fxml
index e3ace69f6..0e19ac470 100644
--- a/main/ui/src/main/resources/fxml/preferences_general.fxml
+++ b/main/ui/src/main/resources/fxml/preferences_general.fxml
@@ -39,6 +39,11 @@
 			<Hyperlink styleClass="hyperlink-underline" text="%preferences.general.debugDirectory" onAction="#showLogfileDirectory"/>
 		</HBox>
 
+		<HBox spacing="6" alignment="CENTER_LEFT">
+			<Label text="%preferences.general.keychainBackend"/>
+			<ChoiceBox fx:id="keychainBackendChoiceBox"/>
+		</HBox>
+
 		<CheckBox fx:id="autoStartCheckbox" text="%preferences.general.autoStart" visible="${controller.autoStartSupported}" managed="${controller.autoStartSupported}" onAction="#toggleAutoStart"/>
 	</children>
 </VBox>
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 18208a9bb..c92e5fa1f 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -143,6 +143,11 @@ preferences.general.startHidden=Hide window when starting Cryptomator
 preferences.general.debugLogging=Enable debug logging
 preferences.general.debugDirectory=Reveal log files
 preferences.general.autoStart=Launch Cryptomator on system start
+preferences.general.keychainBackend=Password backend
+preferences.general.keychainBackend.gnome=Gnome Keyring
+preferences.general.keychainBackend.kde=KDE KWallet
+preferences.general.keychainBackend.macSystemKeychain=macOS Keychain Access
+preferences.general.keychainBackend.winSystemKeychain=Windows Data Protection Keychain
 preferences.general.interfaceOrientation=Interface Orientation
 preferences.general.interfaceOrientation.ltr=Left to Right
 preferences.general.interfaceOrientation.rtl=Right to Left

From 2720a999d190978fa2db649e4b5f35c1f88d3320 Mon Sep 17 00:00:00 2001
From: JaniruTEC <52893617+JaniruTEC@users.noreply.github.com>
Date: Mon, 2 Nov 2020 08:45:41 +0100
Subject: [PATCH 140/169] Updated codestyle (#1388)

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
---
 .idea/codeStyles/Project.xml                  |  26 ++-
 main/buildkit/assembly-linux.xml              |   2 +-
 main/buildkit/assembly-mac.xml                |   2 +-
 main/buildkit/assembly-win.xml                |   2 +-
 main/buildkit/pom.xml                         |   2 +-
 main/commons/pom.xml                          |   2 +-
 .../org/cryptomator/common/CommonsModule.java |   6 +-
 .../cryptomator/common/LazyInitializer.java   |   8 +-
 .../org/cryptomator/common/LicenseHolder.java |   8 +-
 .../cryptomator/common/SemVerComparator.java  |   4 +-
 .../cryptomator/common/settings/Settings.java |   5 +-
 .../common/settings/SettingsJsonAdapter.java  |   2 +-
 .../common/settings/VaultSettings.java        |   5 +-
 .../common/settings/WebDavUrlScheme.java      |   3 +-
 .../common/vaults/AbstractVolume.java         |   2 +-
 .../common/vaults/DefaultMountFlags.java      |   1 +
 .../org/cryptomator/common/vaults/Vault.java  |  10 +-
 .../common/vaults/VaultComponent.java         |   3 +-
 .../vaults/VaultListChangeListener.java       |   6 +-
 .../common/vaults/VaultListManager.java       |   4 +-
 .../common/vaults/VaultModule.java            |  12 +-
 .../cryptomator/common/vaults/VaultState.java |   2 +-
 .../cryptomator/common/vaults/VaultStats.java |  12 +-
 .../org/cryptomator/common/vaults/Volume.java |   1 +
 .../cryptomator/common/EnvironmentTest.java   |   8 +-
 .../common/LicenseCheckerTest.java            |   7 +-
 .../settings/SettingsJsonAdapterTest.java     |   8 +-
 .../VaultSettingsJsonAdapterTest.java         |   2 +-
 .../common/vaults/VaultModuleTest.java        |   8 +-
 main/keychain/pom.xml                         |   2 +-
 .../keychain/KeychainAccessException.java     |   2 +-
 .../cryptomator/keychain/KeychainManager.java |  10 +-
 .../cryptomator/keychain/KeychainModule.java  |   4 +-
 .../LinuxKDEWalletKeychainAccessImpl.java     | 210 +++++++++---------
 .../LinuxSecretServiceKeychainAccessImpl.java |   3 +-
 .../keychain/MacSystemKeychainAccess.java     |   9 +-
 .../keychain/KeychainManagerTest.java         |  16 +-
 main/keychain/src/test/resources/log4j2.xml   |  14 +-
 main/launcher/pom.xml                         |   2 +-
 .../launcher/CryptomatorModule.java           |   2 +-
 .../launcher/FileOpenRequestHandler.java      |   3 +-
 .../cryptomator/launcher/IpcProtocolImpl.java |   1 -
 .../org/cryptomator/logging/DebugMode.java    |   2 +-
 .../logging/LaunchBasedTriggeringPolicy.java  |   4 +-
 .../logging/LoggerConfiguration.java          |   2 +-
 .../cryptomator/launcher/IpcFactoryTest.java  |   4 +-
 main/pom.xml                                  |   2 +-
 main/ui/pom.xml                               |  10 +-
 main/ui/src/license/template.ftl              |  20 +-
 .../ui/addvaultwizard/AddVaultModule.java     |  20 +-
 .../AddVaultSuccessController.java            |   8 +-
 .../AddVaultWelcomeController.java            |   4 +-
 .../AddVaultWizardComponent.java              |   5 +-
 .../ChooseExistingVaultController.java        |  12 +-
 .../CreateNewVaultLocationController.java     |  20 +-
 .../CreateNewVaultNameController.java         |  12 +-
 .../CreateNewVaultPasswordController.java     |  26 +--
 .../CreateNewVaultRecoveryKeyController.java  |   6 +-
 .../ui/addvaultwizard/LocationPresets.java    |   3 +-
 .../ui/addvaultwizard/ReadmeGenerator.java    |  18 +-
 .../ChangePasswordComponent.java              |   4 +-
 .../ChangePasswordController.java             |  14 +-
 .../changepassword/ChangePasswordModule.java  |  17 +-
 .../org/cryptomator/ui/common/Animations.java |   2 +-
 .../ui/common/DefaultSceneFactory.java        |  10 +-
 .../cryptomator/ui/common/ErrorComponent.java |   4 +-
 .../ui/common/ErrorController.java            |   9 +-
 .../cryptomator/ui/common/ErrorModule.java    |   2 +-
 .../ui/common/FXMLLoaderFactory.java          |   3 +-
 .../org/cryptomator/ui/common/FontLoader.java |   2 +-
 .../cryptomator/ui/common/FxController.java   |   1 +
 .../ui/common/FxControllerKey.java            |   1 +
 .../org/cryptomator/ui/common/FxmlFile.java   |   2 +-
 .../ui/common/NewPasswordController.java      |   6 +-
 .../cryptomator/ui/common/StageFactory.java   |   5 +-
 .../java/org/cryptomator/ui/common/Tasks.java |   6 +-
 .../ui/common/UserInteractionLock.java        |   9 +-
 .../cryptomator/ui/common/VaultService.java   |   2 +-
 .../ui/controls/AlphanumericTextField.java    |   1 -
 .../ui/controls/DraggableListCell.java        |  10 +-
 .../ui/controls/FontAwesome5IconView.java     |  20 +-
 .../ui/controls/FormattedString.java          |   2 +-
 .../ui/controls/NumericTextField.java         |   1 -
 .../controls/PasswordStrengthIndicator.java   |   9 +-
 .../ui/controls/SecurePasswordField.java      |   2 +-
 .../ForgetPasswordComponent.java              |   6 +-
 .../ForgetPasswordController.java             |   6 +-
 .../forgetPassword/ForgetPasswordModule.java  |  16 +-
 .../cryptomator/ui/fxapp/FxApplication.java   |  14 +-
 .../ui/fxapp/FxApplicationComponent.java      |   2 +-
 .../ui/fxapp/FxApplicationModule.java         |  12 +-
 .../cryptomator/ui/fxapp/UpdateChecker.java   |  14 +-
 .../ui/fxapp/UpdateCheckerModule.java         |  12 +-
 .../ui/fxapp/UpdateCheckerTask.java           |   2 +-
 .../ui/launcher/AppLaunchEvent.java           |   6 +-
 .../ui/launcher/AppLaunchEventHandler.java    |   8 +-
 .../ui/launcher/AppLifecycleListener.java     |   6 +-
 .../ui/launcher/FxApplicationStarter.java     |   2 +-
 .../cryptomator/ui/launcher/UiLauncher.java   |   2 +-
 .../ui/launcher/UiLauncherModule.java         |   1 -
 .../ui/mainwindow/MainWindowComponent.java    |   5 +-
 .../ui/mainwindow/MainWindowController.java   |  18 +-
 .../ui/mainwindow/MainWindowModule.java       |  14 +-
 .../ui/mainwindow/MainWindowSceneFactory.java |  10 +-
 .../mainwindow/MainWindowTitleController.java |  10 +-
 .../ui/mainwindow/ResizeController.java       |   6 +-
 .../ui/mainwindow/VaultDetailController.java  |  10 +-
 .../VaultDetailLockedController.java          |  12 +-
 .../VaultDetailMissingVaultController.java    |   8 +-
 .../VaultDetailNeedsMigrationController.java  |   6 +-
 .../VaultDetailUnknownErrorController.java    |   4 +-
 .../VaultDetailUnlockedController.java        |   6 +-
 .../mainwindow/VaultListCellController.java   |   8 +-
 .../ui/mainwindow/VaultListCellFactory.java   |  12 +-
 .../ui/mainwindow/VaultListController.java    |  14 +-
 .../ui/mainwindow/WelcomeController.java      |  14 +-
 .../MigrationCapabilityErrorController.java   |  14 +-
 .../ui/migration/MigrationComponent.java      |   5 +-
 .../MigrationImpossibleController.java        |   4 +-
 .../ui/migration/MigrationModule.java         |  14 +-
 .../ui/migration/MigrationRunController.java  |  26 +--
 .../migration/MigrationStartController.java   |   6 +-
 .../migration/MigrationSuccessController.java |   4 +-
 .../ui/preferences/AutoStartStrategy.java     |   2 +-
 .../DonationKeyPreferencesController.java     |   8 +-
 .../GeneralPreferencesController.java         |  27 +--
 .../ui/preferences/PreferencesComponent.java  |   5 +-
 .../ui/preferences/PreferencesController.java |  12 +-
 .../ui/preferences/PreferencesModule.java     |  11 +-
 .../UpdatesPreferencesController.java         |  12 +-
 .../VolumePreferencesController.java          |  14 +-
 .../cryptomator/ui/quit/QuitComponent.java    |   4 +-
 .../cryptomator/ui/quit/QuitController.java   |  12 +-
 .../org/cryptomator/ui/quit/QuitModule.java   |  12 +-
 .../ui/recoverykey/AutoCompleter.java         |   4 +-
 .../ui/recoverykey/RecoveryKeyComponent.java  |   6 +-
 .../RecoveryKeyCreationController.java        |  10 +-
 .../RecoveryKeyDisplayController.java         |  12 +-
 .../ui/recoverykey/RecoveryKeyFactory.java    |  10 +-
 .../ui/recoverykey/RecoveryKeyModule.java     |  18 +-
 .../RecoveryKeyRecoverController.java         |  12 +-
 .../RecoveryKeyResetPasswordController.java   |  24 +-
 .../RecoveryKeySuccessController.java         |   4 +-
 .../ui/recoverykey/WordEncoder.java           |  29 +--
 .../ui/removevault/RemoveVaultComponent.java  |   5 +-
 .../ui/removevault/RemoveVaultController.java |   6 +-
 .../ui/removevault/RemoveVaultModule.java     |  12 +-
 .../ui/traymenu/TrayMenuController.java       |   6 +-
 .../ui/unlock/UnlockComponent.java            |   2 +-
 .../ui/unlock/UnlockController.java           |  46 ++--
 .../UnlockInvalidMountPointController.java    |   6 +-
 .../cryptomator/ui/unlock/UnlockModule.java   |  11 +-
 .../ui/unlock/UnlockSuccessController.java    |  16 +-
 .../cryptomator/ui/unlock/UnlockWorkflow.java |  10 +-
 .../GeneralVaultOptionsController.java        |  13 +-
 .../MasterkeyOptionsController.java           |  10 +-
 .../vaultoptions/MountOptionsController.java  |  20 +-
 .../vaultoptions/VaultOptionsComponent.java   |   5 +-
 .../ui/vaultoptions/VaultOptionsModule.java   |   6 +-
 .../WrongFileAlertComponent.java              |   5 +-
 .../WrongFileAlertController.java             |   8 +-
 .../wrongfilealert/WrongFileAlertModule.java  |   9 +-
 main/ui/src/main/resources/css/dark_theme.css |  44 ++--
 .../ui/src/main/resources/css/light_theme.css |  40 ++--
 .../resources/fxml/addvault_existing.fxml     |   4 +-
 .../resources/fxml/addvault_new_location.fxml |   6 +-
 .../resources/fxml/addvault_new_name.fxml     |   6 +-
 .../resources/fxml/addvault_new_password.fxml |  10 +-
 .../fxml/addvault_new_recoverykey.fxml        |   4 +-
 .../main/resources/fxml/addvault_success.fxml |   8 +-
 .../main/resources/fxml/addvault_welcome.fxml |   6 +-
 .../main/resources/fxml/changepassword.fxml   |  10 +-
 main/ui/src/main/resources/fxml/error.fxml    |  16 +-
 .../main/resources/fxml/forget_password.fxml  |   6 +-
 .../src/main/resources/fxml/main_window.fxml  |   8 +-
 .../resources/fxml/main_window_resize.fxml    |   4 +-
 .../resources/fxml/main_window_title.fxml     |   6 +-
 .../fxml/migration_capability_error.fxml      |   6 +-
 .../resources/fxml/migration_impossible.fxml  |   6 +-
 .../main/resources/fxml/migration_run.fxml    |   8 +-
 .../main/resources/fxml/migration_start.fxml  |  10 +-
 .../resources/fxml/migration_success.fxml     |   8 +-
 .../src/main/resources/fxml/new_password.fxml |  10 +-
 .../src/main/resources/fxml/preferences.fxml  |   6 +-
 .../resources/fxml/preferences_about.fxml     |   6 +-
 .../fxml/preferences_donationkey.fxml         |  12 +-
 .../resources/fxml/preferences_general.fxml   |   4 +-
 .../resources/fxml/preferences_updates.fxml   |  10 +-
 .../resources/fxml/preferences_volume.fxml    |   6 +-
 main/ui/src/main/resources/fxml/quit.fxml     |   6 +-
 .../resources/fxml/recoverykey_create.fxml    |  10 +-
 .../resources/fxml/recoverykey_display.fxml   |   8 +-
 .../resources/fxml/recoverykey_recover.fxml   |  18 +-
 .../fxml/recoverykey_reset_password.fxml      |   6 +-
 .../resources/fxml/recoverykey_success.fxml   |   6 +-
 .../src/main/resources/fxml/remove_vault.fxml |   6 +-
 main/ui/src/main/resources/fxml/unlock.fxml   |   8 +-
 .../fxml/unlock_invalid_mount_point.fxml      |   8 +-
 .../main/resources/fxml/unlock_success.fxml   |  10 +-
 .../src/main/resources/fxml/vault_detail.fxml |   6 +-
 .../resources/fxml/vault_detail_locked.fxml   |   6 +-
 .../resources/fxml/vault_detail_missing.fxml  |   6 +-
 .../fxml/vault_detail_needsmigration.fxml     |   6 +-
 .../fxml/vault_detail_unknownerror.fxml       |   4 +-
 .../resources/fxml/vault_detail_unlocked.fxml |   8 +-
 .../resources/fxml/vault_detail_welcome.fxml  |   4 +-
 .../src/main/resources/fxml/vault_list.fxml   |   6 +-
 .../main/resources/fxml/vault_list_cell.fxml  |   6 +-
 .../main/resources/fxml/vault_options.fxml    |   6 +-
 .../resources/fxml/vault_options_general.fxml |   4 +-
 .../fxml/vault_options_masterkey.fxml         |   9 +-
 .../resources/fxml/vault_options_mount.fxml   |   7 +-
 .../main/resources/fxml/wrongfilealert.fxml   |   6 +-
 .../ui/common/PasswordStrengthUtilTest.java   |   2 +-
 .../ui/controls/SecurePasswordFieldTest.java  |   2 +-
 .../ui/recoverykey/AutoCompleterTest.java     |   2 +-
 .../recoverykey/RecoveryKeyFactoryTest.java   |  16 +-
 217 files changed, 999 insertions(+), 1009 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0c9e1cbd8..d361191e8 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -9,14 +9,36 @@
     <option name="RIGHT_MARGIN" value="220" />
     <option name="FORMATTER_TAGS_ENABLED" value="true" />
     <JavaCodeStyleSettings>
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="30" />
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="10" />
       <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
         <value />
       </option>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <package name="javafx" withSubpackages="true" static="false" />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="true" />
+        </value>
+      </option>
       <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
       <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
     </JavaCodeStyleSettings>
+    <Properties>
+      <option name="KEEP_BLANK_LINES" value="true" />
+    </Properties>
+    <XML>
+      <option name="XML_ATTRIBUTE_WRAP" value="0" />
+    </XML>
+    <codeStyleSettings language="CSS">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
     <codeStyleSettings language="Groovy">
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />
@@ -30,9 +52,11 @@
     <codeStyleSettings language="JAVA">
       <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="ENUM_CONSTANTS_WRAP" value="2" />
       <indentOptions>
         <option name="USE_TAB_CHARACTER" value="true" />
       </indentOptions>
diff --git a/main/buildkit/assembly-linux.xml b/main/buildkit/assembly-linux.xml
index b618c7d15..5d8bfc785 100644
--- a/main/buildkit/assembly-linux.xml
+++ b/main/buildkit/assembly-linux.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
 		  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
 	<id>tarball</id>
 	<includeBaseDirectory>false</includeBaseDirectory>
diff --git a/main/buildkit/assembly-mac.xml b/main/buildkit/assembly-mac.xml
index 3b1bf9666..c9057dcdd 100644
--- a/main/buildkit/assembly-mac.xml
+++ b/main/buildkit/assembly-mac.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
 		  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
 	<id>tarball</id>
 	<includeBaseDirectory>false</includeBaseDirectory>
diff --git a/main/buildkit/assembly-win.xml b/main/buildkit/assembly-win.xml
index 928994c5f..2e81782b3 100644
--- a/main/buildkit/assembly-win.xml
+++ b/main/buildkit/assembly-win.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<assembly xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/ASSEMBLY/2.0.0"
 		  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
 	<id>tarball</id>
 	<includeBaseDirectory>false</includeBaseDirectory>
diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml
index 705138204..23059eb4a 100644
--- a/main/buildkit/pom.xml
+++ b/main/buildkit/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.cryptomator</groupId>
diff --git a/main/commons/pom.xml b/main/commons/pom.xml
index a6d00c2db..1927a4889 100644
--- a/main/commons/pom.xml
+++ b/main/commons/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.cryptomator</groupId>
diff --git a/main/commons/src/main/java/org/cryptomator/common/CommonsModule.java b/main/commons/src/main/java/org/cryptomator/common/CommonsModule.java
index 93e0d3d44..5ace6a3e2 100644
--- a/main/commons/src/main/java/org/cryptomator/common/CommonsModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/CommonsModule.java
@@ -8,9 +8,6 @@ package org.cryptomator.common;
 import com.tobiasdiez.easybind.EasyBind;
 import dagger.Module;
 import dagger.Provides;
-import javafx.beans.binding.Binding;
-import javafx.beans.binding.Bindings;
-import javafx.collections.ObservableList;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.SettingsProvider;
@@ -23,6 +20,9 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Named;
 import javax.inject.Singleton;
+import javafx.beans.binding.Binding;
+import javafx.beans.binding.Bindings;
+import javafx.collections.ObservableList;
 import java.net.InetSocketAddress;
 import java.util.Comparator;
 import java.util.concurrent.ExecutorService;
diff --git a/main/commons/src/main/java/org/cryptomator/common/LazyInitializer.java b/main/commons/src/main/java/org/cryptomator/common/LazyInitializer.java
index d58d5af36..7bca69457 100644
--- a/main/commons/src/main/java/org/cryptomator/common/LazyInitializer.java
+++ b/main/commons/src/main/java/org/cryptomator/common/LazyInitializer.java
@@ -5,12 +5,12 @@
  *******************************************************************************/
 package org.cryptomator.common;
 
+import com.google.common.base.Throwables;
+
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Supplier;
 import java.util.function.UnaryOperator;
 
-import com.google.common.base.Throwables;
-
 public final class LazyInitializer {
 
 	private LazyInitializer() {
@@ -18,7 +18,7 @@ public final class LazyInitializer {
 
 	/**
 	 * Same as {@link #initializeLazily(AtomicReference, SupplierThrowingException, Class)} except that no checked exception may be thrown by the factory function.
-	 * 
+	 *
 	 * @param <T> Type of the value
 	 * @param reference A reference to a maybe not yet initialized value.
 	 * @param factory A factory providing a value for the reference, if it doesn't exist yet. The factory may be invoked multiple times, but only one result will survive.
@@ -31,7 +31,7 @@ public final class LazyInitializer {
 
 	/**
 	 * Threadsafe lazy initialization pattern as proposed on http://stackoverflow.com/a/30247202/4014509
-	 * 
+	 *
 	 * @param <T> Type of the value
 	 * @param <E> Type of the any expected exception that may occur during initialization
 	 * @param reference A reference to a maybe not yet initialized value.
diff --git a/main/commons/src/main/java/org/cryptomator/common/LicenseHolder.java b/main/commons/src/main/java/org/cryptomator/common/LicenseHolder.java
index 70d439afe..a31807a8d 100644
--- a/main/commons/src/main/java/org/cryptomator/common/LicenseHolder.java
+++ b/main/commons/src/main/java/org/cryptomator/common/LicenseHolder.java
@@ -1,15 +1,15 @@
 package org.cryptomator.common;
 
 import com.auth0.jwt.interfaces.DecodedJWT;
+import org.cryptomator.common.settings.Settings;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.StringBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import org.cryptomator.common.settings.Settings;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
 import java.util.Optional;
 
 @Singleton
diff --git a/main/commons/src/main/java/org/cryptomator/common/SemVerComparator.java b/main/commons/src/main/java/org/cryptomator/common/SemVerComparator.java
index 96588e6b5..e0ff9ae25 100644
--- a/main/commons/src/main/java/org/cryptomator/common/SemVerComparator.java
+++ b/main/commons/src/main/java/org/cryptomator/common/SemVerComparator.java
@@ -8,10 +8,10 @@
  *******************************************************************************/
 package org.cryptomator.common;
 
-import java.util.Comparator;
-
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Comparator;
+
 /**
  * Compares version strings according to <a href="http://semver.org/spec/v2.0.0.html">SemVer 2.0.0</a>.
  */
diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java b/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java
index 3a6cb1f25..22b42628d 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java
@@ -20,7 +20,6 @@ import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.geometry.NodeOrientation;
-
 import java.util.function.Consumer;
 
 public class Settings {
@@ -78,7 +77,7 @@ public class Settings {
 	void setSaveCmd(Consumer<Settings> saveCmd) {
 		this.saveCmd = saveCmd;
 	}
-	
+
 	private void somethingChanged(@SuppressWarnings("unused") Observable observable) {
 		this.save();
 	}
@@ -102,7 +101,7 @@ public class Settings {
 	public BooleanProperty checkForUpdates() {
 		return checkForUpdates;
 	}
-	
+
 	public BooleanProperty startHidden() {
 		return startHidden;
 	}
diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java b/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
index b1ff100c9..3b06b8a0b 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java
@@ -9,10 +9,10 @@ import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
-import javafx.geometry.NodeOrientation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javafx.geometry.NodeOrientation;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
index 2a90b969b..c99da6325 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java
@@ -7,7 +7,8 @@ package org.cryptomator.common.settings;
 
 import com.google.common.base.Strings;
 import com.google.common.io.BaseEncoding;
-import com.tobiasdiez.easybind.EasyBind;
+import org.apache.commons.lang3.StringUtils;
+
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.StringBinding;
@@ -19,8 +20,6 @@ import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import org.apache.commons.lang3.StringUtils;
-
 import java.nio.file.Path;
 import java.util.Objects;
 import java.util.Optional;
diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/WebDavUrlScheme.java b/main/commons/src/main/java/org/cryptomator/common/settings/WebDavUrlScheme.java
index 0dcb4ac9d..a72d11968 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/WebDavUrlScheme.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/WebDavUrlScheme.java
@@ -7,7 +7,8 @@ public enum WebDavUrlScheme {
 	private final String prefix;
 	private final String displayName;
 
-	WebDavUrlScheme(String prefix, String displayName) {this.prefix = prefix;
+	WebDavUrlScheme(String prefix, String displayName) {
+		this.prefix = prefix;
 		this.displayName = displayName;
 	}
 
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
index 738118608..91c6e22e4 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/AbstractVolume.java
@@ -27,7 +27,7 @@ public abstract class AbstractVolume implements Volume {
 	protected Path determineMountPoint() throws InvalidMountPointException {
 		SortedSet<MountPointChooser> checkedChoosers = new TreeSet<>(); //Natural order
 		for (MountPointChooser chooser : this.choosers) {
-			if(!chooser.isApplicable(this)) {
+			if (!chooser.isApplicable(this)) {
 				continue;
 			}
 
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/DefaultMountFlags.java b/main/commons/src/main/java/org/cryptomator/common/vaults/DefaultMountFlags.java
index ea2cdfa0a..68b61688b 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/DefaultMountFlags.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/DefaultMountFlags.java
@@ -10,4 +10,5 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 @Documented
 @Retention(RUNTIME)
 public @interface DefaultMountFlags {
+
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
index 90e099ae0..aa9a021a9 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
@@ -9,11 +9,6 @@
 package org.cryptomator.common.vaults;
 
 import com.google.common.base.Strings;
-import javafx.beans.Observable;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.binding.StringBinding;
-import javafx.beans.property.ObjectProperty;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.LazyInitializer;
 import org.cryptomator.common.mountpoint.InvalidMountPointException;
@@ -33,6 +28,11 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Provider;
+import javafx.beans.Observable;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.binding.StringBinding;
+import javafx.beans.property.ObjectProperty;
 import java.io.IOException;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultComponent.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultComponent.java
index 8d6baf1a3..debfab3ed 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultComponent.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultComponent.java
@@ -6,11 +6,10 @@
 package org.cryptomator.common.vaults;
 
 import dagger.BindsInstance;
+import dagger.Subcomponent;
 import org.cryptomator.common.mountpoint.MountPointChooserModule;
 import org.cryptomator.common.settings.VaultSettings;
 
-import dagger.Subcomponent;
-
 import javax.annotation.Nullable;
 import javax.inject.Named;
 
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListChangeListener.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListChangeListener.java
index 147d6cc45..a7e422115 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListChangeListener.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListChangeListener.java
@@ -1,9 +1,9 @@
 package org.cryptomator.common.vaults;
 
+import org.cryptomator.common.settings.VaultSettings;
+
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import org.cryptomator.common.settings.VaultSettings;
-
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -20,7 +20,7 @@ class VaultListChangeListener implements ListChangeListener<Vault> {
 
 	@Override
 	public void onChanged(Change<? extends Vault> c) {
-		while(c.next()) {
+		while (c.next()) {
 			if (c.wasAdded()) {
 				List<VaultSettings> addedSettings = c.getAddedSubList().stream().map(Vault::getVaultSettings).collect(Collectors.toList());
 				vaultSettingsList.addAll(c.getFrom(), addedSettings);
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
index a670acab5..984008ba9 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
@@ -8,8 +8,6 @@
  *******************************************************************************/
 package org.cryptomator.common.vaults;
 
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.cryptofs.CryptoFileSystemProvider;
@@ -19,6 +17,8 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import java.io.IOException;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
index 39ac77f78..4844143a3 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultModule.java
@@ -7,12 +7,6 @@ package org.cryptomator.common.vaults;
 
 import dagger.Module;
 import dagger.Provides;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.StringBinding;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VaultSettings;
@@ -23,6 +17,12 @@ import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nullable;
 import javax.inject.Named;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.StringBinding;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultState.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultState.java
index a25ce59fa..fa5e6c295 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultState.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultState.java
@@ -2,7 +2,7 @@ package org.cryptomator.common.vaults;
 
 public enum VaultState {
 	/**
-	 * No vault found at the provided path 
+	 * No vault found at the provided path
 	 */
 	MISSING,
 
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
index c23682008..46ffe28be 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultStats.java
@@ -1,5 +1,11 @@
 package org.cryptomator.common.vaults;
 
+import org.cryptomator.cryptofs.CryptoFileSystem;
+import org.cryptomator.cryptofs.CryptoFileSystemStats;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
 import javafx.application.Platform;
 import javafx.beans.Observable;
 import javafx.beans.property.LongProperty;
@@ -8,12 +14,6 @@ import javafx.beans.property.SimpleLongProperty;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
 import javafx.util.Duration;
-import org.cryptomator.cryptofs.CryptoFileSystem;
-import org.cryptomator.cryptofs.CryptoFileSystemStats;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java
index 58fce712a..624efea13 100644
--- a/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java
+++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Volume.java
@@ -23,6 +23,7 @@ public interface Volume {
 
 	/**
 	 * Gets the coresponding enum type of the {@link VolumeImpl volume implementation ("VolumeImpl")} that is implemented by this Volume.
+	 *
 	 * @return the type of implementation as defined by the {@link VolumeImpl VolumeImpl enum}
 	 */
 	VolumeImpl getImplementationType();
diff --git a/main/commons/src/test/java/org/cryptomator/common/EnvironmentTest.java b/main/commons/src/test/java/org/cryptomator/common/EnvironmentTest.java
index cd8514397..3d3464191 100644
--- a/main/commons/src/test/java/org/cryptomator/common/EnvironmentTest.java
+++ b/main/commons/src/test/java/org/cryptomator/common/EnvironmentTest.java
@@ -37,7 +37,7 @@ class EnvironmentTest {
 
 		List<Path> result = env.getSettingsPath().collect(Collectors.toList());
 		MatcherAssert.assertThat(result, Matchers.hasSize(2));
-		MatcherAssert.assertThat(result, Matchers.contains(Paths.get("/home/testuser/.config/Cryptomator/settings.json"),
+		MatcherAssert.assertThat(result, Matchers.contains(Paths.get("/home/testuser/.config/Cryptomator/settings.json"), //
 				Paths.get("/home/testuser/.Cryptomator/settings.json")));
 	}
 
@@ -48,7 +48,7 @@ class EnvironmentTest {
 
 		List<Path> result = env.getIpcPortPath().collect(Collectors.toList());
 		MatcherAssert.assertThat(result, Matchers.hasSize(2));
-		MatcherAssert.assertThat(result, Matchers.contains(Paths.get("/home/testuser/.config/Cryptomator/ipcPort.bin"),
+		MatcherAssert.assertThat(result, Matchers.contains(Paths.get("/home/testuser/.config/Cryptomator/ipcPort.bin"), //
 				Paths.get("/home/testuser/.Cryptomator/ipcPort.bin")));
 	}
 
@@ -123,8 +123,8 @@ class EnvironmentTest {
 			List<Path> result = env.getPaths("test.path.property").collect(Collectors.toList());
 
 			MatcherAssert.assertThat(result, Matchers.hasSize(3));
-			MatcherAssert.assertThat(result, Matchers.contains(Paths.get("/home/testuser/test"),
-					Paths.get("/home/testuser/test2"),
+			MatcherAssert.assertThat(result, Matchers.contains(Paths.get("/home/testuser/test"), //
+					Paths.get("/home/testuser/test2"), //
 					Paths.get("/foo/bar/test")));
 		}
 
diff --git a/main/commons/src/test/java/org/cryptomator/common/LicenseCheckerTest.java b/main/commons/src/test/java/org/cryptomator/common/LicenseCheckerTest.java
index 5ae8f0fb9..6bb4befb4 100644
--- a/main/commons/src/test/java/org/cryptomator/common/LicenseCheckerTest.java
+++ b/main/commons/src/test/java/org/cryptomator/common/LicenseCheckerTest.java
@@ -1,7 +1,6 @@
 package org.cryptomator.common;
 
 import com.auth0.jwt.interfaces.DecodedJWT;
-import org.cryptomator.common.LicenseChecker;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -14,7 +13,7 @@ class LicenseCheckerTest {
 			+ "PDZ0VEnsaUFLEYpTzb90nITtJUcPUbvOsdZIZ1Q8fnbquAYgxXL5UgHMoywAib47" //
 			+ "6MkyyYgPk0BXZq3mq4zImTRNuaU9slj9TVJ3ScT3L1bXwVuPJDzpr5GOFpaj+WwM" //
 			+ "Al8G7CqwoJOsW7Kddns=";
-	
+
 	private LicenseChecker licenseChecker;
 
 	@BeforeEach
@@ -25,9 +24,9 @@ class LicenseCheckerTest {
 	@Test
 	public void testCheckValidLicense() {
 		String license = "eyJhbGciOiJFUzUxMiIsInR5cCI6IkpXVCIsImtpZCI6InhaRGZacHJ5NFA5dlpQWnlHMmZOQlJqLTdMejVvbVZkbTd0SG9DZ1NOZlkifQ.eyJzdWIiOiJjcnlwdG9ib3RAZXhhbXBsZS5jb20iLCJpYXQiOjE1MTYyMzkwMjJ9.AQaBIKQdNCxmRJi2wLOcbagTgi39WhdWwgdpKTYSPicg-aPr_tst_RjmnqMemx3cBe0Blr4nEbj_lAtSKHz_i61fAUyI1xCIAZYbK9Q3ICHIHQl3AiuCpBwFl-k81OB4QDYiKpEc9gLN5dhW_VymJMsgOvyiC0UjC91f2AM7s46byDNj";
-		
+
 		Optional<DecodedJWT> decoded = licenseChecker.check(license);
-		
+
 		Assertions.assertTrue(decoded.isPresent());
 		Assertions.assertEquals("cryptobot@example.com", decoded.get().getSubject());
 	}
diff --git a/main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java b/main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java
index 347ec1e45..cee725332 100644
--- a/main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java
+++ b/main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java
@@ -37,10 +37,10 @@ public class SettingsJsonAdapterTest {
 	}
 
 	@ParameterizedTest(name = "fromJson() should throw IOException for input: {0}")
-	@ValueSource(strings = {
-			"",
-			"<html>",
-			"{invalidjson}"
+	@ValueSource(strings = { //
+			"", //
+			"<html>", //
+			"{invalidjson}" //
 	})
 	public void testDeserializeMalformed(String input) {
 		Assertions.assertThrows(IOException.class, () -> {
diff --git a/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java b/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
index a0faee551..ff33605af 100644
--- a/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
+++ b/main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java
@@ -50,7 +50,7 @@ public class VaultSettingsJsonAdapterTest {
 		String result = buf.toString();
 
 		MatcherAssert.assertThat(result, CoreMatchers.containsString("\"id\":\"test\""));
-		if(System.getProperty("os.name").contains("Windows")){
+		if (System.getProperty("os.name").contains("Windows")) {
 			MatcherAssert.assertThat(result, CoreMatchers.containsString("\"path\":\"\\\\foo\\\\bar\""));
 		} else {
 			MatcherAssert.assertThat(result, CoreMatchers.containsString("\"path\":\"/foo/bar\""));
diff --git a/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java b/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
index e4922963b..907e88623 100644
--- a/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
+++ b/main/commons/src/test/java/org/cryptomator/common/vaults/VaultModuleTest.java
@@ -1,9 +1,5 @@
 package org.cryptomator.common.vaults;
 
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.StringBinding;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.common.settings.VolumeImpl;
@@ -17,6 +13,10 @@ import org.junit.jupiter.api.condition.OS;
 import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mockito;
 
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.StringBinding;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import java.nio.file.Path;
 
 public class VaultModuleTest {
diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml
index 3eaa5c2e7..c70d7cacb 100644
--- a/main/keychain/pom.xml
+++ b/main/keychain/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.cryptomator</groupId>
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessException.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessException.java
index 430b17b29..b4f0cf5c8 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessException.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessException.java
@@ -4,7 +4,7 @@ package org.cryptomator.keychain;
  * Indicates an error during communication with the operating system's keychain.
  */
 public class KeychainAccessException extends Exception {
-	
+
 	KeychainAccessException(Throwable cause) {
 		super(cause);
 	}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainManager.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainManager.java
index 300b5b035..515195232 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainManager.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainManager.java
@@ -3,13 +3,13 @@ package org.cryptomator.keychain;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Arrays;
 
 public class KeychainManager implements KeychainAccessStrategy {
@@ -77,7 +77,7 @@ public class KeychainManager implements KeychainAccessStrategy {
 			}
 		}
 	}
-	
+
 	private void setPassphraseStored(String key, boolean value) {
 		BooleanProperty property = passphraseStoredProperties.getIfPresent(key);
 		if (property != null) {
@@ -99,7 +99,7 @@ public class KeychainManager implements KeychainAccessStrategy {
 	 *
 	 * @param key The key to look up
 	 * @return An observable property which is <code>true</code> when it almost certain that a password for <code>key</code> is stored.
-	 * @see #isPassphraseStored(String) 
+	 * @see #isPassphraseStored(String)
 	 */
 	public ReadOnlyBooleanProperty getPassphraseStoredProperty(String key) {
 		return passphraseStoredProperties.getUnchecked(key);
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
index a6054be2d..791eb1dd0 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
@@ -25,7 +25,7 @@ public abstract class KeychainModule {
 	@Binds
 	@IntoSet
 	abstract KeychainAccessStrategy bindWindowsProtectedKeychainAccess(WindowsProtectedKeychainAccess keychainAccessStrategy);
-	
+
 	@Binds
 	@IntoSet
 	abstract KeychainAccessStrategy bindLinuxSystemKeychainAccess(LinuxSystemKeychainAccess keychainAccessStrategy);
@@ -35,7 +35,7 @@ public abstract class KeychainModule {
 	static Optional<KeychainAccessStrategy> provideSupportedKeychain(Set<KeychainAccessStrategy> keychainAccessStrategies) {
 		return keychainAccessStrategies.stream().filter(KeychainAccessStrategy::isSupported).findFirst();
 	}
-	
+
 	@Provides
 	@Singleton
 	public static Optional<KeychainManager> provideKeychainManager(Optional<KeychainAccessStrategy> keychainAccess) {
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
index 8e97dc6d4..1f74bd18d 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
@@ -10,117 +10,117 @@ import org.slf4j.LoggerFactory;
 
 public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy {
 
-    private static final Logger LOG = LoggerFactory.getLogger(LinuxKDEWalletKeychainAccessImpl.class);
+	private static final Logger LOG = LoggerFactory.getLogger(LinuxKDEWalletKeychainAccessImpl.class);
 
-    private final String FOLDER_NAME = "Cryptomator";
-    private final String APP_NAME = "Cryptomator";
-    private DBusConnection connection;
-    private KDEWallet wallet;
-    private int handle = -1;
+	private final String FOLDER_NAME = "Cryptomator";
+	private final String APP_NAME = "Cryptomator";
+	private DBusConnection connection;
+	private KDEWallet wallet;
+	private int handle = -1;
 
-    public LinuxKDEWalletKeychainAccessImpl() throws KeychainAccessException {
-        try {
-            connection = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
-        } catch (DBusException e) {
-            LOG.error("Connecting to D-Bus failed:", e);
-            throw new KeychainAccessException(e);
-        }
-    }
+	public LinuxKDEWalletKeychainAccessImpl() throws KeychainAccessException {
+		try {
+			connection = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
+		} catch (DBusException e) {
+			LOG.error("Connecting to D-Bus failed:", e);
+			throw new KeychainAccessException(e);
+		}
+	}
 
-    @Override
-    public boolean isSupported() {
-        try {
-            wallet = new KDEWallet(connection);
-            return wallet.isEnabled();
-        } catch (Exception e) {
-            LOG.error("A KDEWallet could not be created:", e);
-            return false;
-        }
-    }
+	@Override
+	public boolean isSupported() {
+		try {
+			wallet = new KDEWallet(connection);
+			return wallet.isEnabled();
+		} catch (Exception e) {
+			LOG.error("A KDEWallet could not be created:", e);
+			return false;
+		}
+	}
 
-    @Override
-    public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
-        try {
-            if (walletIsOpen() &&
-                    !(wallet.hasEntry(handle, FOLDER_NAME, key, APP_NAME)
-                            && wallet.entryType(handle, FOLDER_NAME, key, APP_NAME) == 1)
-                    && wallet.writePassword(handle, FOLDER_NAME, key, passphrase.toString(), APP_NAME) == 0) {
-                LOG.debug("Passphrase successfully stored.");
-            } else {
-                LOG.debug("Passphrase was not stored.");
-            }
-        } catch (Exception e) {
-            LOG.error("Storing the passphrase failed:", e);
-            throw new KeychainAccessException(e);
-        }
-    }
+	@Override
+	public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
+		try {
+			if (walletIsOpen() && //
+					!(wallet.hasEntry(handle, FOLDER_NAME, key, APP_NAME) //
+							&& wallet.entryType(handle, FOLDER_NAME, key, APP_NAME) == 1) //
+					&& wallet.writePassword(handle, FOLDER_NAME, key, passphrase.toString(), APP_NAME) == 0) {
+				LOG.debug("Passphrase successfully stored.");
+			} else {
+				LOG.debug("Passphrase was not stored.");
+			}
+		} catch (Exception e) {
+			LOG.error("Storing the passphrase failed:", e);
+			throw new KeychainAccessException(e);
+		}
+	}
 
-    @Override
-    public char[] loadPassphrase(String key) throws KeychainAccessException {
-        String password = "";
-        try {
-            if (walletIsOpen()) {
-                password = wallet.readPassword(handle, FOLDER_NAME, key, APP_NAME);
-                LOG.debug("loadPassphrase: wallet is open.");
-            } else {
-                LOG.debug("loadPassphrase: wallet is closed.");
-            }
-            return (password.equals("")) ? null : password.toCharArray();
-        } catch (Exception e) {
-            LOG.error("Loading the passphrase failed:", e);
-            throw new KeychainAccessException(e);
-        }
-    }
+	@Override
+	public char[] loadPassphrase(String key) throws KeychainAccessException {
+		String password = "";
+		try {
+			if (walletIsOpen()) {
+				password = wallet.readPassword(handle, FOLDER_NAME, key, APP_NAME);
+				LOG.debug("loadPassphrase: wallet is open.");
+			} else {
+				LOG.debug("loadPassphrase: wallet is closed.");
+			}
+			return (password.equals("")) ? null : password.toCharArray();
+		} catch (Exception e) {
+			LOG.error("Loading the passphrase failed:", e);
+			throw new KeychainAccessException(e);
+		}
+	}
 
-    @Override
-    public void deletePassphrase(String key) throws KeychainAccessException {
-        try {
-            if (walletIsOpen()
-                    && wallet.hasEntry(handle, FOLDER_NAME, key, APP_NAME)
-                    && wallet.entryType(handle, FOLDER_NAME, key, APP_NAME) == 1
-                    && wallet.removeEntry(handle, FOLDER_NAME, key, APP_NAME) == 0) {
-                LOG.debug("Passphrase successfully deleted.");
-            } else {
-                LOG.debug("Passphrase was not deleted.");
-            }
-        } catch (Exception e) {
-            LOG.error("Deleting the passphrase failed:", e);
-            throw new KeychainAccessException(e);
-        }
-    }
+	@Override
+	public void deletePassphrase(String key) throws KeychainAccessException {
+		try {
+			if (walletIsOpen() //
+					&& wallet.hasEntry(handle, FOLDER_NAME, key, APP_NAME) //
+					&& wallet.entryType(handle, FOLDER_NAME, key, APP_NAME) == 1 //
+					&& wallet.removeEntry(handle, FOLDER_NAME, key, APP_NAME) == 0) {
+				LOG.debug("Passphrase successfully deleted.");
+			} else {
+				LOG.debug("Passphrase was not deleted.");
+			}
+		} catch (Exception e) {
+			LOG.error("Deleting the passphrase failed:", e);
+			throw new KeychainAccessException(e);
+		}
+	}
 
-    @Override
-    public void changePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
-        try {
-            if (walletIsOpen()
-                    && wallet.hasEntry(handle, FOLDER_NAME, key, APP_NAME)
-                    && wallet.entryType(handle, FOLDER_NAME, key, APP_NAME) == 1
-                    && wallet.writePassword(handle, FOLDER_NAME, key, passphrase.toString(), APP_NAME) == 0) {
-                LOG.debug("Passphrase successfully changed.");
-            } else {
-                LOG.debug("Passphrase could not be changed.");
-            }
-        } catch (Exception e) {
-            LOG.error("Changing the passphrase failed:", e);
-            throw new KeychainAccessException(e);
-        }
-    }
+	@Override
+	public void changePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
+		try {
+			if (walletIsOpen() //
+					&& wallet.hasEntry(handle, FOLDER_NAME, key, APP_NAME) //
+					&& wallet.entryType(handle, FOLDER_NAME, key, APP_NAME) == 1 //
+					&& wallet.writePassword(handle, FOLDER_NAME, key, passphrase.toString(), APP_NAME) == 0) {
+				LOG.debug("Passphrase successfully changed.");
+			} else {
+				LOG.debug("Passphrase could not be changed.");
+			}
+		} catch (Exception e) {
+			LOG.error("Changing the passphrase failed:", e);
+			throw new KeychainAccessException(e);
+		}
+	}
 
-    private boolean walletIsOpen() throws KeychainAccessException {
-        try {
-            if (wallet.isOpen(Static.DEFAULT_WALLET)) {
-                // This is needed due to KeechainManager loading the passphase directly
-                if (handle == -1) handle = wallet.open(Static.DEFAULT_WALLET, 0, APP_NAME);
-                return true;
-            }
-            wallet.openAsync(Static.DEFAULT_WALLET, 0, APP_NAME, false);
-            wallet.getSignalHandler().await(KWallet.walletAsyncOpened.class, Static.ObjectPaths.KWALLETD5, () -> null);
-            handle = wallet.getSignalHandler().getLastHandledSignal(KWallet.walletAsyncOpened.class, Static.ObjectPaths.KWALLETD5).handle;
-            LOG.debug("Wallet successfully initialized.");
-            return handle != -1;
-        } catch (Exception e) {
-            LOG.error("Asynchronous opening the wallet failed:", e);
-            throw new KeychainAccessException(e);
-        }
-    }
+	private boolean walletIsOpen() throws KeychainAccessException {
+		try {
+			if (wallet.isOpen(Static.DEFAULT_WALLET)) {
+				// This is needed due to KeechainManager loading the passphase directly
+				if (handle == -1) handle = wallet.open(Static.DEFAULT_WALLET, 0, APP_NAME);
+				return true;
+			}
+			wallet.openAsync(Static.DEFAULT_WALLET, 0, APP_NAME, false);
+			wallet.getSignalHandler().await(KWallet.walletAsyncOpened.class, Static.ObjectPaths.KWALLETD5, () -> null);
+			handle = wallet.getSignalHandler().getLastHandledSignal(KWallet.walletAsyncOpened.class, Static.ObjectPaths.KWALLETD5).handle;
+			LOG.debug("Wallet successfully initialized.");
+			return handle != -1;
+		} catch (Exception e) {
+			LOG.error("Asynchronous opening the wallet failed:", e);
+			throw new KeychainAccessException(e);
+		}
+	}
 }
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java
index 48b76fccb..e422fff2e 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java
@@ -27,8 +27,7 @@ class LinuxSecretServiceKeychainAccessImpl implements KeychainAccessStrategy {
 			List<String> list = keyring.getItems(createAttributes(key));
 			if (list == null) {
 				keyring.createItem(LABEL_FOR_SECRET_IN_KEYRING, passphrase, createAttributes(key));
-			}
-			else {
+			} else {
 				changePassphrase(key, passphrase);
 			}
 		} catch (IOException e) {
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
index 0021cc13d..39a6cd756 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
@@ -5,15 +5,14 @@
  *******************************************************************************/
 package org.cryptomator.keychain;
 
-import java.util.Optional;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.jni.MacFunctions;
 import org.cryptomator.jni.MacKeychainAccess;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Optional;
+
 @Singleton
 class MacSystemKeychainAccess implements KeychainAccessStrategy {
 
diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/KeychainManagerTest.java b/main/keychain/src/test/java/org/cryptomator/keychain/KeychainManagerTest.java
index 67f10e035..8577b0977 100644
--- a/main/keychain/src/test/java/org/cryptomator/keychain/KeychainManagerTest.java
+++ b/main/keychain/src/test/java/org/cryptomator/keychain/KeychainManagerTest.java
@@ -1,27 +1,27 @@
 package org.cryptomator.keychain;
 
 
-import javafx.application.Platform;
-import javafx.beans.property.ReadOnlyBooleanProperty;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
+import javafx.application.Platform;
+import javafx.beans.property.ReadOnlyBooleanProperty;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 
 class KeychainManagerTest {
-	
+
 	@Test
 	public void testStoreAndLoad() throws KeychainAccessException {
 		KeychainManager keychainManager = new KeychainManager(new MapKeychainAccess());
 		keychainManager.storePassphrase("test", "asd");
 		Assertions.assertArrayEquals("asd".toCharArray(), keychainManager.loadPassphrase("test"));
 	}
-	
+
 	@Nested
 	public static class WhenObservingProperties {
 
@@ -31,15 +31,15 @@ class KeychainManagerTest {
 			Platform.startup(latch::countDown);
 			latch.await(5, TimeUnit.SECONDS);
 		}
-		
+
 		@Test
 		public void testPropertyChangesWhenStoringPassword() throws KeychainAccessException, InterruptedException {
 			KeychainManager keychainManager = new KeychainManager(new MapKeychainAccess());
 			ReadOnlyBooleanProperty property = keychainManager.getPassphraseStoredProperty("test");
 			Assertions.assertEquals(false, property.get());
-			
+
 			keychainManager.storePassphrase("test", "bar");
-			
+
 			AtomicBoolean result = new AtomicBoolean(false);
 			CountDownLatch latch = new CountDownLatch(1);
 			Platform.runLater(() -> {
@@ -49,7 +49,7 @@ class KeychainManagerTest {
 			latch.await(1, TimeUnit.SECONDS);
 			Assertions.assertEquals(true, result.get());
 		}
-		
+
 	}
 
 }
\ No newline at end of file
diff --git a/main/keychain/src/test/resources/log4j2.xml b/main/keychain/src/test/resources/log4j2.xml
index 39c2f8545..3e9a7bd67 100644
--- a/main/keychain/src/test/resources/log4j2.xml
+++ b/main/keychain/src/test/resources/log4j2.xml
@@ -11,22 +11,22 @@
 
 	<Appenders>
 		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
-			<ThresholdFilter level="WARN" onMatch="DENY" onMismatch="ACCEPT" />
+			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n"/>
+			<ThresholdFilter level="WARN" onMatch="DENY" onMismatch="ACCEPT"/>
 		</Console>
 		<Console name="StdErr" target="SYSTEM_ERR">
-			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
-			<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY" />
+			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n"/>
+			<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
 		</Console>
 	</Appenders>
 
 	<Loggers>
 		<!-- show our own debug messages: -->
-		<Logger name="org.cryptomator" level="DEBUG" />
+		<Logger name="org.cryptomator" level="DEBUG"/>
 		<!-- mute dependencies: -->
 		<Root level="INFO">
-			<AppenderRef ref="Console" />
-			<AppenderRef ref="StdErr" />
+			<AppenderRef ref="Console"/>
+			<AppenderRef ref="StdErr"/>
 		</Root>
 	</Loggers>
 
diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml
index 21a8f910c..a2559d145 100644
--- a/main/launcher/pom.xml
+++ b/main/launcher/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.cryptomator</groupId>
diff --git a/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorModule.java b/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorModule.java
index 6b37e29b6..4afe332b6 100644
--- a/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorModule.java
+++ b/main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorModule.java
@@ -10,7 +10,7 @@ import java.util.concurrent.CountDownLatch;
 
 @Module
 class CryptomatorModule {
-	
+
 	@Provides
 	@Singleton
 	@Named("shutdownLatch")
diff --git a/main/launcher/src/main/java/org/cryptomator/launcher/FileOpenRequestHandler.java b/main/launcher/src/main/java/org/cryptomator/launcher/FileOpenRequestHandler.java
index cabcaf087..8c9ac2f9f 100644
--- a/main/launcher/src/main/java/org/cryptomator/launcher/FileOpenRequestHandler.java
+++ b/main/launcher/src/main/java/org/cryptomator/launcher/FileOpenRequestHandler.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
  * All rights reserved.
- * 
+ *
  * This class is licensed under the LGPL 3.0 (https://www.gnu.org/licenses/lgpl-3.0.de.html).
  *******************************************************************************/
 package org.cryptomator.launcher;
@@ -25,7 +25,6 @@ import java.util.Collection;
 import java.util.Objects;
 import java.util.concurrent.BlockingQueue;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 @Singleton
 class FileOpenRequestHandler {
diff --git a/main/launcher/src/main/java/org/cryptomator/launcher/IpcProtocolImpl.java b/main/launcher/src/main/java/org/cryptomator/launcher/IpcProtocolImpl.java
index 57f21f5e8..44f67e0cd 100644
--- a/main/launcher/src/main/java/org/cryptomator/launcher/IpcProtocolImpl.java
+++ b/main/launcher/src/main/java/org/cryptomator/launcher/IpcProtocolImpl.java
@@ -10,7 +10,6 @@ import javax.inject.Singleton;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.concurrent.BlockingQueue;
-import java.util.stream.Stream;
 
 @Singleton
 class IpcProtocolImpl implements IpcProtocol {
diff --git a/main/launcher/src/main/java/org/cryptomator/logging/DebugMode.java b/main/launcher/src/main/java/org/cryptomator/logging/DebugMode.java
index de9e3110b..c15fb466b 100644
--- a/main/launcher/src/main/java/org/cryptomator/logging/DebugMode.java
+++ b/main/launcher/src/main/java/org/cryptomator/logging/DebugMode.java
@@ -8,12 +8,12 @@ package org.cryptomator.logging;
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
-import javafx.beans.value.ObservableValue;
 import org.cryptomator.common.settings.Settings;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import javafx.beans.value.ObservableValue;
 import java.util.Map;
 
 @Singleton
diff --git a/main/launcher/src/main/java/org/cryptomator/logging/LaunchBasedTriggeringPolicy.java b/main/launcher/src/main/java/org/cryptomator/logging/LaunchBasedTriggeringPolicy.java
index 029ea586c..57b532015 100644
--- a/main/launcher/src/main/java/org/cryptomator/logging/LaunchBasedTriggeringPolicy.java
+++ b/main/launcher/src/main/java/org/cryptomator/logging/LaunchBasedTriggeringPolicy.java
@@ -5,11 +5,11 @@
  *******************************************************************************/
 package org.cryptomator.logging;
 
+import ch.qos.logback.core.rolling.TriggeringPolicyBase;
+
 import java.io.File;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import ch.qos.logback.core.rolling.TriggeringPolicyBase;
-
 /**
  * Triggers a roll-over on the first log event, so each launched application instance will rotate the log.
  */
diff --git a/main/launcher/src/main/java/org/cryptomator/logging/LoggerConfiguration.java b/main/launcher/src/main/java/org/cryptomator/logging/LoggerConfiguration.java
index ce9109c88..3d8cc9216 100644
--- a/main/launcher/src/main/java/org/cryptomator/logging/LoggerConfiguration.java
+++ b/main/launcher/src/main/java/org/cryptomator/logging/LoggerConfiguration.java
@@ -15,7 +15,7 @@ import java.util.Map;
 
 @Singleton
 public class LoggerConfiguration {
-	
+
 	private final LoggerContext context;
 	private final Environment environment;
 	private final Appender<ILoggingEvent> stdout;
diff --git a/main/launcher/src/test/java/org/cryptomator/launcher/IpcFactoryTest.java b/main/launcher/src/test/java/org/cryptomator/launcher/IpcFactoryTest.java
index e4fef5556..aeb9fbeb3 100644
--- a/main/launcher/src/test/java/org/cryptomator/launcher/IpcFactoryTest.java
+++ b/main/launcher/src/test/java/org/cryptomator/launcher/IpcFactoryTest.java
@@ -62,8 +62,8 @@ public class IpcFactoryTest {
 				Assertions.assertTrue(endpoint2.isConnectedToRemote());
 				Assertions.assertNotSame(protocolHandler, endpoint2.getRemote());
 				Mockito.verifyZeroInteractions(protocolHandler);
-				endpoint2.getRemote().handleLaunchArgs(new String[] {"foo"});
-				Mockito.verify(protocolHandler).handleLaunchArgs(new String[] {"foo"});
+				endpoint2.getRemote().handleLaunchArgs(new String[]{"foo"});
+				Mockito.verify(protocolHandler).handleLaunchArgs(new String[]{"foo"});
 			}
 		}
 	}
diff --git a/main/pom.xml b/main/pom.xml
index 87281805e..e30e843a3 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index 0991215cc..79b59eeec 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.cryptomator</groupId>
@@ -22,7 +22,7 @@
 			<groupId>org.cryptomator</groupId>
 			<artifactId>jni</artifactId>
 		</dependency>
-		
+
 		<!-- JavaFx -->
 		<dependency>
 			<groupId>org.openjfx</groupId>
@@ -67,14 +67,14 @@
 			<artifactId>zxcvbn</artifactId>
 			<version>1.3.0</version>
 		</dependency>
-		
+
 		<!-- Logging -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
 			<scope>test</scope>
 		</dependency>
-		
+
 		<!-- Testing -->
 		<dependency>
 			<groupId>com.google.jimfs</groupId>
@@ -88,7 +88,7 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	
+
 	<build>
 		<plugins>
 			<plugin>
diff --git a/main/ui/src/license/template.ftl b/main/ui/src/license/template.ftl
index 5cf4a819e..f577ceaff 100644
--- a/main/ui/src/license/template.ftl
+++ b/main/ui/src/license/template.ftl
@@ -20,16 +20,16 @@ along with this program.  If not, see http://www.gnu.org/licenses/.
 
 Cryptomator uses ${dependencyMap?size} third-party dependencies under the following licenses:
 <#list licenseMap as e>
-	<#assign license = e.getKey()/>
-	<#assign projects = e.getValue()/>
-	<#if projects?size &gt; 0>
-	${license}:
-	<#list projects as project>
-		- ${artifactFormat(project)}
-	</#list>
-	</#if>
+    <#assign license = e.getKey()/>
+    <#assign projects = e.getValue()/>
+    <#if projects?size &gt; 0>
+        ${license}:
+        <#list projects as project>
+			- ${artifactFormat(project)}
+        </#list>
+    </#if>
 </#list>
 
 Cryptomator uses other third-party assets under the following licenses:
-	SIL OFL 1.1 License:
-		- Font Awesome 5.12.0 (https://fontawesome.com/)
+SIL OFL 1.1 License:
+- Font Awesome 5.12.0 (https://fontawesome.com/)
diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java
index d3e97e8d7..3c9c53e5b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java
@@ -4,14 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
@@ -27,8 +19,14 @@ import org.cryptomator.ui.recoverykey.RecoveryKeyDisplayController;
 
 import javax.inject.Named;
 import javax.inject.Provider;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.nio.file.Path;
-import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
 
@@ -103,7 +101,7 @@ public abstract class AddVaultModule {
 	static Scene provideChooseExistingVaultScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) {
 		return fxmlLoaders.createScene(FxmlFile.ADDVAULT_EXISTING.getRessourcePathString());
 	}
-	
+
 	@Provides
 	@FxmlScene(FxmlFile.ADDVAULT_NEW_NAME)
 	@AddVaultWizardScoped
@@ -189,5 +187,5 @@ public abstract class AddVaultModule {
 	@IntoMap
 	@FxControllerKey(AddVaultSuccessController.class)
 	abstract FxController bindAddVaultSuccessController(AddVaultSuccessController controller);
-	
+
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultSuccessController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultSuccessController.java
index 905efeb6d..99d01577f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultSuccessController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultSuccessController.java
@@ -1,14 +1,14 @@
 package org.cryptomator.ui.addvaultwizard;
 
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.fxapp.FxApplication;
 
 import javax.inject.Inject;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
 import java.util.Optional;
 
 @AddVaultWizardScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWelcomeController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWelcomeController.java
index bec137eed..3c13aeb75 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWelcomeController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWelcomeController.java
@@ -1,8 +1,6 @@
 package org.cryptomator.ui.addvaultwizard;
 
 import dagger.Lazy;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
@@ -10,6 +8,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 
 @AddVaultWizardScoped
 public class AddVaultWelcomeController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java
index 60238abbe..1253d8347 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultWizardComponent.java
@@ -7,11 +7,12 @@ package org.cryptomator.ui.addvaultwizard;
 
 import dagger.Lazy;
 import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
 @AddVaultWizardScoped
 @Subcomponent(modules = {AddVaultModule.class})
 public interface AddVaultWizardComponent {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java
index 7fc644f0d..a5398d51b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java
@@ -1,12 +1,6 @@
 package org.cryptomator.ui.addvaultwizard;
 
 import dagger.Lazy;
-import javafx.beans.property.ObjectProperty;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.stage.FileChooser;
-import javafx.stage.Stage;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
@@ -18,6 +12,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import javafx.beans.property.ObjectProperty;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.scene.image.Image;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java
index c1f224529..1efd5ba50 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java
@@ -2,6 +2,15 @@ package org.cryptomator.ui.addvaultwizard;
 
 import com.tobiasdiez.easybind.EasyBind;
 import dagger.Lazy;
+import org.cryptomator.ui.common.ErrorComponent;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Named;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.BooleanProperty;
@@ -17,15 +26,6 @@ import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.Stage;
-import org.cryptomator.ui.common.ErrorComponent;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
-import javax.inject.Named;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.FileAlreadyExistsException;
@@ -88,7 +88,7 @@ public class CreateNewVaultLocationController implements FxController {
 	}
 
 	private void vaultPathDidChange(Path newValue) {
-		if ( newValue != null && !Files.notExists(newValue)) {
+		if (newValue != null && !Files.notExists(newValue)) {
 			warningText.set(resourceBundle.getString("addvaultwizard.new.fileAlreadyExists"));
 		} else {
 			warningText.set(null);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
index 57b8bed04..cab32c9db 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java
@@ -1,6 +1,12 @@
 package org.cryptomator.ui.addvaultwizard;
 
 import dagger.Lazy;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
+
+import javax.inject.Inject;
+import javax.inject.Named;
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -11,12 +17,6 @@ import javafx.fxml.FXML;
 import javafx.scene.Scene;
 import javafx.scene.control.TextField;
 import javafx.stage.Stage;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;
-
-import javax.inject.Inject;
-import javax.inject.Named;
 import java.nio.file.Path;
 import java.util.ResourceBundle;
 import java.util.regex.Pattern;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java
index 87152f7b5..c4e226359 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java
@@ -1,19 +1,6 @@
 package org.cryptomator.ui.addvaultwizard;
 
 import dagger.Lazy;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.binding.ObjectBinding;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.StringProperty;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.scene.control.ContentDisplay;
-import javafx.scene.control.Toggle;
-import javafx.scene.control.ToggleGroup;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.cryptofs.CryptoFileSystemProperties;
@@ -29,6 +16,19 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.binding.ObjectBinding;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.StringProperty;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.scene.control.ContentDisplay;
+import javafx.scene.control.Toggle;
+import javafx.scene.control.ToggleGroup;
+import javafx.stage.Stage;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.channels.WritableByteChannel;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultRecoveryKeyController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultRecoveryKeyController.java
index 44f186774..6104a50fc 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultRecoveryKeyController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultRecoveryKeyController.java
@@ -1,14 +1,14 @@
 package org.cryptomator.ui.addvaultwizard;
 
 import dagger.Lazy;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 
 import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 
 public class CreateNewVaultRecoveryKeyController implements FxController {
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java
index aa67862f3..b9f796043 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java
@@ -1,10 +1,9 @@
 package org.cryptomator.ui.addvaultwizard;
 
+import javax.inject.Inject;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-
-import javax.inject.Inject;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java
index 64c061d58..5cf14444a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java
@@ -6,7 +6,7 @@ import java.util.ResourceBundle;
 
 @AddVaultWizardScoped
 public class ReadmeGenerator {
-	
+
 	// specs: https://web.archive.org/web/20190708132914/http://www.kleinlercher.at/tools/Windows_Protocols/Word2007RTFSpec9.pdf
 	private static final String RTF_HEADER = "{\\rtf1\\fbidis\\ansi\\uc0\\fs32\n";
 	private static final String RTF_FOOTER = "}";
@@ -22,7 +22,7 @@ public class ReadmeGenerator {
 	public ReadmeGenerator(ResourceBundle resourceBundle) {
 		this.resourceBundle = resourceBundle;
 	}
-	
+
 	public String createVaultStorageLocationReadmeRtf() {
 		return createDocument(List.of( //
 				String.format(HEADING, resourceBundle.getString("addvault.new.readme.storageLocation.1")), //
@@ -40,16 +40,15 @@ public class ReadmeGenerator {
 				String.format(resourceBundle.getString("addvault.new.readme.storageLocation.10"), HELP_URL)  //
 		));
 	}
-	
+
 	public String createVaultAccessLocationReadmeRtf() {
 		return createDocument(List.of( //
-				String.format(HEADING,resourceBundle.getString("addvault.new.readme.accessLocation.1")), //
+				String.format(HEADING, resourceBundle.getString("addvault.new.readme.accessLocation.1")), //
 				resourceBundle.getString("addvault.new.readme.accessLocation.2"), //
 				EMPTY_PAR, //
 				resourceBundle.getString("addvault.new.readme.accessLocation.3"), //
 				EMPTY_PAR, //
-				resourceBundle.getString("addvault.new.readme.accessLocation.4")
-		));
+				resourceBundle.getString("addvault.new.readme.accessLocation.4")));
 	}
 
 	// visible for testing
@@ -63,14 +62,14 @@ public class ReadmeGenerator {
 		sb.append(RTF_FOOTER);
 		return sb.toString();
 	}
-	
+
 	// visible for testing
 	String escapeNonAsciiChars(CharSequence input) {
 		StringBuilder sb = new StringBuilder();
 		appendEscaped(sb, input);
 		return sb.toString();
 	}
-	
+
 	private void appendEscaped(StringBuilder sb, CharSequence input) {
 		input.chars().forEachOrdered(c -> {
 			if (c < 128) {
@@ -80,7 +79,6 @@ public class ReadmeGenerator {
 			}
 		});
 	}
-	
-	
+
 
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordComponent.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordComponent.java
index 013fa2b5b..ac3529335 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordComponent.java
@@ -3,13 +3,13 @@ package org.cryptomator.ui.changepassword;
 import dagger.BindsInstance;
 import dagger.Lazy;
 import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 
 import javax.inject.Named;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 
 @ChangePasswordScoped
 @Subcomponent(modules = {ChangePasswordModule.class})
diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
index d357c8451..e1fc9c093 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
@@ -1,12 +1,5 @@
 package org.cryptomator.ui.changepassword;
 
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.CheckBox;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptofs.CryptoFileSystemProvider;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
@@ -21,6 +14,13 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
+import javafx.stage.Stage;
 import java.io.IOException;
 import java.nio.CharBuffer;
 import java.util.Optional;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java
index c6367d124..aff1b1e0d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordModule.java
@@ -4,12 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
 import org.cryptomator.ui.common.FxController;
@@ -22,14 +16,17 @@ import org.cryptomator.ui.common.StageFactory;
 
 import javax.inject.Named;
 import javax.inject.Provider;
-import java.nio.CharBuffer;
-import java.util.List;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;
 
 @Module
 abstract class ChangePasswordModule {
-	
+
 	@Provides
 	@ChangePasswordScoped
 	@Named("newPassword")
@@ -70,7 +67,7 @@ abstract class ChangePasswordModule {
 	@IntoMap
 	@FxControllerKey(ChangePasswordController.class)
 	abstract FxController bindUnlockController(ChangePasswordController controller);
-	
+
 	@Provides
 	@IntoMap
 	@FxControllerKey(NewPasswordController.class)
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/Animations.java b/main/ui/src/main/java/org/cryptomator/ui/common/Animations.java
index d9c1ed19f..d71309933 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/Animations.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/Animations.java
@@ -8,7 +8,7 @@ import javafx.stage.Window;
 import javafx.util.Duration;
 
 public class Animations {
-	
+
 	public static Timeline createShakeWindowAnimation(Window window) {
 		WritableValue<Double> writableWindowX = new WritableValue<>() {
 			@Override
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/DefaultSceneFactory.java b/main/ui/src/main/java/org/cryptomator/ui/common/DefaultSceneFactory.java
index a2757d7b7..ad6056c44 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/DefaultSceneFactory.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/DefaultSceneFactory.java
@@ -1,5 +1,10 @@
 package org.cryptomator.ui.common;
 
+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.settings.Settings;
+import org.cryptomator.ui.fxapp.FxApplicationScoped;
+
+import javax.inject.Inject;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.input.KeyCode;
@@ -7,11 +12,6 @@ import javafx.scene.input.KeyCodeCombination;
 import javafx.scene.input.KeyCombination;
 import javafx.stage.Stage;
 import javafx.stage.Window;
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.settings.Settings;
-import org.cryptomator.ui.fxapp.FxApplicationScoped;
-
-import javax.inject.Inject;
 import java.util.function.Function;
 
 @FxApplicationScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java
index 54f32c07e..6a50ee44a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java
@@ -2,10 +2,10 @@ package org.cryptomator.ui.common;
 
 import dagger.BindsInstance;
 import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 
 import javax.annotation.Nullable;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 
 @Subcomponent(modules = {ErrorModule.class})
 public interface ErrorComponent {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorController.java b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorController.java
index 52c3d4034..c7f19a9e6 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorController.java
@@ -1,12 +1,11 @@
 package org.cryptomator.ui.common;
 
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 
 public class ErrorController implements FxController {
 
@@ -34,7 +33,7 @@ public class ErrorController implements FxController {
 	}
 
 	/* Getter/Setter */
-	
+
 	public boolean isPreviousScenePresent() {
 		return previousScene != null;
 	}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java
index 27a51c00b..3dd0a6a14 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java
@@ -4,10 +4,10 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.scene.Scene;
 
 import javax.inject.Named;
 import javax.inject.Provider;
+import javafx.scene.Scene;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java b/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java
index 210655a5f..c1f7f8350 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java
@@ -1,10 +1,9 @@
 package org.cryptomator.ui.common;
 
+import javax.inject.Provider;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-
-import javax.inject.Provider;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FontLoader.java b/main/ui/src/main/java/org/cryptomator/ui/common/FontLoader.java
index 05ce9cc83..37dc7b3ce 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/FontLoader.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/FontLoader.java
@@ -1,9 +1,9 @@
 package org.cryptomator.ui.common;
 
-import javafx.scene.text.Font;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javafx.scene.text.Font;
 import java.io.IOException;
 import java.io.InputStream;
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxController.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxController.java
index 779b3f7e9..236927245 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/FxController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxController.java
@@ -6,4 +6,5 @@
 package org.cryptomator.ui.common;
 
 public interface FxController {
+
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxControllerKey.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxControllerKey.java
index 1daf5bc30..a89eb918e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/FxControllerKey.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxControllerKey.java
@@ -19,5 +19,6 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
 @Retention(RUNTIME)
 @MapKey
 public @interface FxControllerKey {
+
 	Class<? extends FxController> value();
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
index 262af2283..f89c0dd95 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
@@ -36,7 +36,7 @@ public enum FxmlFile {
 		this.ressourcePathString = ressourcePathString;
 	}
 
-	public String getRessourcePathString(){
+	public String getRessourcePathString() {
 		return ressourcePathString;
 	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
index 310a2379d..b7bf48870 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/NewPasswordController.java
@@ -1,6 +1,9 @@
 package org.cryptomator.ui.common;
 
 import com.tobiasdiez.easybind.EasyBind;
+import org.cryptomator.ui.controls.FontAwesome5IconView;
+import org.cryptomator.ui.controls.NiceSecurePasswordField;
+
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -9,9 +12,6 @@ import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
-import org.cryptomator.ui.controls.FontAwesome5IconView;
-import org.cryptomator.ui.controls.NiceSecurePasswordField;
-
 import java.util.ResourceBundle;
 
 public class NewPasswordController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/StageFactory.java b/main/ui/src/main/java/org/cryptomator/ui/common/StageFactory.java
index cb980d523..9a0dcb1c5 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/StageFactory.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/StageFactory.java
@@ -2,7 +2,6 @@ package org.cryptomator.ui.common;
 
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
-
 import java.util.function.Consumer;
 
 public class StageFactory {
@@ -12,11 +11,11 @@ public class StageFactory {
 	public StageFactory(Consumer<Stage> initializer) {
 		this.initializer = initializer;
 	}
-	
+
 	public Stage create() {
 		return create(StageStyle.DECORATED);
 	}
-	
+
 	public Stage create(StageStyle stageStyle) {
 		Stage stage = new Stage(stageStyle);
 		initializer.accept(stage);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/Tasks.java b/main/ui/src/main/java/org/cryptomator/ui/common/Tasks.java
index 164ee41e3..747b1124f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/Tasks.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/Tasks.java
@@ -5,13 +5,13 @@
  *******************************************************************************/
 package org.cryptomator.ui.common;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import javafx.application.Platform;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
 import javafx.util.Duration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/UserInteractionLock.java b/main/ui/src/main/java/org/cryptomator/ui/common/UserInteractionLock.java
index 91259ce8e..f0c199648 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/UserInteractionLock.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/UserInteractionLock.java
@@ -4,7 +4,6 @@ import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
-
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -15,11 +14,11 @@ public class UserInteractionLock<E extends Enum> {
 	private final Condition condition = lock.newCondition();
 	private final BooleanProperty awaitingInteraction = new SimpleBooleanProperty();
 	private volatile E state;
-	
+
 	public UserInteractionLock(E initialValue) {
 		state = initialValue;
 	}
-	
+
 	public void interacted(E result) {
 		assert Platform.isFxApplicationThread();
 		lock.lock();
@@ -31,7 +30,7 @@ public class UserInteractionLock<E extends Enum> {
 			lock.unlock();
 		}
 	}
-	
+
 	public E awaitInteraction() throws InterruptedException {
 		assert !Platform.isFxApplicationThread();
 		lock.lock();
@@ -43,7 +42,7 @@ public class UserInteractionLock<E extends Enum> {
 			lock.unlock();
 		}
 	}
-	
+
 	public ReadOnlyBooleanProperty awaitingInteraction() {
 		return awaitingInteraction;
 	}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java
index a6b7dc425..2631c0f6a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.common;
 
-import javafx.concurrent.Task;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.common.vaults.Volume;
@@ -10,6 +9,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import javafx.concurrent.Task;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/AlphanumericTextField.java b/main/ui/src/main/java/org/cryptomator/ui/controls/AlphanumericTextField.java
index 9271ca088..c7de692c0 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/AlphanumericTextField.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/AlphanumericTextField.java
@@ -2,7 +2,6 @@ package org.cryptomator.ui.controls;
 
 import javafx.scene.control.TextField;
 import javafx.scene.control.TextFormatter;
-
 import java.util.regex.Pattern;
 
 public class AlphanumericTextField extends TextField {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/DraggableListCell.java b/main/ui/src/main/java/org/cryptomator/ui/controls/DraggableListCell.java
index ca78bcac6..dcb5bc4c8 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/DraggableListCell.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/DraggableListCell.java
@@ -9,6 +9,7 @@
 package org.cryptomator.ui.controls;
 
 import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.scene.SnapshotParameters;
@@ -19,14 +20,13 @@ import javafx.scene.input.DragEvent;
 import javafx.scene.input.Dragboard;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.input.TransferMode;
-
 import java.util.List;
 
 public class DraggableListCell<T> extends ListCell<T> {
-	
+
 	private static final String DROP_ABOVE_CLASS = "drop-above";
 	private static final String DROP_BELOW_CLASS = "drop-below";
-	
+
 	private final BooleanProperty dropAbove = new SimpleBooleanProperty();
 	private final BooleanProperty dropBelow = new SimpleBooleanProperty();
 
@@ -41,7 +41,7 @@ public class DraggableListCell<T> extends ListCell<T> {
 		EasyBind.includeWhen(getStyleClass(), DROP_ABOVE_CLASS, dropAbove);
 		EasyBind.includeWhen(getStyleClass(), DROP_BELOW_CLASS, dropBelow);
 	}
-	
+
 	private void setDropPositionStyleClass(double verticalCursorPosition) {
 		boolean isUpperHalf = verticalCursorPosition < this.getHeight() / 2.0;
 		if (isUpperHalf) {
@@ -52,7 +52,7 @@ public class DraggableListCell<T> extends ListCell<T> {
 			this.dropBelow.set(true);
 		}
 	}
-	
+
 	private void resetDropPositionStyleClasses() {
 		this.dropAbove.set(false);
 		this.dropBelow.set(false);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5IconView.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5IconView.java
index 6d131da27..4d0797eaa 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5IconView.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5IconView.java
@@ -1,5 +1,7 @@
 package org.cryptomator.ui.controls;
 
+import org.cryptomator.ui.common.FontLoader;
+
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleDoubleProperty;
@@ -7,8 +9,6 @@ import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.scene.text.Font;
 import javafx.scene.text.Text;
-import org.cryptomator.ui.common.FontLoader;
-
 import java.io.UncheckedIOException;
 
 /**
@@ -55,23 +55,23 @@ public class FontAwesome5IconView extends Text {
 		return glyph;
 	}
 
-	public void setGlyph(FontAwesome5Icon glyph) {
-		this.glyph.set(glyph == null ? DEFAULT_GLYPH : glyph);
-	}
-
 	public FontAwesome5Icon getGlyph() {
 		return glyph.get();
 	}
 
+	public void setGlyph(FontAwesome5Icon glyph) {
+		this.glyph.set(glyph == null ? DEFAULT_GLYPH : glyph);
+	}
+
 	public DoubleProperty glyphSizeProperty() {
 		return glyphSize;
 	}
 
-	public void setGlyphSize(double glyphSize) {
-		this.glyphSize.set(glyphSize);
-	}
-
 	public double getGlyphSize() {
 		return glyphSize.get();
 	}
+
+	public void setGlyphSize(double glyphSize) {
+		this.glyphSize.set(glyphSize);
+	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedString.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedString.java
index d678a3d86..80a7a74d0 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedString.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedString.java
@@ -13,7 +13,7 @@ public class FormattedString {
 	private final ObjectProperty<Object> arg1 = new SimpleObjectProperty<>();
 	// add arg2, arg3, ... on demand
 	private final StringBinding value;
-	
+
 	public FormattedString() {
 		this.value = Bindings.createStringBinding(this::computeValue, format, arg1);
 	}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/NumericTextField.java b/main/ui/src/main/java/org/cryptomator/ui/controls/NumericTextField.java
index d875442c3..178abfa57 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/NumericTextField.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/NumericTextField.java
@@ -2,7 +2,6 @@ package org.cryptomator.ui.controls;
 
 import javafx.scene.control.TextField;
 import javafx.scene.control.TextFormatter;
-
 import java.util.regex.Pattern;
 
 public class NumericTextField extends TextField {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/PasswordStrengthIndicator.java b/main/ui/src/main/java/org/cryptomator/ui/controls/PasswordStrengthIndicator.java
index 156da3b0b..5bf2c1ed3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/PasswordStrengthIndicator.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/PasswordStrengthIndicator.java
@@ -1,6 +1,7 @@
 package org.cryptomator.ui.controls;
 
 import com.tobiasdiez.easybind.EasyBind;
+
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -75,11 +76,11 @@ public class PasswordStrengthIndicator extends HBox {
 		return strength;
 	}
 
-	public void setStrength(int strength) {
-		this.strength.set(strength);
-	}
-
 	public int getStrength() {
 		return strength.get();
 	}
+
+	public void setStrength(int strength) {
+		this.strength.set(strength);
+	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/SecurePasswordField.java b/main/ui/src/main/java/org/cryptomator/ui/controls/SecurePasswordField.java
index ee8bda5bc..0fde886f6 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controls/SecurePasswordField.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/SecurePasswordField.java
@@ -9,6 +9,7 @@
 package org.cryptomator.ui.controls;
 
 import com.google.common.base.Strings;
+
 import javafx.beans.NamedArg;
 import javafx.beans.Observable;
 import javafx.beans.property.BooleanProperty;
@@ -26,7 +27,6 @@ import javafx.scene.input.KeyCodeCombination;
 import javafx.scene.input.KeyCombination;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.TransferMode;
-
 import java.awt.Toolkit;
 import java.nio.CharBuffer;
 import java.text.Normalizer;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordComponent.java b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordComponent.java
index 05a33c870..e7300bb79 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordComponent.java
@@ -3,14 +3,14 @@ package org.cryptomator.ui.forgetPassword;
 import dagger.BindsInstance;
 import dagger.Lazy;
 import dagger.Subcomponent;
-import javafx.beans.property.ReadOnlyBooleanProperty;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 
 import javax.inject.Named;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 import java.util.concurrent.CompletableFuture;
 
 @ForgetPasswordScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java
index 008668126..99f8cbc41 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java
@@ -1,8 +1,5 @@
 package org.cryptomator.ui.forgetPassword;
 
-import javafx.beans.property.BooleanProperty;
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.keychain.KeychainAccessException;
 import org.cryptomator.keychain.KeychainManager;
@@ -11,6 +8,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import javafx.beans.property.BooleanProperty;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
 import java.util.Optional;
 
 @ForgetPasswordScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java
index 930a2638b..5164eea30 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordModule.java
@@ -4,13 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ReadOnlyBooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
 import org.cryptomator.ui.common.FxController;
@@ -21,7 +14,12 @@ import org.cryptomator.ui.common.StageFactory;
 
 import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;
 
@@ -58,7 +56,7 @@ abstract class ForgetPasswordModule {
 	@ForgetPasswordWindow
 	@ForgetPasswordScoped
 	abstract ReadOnlyBooleanProperty bindReadOnlyConfirmedProperty(@ForgetPasswordWindow BooleanProperty confirmedProperty);
-	
+
 	// ------------------
 
 	@Provides
diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
index 8402bddf2..decf50718 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
@@ -2,13 +2,6 @@ package org.cryptomator.ui.fxapp;
 
 import com.tobiasdiez.easybind.EasyBind;
 import dagger.Lazy;
-import javafx.application.Application;
-import javafx.application.Platform;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.value.ObservableValue;
-import javafx.collections.ObservableSet;
-import javafx.stage.Stage;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
@@ -28,6 +21,13 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.value.ObservableValue;
+import javafx.collections.ObservableSet;
+import javafx.stage.Stage;
 import java.awt.desktop.QuitResponse;
 import java.util.Optional;
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationComponent.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationComponent.java
index f03a63f82..0fe031617 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationComponent.java
@@ -18,7 +18,7 @@ public interface FxApplicationComponent {
 
 	@Subcomponent.Builder
 	interface Builder {
-		
+
 		@BindsInstance
 		Builder trayMenuSupported(@Named("trayMenuSupported") boolean trayMenuSupported);
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
index b52d64ad3..a6297ce4a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java
@@ -8,11 +8,6 @@ package org.cryptomator.ui.fxapp;
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
-import javafx.application.Application;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableSet;
-import javafx.scene.image.Image;
-import javafx.stage.Stage;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.StageFactory;
@@ -22,6 +17,11 @@ import org.cryptomator.ui.quit.QuitComponent;
 import org.cryptomator.ui.unlock.UnlockComponent;
 
 import javax.inject.Named;
+import javafx.application.Application;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableSet;
+import javafx.scene.image.Image;
+import javafx.stage.Stage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
@@ -53,7 +53,7 @@ abstract class FxApplicationModule {
 			throw new UncheckedIOException("Failed to load embedded resource.", e);
 		}
 	}
-	
+
 	@Provides
 	@FxApplicationScoped
 	static StageFactory provideStageFactory(@Named("windowIcons") List<Image> windowIcons, ObservableSet<Stage> visibleStages) {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java
index 4a8515b42..d68521b6d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java
@@ -1,5 +1,11 @@
 package org.cryptomator.ui.fxapp;
 
+import org.cryptomator.common.settings.Settings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Named;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -8,12 +14,6 @@ import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Worker;
 import javafx.concurrent.WorkerStateEvent;
 import javafx.util.Duration;
-import org.cryptomator.common.settings.Settings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
-import javax.inject.Named;
 import java.util.Comparator;
 import java.util.Optional;
 
@@ -80,7 +80,7 @@ public class UpdateChecker {
 	private void checkFailed(WorkerStateEvent event) {
 		LOG.warn("Error checking for updates", event.getSource().getException());
 	}
-	
+
 	/* Observable Properties */
 
 	public BooleanBinding checkingForUpdatesProperty() {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerModule.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerModule.java
index a15b81044..596e704e9 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerModule.java
@@ -2,6 +2,12 @@ package org.cryptomator.ui.fxapp;
 
 import dagger.Module;
 import dagger.Provides;
+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.settings.Settings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Named;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
 import javafx.beans.property.SimpleStringProperty;
@@ -9,12 +15,6 @@ import javafx.beans.property.StringProperty;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
 import javafx.util.Duration;
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.settings.Settings;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Named;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java
index 8fec56b64..d9de7f2da 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateCheckerTask.java
@@ -4,11 +4,11 @@ import com.google.common.io.ByteStreams;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
-import javafx.concurrent.Task;
 import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javafx.concurrent.Task;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLaunchEvent.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLaunchEvent.java
index a7334302c..710c6d435 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLaunchEvent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLaunchEvent.java
@@ -2,14 +2,16 @@ package org.cryptomator.ui.launcher;
 
 import java.nio.file.Path;
 import java.util.Collection;
-import java.util.stream.Stream;
 
 public class AppLaunchEvent {
 
 	private final EventType type;
 	private final Collection<Path> pathsToOpen;
 
-	public enum EventType {REVEAL_APP, OPEN_FILE}
+	public enum EventType {
+		REVEAL_APP,
+		OPEN_FILE
+	}
 
 	public AppLaunchEvent(EventType type, Collection<Path> pathsToOpen) {
 		this.type = type;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java
index fb75418f3..b48023687 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.launcher;
 
-import javafx.application.Platform;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.ui.fxapp.FxApplication;
 import org.slf4j.Logger;
@@ -9,6 +8,7 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
+import javafx.application.Platform;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.concurrent.BlockingQueue;
@@ -54,10 +54,10 @@ class AppLaunchEventHandler {
 		switch (event.getType()) {
 			case REVEAL_APP -> fxApplicationStarter.get(hasTrayIcon).thenAccept(FxApplication::showMainWindow);
 			case OPEN_FILE -> fxApplicationStarter.get(hasTrayIcon).thenRun(() -> {
-					Platform.runLater(() -> {
-						event.getPathsToOpen().forEach(this::addVault);
-					});
+				Platform.runLater(() -> {
+					event.getPathsToOpen().forEach(this::addVault);
 				});
+			});
 			default -> LOG.warn("Unsupported event type: {}", event.getType());
 		}
 	}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLifecycleListener.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLifecycleListener.java
index b0eda0e86..fcf9bc735 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLifecycleListener.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLifecycleListener.java
@@ -1,8 +1,5 @@
 package org.cryptomator.ui.launcher;
 
-import javafx.application.Platform;
-import javafx.beans.Observable;
-import javafx.collections.ObservableList;
 import org.cryptomator.common.ShutdownHook;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
@@ -14,6 +11,9 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
+import javafx.application.Platform;
+import javafx.beans.Observable;
+import javafx.collections.ObservableList;
 import java.awt.Desktop;
 import java.awt.EventQueue;
 import java.awt.desktop.AboutEvent;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/FxApplicationStarter.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/FxApplicationStarter.java
index 7bdd46ce2..033c719d0 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/launcher/FxApplicationStarter.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/FxApplicationStarter.java
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.launcher;
 
-import javafx.application.Platform;
 import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.fxapp.FxApplicationComponent;
 import org.slf4j.Logger;
@@ -8,6 +7,7 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import javafx.application.Platform;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ExecutorService;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncher.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncher.java
index d689b4ae2..ad98fe226 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncher.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncher.java
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.launcher;
 
-import javafx.collections.ObservableList;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.jni.JniException;
@@ -13,6 +12,7 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
+import javafx.collections.ObservableList;
 import java.awt.Desktop;
 import java.awt.SystemTray;
 import java.awt.desktop.AppReopenedListener;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
index 951db2b27..9b8d6e776 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
@@ -9,7 +9,6 @@ import org.cryptomator.ui.traymenu.TrayMenuComponent;
 
 import javax.inject.Named;
 import javax.inject.Singleton;
-import java.util.Locale;
 import java.util.ResourceBundle;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowComponent.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowComponent.java
index d4e03fbfe..40885b387 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowComponent.java
@@ -7,11 +7,12 @@ package org.cryptomator.ui.mainwindow;
 
 import dagger.Lazy;
 import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
 @MainWindowScoped
 @Subcomponent(modules = {MainWindowModule.class})
 public interface MainWindowComponent {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java
index 85bcd057c..65c3a8fcf 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java
@@ -1,5 +1,14 @@
 package org.cryptomator.ui.mainwindow;
 
+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.common.vaults.VaultListManager;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.wrongfilealert.WrongFileAlertComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
 import javafx.beans.Observable;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -10,15 +19,6 @@ import javafx.scene.input.DragEvent;
 import javafx.scene.input.TransferMode;
 import javafx.scene.layout.StackPane;
 import javafx.stage.Stage;
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.common.vaults.VaultListManager;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.wrongfilealert.WrongFileAlertComponent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
 import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java
index a34273f84..255f560a6 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java
@@ -4,12 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.stage.Stage;
-import javafx.stage.StageStyle;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.addvaultwizard.AddVaultWizardComponent;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
@@ -18,15 +12,17 @@ import org.cryptomator.ui.common.FxControllerKey;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 import org.cryptomator.ui.common.StageFactory;
-import org.cryptomator.ui.fxapp.FxApplicationScoped;
 import org.cryptomator.ui.migration.MigrationComponent;
 import org.cryptomator.ui.removevault.RemoveVaultComponent;
 import org.cryptomator.ui.vaultoptions.VaultOptionsComponent;
 import org.cryptomator.ui.wrongfilealert.WrongFileAlertComponent;
 
-import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 import java.util.Map;
 import java.util.ResourceBundle;
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowSceneFactory.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowSceneFactory.java
index dbb9b4cbf..f93f4109d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowSceneFactory.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowSceneFactory.java
@@ -1,16 +1,16 @@
 package org.cryptomator.ui.mainwindow;
 
 import dagger.Lazy;
-import javafx.scene.Scene;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyCodeCombination;
-import javafx.scene.input.KeyCombination;
-import javafx.stage.Stage;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 
 import javax.inject.Inject;
+import javafx.scene.Scene;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyCodeCombination;
+import javafx.scene.input.KeyCombination;
+import javafx.stage.Stage;
 
 @MainWindowScoped
 public class MainWindowSceneFactory extends DefaultSceneFactory {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java
index 1f8fbc271..d7eda58c8 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowTitleController.java
@@ -1,10 +1,5 @@
 package org.cryptomator.ui.mainwindow;
 
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.fxml.FXML;
-import javafx.scene.layout.HBox;
-import javafx.stage.Stage;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.ui.common.FxController;
@@ -17,6 +12,11 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.fxml.FXML;
+import javafx.scene.layout.HBox;
+import javafx.stage.Stage;
 
 @MainWindowScoped
 public class MainWindowTitleController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java
index fbf67aeb2..908944d68 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java
@@ -1,12 +1,12 @@
 package org.cryptomator.ui.mainwindow;
 
+import org.cryptomator.ui.common.FxController;
+
+import javax.inject.Inject;
 import javafx.fxml.FXML;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Region;
 import javafx.stage.Stage;
-import org.cryptomator.ui.common.FxController;
-
-import javax.inject.Inject;
 
 @MainWindow
 public class ResizeController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java
index e384a67bc..40df6b7c5 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java
@@ -1,11 +1,6 @@
 package org.cryptomator.ui.mainwindow;
 
 import com.tobiasdiez.easybind.EasyBind;
-import javafx.beans.binding.Binding;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.fxml.FXML;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.ui.common.FxController;
@@ -13,6 +8,11 @@ import org.cryptomator.ui.controls.FontAwesome5Icon;
 import org.cryptomator.ui.fxapp.FxApplication;
 
 import javax.inject.Inject;
+import javafx.beans.binding.Binding;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.fxml.FXML;
 
 @MainWindowScoped
 public class VaultDetailController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
index f615d51ca..367aacc3a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
@@ -1,12 +1,6 @@
 package org.cryptomator.ui.mainwindow;
 
 import com.tobiasdiez.easybind.EasyBind;
-import javafx.beans.binding.BooleanExpression;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.keychain.KeychainManager;
 import org.cryptomator.ui.common.FxController;
@@ -14,6 +8,12 @@ import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.vaultoptions.VaultOptionsComponent;
 
 import javax.inject.Inject;
+import javafx.beans.binding.BooleanExpression;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
 import java.util.Optional;
 
 @MainWindowScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java
index 095743490..8d9f192b5 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java
@@ -1,15 +1,15 @@
 package org.cryptomator.ui.mainwindow;
 
-import javafx.beans.property.ObjectProperty;
-import javafx.fxml.FXML;
-import javafx.stage.FileChooser;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.removevault.RemoveVaultComponent;
 
 import javax.inject.Inject;
+import javafx.beans.property.ObjectProperty;
+import javafx.fxml.FXML;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
 import java.io.File;
 import java.util.ResourceBundle;
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailNeedsMigrationController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailNeedsMigrationController.java
index 480c69050..3ff78770a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailNeedsMigrationController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailNeedsMigrationController.java
@@ -1,13 +1,13 @@
 package org.cryptomator.ui.mainwindow;
 
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.fxml.FXML;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.migration.MigrationComponent;
 
 import javax.inject.Inject;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.fxml.FXML;
 
 @MainWindowScoped
 public class VaultDetailNeedsMigrationController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnknownErrorController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnknownErrorController.java
index b975174f8..13d1bf5c9 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnknownErrorController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnknownErrorController.java
@@ -1,12 +1,12 @@
 package org.cryptomator.ui.mainwindow;
 
 import com.tobiasdiez.easybind.EasyBind;
-import javafx.beans.binding.Binding;
-import javafx.beans.property.ObjectProperty;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
+import javafx.beans.binding.Binding;
+import javafx.beans.property.ObjectProperty;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
index 32f9bc9b0..8eb4d7f74 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
@@ -1,13 +1,13 @@
 package org.cryptomator.ui.mainwindow;
 
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.fxml.FXML;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.VaultService;
 
 import javax.inject.Inject;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.fxml.FXML;
 
 @MainWindowScoped
 public class VaultDetailUnlockedController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java
index 999afaaf1..abc287d6e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java
@@ -1,15 +1,15 @@
 package org.cryptomator.ui.mainwindow;
 
 import com.tobiasdiez.easybind.EasyBind;
-import javafx.beans.binding.Binding;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.controls.FontAwesome5Icon;
 
 import javax.inject.Inject;
+import javafx.beans.binding.Binding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 
 // unscoped because each cell needs its own controller
 public class VaultListCellController implements FxController {
@@ -25,7 +25,7 @@ public class VaultListCellController implements FxController {
 	}
 
 	private FontAwesome5Icon getGlyphForVaultState(VaultState state) {
-		if(state != null){
+		if (state != null) {
 			return switch (state) {
 				case LOCKED -> FontAwesome5Icon.LOCK;
 				case PROCESSING -> FontAwesome5Icon.SPINNER;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellFactory.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellFactory.java
index 96b63bc32..80cf2f82b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellFactory.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellFactory.java
@@ -1,16 +1,16 @@
 package org.cryptomator.ui.mainwindow;
 
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FXMLLoaderFactory;
+import org.cryptomator.ui.controls.DraggableListCell;
+
+import javax.inject.Inject;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.util.Callback;
-import org.cryptomator.ui.common.FXMLLoaderFactory;
-import org.cryptomator.ui.controls.DraggableListCell;
-import org.cryptomator.common.vaults.Vault;
-
-import javax.inject.Inject;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 
@@ -33,7 +33,7 @@ public class VaultListCellFactory implements Callback<ListView<Vault>, ListCell<
 			throw new UncheckedIOException("Failed to load /fxml/vault_list_cell.fxml.", e);
 		}
 	}
-	
+
 	private static class Cell extends DraggableListCell<Vault> {
 
 		private final Parent node;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
index d1aecb19f..0533cf50f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
@@ -1,13 +1,6 @@
 package org.cryptomator.ui.mainwindow;
 
 import com.tobiasdiez.easybind.EasyBind;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.collections.ListChangeListener;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.scene.control.ListView;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.ui.addvaultwizard.AddVaultWizardComponent;
@@ -17,6 +10,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.scene.control.ListView;
 
 @MainWindowScoped
 public class VaultListController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java
index 95a65f6ac..34e5af125 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java
@@ -1,20 +1,20 @@
 package org.cryptomator.ui.mainwindow;
 
-import javafx.application.Application;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import javafx.application.Application;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
 
 @MainWindowScoped
 public class WelcomeController implements FxController {
-	
+
 	private static final Logger LOG = LoggerFactory.getLogger(WelcomeController.class);
 	private static final String GETTING_STARTED_URI = "https://docs.cryptomator.org/en/1.5/desktop/getting-started/";
 
@@ -42,5 +42,5 @@ public class WelcomeController implements FxController {
 	public boolean isNoVaultPresent() {
 		return noVaultPresent.get();
 	}
-	
+
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationCapabilityErrorController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationCapabilityErrorController.java
index e6c31b7a0..a65c9ebb3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationCapabilityErrorController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationCapabilityErrorController.java
@@ -1,13 +1,6 @@
 package org.cryptomator.ui.migration;
 
 import dagger.Lazy;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.StringBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyObjectProperty;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.cryptofs.common.FileSystemCapabilityChecker;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
@@ -15,6 +8,13 @@ import org.cryptomator.ui.common.FxmlScene;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.StringBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyObjectProperty;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 import java.util.ResourceBundle;
 
 @MigrationScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationComponent.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationComponent.java
index 98507a2f9..831955ece 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationComponent.java
@@ -3,12 +3,13 @@ package org.cryptomator.ui.migration;
 import dagger.BindsInstance;
 import dagger.Lazy;
 import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
 @MigrationScoped
 @Subcomponent(modules = {MigrationModule.class})
 public interface MigrationComponent {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationImpossibleController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationImpossibleController.java
index 76d462113..191fc7a8f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationImpossibleController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationImpossibleController.java
@@ -1,12 +1,12 @@
 package org.cryptomator.ui.migration;
 
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.fxapp.FxApplication;
 
 import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
 
 public class MigrationImpossibleController implements FxController {
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java
index 79803f861..9f41b497e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java
@@ -4,12 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
 import org.cryptomator.cryptofs.common.FileSystemCapabilityChecker;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
@@ -22,7 +16,11 @@ import org.cryptomator.ui.mainwindow.MainWindow;
 
 import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;
 
@@ -47,7 +45,7 @@ abstract class MigrationModule {
 		stage.initOwner(owner);
 		return stage;
 	}
-	
+
 	@Provides
 	@Named("capabilityErrorCause")
 	@MigrationScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java
index 5233d979b..2bf4f49a1 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java
@@ -1,19 +1,6 @@
 package org.cryptomator.ui.migration;
 
 import dagger.Lazy;
-import javafx.application.Platform;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.ObjectBinding;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.DoubleProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.ReadOnlyDoubleProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.scene.control.ContentDisplay;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.cryptofs.FileNameTooLongException;
@@ -36,6 +23,19 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.application.Platform;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.ReadOnlyDoubleProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.scene.control.ContentDisplay;
+import javafx.stage.Stage;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationStartController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationStartController.java
index 260b43823..27ad96d26 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationStartController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationStartController.java
@@ -1,15 +1,15 @@
 package org.cryptomator.ui.migration;
 
 import dagger.Lazy;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 
 import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 
 @MigrationScoped
 public class MigrationStartController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationSuccessController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationSuccessController.java
index e0135f8b9..1a5de5647 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationSuccessController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationSuccessController.java
@@ -1,13 +1,13 @@
 package org.cryptomator.ui.migration;
 
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.mainwindow.MainWindow;
 
 import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
 import java.util.Optional;
 
 @MigrationScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java
index 99b21b4cd..64ad27abc 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java
@@ -19,6 +19,6 @@ public interface AutoStartStrategy {
 		public TogglingAutoStartFailedException(String message, Throwable cause) {
 			super(message, cause);
 		}
-		
+
 	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/DonationKeyPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/DonationKeyPreferencesController.java
index 21a2d3d9a..e7708af81 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/DonationKeyPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/DonationKeyPreferencesController.java
@@ -1,15 +1,15 @@
 package org.cryptomator.ui.preferences;
 
-import javafx.application.Application;
-import javafx.beans.value.ObservableValue;
-import javafx.fxml.FXML;
-import javafx.scene.control.TextArea;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
+import javafx.application.Application;
+import javafx.beans.value.ObservableValue;
+import javafx.fxml.FXML;
+import javafx.scene.control.TextArea;
 
 @PreferencesScoped
 public class DonationKeyPreferencesController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index 0cdfd4a5a..4e4abfbc9 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -1,18 +1,5 @@
 package org.cryptomator.ui.preferences;
 
-import javafx.application.Application;
-import javafx.application.Platform;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.value.ObservableValue;
-import javafx.concurrent.Task;
-import javafx.fxml.FXML;
-import javafx.geometry.NodeOrientation;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.Toggle;
-import javafx.scene.control.ToggleGroup;
-import javafx.util.StringConverter;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.LicenseHolder;
@@ -27,6 +14,20 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.application.Application;
+import javafx.application.Platform;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.value.ObservableValue;
+import javafx.concurrent.Task;
+import javafx.fxml.FXML;
+import javafx.geometry.NodeOrientation;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.Toggle;
+import javafx.scene.control.ToggleGroup;
+import javafx.util.StringConverter;
+
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.Optional;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesComponent.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesComponent.java
index 320b8c63f..8dcb11fd8 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesComponent.java
@@ -7,11 +7,12 @@ package org.cryptomator.ui.preferences;
 
 import dagger.Lazy;
 import dagger.Subcomponent;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
+
 import javafx.beans.property.ObjectProperty;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;
 
 @PreferencesScoped
 @Subcomponent(modules = {PreferencesModule.class})
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java
index 2b58eda30..64d5c991b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java
@@ -1,5 +1,11 @@
 package org.cryptomator.ui.preferences;
 
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.fxapp.UpdateChecker;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ObjectProperty;
 import javafx.fxml.FXML;
@@ -7,12 +13,6 @@ import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.fxapp.UpdateChecker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
 
 @PreferencesScoped
 public class PreferencesController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java
index 7a9dc2027..2558582fd 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java
@@ -4,11 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
 import org.cryptomator.ui.common.FxController;
@@ -17,9 +12,11 @@ import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 import org.cryptomator.ui.common.StageFactory;
 
-import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java
index 60edc4f12..bb0f43edd 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java
@@ -1,5 +1,10 @@
 package org.cryptomator.ui.preferences;
 
+import org.cryptomator.common.settings.Settings;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.fxapp.UpdateChecker;
+
+import javax.inject.Inject;
 import javafx.application.Application;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -8,17 +13,12 @@ import javafx.beans.property.ReadOnlyStringProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ContentDisplay;
-import org.cryptomator.common.settings.Settings;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.fxapp.UpdateChecker;
-
-import javax.inject.Inject;
 
 @PreferencesScoped
 public class UpdatesPreferencesController implements FxController {
 
 	private static final String DOWNLOADS_URI = "https://cryptomator.org/downloads";
-	
+
 	private final Application application;
 	private final Settings settings;
 	private final UpdateChecker updateChecker;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
index 5faf5b694..4af86dc85 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/VolumePreferencesController.java
@@ -1,12 +1,5 @@
 package org.cryptomator.ui.preferences;
 
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.scene.control.Button;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.TextField;
-import javafx.util.StringConverter;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VolumeImpl;
@@ -15,6 +8,13 @@ import org.cryptomator.common.vaults.Volume;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.scene.control.Button;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.TextField;
+import javafx.util.StringConverter;
 
 /**
  * TODO: if WebDAV is selected under Windows, show warning that specific mount options (like selecting a directory as mount point) are _not_ supported
diff --git a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitComponent.java b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitComponent.java
index 0b8f9a729..23ddf311a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitComponent.java
@@ -8,11 +8,11 @@ package org.cryptomator.ui.quit;
 import dagger.BindsInstance;
 import dagger.Lazy;
 import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 import java.awt.desktop.QuitResponse;
 
 @QuitScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java
index 7255115ea..130556ef2 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java
@@ -1,11 +1,5 @@
 package org.cryptomator.ui.quit;
 
-import javafx.collections.ObservableList;
-import javafx.concurrent.Task;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.ContentDisplay;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.VaultService;
@@ -13,6 +7,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import javafx.collections.ObservableList;
+import javafx.concurrent.Task;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.ContentDisplay;
+import javafx.stage.Stage;
 import java.awt.desktop.QuitResponse;
 import java.util.Collection;
 import java.util.concurrent.ExecutorService;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java
index d79cabfcb..e73fa9d46 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitModule.java
@@ -4,13 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyCodeCombination;
-import javafx.scene.input.KeyCombination;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
 import org.cryptomator.ui.common.FxController;
@@ -19,9 +12,10 @@ import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 import org.cryptomator.ui.common.StageFactory;
 
-import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/AutoCompleter.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/AutoCompleter.java
index 4ca6d58ce..5c747261b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/AutoCompleter.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/AutoCompleter.java
@@ -37,10 +37,10 @@ public class AutoCompleter {
 
 	/**
 	 * Find the index of the first word in {@link #dictionary} that starts with a given prefix.
-	 * 
+	 * <p>
 	 * This method performs an "unsuccessful" binary search (it doesn't return when encountering an exact match).
 	 * Instead it continues searching in the left half (which includes the exact match) until only one element is left.
-	 * 
+	 * <p>
 	 * If the dictionary doesn't contain a word "left" of the given prefix, this method returns an invalid index, though.
 	 *
 	 * @param begin Index of first element (inclusive)
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java
index b9ab0fe37..cfec43e3e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyComponent.java
@@ -3,15 +3,13 @@ package org.cryptomator.ui.recoverykey;
 import dagger.BindsInstance;
 import dagger.Lazy;
 import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 
-import javax.annotation.Nullable;
 import javax.inject.Named;
-import java.util.Optional;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 
 @RecoveryKeyScoped
 @Subcomponent(modules = {RecoveryKeyModule.class})
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
index f5b002cbf..de756d899 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
@@ -1,11 +1,6 @@
 package org.cryptomator.ui.recoverykey;
 
 import dagger.Lazy;
-import javafx.beans.property.StringProperty;
-import javafx.concurrent.Task;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
 import org.cryptomator.ui.common.Animations;
@@ -17,6 +12,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import javafx.beans.property.StringProperty;
+import javafx.concurrent.Task;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java
index 40d3657ff..033d94b2b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java
@@ -1,5 +1,9 @@
 package org.cryptomator.ui.recoverykey;
 
+import org.cryptomator.ui.common.FxController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import javafx.fxml.FXML;
 import javafx.print.PageLayout;
 import javafx.print.Printer;
@@ -13,14 +17,10 @@ import javafx.scene.text.FontWeight;
 import javafx.scene.text.Text;
 import javafx.scene.text.TextFlow;
 import javafx.stage.Stage;
-import org.cryptomator.ui.common.FxController;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ResourceBundle;
 
 public class RecoveryKeyDisplayController implements FxController {
-	
+
 	private static final Logger LOG = LoggerFactory.getLogger(RecoveryKeyDisplayController.class);
 
 	private final Stage window;
@@ -41,7 +41,7 @@ public class RecoveryKeyDisplayController implements FxController {
 		PrinterJob job = PrinterJob.createPrinterJob();
 		if (job != null && job.showPrintDialog(window)) {
 			PageLayout pageLayout = job.getJobSettings().getPageLayout();
-			
+
 			String headingText = String.format(localization.getString("recoveryKey.printout.heading"), vaultName);
 			Text heading = new Text(headingText);
 			heading.setFont(Font.font("serif", FontWeight.BOLD, 20));
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java
index c07bd3bd3..15d4e651e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java
@@ -18,14 +18,14 @@ import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
 public class RecoveryKeyFactory {
 
 	private static final byte[] PEPPER = new byte[0];
-	
+
 	private final WordEncoder wordEncoder;
-	
+
 	@Inject
 	public RecoveryKeyFactory(WordEncoder wordEncoder) {
 		this.wordEncoder = wordEncoder;
 	}
-	
+
 	public Collection<String> getDictionary() {
 		return wordEncoder.getWords();
 	}
@@ -62,6 +62,7 @@ public class RecoveryKeyFactory {
 
 	/**
 	 * Creates a completely new masterkey using a recovery key.
+	 *
 	 * @param vaultPath Path to the storage location of a vault
 	 * @param recoveryKey A recovery key for this vault
 	 * @param newPassword The new password used to encrypt the keys
@@ -80,6 +81,7 @@ public class RecoveryKeyFactory {
 
 	/**
 	 * Checks whether a String is a syntactically correct recovery key with a valid checksum
+	 *
 	 * @param recoveryKey A word sequence which might be a recovery key
 	 * @return <code>true</code> if this seems to be a legitimate recovery key
 	 */
@@ -92,7 +94,7 @@ public class RecoveryKeyFactory {
 			return false;
 		}
 	}
-	
+
 	private byte[] decodeRecoveryKey(String recoveryKey) throws IllegalArgumentException {
 		byte[] paddedKey = new byte[0];
 		try {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
index 9ad3d73ad..c6f502886 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java
@@ -4,13 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.scene.Scene;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
@@ -24,6 +17,13 @@ import org.cryptomator.ui.common.StageFactory;
 
 import javax.inject.Named;
 import javax.inject.Provider;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;
 
@@ -48,7 +48,7 @@ abstract class RecoveryKeyModule {
 		stage.initOwner(owner);
 		return stage;
 	}
-	
+
 	@Provides
 	@RecoveryKeyWindow
 	@RecoveryKeyScoped
@@ -129,5 +129,5 @@ abstract class RecoveryKeyModule {
 	static FxController provideNewPasswordController(ResourceBundle resourceBundle, PasswordStrengthUtil strengthRater, @Named("newPassword") ObjectProperty<CharSequence> password) {
 		return new NewPasswordController(resourceBundle, strengthRater, password);
 	}
-	
+
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java
index 8b9e1cdfb..7e40a833b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java
@@ -3,6 +3,12 @@ package org.cryptomator.ui.recoverykey;
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Strings;
 import dagger.Lazy;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
+
+import javax.inject.Inject;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.StringProperty;
@@ -13,12 +19,6 @@ import javafx.scene.control.TextFormatter;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.stage.Stage;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;
-
-import javax.inject.Inject;
 import java.util.Optional;
 
 @RecoveryKeyScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
index 8f626a652..cdf54990f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java
@@ -1,17 +1,7 @@
 package org.cryptomator.ui.recoverykey;
 
 import dagger.Lazy;
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.StringProperty;
-import javafx.concurrent.Task;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.cryptolib.api.InvalidPassphraseException;
-import org.cryptomator.ui.common.Animations;
 import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
@@ -21,12 +11,20 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.StringProperty;
+import javafx.concurrent.Task;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 
 @RecoveryKeyScoped
 public class RecoveryKeyResetPasswordController implements FxController {
-	
+
 	private static final Logger LOG = LoggerFactory.getLogger(RecoveryKeyResetPasswordController.class);
 
 	private final Stage window;
@@ -40,7 +38,7 @@ public class RecoveryKeyResetPasswordController implements FxController {
 	private final ErrorComponent.Builder errorComponent;
 
 	@Inject
-	public RecoveryKeyResetPasswordController(@RecoveryKeyWindow Stage window, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @Named("newPassword")ObjectProperty<CharSequence> newPassword, @FxmlScene(FxmlFile.RECOVERYKEY_RECOVER) Lazy<Scene> recoverScene, ErrorComponent.Builder errorComponent) {
+	public RecoveryKeyResetPasswordController(@RecoveryKeyWindow Stage window, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @Named("newPassword") ObjectProperty<CharSequence> newPassword, @FxmlScene(FxmlFile.RECOVERYKEY_RECOVER) Lazy<Scene> recoverScene, ErrorComponent.Builder errorComponent) {
 		this.window = window;
 		this.vault = vault;
 		this.recoveryKeyFactory = recoveryKeyFactory;
@@ -88,7 +86,7 @@ public class RecoveryKeyResetPasswordController implements FxController {
 		}
 
 	}
-	
+
 	/* Getter/Setter */
 
 	public BooleanBinding invalidNewPasswordProperty() {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeySuccessController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeySuccessController.java
index ae9e2e70f..568a6c16e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeySuccessController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeySuccessController.java
@@ -1,10 +1,10 @@
 package org.cryptomator.ui.recoverykey;
 
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
 
 @RecoveryKeyScoped
 public class RecoveryKeySuccessController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java
index d5e7e667c..ba4753879 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/WordEncoder.java
@@ -12,7 +12,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -24,19 +23,19 @@ class WordEncoder {
 	private static final String DEFAULT_WORD_FILE = "/i18n/4096words_en.txt";
 	private static final int WORD_COUNT = 4096;
 	private static final char DELIMITER = ' ';
-	
+
 	private final List<String> words;
 	private final Map<String, Integer> indices;
-	
+
 	@Inject
 	public WordEncoder() {
 		this(DEFAULT_WORD_FILE);
 	}
-	
+
 	public List<String> getWords() {
 		return words;
 	}
-	
+
 	public WordEncoder(String wordFile) {
 		try (InputStream in = getClass().getResourceAsStream(wordFile); //
 			 Reader reader = new InputStreamReader(in, StandardCharsets.US_ASCII.newDecoder()); //
@@ -53,6 +52,7 @@ class WordEncoder {
 
 	/**
 	 * Encodes the given input as a sequence of words.
+	 *
 	 * @param input A multiple of three bytes
 	 * @return A String that can be {@link #decode(String) decoded} to the input again.
 	 * @throws IllegalArgumentException If input is not a multiple of three bytes
@@ -60,10 +60,10 @@ class WordEncoder {
 	public String encodePadded(byte[] input) {
 		Preconditions.checkArgument(input.length % 3 == 0, "input needs to be padded to a multipe of three");
 		StringBuilder sb = new StringBuilder();
-		for (int i = 0; i < input.length; i+=3) {
+		for (int i = 0; i < input.length; i += 3) {
 			byte b1 = input[i];
-			byte b2 = input[i+1];
-			byte b3 = input[i+2];
+			byte b2 = input[i + 1];
+			byte b3 = input[i + 2];
 			int firstWordIndex = (0xFF0 & (b1 << 4)) + (0x00F & (b2 >> 4)); // 0xFFF000
 			int secondWordIndex = (0xF00 & (b2 << 8)) + (0x0FF & b3); // 0x000FFF
 			assert firstWordIndex < WORD_COUNT;
@@ -79,6 +79,7 @@ class WordEncoder {
 
 	/**
 	 * Decodes a String that has previously been {@link #encodePadded(byte[]) encoded} to a word sequence.
+	 *
 	 * @param encoded The word sequence
 	 * @return Decoded bytes
 	 * @throws IllegalArgumentException If the encoded string doesn't consist of a multiple of two words or one of the words is unknown to this encoder.
@@ -87,9 +88,9 @@ class WordEncoder {
 		List<String> splitted = Splitter.on(DELIMITER).omitEmptyStrings().splitToList(Strings.nullToEmpty(encoded));
 		Preconditions.checkArgument(splitted.size() % 2 == 0, "%s needs to be a multiple of two words", encoded);
 		byte[] result = new byte[splitted.size() / 2 * 3];
-		for (int i = 0; i < splitted.size(); i+=2) {
+		for (int i = 0; i < splitted.size(); i += 2) {
 			String w1 = splitted.get(i);
-			String w2 = splitted.get(i+1);
+			String w2 = splitted.get(i + 1);
 			int firstWordIndex = indices.getOrDefault(w1, -1);
 			int secondWordIndex = indices.getOrDefault(w2, -1);
 			Preconditions.checkArgument(firstWordIndex != -1, "%s not in dictionary", w1);
@@ -97,12 +98,12 @@ class WordEncoder {
 			byte b1 = (byte) (0xFF & (firstWordIndex >> 4));
 			byte b2 = (byte) ((0xF0 & (firstWordIndex << 4)) + (0x0F & (secondWordIndex >> 8)));
 			byte b3 = (byte) (0xFF & secondWordIndex);
-			result[i/2*3] = b1;
-			result[i/2*3+1] = b2;
-			result[i/2*3+2] = b3;
+			result[i / 2 * 3] = b1;
+			result[i / 2 * 3 + 1] = b2;
+			result[i / 2 * 3 + 2] = b3;
 		}
 		return result;
 	}
-	
+
 
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java
index 55e7daf4e..c8b3fd574 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultComponent.java
@@ -3,12 +3,13 @@ package org.cryptomator.ui.removevault;
 import dagger.BindsInstance;
 import dagger.Lazy;
 import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
 @RemoveVaultScoped
 @Subcomponent(modules = {RemoveVaultModule.class})
 public interface RemoveVaultComponent {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java
index 836ed519f..e486d65f0 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java
@@ -1,14 +1,14 @@
 package org.cryptomator.ui.removevault;
 
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
+import javafx.collections.ObservableList;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
 
 @RemoveVaultScoped
 public class RemoveVaultController implements FxController {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java
index 5f61ec7ed..5e717c431 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultModule.java
@@ -4,13 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyCodeCombination;
-import javafx.scene.input.KeyCombination;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
 import org.cryptomator.ui.common.FxController;
@@ -20,9 +13,10 @@ import org.cryptomator.ui.common.FxmlScene;
 import org.cryptomator.ui.common.StageFactory;
 import org.cryptomator.ui.mainwindow.MainWindow;
 
-import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
index 1610c6862..51f7c2225 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
@@ -1,14 +1,14 @@
 package org.cryptomator.ui.traymenu;
 
-import javafx.application.Platform;
-import javafx.beans.Observable;
-import javafx.collections.ObservableList;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.launcher.AppLifecycleListener;
 import org.cryptomator.ui.launcher.FxApplicationStarter;
 import org.cryptomator.ui.preferences.SelectedPreferencesTab;
 
 import javax.inject.Inject;
+import javafx.application.Platform;
+import javafx.beans.Observable;
+import javafx.collections.ObservableList;
 import java.awt.Menu;
 import java.awt.MenuItem;
 import java.awt.PopupMenu;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockComponent.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockComponent.java
index 18ae3b5f0..9c0338c5b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockComponent.java
@@ -7,10 +7,10 @@ package org.cryptomator.ui.unlock;
 
 import dagger.BindsInstance;
 import dagger.Subcomponent;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 
 import javax.inject.Named;
+import javafx.stage.Stage;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
index 537eba9a8..b64195d9a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
@@ -1,5 +1,17 @@
 package org.cryptomator.ui.unlock;
 
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.keychain.KeychainManager;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.UserInteractionLock;
+import org.cryptomator.ui.common.WeakBindings;
+import org.cryptomator.ui.controls.NiceSecurePasswordField;
+import org.cryptomator.ui.forgetPassword.ForgetPasswordComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Named;
 import javafx.animation.Animation;
 import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
@@ -20,18 +32,6 @@ import javafx.scene.transform.Rotate;
 import javafx.scene.transform.Translate;
 import javafx.stage.Stage;
 import javafx.util.Duration;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.keychain.KeychainManager;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.UserInteractionLock;
-import org.cryptomator.ui.common.WeakBindings;
-import org.cryptomator.ui.controls.NiceSecurePasswordField;
-import org.cryptomator.ui.forgetPassword.ForgetPasswordComponent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
-import javax.inject.Named;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -88,7 +88,7 @@ public class UnlockController implements FxController {
 			passwordField.setPassword(password.get());
 		}
 		unlockButtonDisabled.bind(userInteractionDisabled.or(passwordField.textProperty().isEmpty()));
-		
+
 		var leftArmTranslation = new Translate(24, 0);
 		var leftArmRotation = new Rotate(60, 16, 30, 0);
 		var leftArmRetracted = new KeyValue(leftArmTranslation.xProperty(), 24);
@@ -116,15 +116,15 @@ public class UnlockController implements FxController {
 		var faceVisible = new KeyValue(face.opacityProperty(), 1.0, Interpolator.LINEAR);
 		face.setOpacity(0);
 
-		unlockAnimation = new Timeline(
-				new KeyFrame(Duration.ZERO, leftArmRetracted, leftArmHorizontal, rightArmRetracted, rightArmHorizontal, legsRetractedY, legsRetractedX, faceHidden),
-				new KeyFrame(Duration.millis(200), leftArmExtended, leftArmHorizontal, rightArmRetracted, rightArmHorizontal),
-				new KeyFrame(Duration.millis(400), leftArmExtended, leftArmHanging, rightArmExtended, rightArmHorizontal),
-				new KeyFrame(Duration.millis(600), leftArmExtended, leftArmHanging, rightArmExtended, rightArmHanging),
-				new KeyFrame(Duration.millis(800), legsExtendedY, legsExtendedX, faceHidden),
-				new KeyFrame(Duration.millis(1000), faceVisible)
+		unlockAnimation = new Timeline( //
+				new KeyFrame(Duration.ZERO, leftArmRetracted, leftArmHorizontal, rightArmRetracted, rightArmHorizontal, legsRetractedY, legsRetractedX, faceHidden), //
+				new KeyFrame(Duration.millis(200), leftArmExtended, leftArmHorizontal, rightArmRetracted, rightArmHorizontal), //
+				new KeyFrame(Duration.millis(400), leftArmExtended, leftArmHanging, rightArmExtended, rightArmHorizontal), //
+				new KeyFrame(Duration.millis(600), leftArmExtended, leftArmHanging, rightArmExtended, rightArmHanging), //
+				new KeyFrame(Duration.millis(800), legsExtendedY, legsExtendedX, faceHidden), //
+				new KeyFrame(Duration.millis(1000), faceVisible) //
 		);
-		
+
 		passwordEntryLock.awaitingInteraction().addListener(observable -> stopUnlockAnimation());
 	}
 
@@ -152,7 +152,7 @@ public class UnlockController implements FxController {
 		passwordEntryLock.interacted(UnlockModule.PasswordEntry.PASSWORD_ENTERED);
 		startUnlockAnimation();
 	}
-	
+
 	private void startUnlockAnimation() {
 		leftArm.setVisible(true);
 		rightArm.setVisible(true);
@@ -184,7 +184,7 @@ public class UnlockController implements FxController {
 	public String getVaultName() {
 		return vaultName.get();
 	}
-	
+
 	public StringBinding vaultNameProperty() {
 		return vaultName;
 	}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
index 792edbf91..1850953c9 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java
@@ -1,9 +1,6 @@
 package org.cryptomator.ui.unlock;
 
 import dagger.Lazy;
-import javafx.fxml.FXML;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.MountPointRequirement;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
@@ -11,6 +8,9 @@ import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 
 import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 
 //At the current point in time only the CustomMountPointChooser may cause this window to be shown.
 @UnlockScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
index bef612dc1..102743e7f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
@@ -4,9 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.scene.Scene;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.keychain.KeychainAccessException;
 import org.cryptomator.keychain.KeychainManager;
@@ -24,6 +21,9 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Named;
 import javax.inject.Provider;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.Optional;
 import java.util.ResourceBundle;
@@ -35,7 +35,10 @@ abstract class UnlockModule {
 
 	private static final Logger LOG = LoggerFactory.getLogger(UnlockModule.class);
 
-	public enum PasswordEntry {PASSWORD_ENTERED, CANCELED}
+	public enum PasswordEntry {
+		PASSWORD_ENTERED,
+		CANCELED
+	}
 
 	@Provides
 	@UnlockScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java
index f7952ad9f..ee3ffc5ae 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockSuccessController.java
@@ -1,5 +1,13 @@
 package org.cryptomator.ui.unlock;
 
+import org.cryptomator.common.settings.WhenUnlocked;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.VaultService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
@@ -10,14 +18,6 @@ import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ContentDisplay;
 import javafx.stage.Stage;
-import org.cryptomator.common.settings.WhenUnlocked;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.VaultService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
 import java.util.concurrent.ExecutorService;
 
 @UnlockScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index 12633452a..bdefb4ad3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -1,11 +1,6 @@
 package org.cryptomator.ui.unlock;
 
 import dagger.Lazy;
-import javafx.application.Platform;
-import javafx.concurrent.Task;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-import javafx.stage.Window;
 import org.cryptomator.common.mountpoint.InvalidMountPointException;
 import org.cryptomator.common.vaults.MountPointRequirement;
 import org.cryptomator.common.vaults.Vault;
@@ -26,6 +21,11 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
+import javafx.application.Platform;
+import javafx.concurrent.Task;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+import javafx.stage.Window;
 import java.io.IOException;
 import java.nio.CharBuffer;
 import java.nio.file.DirectoryNotEmptyException;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
index 9849b0513..4425139f3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/GeneralVaultOptionsController.java
@@ -1,16 +1,15 @@
 package org.cryptomator.ui.vaultoptions;
 
-import javafx.fxml.FXML;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.TextField;
-import javafx.util.StringConverter;
-import org.cryptomator.common.settings.UiTheme;
 import org.cryptomator.common.settings.WhenUnlocked;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.ChoiceBox;
+import javafx.scene.control.TextField;
+import javafx.util.StringConverter;
 import java.util.ResourceBundle;
 
 @VaultOptionsScoped
@@ -39,7 +38,7 @@ public class GeneralVaultOptionsController implements FxController {
 	}
 
 	private static class WhenUnlockedConverter extends StringConverter<WhenUnlocked> {
-		
+
 		private final ResourceBundle resourceBundle;
 
 		public WhenUnlockedConverter(ResourceBundle resourceBundle) {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java
index 6ec7576dd..4c08ad75a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java
@@ -1,10 +1,5 @@
 package org.cryptomator.ui.vaultoptions;
 
-import javafx.beans.binding.Bindings;
-import javafx.beans.binding.BooleanExpression;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.fxml.FXML;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.keychain.KeychainAccessException;
 import org.cryptomator.keychain.KeychainManager;
@@ -13,6 +8,11 @@ import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.recoverykey.RecoveryKeyComponent;
 
 import javax.inject.Inject;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.BooleanExpression;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
 import java.util.Optional;
 
 @VaultOptionsScoped
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
index ff0f178dc..5d65107d0 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MountOptionsController.java
@@ -1,6 +1,15 @@
 package org.cryptomator.ui.vaultoptions;
 
 import com.google.common.base.Strings;
+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.Environment;
+import org.cryptomator.common.settings.Settings;
+import org.cryptomator.common.settings.VolumeImpl;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.common.vaults.WindowsDriveLetters;
+import org.cryptomator.ui.common.FxController;
+
+import javax.inject.Inject;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.BooleanProperty;
@@ -17,15 +26,6 @@ import javafx.scene.control.ToggleGroup;
 import javafx.stage.DirectoryChooser;
 import javafx.stage.Stage;
 import javafx.util.StringConverter;
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.Environment;
-import org.cryptomator.common.settings.Settings;
-import org.cryptomator.common.settings.VolumeImpl;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.common.vaults.WindowsDriveLetters;
-import org.cryptomator.ui.common.FxController;
-
-import javax.inject.Inject;
 import java.io.File;
 import java.nio.file.Path;
 import java.util.ResourceBundle;
@@ -73,7 +73,7 @@ public class MountOptionsController implements FxController {
 
 		// readonly:
 		readOnlyCheckbox.selectedProperty().bindBidirectional(vault.getVaultSettings().usesReadOnlyMode());
-		if(getRestrictToStableFuseOnWindows()) {
+		if (getRestrictToStableFuseOnWindows()) {
 			readOnlyCheckbox.setSelected(false); // to prevent invalid states
 		}
 		readOnlyCheckbox.disableProperty().bind(customMountFlagsCheckbox.selectedProperty().or(restrictToStableFuseOnWindows));
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsComponent.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsComponent.java
index 578219aa5..09b362aff 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsComponent.java
@@ -8,12 +8,13 @@ package org.cryptomator.ui.vaultoptions;
 import dagger.BindsInstance;
 import dagger.Lazy;
 import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
 @VaultOptionsScoped
 @Subcomponent(modules = {VaultOptionsModule.class})
 public interface VaultOptionsComponent {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java
index f39af7e34..0e65ed0d2 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java
@@ -4,9 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.scene.Scene;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.changepassword.ChangePasswordComponent;
 import org.cryptomator.ui.common.DefaultSceneFactory;
@@ -20,6 +17,9 @@ import org.cryptomator.ui.mainwindow.MainWindow;
 import org.cryptomator.ui.recoverykey.RecoveryKeyComponent;
 
 import javax.inject.Provider;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertComponent.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertComponent.java
index a79567f9d..f21a7a91a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertComponent.java
@@ -2,11 +2,12 @@ package org.cryptomator.ui.wrongfilealert;
 
 import dagger.Lazy;
 import dagger.Subcomponent;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
 
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
 @WrongFileAlertScoped
 @Subcomponent(modules = {WrongFileAlertModule.class})
 public interface WrongFileAlertComponent {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java
index 292486a6a..7f05e5287 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java
@@ -1,13 +1,13 @@
 package org.cryptomator.ui.wrongfilealert;
 
-import javafx.application.Application;
-import javafx.fxml.FXML;
-import javafx.scene.image.Image;
-import javafx.stage.Stage;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.ui.common.FxController;
 
 import javax.inject.Inject;
+import javafx.application.Application;
+import javafx.fxml.FXML;
+import javafx.scene.image.Image;
+import javafx.stage.Stage;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java
index cca3b0269..4d26a371c 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java
@@ -4,10 +4,6 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
-import javafx.scene.Scene;
-import javafx.scene.image.Image;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
 import org.cryptomator.ui.common.FxController;
@@ -17,9 +13,10 @@ import org.cryptomator.ui.common.FxmlScene;
 import org.cryptomator.ui.common.StageFactory;
 import org.cryptomator.ui.mainwindow.MainWindow;
 
-import javax.inject.Named;
 import javax.inject.Provider;
-import java.util.List;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;
 
diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css
index c96527374..997cc233a 100644
--- a/main/ui/src/main/resources/css/dark_theme.css
+++ b/main/ui/src/main/resources/css/dark_theme.css
@@ -82,8 +82,8 @@
 	PROGRESS_BAR_BG: GRAY_2;
 
 	-fx-background-color: MAIN_BG;
-    -fx-text-fill: TEXT_FILL;
-    -fx-font-family: 'Open Sans';
+	-fx-text-fill: TEXT_FILL;
+	-fx-font-family: 'Open Sans';
 }
 
 /*******************************************************************************
@@ -191,7 +191,7 @@
 	-fx-background-color: white, RED_5;
 	-fx-background-insets: 1px, 2px;
 	-fx-background-radius: 6px, 5px;
-	-fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 2, 0, 0, 0);
+	-fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.8), 2, 0, 0, 0);
 }
 
 .main-window .drag-n-drop-indicator {
@@ -443,7 +443,7 @@
 	-fx-font-size: 0.8em;
 	-fx-background-color: CONTROL_BG_NORMAL;
 	-fx-padding: 0.2em 0.4em 0.2em 0.4em;
-	-fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.5), 2, 0, 0, 0);
+	-fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.5), 2, 0, 0, 0);
 }
 
 /*******************************************************************************
@@ -488,7 +488,7 @@
  ******************************************************************************/
 
 .text-area {
-    -fx-cursor: default;
+	-fx-cursor: default;
 	-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_NORMAL;
 	-fx-background-insets: 0, 1px;
 	-fx-background-radius: 4px;
@@ -505,7 +505,7 @@
 }
 
 .text-area > .scroll-pane > .scroll-bar {
-    -fx-padding: 2px;
+	-fx-padding: 2px;
 }
 
 .text-area .content {
@@ -514,7 +514,7 @@
 	-fx-text-fill: TEXT_FILL;
 	-fx-highlight-fill: PRIMARY;
 	-fx-prompt-text-fill: TEXT_FILL_MUTED;
-    -fx-background-color: null;
+	-fx-background-color: null;
 }
 
 /*******************************************************************************
@@ -748,7 +748,7 @@
 	-fx-background-insets: 0, 1px;
 	-fx-background-radius: 4px;
 	-fx-padding: 0.2em 0 0.2em 0;
-	-fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.2), 8, 0, 0, 0);
+	-fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.2), 8, 0, 0, 0);
 }
 
 /*******************************************************************************
@@ -775,7 +775,7 @@
 }
 
 .menu-item > .label {
-    -fx-padding: 1px 0.5em 1px 0.5em;
+	-fx-padding: 1px 0.5em 1px 0.5em;
 }
 
 .menu-item:disabled > .label {
@@ -801,7 +801,7 @@
 }
 
 .progress-indicator:indeterminate > .spinner {
-	-fx-padding: 0.083333em; 
+	-fx-padding: 0.083333em;
 }
 
 .progress-indicator:indeterminate .segment {
@@ -810,51 +810,51 @@
 }
 
 .progress-indicator:indeterminate .segment0 {
-	-fx-shape:"m 12.007729,4.9541827 c -0.49762,0.7596865 0.893181,1.6216808 1.327833,0.7666252 L 15.456199,2.0477574 C 15.942094,1.2061627 14.61426,0.43953765 14.128365,1.2811324 z";
+	-fx-shape: "m 12.007729,4.9541827 c -0.49762,0.7596865 0.893181,1.6216808 1.327833,0.7666252 L 15.456199,2.0477574 C 15.942094,1.2061627 14.61426,0.43953765 14.128365,1.2811324 z";
 }
 
 .progress-indicator:indeterminate .segment1 {
-	-fx-shape:"m 9.2224559,4.62535 c -0.051108,0.9067177 1.5843581,0.957826 1.5332501,0 l 0,-4.24127319 c 0,-0.9717899 -1.5332501,-0.9717899 -1.5332501,0 z";
+	-fx-shape: "m 9.2224559,4.62535 c -0.051108,0.9067177 1.5843581,0.957826 1.5332501,0 l 0,-4.24127319 c 0,-0.9717899 -1.5332501,-0.9717899 -1.5332501,0 z";
 }
 
 .progress-indicator:indeterminate .segment2 {
-	-fx-shape:"M 8.0465401,4.9030617 C 8.5441601,5.6627485 7.1533584,6.5247425 6.7187068,5.6696872 L 4.5980702,1.9966363 C 4.1121752,1.1550418 5.4400085,0.38841683 5.9259035,1.2300114 z";
+	-fx-shape: "M 8.0465401,4.9030617 C 8.5441601,5.6627485 7.1533584,6.5247425 6.7187068,5.6696872 L 4.5980702,1.9966363 C 4.1121752,1.1550418 5.4400085,0.38841683 5.9259035,1.2300114 z";
 }
 
 .progress-indicator:indeterminate .segment3 {
-	-fx-shape:"M 5.7330066,6.5305598 C 6.5579512,6.9103162 5.8366865,8.3790371 5.0144939,7.8850315 L 1.2677551,5.8974832 C 0.409277,5.4420823 1.1277888,4.0876101 1.9862674,4.5430105 z";
+	-fx-shape: "M 5.7330066,6.5305598 C 6.5579512,6.9103162 5.8366865,8.3790371 5.0144939,7.8850315 L 1.2677551,5.8974832 C 0.409277,5.4420823 1.1277888,4.0876101 1.9862674,4.5430105 z";
 }
 
 .progress-indicator:indeterminate .segment4 {
-	-fx-shape:"m 0.42171041,9.2083842 c -0.90671825,-0.051108 -0.95782608,1.5843588 0,1.5332498 l 4.24127319,0 c 0.9717899,0 0.9717899,-1.5332498 0,-1.5332498 z";
+	-fx-shape: "m 0.42171041,9.2083842 c -0.90671825,-0.051108 -0.95782608,1.5843588 0,1.5332498 l 4.24127319,0 c 0.9717899,0 0.9717899,-1.5332498 0,-1.5332498 z";
 }
 
 .progress-indicator:indeterminate .segment5 {
-	-fx-shape:"M 5.7330066,13.443113 C 6.5579512,13.063356 5.8366865,11.594635 5.0144939,12.088641 L 1.2677551,14.076189 C 0.409277,14.53159 1.1277888,15.886062 1.9862674,15.430662 z";
+	-fx-shape: "M 5.7330066,13.443113 C 6.5579512,13.063356 5.8366865,11.594635 5.0144939,12.088641 L 1.2677551,14.076189 C 0.409277,14.53159 1.1277888,15.886062 1.9862674,15.430662 z";
 }
 
 .progress-indicator:indeterminate .segment6 {
-	-fx-shape:"M 8.0465401,15.070611 C 8.5441601,14.310924 7.1533584,13.44893 6.7187068,14.303985 l -2.1206366,3.673051 c -0.485895,0.841595 0.8419383,1.60822 1.3278333,0.766625 z";
+	-fx-shape: "M 8.0465401,15.070611 C 8.5441601,14.310924 7.1533584,13.44893 6.7187068,14.303985 l -2.1206366,3.673051 c -0.485895,0.841595 0.8419383,1.60822 1.3278333,0.766625 z";
 }
 
 .progress-indicator:indeterminate .segment7 {
-	-fx-shape:"m 9.2224559,19.539943 c -0.051108,0.906718 1.5843581,0.957826 1.5332501,0 l 0,-4.241273 c 0,-0.97179 -1.5332501,-0.97179 -1.5332501,0 z";
+	-fx-shape: "m 9.2224559,19.539943 c -0.051108,0.906718 1.5843581,0.957826 1.5332501,0 l 0,-4.241273 c 0,-0.97179 -1.5332501,-0.97179 -1.5332501,0 z";
 }
 
 .progress-indicator:indeterminate .segment8 {
-	-fx-shape:"m 12.10997,15.070611 c -0.49762,-0.759687 0.893182,-1.621681 1.327834,-0.766626 l 2.120636,3.673051 c 0.485895,0.841595 -0.841938,1.60822 -1.327833,0.766625 z";
+	-fx-shape: "m 12.10997,15.070611 c -0.49762,-0.759687 0.893182,-1.621681 1.327834,-0.766626 l 2.120636,3.673051 c 0.485895,0.841595 -0.841938,1.60822 -1.327833,0.766625 z";
 }
 
 .progress-indicator:indeterminate .segment9 {
-	-fx-shape:"m 14.423504,13.443113 c -0.824945,-0.379757 -0.10368,-1.848478 0.718512,-1.354472 l 3.746739,1.987548 c 0.858478,0.455401 0.139967,1.809873 -0.718512,1.354473 z";
+	-fx-shape: "m 14.423504,13.443113 c -0.824945,-0.379757 -0.10368,-1.848478 0.718512,-1.354472 l 3.746739,1.987548 c 0.858478,0.455401 0.139967,1.809873 -0.718512,1.354473 z";
 }
 
 .progress-indicator:indeterminate .segment10 {
-	-fx-shape:"m 15.372451,9.2445322 c -0.906719,-0.051108 -0.957826,1.5843588 0,1.5332498 l 4.241273,0 c 0.97179,0 0.97179,-1.5332498 0,-1.5332498 z";
+	-fx-shape: "m 15.372451,9.2445322 c -0.906719,-0.051108 -0.957826,1.5843588 0,1.5332498 l 4.241273,0 c 0.97179,0 0.97179,-1.5332498 0,-1.5332498 z";
 }
 
 .progress-indicator:indeterminate .segment11 {
-	-fx-shape:"m 14.321262,6.5816808 c -0.824944,0.3797564 -0.10368,1.8484772 0.718513,1.3544717 L 18.786514,5.9486042 C 19.644992,5.4932031 18.92648,4.1387308 18.068001,4.5941315 z";
+	-fx-shape: "m 14.321262,6.5816808 c -0.824944,0.3797564 -0.10368,1.8484772 0.718513,1.3544717 L 18.786514,5.9486042 C 19.644992,5.4932031 18.92648,4.1387308 18.068001,4.5941315 z";
 }
 
 /*******************************************************************************
diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css
index c16fbe1a6..606198cbc 100644
--- a/main/ui/src/main/resources/css/light_theme.css
+++ b/main/ui/src/main/resources/css/light_theme.css
@@ -190,7 +190,7 @@
 	-fx-background-color: white, RED_5;
 	-fx-background-insets: 1px, 2px;
 	-fx-background-radius: 6px, 5px;
-	-fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 2, 0, 0, 0);
+	-fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.8), 2, 0, 0, 0);
 }
 
 .main-window .drag-n-drop-indicator {
@@ -441,7 +441,7 @@
 	-fx-font-size: 0.8em;
 	-fx-background-color: CONTROL_BG_NORMAL;
 	-fx-padding: 0.2em 0.4em 0.2em 0.4em;
-	-fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.5), 2, 0, 0, 0);
+	-fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.5), 2, 0, 0, 0);
 }
 
 /*******************************************************************************
@@ -486,7 +486,7 @@
  ******************************************************************************/
 
 .text-area {
-    -fx-cursor: default;
+	-fx-cursor: default;
 	-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_NORMAL;
 	-fx-background-insets: 0, 1px;
 	-fx-background-radius: 4px;
@@ -503,7 +503,7 @@
 }
 
 .text-area > .scroll-pane > .scroll-bar {
-    -fx-padding: 2px;
+	-fx-padding: 2px;
 }
 
 .text-area .content {
@@ -512,7 +512,7 @@
 	-fx-text-fill: TEXT_FILL;
 	-fx-highlight-fill: PRIMARY;
 	-fx-prompt-text-fill: TEXT_FILL_MUTED;
-    -fx-background-color: null;
+	-fx-background-color: null;
 }
 
 /*******************************************************************************
@@ -746,7 +746,7 @@
 	-fx-background-insets: 0, 1px;
 	-fx-background-radius: 4px;
 	-fx-padding: 0.2em 0 0.2em 0;
-	-fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.2), 8, 0, 0, 0);
+	-fx-effect: dropshadow(three-pass-box, rgba(0, 0, 0, 0.2), 8, 0, 0, 0);
 }
 
 /*******************************************************************************
@@ -773,7 +773,7 @@
 }
 
 .menu-item > .label {
-    -fx-padding: 1px 0.5em 1px 0.5em;
+	-fx-padding: 1px 0.5em 1px 0.5em;
 }
 
 .menu-item:disabled > .label {
@@ -799,7 +799,7 @@
 }
 
 .progress-indicator:indeterminate > .spinner {
-	-fx-padding: 0.083333em; 
+	-fx-padding: 0.083333em;
 }
 
 .progress-indicator:indeterminate .segment {
@@ -808,51 +808,51 @@
 }
 
 .progress-indicator:indeterminate .segment0 {
-	-fx-shape:"m 12.007729,4.9541827 c -0.49762,0.7596865 0.893181,1.6216808 1.327833,0.7666252 L 15.456199,2.0477574 C 15.942094,1.2061627 14.61426,0.43953765 14.128365,1.2811324 z";
+	-fx-shape: "m 12.007729,4.9541827 c -0.49762,0.7596865 0.893181,1.6216808 1.327833,0.7666252 L 15.456199,2.0477574 C 15.942094,1.2061627 14.61426,0.43953765 14.128365,1.2811324 z";
 }
 
 .progress-indicator:indeterminate .segment1 {
-	-fx-shape:"m 9.2224559,4.62535 c -0.051108,0.9067177 1.5843581,0.957826 1.5332501,0 l 0,-4.24127319 c 0,-0.9717899 -1.5332501,-0.9717899 -1.5332501,0 z";
+	-fx-shape: "m 9.2224559,4.62535 c -0.051108,0.9067177 1.5843581,0.957826 1.5332501,0 l 0,-4.24127319 c 0,-0.9717899 -1.5332501,-0.9717899 -1.5332501,0 z";
 }
 
 .progress-indicator:indeterminate .segment2 {
-	-fx-shape:"M 8.0465401,4.9030617 C 8.5441601,5.6627485 7.1533584,6.5247425 6.7187068,5.6696872 L 4.5980702,1.9966363 C 4.1121752,1.1550418 5.4400085,0.38841683 5.9259035,1.2300114 z";
+	-fx-shape: "M 8.0465401,4.9030617 C 8.5441601,5.6627485 7.1533584,6.5247425 6.7187068,5.6696872 L 4.5980702,1.9966363 C 4.1121752,1.1550418 5.4400085,0.38841683 5.9259035,1.2300114 z";
 }
 
 .progress-indicator:indeterminate .segment3 {
-	-fx-shape:"M 5.7330066,6.5305598 C 6.5579512,6.9103162 5.8366865,8.3790371 5.0144939,7.8850315 L 1.2677551,5.8974832 C 0.409277,5.4420823 1.1277888,4.0876101 1.9862674,4.5430105 z";
+	-fx-shape: "M 5.7330066,6.5305598 C 6.5579512,6.9103162 5.8366865,8.3790371 5.0144939,7.8850315 L 1.2677551,5.8974832 C 0.409277,5.4420823 1.1277888,4.0876101 1.9862674,4.5430105 z";
 }
 
 .progress-indicator:indeterminate .segment4 {
-	-fx-shape:"m 0.42171041,9.2083842 c -0.90671825,-0.051108 -0.95782608,1.5843588 0,1.5332498 l 4.24127319,0 c 0.9717899,0 0.9717899,-1.5332498 0,-1.5332498 z";
+	-fx-shape: "m 0.42171041,9.2083842 c -0.90671825,-0.051108 -0.95782608,1.5843588 0,1.5332498 l 4.24127319,0 c 0.9717899,0 0.9717899,-1.5332498 0,-1.5332498 z";
 }
 
 .progress-indicator:indeterminate .segment5 {
-	-fx-shape:"M 5.7330066,13.443113 C 6.5579512,13.063356 5.8366865,11.594635 5.0144939,12.088641 L 1.2677551,14.076189 C 0.409277,14.53159 1.1277888,15.886062 1.9862674,15.430662 z";
+	-fx-shape: "M 5.7330066,13.443113 C 6.5579512,13.063356 5.8366865,11.594635 5.0144939,12.088641 L 1.2677551,14.076189 C 0.409277,14.53159 1.1277888,15.886062 1.9862674,15.430662 z";
 }
 
 .progress-indicator:indeterminate .segment6 {
-	-fx-shape:"M 8.0465401,15.070611 C 8.5441601,14.310924 7.1533584,13.44893 6.7187068,14.303985 l -2.1206366,3.673051 c -0.485895,0.841595 0.8419383,1.60822 1.3278333,0.766625 z";
+	-fx-shape: "M 8.0465401,15.070611 C 8.5441601,14.310924 7.1533584,13.44893 6.7187068,14.303985 l -2.1206366,3.673051 c -0.485895,0.841595 0.8419383,1.60822 1.3278333,0.766625 z";
 }
 
 .progress-indicator:indeterminate .segment7 {
-	-fx-shape:"m 9.2224559,19.539943 c -0.051108,0.906718 1.5843581,0.957826 1.5332501,0 l 0,-4.241273 c 0,-0.97179 -1.5332501,-0.97179 -1.5332501,0 z";
+	-fx-shape: "m 9.2224559,19.539943 c -0.051108,0.906718 1.5843581,0.957826 1.5332501,0 l 0,-4.241273 c 0,-0.97179 -1.5332501,-0.97179 -1.5332501,0 z";
 }
 
 .progress-indicator:indeterminate .segment8 {
-	-fx-shape:"m 12.10997,15.070611 c -0.49762,-0.759687 0.893182,-1.621681 1.327834,-0.766626 l 2.120636,3.673051 c 0.485895,0.841595 -0.841938,1.60822 -1.327833,0.766625 z";
+	-fx-shape: "m 12.10997,15.070611 c -0.49762,-0.759687 0.893182,-1.621681 1.327834,-0.766626 l 2.120636,3.673051 c 0.485895,0.841595 -0.841938,1.60822 -1.327833,0.766625 z";
 }
 
 .progress-indicator:indeterminate .segment9 {
-	-fx-shape:"m 14.423504,13.443113 c -0.824945,-0.379757 -0.10368,-1.848478 0.718512,-1.354472 l 3.746739,1.987548 c 0.858478,0.455401 0.139967,1.809873 -0.718512,1.354473 z";
+	-fx-shape: "m 14.423504,13.443113 c -0.824945,-0.379757 -0.10368,-1.848478 0.718512,-1.354472 l 3.746739,1.987548 c 0.858478,0.455401 0.139967,1.809873 -0.718512,1.354473 z";
 }
 
 .progress-indicator:indeterminate .segment10 {
-	-fx-shape:"m 15.372451,9.2445322 c -0.906719,-0.051108 -0.957826,1.5843588 0,1.5332498 l 4.241273,0 c 0.97179,0 0.97179,-1.5332498 0,-1.5332498 z";
+	-fx-shape: "m 15.372451,9.2445322 c -0.906719,-0.051108 -0.957826,1.5843588 0,1.5332498 l 4.241273,0 c 0.97179,0 0.97179,-1.5332498 0,-1.5332498 z";
 }
 
 .progress-indicator:indeterminate .segment11 {
-	-fx-shape:"m 14.321262,6.5816808 c -0.824944,0.3797564 -0.10368,1.8484772 0.718513,1.3544717 L 18.786514,5.9486042 C 19.644992,5.4932031 18.92648,4.1387308 18.068001,4.5941315 z";
+	-fx-shape: "m 14.321262,6.5816808 c -0.824944,0.3797564 -0.10368,1.8484772 0.718513,1.3544717 L 18.786514,5.9486042 C 19.644992,5.4932031 18.92648,4.1387308 18.068001,4.5941315 z";
 }
 
 /*******************************************************************************
diff --git a/main/ui/src/main/resources/fxml/addvault_existing.fxml b/main/ui/src/main/resources/fxml/addvault_existing.fxml
index be780d03c..c46ad6355 100644
--- a/main/ui/src/main/resources/fxml/addvault_existing.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_existing.fxml
@@ -7,8 +7,8 @@
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.addvaultwizard.ChooseExistingVaultController"
 	  prefWidth="450"
 	  prefHeight="450"
diff --git a/main/ui/src/main/resources/fxml/addvault_new_location.fxml b/main/ui/src/main/resources/fxml/addvault_new_location.fxml
index 53336fb25..66b34ff95 100644
--- a/main/ui/src/main/resources/fxml/addvault_new_location.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_new_location.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
@@ -10,9 +11,8 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.addvaultwizard.CreateNewVaultLocationController"
 	  prefWidth="450"
 	  prefHeight="450"
diff --git a/main/ui/src/main/resources/fxml/addvault_new_name.fxml b/main/ui/src/main/resources/fxml/addvault_new_name.fxml
index a0031e533..bf922cd33 100644
--- a/main/ui/src/main/resources/fxml/addvault_new_name.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_new_name.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
@@ -8,9 +9,8 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.addvaultwizard.CreateNewVaultNameController"
 	  prefWidth="450"
 	  prefHeight="450"
diff --git a/main/ui/src/main/resources/fxml/addvault_new_password.fxml b/main/ui/src/main/resources/fxml/addvault_new_password.fxml
index 203af9019..7b87bd636 100644
--- a/main/ui/src/main/resources/fxml/addvault_new_password.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_new_password.fxml
@@ -9,8 +9,8 @@
 <?import javafx.scene.control.ToggleGroup?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.addvaultwizard.CreateNewVaultPasswordController"
 	  prefWidth="450"
 	  prefHeight="450"
@@ -26,11 +26,11 @@
 		<fx:include source="/fxml/new_password.fxml"/>
 
 		<Region VBox.vgrow="ALWAYS"/>
-		
+
 		<VBox spacing="6">
 			<Label text="%addvaultwizard.new.generateRecoveryKeyChoice" wrapText="true"/>
-			<RadioButton fx:id="showRecoveryKey" toggleGroup="${recoveryKeyChoice}" text="%addvaultwizard.new.generateRecoveryKeyChoice.yes" />
-			<RadioButton fx:id="skipRecoveryKey" toggleGroup="${recoveryKeyChoice}" text="%addvaultwizard.new.generateRecoveryKeyChoice.no" />
+			<RadioButton fx:id="showRecoveryKey" toggleGroup="${recoveryKeyChoice}" text="%addvaultwizard.new.generateRecoveryKeyChoice.yes"/>
+			<RadioButton fx:id="skipRecoveryKey" toggleGroup="${recoveryKeyChoice}" text="%addvaultwizard.new.generateRecoveryKeyChoice.no"/>
 		</VBox>
 
 		<Region VBox.vgrow="ALWAYS"/>
diff --git a/main/ui/src/main/resources/fxml/addvault_new_recoverykey.fxml b/main/ui/src/main/resources/fxml/addvault_new_recoverykey.fxml
index ecfc1441a..956461fe9 100644
--- a/main/ui/src/main/resources/fxml/addvault_new_recoverykey.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_new_recoverykey.fxml
@@ -5,8 +5,8 @@
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.addvaultwizard.CreateNewVaultRecoveryKeyController"
 	  prefWidth="450"
 	  prefHeight="450"
diff --git a/main/ui/src/main/resources/fxml/addvault_success.fxml b/main/ui/src/main/resources/fxml/addvault_success.fxml
index fd0309450..4df28e6e3 100644
--- a/main/ui/src/main/resources/fxml/addvault_success.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_success.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
@@ -8,10 +10,8 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.addvaultwizard.AddVaultSuccessController"
 	  prefWidth="450"
 	  prefHeight="450"
diff --git a/main/ui/src/main/resources/fxml/addvault_welcome.fxml b/main/ui/src/main/resources/fxml/addvault_welcome.fxml
index 1639beac4..750a574a2 100644
--- a/main/ui/src/main/resources/fxml/addvault_welcome.fxml
+++ b/main/ui/src/main/resources/fxml/addvault_welcome.fxml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.addvaultwizard.AddVaultWelcomeController"
 	  prefWidth="450"
 	  prefHeight="450"
diff --git a/main/ui/src/main/resources/fxml/changepassword.fxml b/main/ui/src/main/resources/fxml/changepassword.fxml
index 18c1b9383..5e8727574 100644
--- a/main/ui/src/main/resources/fxml/changepassword.fxml
+++ b/main/ui/src/main/resources/fxml/changepassword.fxml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FormattedLabel?>
+<?import org.cryptomator.ui.controls.NiceSecurePasswordField?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<?import org.cryptomator.ui.controls.NiceSecurePasswordField?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.changepassword.ChangePasswordController"
 	  minWidth="400"
 	  maxWidth="400"
@@ -24,7 +24,7 @@
 		</VBox>
 
 		<Region prefHeight="12" VBox.vgrow="NEVER"/>
-		
+
 		<fx:include source="/fxml/new_password.fxml"/>
 
 		<CheckBox fx:id="finalConfirmationCheckbox" text="%changepassword.finalConfirmation" wrapText="true"/>
diff --git a/main/ui/src/main/resources/fxml/error.fxml b/main/ui/src/main/resources/fxml/error.fxml
index 267c65ac3..adcebdb67 100644
--- a/main/ui/src/main/resources/fxml/error.fxml
+++ b/main/ui/src/main/resources/fxml/error.fxml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.StackPane?>
-<?import javafx.scene.shape.Circle?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextArea?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.shape.Circle?>
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.common.ErrorController"
 	  prefWidth="450"
 	  prefHeight="450"
@@ -37,7 +37,7 @@
 		<ButtonBar buttonMinWidth="120" buttonOrder="B+C">
 			<buttons>
 				<Button text="%generic.button.back" ButtonBar.buttonData="BACK_PREVIOUS" onAction="#back" visible="${controller.previousScenePresent}"/>
-				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" onAction="#close" />
+				<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" onAction="#close"/>
 			</buttons>
 		</ButtonBar>
 	</children>
diff --git a/main/ui/src/main/resources/fxml/forget_password.fxml b/main/ui/src/main/resources/fxml/forget_password.fxml
index 077a587d2..10b085185 100644
--- a/main/ui/src/main/resources/fxml/forget_password.fxml
+++ b/main/ui/src/main/resources/fxml/forget_password.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
@@ -8,9 +9,8 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.forgetPassword.ForgetPasswordController"
 	  minWidth="400"
 	  maxWidth="400"
diff --git a/main/ui/src/main/resources/fxml/main_window.fxml b/main/ui/src/main/resources/fxml/main_window.fxml
index 1eb017a75..b960f3ed1 100644
--- a/main/ui/src/main/resources/fxml/main_window.fxml
+++ b/main/ui/src/main/resources/fxml/main_window.fxml
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.SplitPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<StackPane xmlns="http://javafx.com/javafx"
-		   xmlns:fx="http://javafx.com/fxml"
+<StackPane xmlns:fx="http://javafx.com/fxml"
+		   xmlns="http://javafx.com/javafx"
 		   fx:id="root"
 		   fx:controller="org.cryptomator.ui.mainwindow.MainWindowController"
 		   styleClass="main-window">
 	<VBox>
-		<fx:include source="/fxml/main_window_title.fxml" VBox.vgrow="NEVER" />
+		<fx:include source="/fxml/main_window_title.fxml" VBox.vgrow="NEVER"/>
 		<StackPane VBox.vgrow="ALWAYS">
 			<SplitPane dividerPositions="0.33" orientation="HORIZONTAL">
 				<fx:include source="/fxml/vault_list.fxml" SplitPane.resizableWithParent="false"/>
diff --git a/main/ui/src/main/resources/fxml/main_window_resize.fxml b/main/ui/src/main/resources/fxml/main_window_resize.fxml
index c6d025ff5..b4eb46916 100644
--- a/main/ui/src/main/resources/fxml/main_window_resize.fxml
+++ b/main/ui/src/main/resources/fxml/main_window_resize.fxml
@@ -1,8 +1,8 @@
 <?import javafx.scene.Cursor?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.Region?>
-<AnchorPane xmlns="http://javafx.com/javafx"
-			xmlns:fx="http://javafx.com/fxml"
+<AnchorPane xmlns:fx="http://javafx.com/fxml"
+			xmlns="http://javafx.com/javafx"
 			fx:controller="org.cryptomator.ui.mainwindow.ResizeController"
 			nodeOrientation="LEFT_TO_RIGHT"
 			pickOnBounds="false">
diff --git a/main/ui/src/main/resources/fxml/main_window_title.fxml b/main/ui/src/main/resources/fxml/main_window_title.fxml
index 54ee8b238..624d64936 100644
--- a/main/ui/src/main/resources/fxml/main_window_title.fxml
+++ b/main/ui/src/main/resources/fxml/main_window_title.fxml
@@ -1,3 +1,4 @@
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Hyperlink?>
@@ -6,9 +7,8 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.StackPane?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<HBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<HBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:id="titleBar"
 	  fx:controller="org.cryptomator.ui.mainwindow.MainWindowTitleController"
 	  styleClass="title"
diff --git a/main/ui/src/main/resources/fxml/migration_capability_error.fxml b/main/ui/src/main/resources/fxml/migration_capability_error.fxml
index af2135834..239f324a3 100644
--- a/main/ui/src/main/resources/fxml/migration_capability_error.fxml
+++ b/main/ui/src/main/resources/fxml/migration_capability_error.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
@@ -9,9 +10,8 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.migration.MigrationCapabilityErrorController"
 	  minWidth="400"
 	  maxWidth="400"
diff --git a/main/ui/src/main/resources/fxml/migration_impossible.fxml b/main/ui/src/main/resources/fxml/migration_impossible.fxml
index 46c1fb94f..80bbd79d1 100644
--- a/main/ui/src/main/resources/fxml/migration_impossible.fxml
+++ b/main/ui/src/main/resources/fxml/migration_impossible.fxml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
@@ -12,9 +13,8 @@
 <?import javafx.scene.shape.Circle?>
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.text.TextFlow?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.migration.MigrationImpossibleController"
 	  minWidth="400"
 	  maxWidth="400"
diff --git a/main/ui/src/main/resources/fxml/migration_run.fxml b/main/ui/src/main/resources/fxml/migration_run.fxml
index f70f27ce3..4a51c4646 100644
--- a/main/ui/src/main/resources/fxml/migration_run.fxml
+++ b/main/ui/src/main/resources/fxml/migration_run.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FormattedLabel?>
+<?import org.cryptomator.ui.controls.NiceSecurePasswordField?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
@@ -7,10 +9,8 @@
 <?import javafx.scene.control.ProgressBar?>
 <?import javafx.scene.control.ProgressIndicator?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<?import org.cryptomator.ui.controls.NiceSecurePasswordField?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.migration.MigrationRunController"
 	  minWidth="400"
 	  maxWidth="400"
diff --git a/main/ui/src/main/resources/fxml/migration_start.fxml b/main/ui/src/main/resources/fxml/migration_start.fxml
index c836a9393..6c10bcd8b 100644
--- a/main/ui/src/main/resources/fxml/migration_start.fxml
+++ b/main/ui/src/main/resources/fxml/migration_start.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
@@ -8,10 +10,8 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.migration.MigrationStartController"
 	  minWidth="400"
 	  maxWidth="400"
@@ -28,7 +28,7 @@
 			</StackPane>
 
 			<VBox spacing="6" HBox.hgrow="ALWAYS">
-				<FormattedLabel format="%migration.start.prompt" arg1="${controller.vault.displayName}" wrapText="true" />
+				<FormattedLabel format="%migration.start.prompt" arg1="${controller.vault.displayName}" wrapText="true"/>
 				<CheckBox fx:id="confirmSyncDone" text="%migration.start.confirm"/>
 			</VBox>
 		</HBox>
diff --git a/main/ui/src/main/resources/fxml/migration_success.fxml b/main/ui/src/main/resources/fxml/migration_success.fxml
index 9fd081757..c04068a9d 100644
--- a/main/ui/src/main/resources/fxml/migration_success.fxml
+++ b/main/ui/src/main/resources/fxml/migration_success.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
@@ -7,10 +9,8 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.migration.MigrationSuccessController"
 	  minWidth="400"
 	  maxWidth="400"
diff --git a/main/ui/src/main/resources/fxml/new_password.fxml b/main/ui/src/main/resources/fxml/new_password.fxml
index c406b8c70..942fea0d0 100644
--- a/main/ui/src/main/resources/fxml/new_password.fxml
+++ b/main/ui/src/main/resources/fxml/new_password.fxml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.Region?>
-<?import javafx.scene.layout.VBox?>
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import org.cryptomator.ui.controls.NiceSecurePasswordField?>
 <?import org.cryptomator.ui.controls.PasswordStrengthIndicator?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.VBox?>
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.common.NewPasswordController"
 	  spacing="6"
 	  alignment="CENTER_LEFT">
diff --git a/main/ui/src/main/resources/fxml/preferences.fxml b/main/ui/src/main/resources/fxml/preferences.fxml
index 92ee7c3a9..c0cd2b6c7 100644
--- a/main/ui/src/main/resources/fxml/preferences.fxml
+++ b/main/ui/src/main/resources/fxml/preferences.fxml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.scene.control.Tab?>
 <?import javafx.scene.control.TabPane?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<TabPane xmlns="http://javafx.com/javafx"
-		 xmlns:fx="http://javafx.com/fxml"
+<TabPane xmlns:fx="http://javafx.com/fxml"
+		 xmlns="http://javafx.com/javafx"
 		 fx:id="tabPane"
 		 fx:controller="org.cryptomator.ui.preferences.PreferencesController"
 		 minWidth="-Infinity"
diff --git a/main/ui/src/main/resources/fxml/preferences_about.fxml b/main/ui/src/main/resources/fxml/preferences_about.fxml
index ba738f25e..f0fcab66c 100644
--- a/main/ui/src/main/resources/fxml/preferences_about.fxml
+++ b/main/ui/src/main/resources/fxml/preferences_about.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FormattedLabel?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextArea?>
@@ -7,9 +8,8 @@
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.preferences.AboutController"
 	  spacing="18">
 	<padding>
diff --git a/main/ui/src/main/resources/fxml/preferences_donationkey.fxml b/main/ui/src/main/resources/fxml/preferences_donationkey.fxml
index 8e192cd9f..087d9da26 100644
--- a/main/ui/src/main/resources/fxml/preferences_donationkey.fxml
+++ b/main/ui/src/main/resources/fxml/preferences_donationkey.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
@@ -8,10 +10,8 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.preferences.DonationKeyPreferencesController"
 	  spacing="18">
 	<padding>
@@ -26,7 +26,7 @@
 				</StackPane>
 				<FormattedLabel format="%preferences.donationKey.registeredFor" arg1="${controller.licenseHolder.licenseSubject}" wrapText="true"/>
 			</HBox>
-			
+
 			<HBox spacing="12" alignment="CENTER_LEFT" visible="${!controller.licenseHolder.validLicense}">
 				<StackPane alignment="CENTER" HBox.hgrow="NEVER">
 					<Circle styleClass="glyph-icon-primary" radius="24"/>
@@ -42,7 +42,7 @@
 				</VBox>
 			</HBox>
 		</StackPane>
-		
+
 		<TextArea fx:id="donationKeyField" wrapText="true" VBox.vgrow="ALWAYS" prefRowCount="6"/>
 	</children>
 </VBox>
diff --git a/main/ui/src/main/resources/fxml/preferences_general.fxml b/main/ui/src/main/resources/fxml/preferences_general.fxml
index 0e19ac470..1f1de67ad 100644
--- a/main/ui/src/main/resources/fxml/preferences_general.fxml
+++ b/main/ui/src/main/resources/fxml/preferences_general.fxml
@@ -9,8 +9,8 @@
 <?import javafx.scene.control.ToggleGroup?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.preferences.GeneralPreferencesController"
 	  spacing="6">
 	<fx:define>
diff --git a/main/ui/src/main/resources/fxml/preferences_updates.fxml b/main/ui/src/main/resources/fxml/preferences_updates.fxml
index 1e7890a3c..11d35ac3d 100644
--- a/main/ui/src/main/resources/fxml/preferences_updates.fxml
+++ b/main/ui/src/main/resources/fxml/preferences_updates.fxml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FormattedLabel?>
+<?import org.cryptomator.ui.controls.FormattedString?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.ProgressIndicator?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<?import org.cryptomator.ui.controls.FormattedString?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.preferences.UpdatesPreferencesController"
 	  spacing="6">
 	<fx:define>
@@ -29,7 +29,7 @@
 					<ProgressIndicator progress="-1" prefWidth="12" prefHeight="12"/>
 				</graphic>
 			</Button>
-			
+
 			<Hyperlink text="${linkLabel.value}" onAction="#visitDownloadsPage" textAlignment="CENTER" wrapText="true" styleClass="hyperlink-underline" visible="${controller.updateAvailable}"/>
 		</VBox>
 	</children>
diff --git a/main/ui/src/main/resources/fxml/preferences_volume.fxml b/main/ui/src/main/resources/fxml/preferences_volume.fxml
index 1ac27fd85..1fa2ac222 100644
--- a/main/ui/src/main/resources/fxml/preferences_volume.fxml
+++ b/main/ui/src/main/resources/fxml/preferences_volume.fxml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.NumericTextField?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ChoiceBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.NumericTextField?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.preferences.VolumePreferencesController"
 	  spacing="6">
 	<padding>
diff --git a/main/ui/src/main/resources/fxml/quit.fxml b/main/ui/src/main/resources/fxml/quit.fxml
index cba3b32e9..0aba3bd10 100644
--- a/main/ui/src/main/resources/fxml/quit.fxml
+++ b/main/ui/src/main/resources/fxml/quit.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
@@ -9,9 +10,8 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.quit.QuitController"
 	  minWidth="400"
 	  maxWidth="400"
diff --git a/main/ui/src/main/resources/fxml/recoverykey_create.fxml b/main/ui/src/main/resources/fxml/recoverykey_create.fxml
index 73775237f..432e126ef 100644
--- a/main/ui/src/main/resources/fxml/recoverykey_create.fxml
+++ b/main/ui/src/main/resources/fxml/recoverykey_create.fxml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FormattedLabel?>
+<?import org.cryptomator.ui.controls.NiceSecurePasswordField?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<?import org.cryptomator.ui.controls.NiceSecurePasswordField?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.recoverykey.RecoveryKeyCreationController"
 	  minWidth="400"
 	  maxWidth="400"
@@ -27,7 +27,7 @@
 		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
 			<ButtonBar buttonMinWidth="120" buttonOrder="C+X">
 				<buttons>
-					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close" />
+					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
 					<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#createRecoveryKey" disable="${passwordField.text.empty}"/>
 				</buttons>
 			</ButtonBar>
diff --git a/main/ui/src/main/resources/fxml/recoverykey_display.fxml b/main/ui/src/main/resources/fxml/recoverykey_display.fxml
index 0be6c1c4c..e0c934cfb 100644
--- a/main/ui/src/main/resources/fxml/recoverykey_display.fxml
+++ b/main/ui/src/main/resources/fxml/recoverykey_display.fxml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextArea?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.recoverykey.RecoveryKeyDisplayController"
 	  minWidth="350"
 	  minHeight="280"
diff --git a/main/ui/src/main/resources/fxml/recoverykey_recover.fxml b/main/ui/src/main/resources/fxml/recoverykey_recover.fxml
index c12a5e83e..46b000ef2 100644
--- a/main/ui/src/main/resources/fxml/recoverykey_recover.fxml
+++ b/main/ui/src/main/resources/fxml/recoverykey_recover.fxml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
+<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextArea?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Label?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.recoverykey.RecoveryKeyRecoverController"
 	  minWidth="400"
 	  maxWidth="400"
@@ -24,7 +24,7 @@
 		<FormattedLabel format="%recoveryKey.recover.prompt" arg1="${controller.vault.displayName}" wrapText="true"/>
 
 		<TextArea wrapText="true" prefRowCount="4" fx:id="textarea" textFormatter="${controller.recoveryKeyTextFormatter}" onKeyPressed="#onKeyPressed"/>
-		
+
 		<Label text="%recoveryKey.recover.validKey" graphicTextGap="6" contentDisplay="LEFT" visible="${controller.validRecoveryKey}">
 			<graphic>
 				<FontAwesome5IconView glyph="CHECK"/>
@@ -36,8 +36,8 @@
 		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
 			<ButtonBar buttonMinWidth="120" buttonOrder="C+X">
 				<buttons>
-					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close" />
-					<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#recover" disable="${!controller.validRecoveryKey}" />
+					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
+					<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#recover" disable="${!controller.validRecoveryKey}"/>
 				</buttons>
 			</ButtonBar>
 		</VBox>
diff --git a/main/ui/src/main/resources/fxml/recoverykey_reset_password.fxml b/main/ui/src/main/resources/fxml/recoverykey_reset_password.fxml
index c57560b4b..30487c330 100644
--- a/main/ui/src/main/resources/fxml/recoverykey_reset_password.fxml
+++ b/main/ui/src/main/resources/fxml/recoverykey_reset_password.fxml
@@ -5,8 +5,8 @@
 <?import javafx.scene.control.ButtonBar?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.recoverykey.RecoveryKeyResetPasswordController"
 	  minWidth="400"
 	  maxWidth="400"
@@ -24,7 +24,7 @@
 		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
 			<ButtonBar buttonMinWidth="120" buttonOrder="B+I">
 				<buttons>
-					<Button text="%generic.button.back" ButtonBar.buttonData="BACK_PREVIOUS" cancelButton="true" onAction="#back" />
+					<Button text="%generic.button.back" ButtonBar.buttonData="BACK_PREVIOUS" cancelButton="true" onAction="#back"/>
 					<Button text="%generic.button.done" ButtonBar.buttonData="FINISH" defaultButton="true" onAction="#done" disable="${controller.invalidNewPassword}"/>
 				</buttons>
 			</ButtonBar>
diff --git a/main/ui/src/main/resources/fxml/recoverykey_success.fxml b/main/ui/src/main/resources/fxml/recoverykey_success.fxml
index cd13fc360..0e9cd2bce 100644
--- a/main/ui/src/main/resources/fxml/recoverykey_success.fxml
+++ b/main/ui/src/main/resources/fxml/recoverykey_success.fxml
@@ -3,10 +3,10 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
-<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.layout.Region?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<?import javafx.scene.layout.VBox?>
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.recoverykey.RecoveryKeySuccessController"
 	  minWidth="400"
 	  maxWidth="400"
diff --git a/main/ui/src/main/resources/fxml/remove_vault.fxml b/main/ui/src/main/resources/fxml/remove_vault.fxml
index fcb0c7873..10aae4bdf 100644
--- a/main/ui/src/main/resources/fxml/remove_vault.fxml
+++ b/main/ui/src/main/resources/fxml/remove_vault.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
@@ -8,9 +9,8 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.removevault.RemoveVaultController"
 	  minWidth="400"
 	  maxWidth="400"
diff --git a/main/ui/src/main/resources/fxml/unlock.fxml b/main/ui/src/main/resources/fxml/unlock.fxml
index 37e5e6e91..54adc5279 100644
--- a/main/ui/src/main/resources/fxml/unlock.fxml
+++ b/main/ui/src/main/resources/fxml/unlock.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FormattedLabel?>
+<?import org.cryptomator.ui.controls.NiceSecurePasswordField?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
@@ -10,10 +12,8 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<?import org.cryptomator.ui.controls.NiceSecurePasswordField?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.unlock.UnlockController"
 	  minWidth="400"
 	  maxWidth="400"
diff --git a/main/ui/src/main/resources/fxml/unlock_invalid_mount_point.fxml b/main/ui/src/main/resources/fxml/unlock_invalid_mount_point.fxml
index 2104d3d15..707bef240 100644
--- a/main/ui/src/main/resources/fxml/unlock_invalid_mount_point.fxml
+++ b/main/ui/src/main/resources/fxml/unlock_invalid_mount_point.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
@@ -8,10 +10,8 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.unlock.UnlockInvalidMountPointController"
 	  minWidth="400"
 	  maxWidth="400"
diff --git a/main/ui/src/main/resources/fxml/unlock_success.fxml b/main/ui/src/main/resources/fxml/unlock_success.fxml
index 5ad817cf6..086fbcf84 100644
--- a/main/ui/src/main/resources/fxml/unlock_success.fxml
+++ b/main/ui/src/main/resources/fxml/unlock_success.fxml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.ProgressIndicator?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<?import javafx.scene.control.CheckBox?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.unlock.UnlockSuccessController"
 	  minWidth="400"
 	  maxWidth="400"
diff --git a/main/ui/src/main/resources/fxml/vault_detail.fxml b/main/ui/src/main/resources/fxml/vault_detail.fxml
index 62be6996f..987ab9977 100644
--- a/main/ui/src/main/resources/fxml/vault_detail.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
@@ -9,9 +10,8 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailController"
 	  minWidth="300"
 	  spacing="60">
diff --git a/main/ui/src/main/resources/fxml/vault_detail_locked.fxml b/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
index 12c192db3..aa4f5e855 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_locked.fxml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailLockedController"
 	  alignment="TOP_CENTER"
 	  spacing="9">
diff --git a/main/ui/src/main/resources/fxml/vault_detail_missing.fxml b/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
index 072ae0150..6f78b8064 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_missing.fxml
@@ -1,12 +1,12 @@
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Circle?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailMissingVaultController"
 	  alignment="TOP_CENTER"
 	  spacing="24">
diff --git a/main/ui/src/main/resources/fxml/vault_detail_needsmigration.fxml b/main/ui/src/main/resources/fxml/vault_detail_needsmigration.fxml
index adb89b29f..99ecceae6 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_needsmigration.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_needsmigration.fxml
@@ -1,9 +1,9 @@
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailNeedsMigrationController"
 	  alignment="TOP_CENTER"
 	  spacing="9">
diff --git a/main/ui/src/main/resources/fxml/vault_detail_unknownerror.fxml b/main/ui/src/main/resources/fxml/vault_detail_unknownerror.fxml
index 4c33a67f0..5fc60f27b 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_unknownerror.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_unknownerror.fxml
@@ -1,8 +1,8 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextArea?>
 <?import javafx.scene.layout.VBox?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailUnknownErrorController"
 	  alignment="CENTER"
 	  spacing="24">
diff --git a/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml b/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
index 492c0336b..655bae1bf 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_unlocked.fxml
@@ -1,13 +1,13 @@
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import org.cryptomator.ui.controls.ThrougputLabel?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import org.cryptomator.ui.controls.ThrougputLabel?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailUnlockedController"
 	  alignment="TOP_CENTER"
 	  spacing="9">
diff --git a/main/ui/src/main/resources/fxml/vault_detail_welcome.fxml b/main/ui/src/main/resources/fxml/vault_detail_welcome.fxml
index d9b6ca9fc..59b2596d9 100644
--- a/main/ui/src/main/resources/fxml/vault_detail_welcome.fxml
+++ b/main/ui/src/main/resources/fxml/vault_detail_welcome.fxml
@@ -4,8 +4,8 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.text.TextFlow?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.mainwindow.WelcomeController"
 	  alignment="CENTER"
 	  spacing="24">
diff --git a/main/ui/src/main/resources/fxml/vault_list.fxml b/main/ui/src/main/resources/fxml/vault_list.fxml
index 51430ca2f..942074639 100644
--- a/main/ui/src/main/resources/fxml/vault_list.fxml
+++ b/main/ui/src/main/resources/fxml/vault_list.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ContextMenu?>
 <?import javafx.scene.control.Label?>
@@ -9,9 +10,8 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.shape.Arc?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultListController"
 	  minWidth="206">
 	<StackPane VBox.vgrow="ALWAYS">
diff --git a/main/ui/src/main/resources/fxml/vault_list_cell.fxml b/main/ui/src/main/resources/fxml/vault_list_cell.fxml
index ce1df1602..659772c7c 100644
--- a/main/ui/src/main/resources/fxml/vault_list_cell.fxml
+++ b/main/ui/src/main/resources/fxml/vault_list_cell.fxml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<HBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<HBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultListCellController"
 	  prefHeight="60"
 	  prefWidth="200"
diff --git a/main/ui/src/main/resources/fxml/vault_options.fxml b/main/ui/src/main/resources/fxml/vault_options.fxml
index 2330f4029..726019112 100644
--- a/main/ui/src/main/resources/fxml/vault_options.fxml
+++ b/main/ui/src/main/resources/fxml/vault_options.fxml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.scene.control.Tab?>
 <?import javafx.scene.control.TabPane?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<TabPane xmlns="http://javafx.com/javafx"
-		 xmlns:fx="http://javafx.com/fxml"
+<TabPane xmlns:fx="http://javafx.com/fxml"
+		 xmlns="http://javafx.com/javafx"
 		 fx:id="tabPane"
 		 fx:controller="org.cryptomator.ui.vaultoptions.VaultOptionsController"
 		 prefWidth="400"
diff --git a/main/ui/src/main/resources/fxml/vault_options_general.fxml b/main/ui/src/main/resources/fxml/vault_options_general.fxml
index 0c4caa772..1fd251ea0 100644
--- a/main/ui/src/main/resources/fxml/vault_options_general.fxml
+++ b/main/ui/src/main/resources/fxml/vault_options_general.fxml
@@ -7,8 +7,8 @@
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.vaultoptions.GeneralVaultOptionsController"
 	  spacing="6">
 	<padding>
diff --git a/main/ui/src/main/resources/fxml/vault_options_masterkey.fxml b/main/ui/src/main/resources/fxml/vault_options_masterkey.fxml
index 75c14c9cb..a8ba03f8f 100644
--- a/main/ui/src/main/resources/fxml/vault_options_masterkey.fxml
+++ b/main/ui/src/main/resources/fxml/vault_options_masterkey.fxml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import javafx.scene.layout.HBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.Region?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<?import javafx.scene.layout.VBox?>
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.vaultoptions.MasterkeyOptionsController"
 	  spacing="6"
 	  alignment="TOP_CENTER">
diff --git a/main/ui/src/main/resources/fxml/vault_options_mount.fxml b/main/ui/src/main/resources/fxml/vault_options_mount.fxml
index 3fa3abaa5..a96784020 100644
--- a/main/ui/src/main/resources/fxml/vault_options_mount.fxml
+++ b/main/ui/src/main/resources/fxml/vault_options_mount.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
@@ -10,10 +11,8 @@
 <?import javafx.scene.control.ToggleGroup?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<?import org.cryptomator.ui.controls.AlphanumericTextField?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.vaultoptions.MountOptionsController"
 	  spacing="6">
 	<fx:define>
diff --git a/main/ui/src/main/resources/fxml/wrongfilealert.fxml b/main/ui/src/main/resources/fxml/wrongfilealert.fxml
index 3e665f6db..da394e068 100644
--- a/main/ui/src/main/resources/fxml/wrongfilealert.fxml
+++ b/main/ui/src/main/resources/fxml/wrongfilealert.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ButtonBar?>
@@ -12,9 +13,8 @@
 <?import javafx.scene.shape.Circle?>
 <?import javafx.scene.text.Text?>
 <?import javafx.scene.text.TextFlow?>
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.wrongfilealert.WrongFileAlertController"
 	  prefWidth="600"
 	  maxWidth="-Infinity"
diff --git a/main/ui/src/test/java/org/cryptomator/ui/common/PasswordStrengthUtilTest.java b/main/ui/src/test/java/org/cryptomator/ui/common/PasswordStrengthUtilTest.java
index fb2a61b18..a6e4e27af 100644
--- a/main/ui/src/test/java/org/cryptomator/ui/common/PasswordStrengthUtilTest.java
+++ b/main/ui/src/test/java/org/cryptomator/ui/common/PasswordStrengthUtilTest.java
@@ -20,7 +20,7 @@ public class PasswordStrengthUtilTest {
 			util.computeRate(longPw);
 		});
 	}
-	
+
 	@Test
 	@Disabled("waiting on upstream fix") // https://github.com/nulab/zxcvbn4j/issues/54
 	public void testIssue979() {
diff --git a/main/ui/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java b/main/ui/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java
index 1fcb2a031..cc5223c6a 100644
--- a/main/ui/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java
+++ b/main/ui/src/test/java/org/cryptomator/ui/controls/SecurePasswordFieldTest.java
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.controls;
 
-import javafx.application.Platform;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
@@ -8,6 +7,7 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
+import javafx.application.Platform;
 import java.awt.GraphicsEnvironment;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
diff --git a/main/ui/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java b/main/ui/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java
index 984d069d2..c0535df8e 100644
--- a/main/ui/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java
+++ b/main/ui/src/test/java/org/cryptomator/ui/recoverykey/AutoCompleterTest.java
@@ -42,7 +42,7 @@ class AutoCompleterTest {
 			Assertions.assertTrue(result.isPresent());
 			Assertions.assertEquals("tame", result.get());
 		}
-		
+
 		@ParameterizedTest
 		@DisplayName("find 'teach'")
 		@ValueSource(strings = {"te", "tea", "teac", "teach"})
diff --git a/main/ui/src/test/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactoryTest.java b/main/ui/src/test/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactoryTest.java
index 63b75ce39..6ca1fd891 100644
--- a/main/ui/src/test/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactoryTest.java
+++ b/main/ui/src/test/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactoryTest.java
@@ -14,7 +14,7 @@ class RecoveryKeyFactoryTest {
 
 	private WordEncoder wordEncoder = new WordEncoder();
 	private RecoveryKeyFactory inTest = new RecoveryKeyFactory(wordEncoder);
-	
+
 	@Test
 	@DisplayName("createRecoveryKey() creates 44 words")
 	public void testCreateRecoveryKey(@TempDir Path pathToVault) throws IOException {
@@ -48,18 +48,18 @@ class RecoveryKeyFactoryTest {
 	@Test
 	@DisplayName("validateRecoveryKey() with invalid checksum")
 	public void testValidateValidateRecoveryKeyWithInvalidCrc() {
-		boolean result = inTest.validateRecoveryKey("pathway lift abuse plenty export texture gentleman landscape beyond ceiling around leaf cafe" +
-				" charity border breakdown victory surely computer cat linger restrict infer crowd live computer true written amazed investor boot" +
-				" depth left theory snow whereby terminal weekly reject happiness circuit partial cup wrong");
+		boolean result = inTest.validateRecoveryKey("pathway lift abuse plenty export texture gentleman landscape beyond ceiling around leaf cafe" //
+				+ " charity border breakdown victory surely computer cat linger restrict infer crowd live computer true written amazed investor boot" //
+				+ " depth left theory snow whereby terminal weekly reject happiness circuit partial cup wrong");
 		Assertions.assertFalse(result);
 	}
-	
+
 	@Test
 	@DisplayName("validateRecoveryKey() with valid input")
 	public void testValidateValidateRecoveryKeyWithValidKey() {
-		boolean result = inTest.validateRecoveryKey("pathway lift abuse plenty export texture gentleman landscape beyond ceiling around leaf cafe" +
-				" charity border breakdown victory surely computer cat linger restrict infer crowd live computer true written amazed investor boot" +
-				" depth left theory snow whereby terminal weekly reject happiness circuit partial cup ad");
+		boolean result = inTest.validateRecoveryKey("pathway lift abuse plenty export texture gentleman landscape beyond ceiling around leaf cafe" //
+				+ " charity border breakdown victory surely computer cat linger restrict infer crowd live computer true written amazed investor boot" //
+				+ " depth left theory snow whereby terminal weekly reject happiness circuit partial cup ad");
 		Assertions.assertTrue(result);
 	}
 

From 2b8f39a1494d46a746b7bf205e3f2b611c8c87c7 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 2 Nov 2020 09:41:07 +0100
Subject: [PATCH 141/169] ignored some derived files

---
 .gitignore                |  3 +++
 .idea/compiler.xml        | 33 ---------------------------------
 .idea/encodings.xml       | 13 -------------
 .idea/jarRepositories.xml | 30 ------------------------------
 4 files changed, 3 insertions(+), 76 deletions(-)
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/encodings.xml
 delete mode 100644 .idea/jarRepositories.xml

diff --git a/.gitignore b/.gitignore
index 3f055e749..900a21ae0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,8 @@ pom.xml.versionsBackup
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/dictionaries
+.idea/compiler.xml
+.idea/encodings.xml
+.idea/jarRepositories.xml
 .idea/**/libraries/
 *.iml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index e8dfd8106..000000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Annotation profile for Cryptomator" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="false">
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-compiler/2.22/dagger-compiler-2.22.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger/2.22/dagger-2.22.jar" />
-          <entry name="$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-producers/2.22/dagger-producers-2.22.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/25.0-jre/guava-25.0-jre.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/checkerframework/checker-compat-qual/2.5.3/checker-compat-qual-2.5.3.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-spi/2.22/dagger-spi-2.22.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/squareup/javapoet/1.11.1/javapoet-1.11.1.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/googlejavaformat/google-java-format/1.5/google-java-format-1.5.jar" />
-          <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/javac-shaded/9-dev-r4023-3/javac-shaded-9-dev-r4023-3.jar" />
-          <entry name="$MAVEN_REPOSITORY$/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" />
-        </processorPath>
-        <module name="keychain" />
-        <module name="commons" />
-        <module name="ui" />
-        <module name="launcher" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index c3807468d..000000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
-    <file url="file://$PROJECT_DIR$/main" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/main/commons/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/main/keychain/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/main/keychain/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/main/launcher/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/main/ui/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/main/ui/src/main/resources" charset="UTF-8" />
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index 727c7b1bb..000000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="bintray" />
-      <option name="name" value="Bintray JCenter" />
-      <option name="url" value="https://jcenter.bintray.com" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jcenter" />
-      <option name="name" value="jcenter" />
-      <option name="url" value="https://jcenter.bintray.com" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file

From 9a375cb3f667724a5c05b6b1a6c2fb1f0c2397b4 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 2 Nov 2020 09:43:54 +0100
Subject: [PATCH 142/169] updated label [ci skip]

---
 main/ui/src/main/resources/i18n/strings.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index c92e5fa1f..3805399aa 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -143,7 +143,7 @@ preferences.general.startHidden=Hide window when starting Cryptomator
 preferences.general.debugLogging=Enable debug logging
 preferences.general.debugDirectory=Reveal log files
 preferences.general.autoStart=Launch Cryptomator on system start
-preferences.general.keychainBackend=Password backend
+preferences.general.keychainBackend=Store passwords with
 preferences.general.keychainBackend.gnome=Gnome Keyring
 preferences.general.keychainBackend.kde=KDE KWallet
 preferences.general.keychainBackend.macSystemKeychain=macOS Keychain Access

From 51e43a05676632b5693c8825b6c9c3219a719765 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 2 Nov 2020 13:08:50 +0100
Subject: [PATCH 143/169] include system integration lib automatically
 depending on current OS

---
 main/commons/pom.xml |  4 +++
 main/pom.xml         | 71 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/main/commons/pom.xml b/main/commons/pom.xml
index 1927a4889..7eaccf881 100644
--- a/main/commons/pom.xml
+++ b/main/commons/pom.xml
@@ -27,6 +27,10 @@
 			<groupId>org.cryptomator</groupId>
 			<artifactId>webdav-nio-adapter</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>integrations-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>jni</artifactId>
diff --git a/main/pom.xml b/main/pom.xml
index e30e843a3..c4bd8dcc4 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -25,6 +25,10 @@
 
 		<!-- cryptomator dependencies -->
 		<cryptomator.cryptofs.version>1.9.12</cryptomator.cryptofs.version>
+		<cryptomator.integrations.version>0.1.4</cryptomator.integrations.version>
+		<cryptomator.integrations.win.version>0.1.0-beta1</cryptomator.integrations.win.version>
+		<cryptomator.integrations.mac.version>0.1.0-beta1</cryptomator.integrations.mac.version>
+		<cryptomator.integrations.linux.version>0.1.0-beta1</cryptomator.integrations.linux.version>
 		<cryptomator.jni.version>2.2.3</cryptomator.jni.version>
 		<cryptomator.fuse.version>1.2.5</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.1.15</cryptomator.dokany.version>
@@ -107,6 +111,26 @@
 				<version>${cryptomator.webdav.version}</version>
 			</dependency>
 			<dependency>
+				<groupId>org.cryptomator</groupId>
+				<artifactId>integrations-api</artifactId>
+				<version>${cryptomator.integrations.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.cryptomator</groupId>
+				<artifactId>integrations-win</artifactId>
+				<version>${cryptomator.integrations.win.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.cryptomator</groupId>
+				<artifactId>integrations-mac</artifactId>
+				<version>${cryptomator.integrations.mac.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.cryptomator</groupId>
+				<artifactId>integrations-linux</artifactId>
+				<version>${cryptomator.integrations.linux.version}</version>
+			</dependency>
+			<dependency> <!-- deprecated: will be replaced by integrations-api -->
 				<groupId>org.cryptomator</groupId>
 				<artifactId>jni</artifactId>
 				<version>${cryptomator.jni.version}</version>
@@ -164,12 +188,12 @@
 			</dependency>
 
 			<!-- Linux System Keychain -->
-			<dependency>
+			<dependency> <!-- deprecated: will be replaced by integrations-api -->
 				<groupId>de.swiesend</groupId>
 				<artifactId>secret-service</artifactId>
 				<version>${secret-service.version}</version>
 			</dependency>
-			<dependency>
+			<dependency> <!-- deprecated: will be replaced by integrations-api -->
 				<groupId>org.purejava</groupId>
 				<artifactId>kdewallet</artifactId>
 				<version>${kdewallet.version}</version>
@@ -279,6 +303,49 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>mac</id>
+			<activation>
+				<os>
+					<family>mac</family>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.cryptomator</groupId>
+					<artifactId>integrations-mac</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>linux</id>
+			<activation>
+				<os>
+					<family>unix</family>
+					<name>Linux</name>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.cryptomator</groupId>
+					<artifactId>integrations-linux</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
+		<profile>
+			<id>windows</id>
+			<activation>
+				<os>
+					<family>windows</family>
+				</os>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.cryptomator</groupId>
+					<artifactId>integrations-win</artifactId>
+				</dependency>
+			</dependencies>
+		</profile>
 	</profiles>
 
 	<build>

From bfde26be794d6b7d0cdc4d8b47c56f5156a92777 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 2 Nov 2020 13:09:30 +0100
Subject: [PATCH 144/169] Added new keychain module and refactored UI parts

---
 .../org/cryptomator/common/CommonsModule.java |   3 +-
 .../org/cryptomator/common/JniModule.java     |   1 +
 .../common/keychain/KeychainModule.java       |  41 +++++
 .../common/settings/KeychainBackend.java      |  40 ++---
 .../cryptomator/common/settings/Settings.java |   6 +-
 .../GeneralPreferencesController.java         |  35 ++--
 .../main/resources/i18n/strings.properties    |   8 +-
 .../main/resources/license/THIRD-PARTY.txt    | 152 +++++++++---------
 8 files changed, 150 insertions(+), 136 deletions(-)
 create mode 100644 main/commons/src/main/java/org/cryptomator/common/keychain/KeychainModule.java

diff --git a/main/commons/src/main/java/org/cryptomator/common/CommonsModule.java b/main/commons/src/main/java/org/cryptomator/common/CommonsModule.java
index 5ace6a3e2..ed278e1ab 100644
--- a/main/commons/src/main/java/org/cryptomator/common/CommonsModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/CommonsModule.java
@@ -9,6 +9,7 @@ import com.tobiasdiez.easybind.EasyBind;
 import dagger.Module;
 import dagger.Provides;
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.keychain.KeychainModule;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.SettingsProvider;
 import org.cryptomator.common.vaults.Vault;
@@ -33,7 +34,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
-@Module(subcomponents = {VaultComponent.class})
+@Module(subcomponents = {VaultComponent.class}, includes = {KeychainModule.class})
 public abstract class CommonsModule {
 
 	private static final Logger LOG = LoggerFactory.getLogger(CommonsModule.class);
diff --git a/main/commons/src/main/java/org/cryptomator/common/JniModule.java b/main/commons/src/main/java/org/cryptomator/common/JniModule.java
index 180736710..aaeda2964 100644
--- a/main/commons/src/main/java/org/cryptomator/common/JniModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/JniModule.java
@@ -15,6 +15,7 @@ import javax.inject.Singleton;
 import java.util.Optional;
 
 @Module
+@Deprecated
 public class JniModule {
 
 	@Provides
diff --git a/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainModule.java b/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainModule.java
new file mode 100644
index 000000000..895781c8f
--- /dev/null
+++ b/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainModule.java
@@ -0,0 +1,41 @@
+package org.cryptomator.common.keychain;
+
+import dagger.Module;
+import dagger.Provides;
+import org.cryptomator.common.settings.Settings;
+import org.cryptomator.integrations.keychain.KeychainAccessProvider;
+
+import javax.inject.Singleton;
+import javafx.beans.binding.Bindings;
+import javafx.beans.binding.ObjectBinding;
+import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Module
+public class KeychainModule {
+
+	@Provides
+	@Singleton
+	static Set<ServiceLoader.Provider<KeychainAccessProvider>> provideAvailableKeychainAccessProviderFactories() {
+		return ServiceLoader.load(KeychainAccessProvider.class).stream().collect(Collectors.toUnmodifiableSet());
+	}
+
+	@Provides
+	@Singleton
+	static Set<KeychainAccessProvider> provideSupportedKeychainAccessProviders(Set<ServiceLoader.Provider<KeychainAccessProvider>> availableFactories) {
+		return availableFactories.stream().map(ServiceLoader.Provider::get).collect(Collectors.toUnmodifiableSet());
+	}
+
+	@Provides
+	@Singleton
+	static ObjectBinding<KeychainAccessProvider> provideKeychainAccessProvider(Settings settings, Set<KeychainAccessProvider> providers) {
+		return Bindings.createObjectBinding(() -> {
+			var selectedProviderClass = settings.keychainBackend().get().getProviderClass();
+			var selectedProvider = providers.stream().filter(provider -> provider.getClass().getName().equals(selectedProviderClass)).findAny();
+			var fallbackProvider = providers.stream().findAny().orElse(null);
+			return selectedProvider.orElse(fallbackProvider);
+		}, settings.keychainBackend());
+	}
+
+}
diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/KeychainBackend.java b/main/commons/src/main/java/org/cryptomator/common/settings/KeychainBackend.java
index a54c81b08..65f869a12 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/KeychainBackend.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/KeychainBackend.java
@@ -1,39 +1,19 @@
 package org.cryptomator.common.settings;
 
-import org.apache.commons.lang3.SystemUtils;
-
-import java.util.Arrays;
-
 public enum KeychainBackend {
-	GNOME("preferences.general.keychainBackend.gnome", SystemUtils.IS_OS_LINUX), //
-	KDE("preferences.general.keychainBackend.kde", SystemUtils.IS_OS_LINUX), //
-	MAC_SYSTEM_KEYCHAIN("preferences.general.keychainBackend.macSystemKeychain", SystemUtils.IS_OS_MAC), //
-	WIN_SYSTEM_KEYCHAIN("preferences.general.keychainBackend.winSystemKeychain", SystemUtils.IS_OS_WINDOWS);
+	GNOME("org.cryptomator.linux.keychain.SecretServiceKeychainAccess"),
+	KDE("org.cryptomator.linux.keychain.KDEWalletKeychainAccess"),
+	MAC_SYSTEM_KEYCHAIN("org.cryptomator.macos.keychain.MacSystemKeychainAccess"),
+	WIN_SYSTEM_KEYCHAIN("org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess");
 
-	public static KeychainBackend[] supportedBackends() {
-		return Arrays.stream(values()).filter(KeychainBackend::isSupported).toArray(KeychainBackend[]::new);
+	private final String providerClass;
+
+	KeychainBackend(String providerClass) {
+		this.providerClass = providerClass;
 	}
 
-	public static KeychainBackend defaultBackend() {
-		if (SystemUtils.IS_OS_LINUX) {
-			return KeychainBackend.GNOME;
-		} else { // SystemUtils.IS_OS_MAC || SystemUtils.IS_OS_WINDOWS
-			return Arrays.stream(KeychainBackend.supportedBackends()).findFirst().orElseThrow(IllegalStateException::new);
-		}
+	public String getProviderClass() {
+		return providerClass;
 	}
 
-	private final String configName;
-	private final boolean isSupported;
-
-	KeychainBackend(String configName, boolean isSupported) {
-		this.configName = configName;
-		this.isSupported = isSupported;
-	}
-
-	public String getDisplayName() {
-		return configName;
-	}
-
-	public boolean isSupported() { return isSupported; }
-
 }
diff --git a/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java b/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java
index 22b42628d..e50391d2d 100644
--- a/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java
+++ b/main/commons/src/main/java/org/cryptomator/common/settings/Settings.java
@@ -8,6 +8,8 @@
  ******************************************************************************/
 package org.cryptomator.common.settings;
 
+import org.apache.commons.lang3.SystemUtils;
+
 import javafx.beans.Observable;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.IntegerProperty;
@@ -33,9 +35,9 @@ public class Settings {
 	public static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3;
 	public static final WebDavUrlScheme DEFAULT_GVFS_SCHEME = WebDavUrlScheme.DAV;
 	public static final boolean DEFAULT_DEBUG_MODE = false;
-	public static final VolumeImpl DEFAULT_PREFERRED_VOLUME_IMPL = System.getProperty("os.name").toLowerCase().contains("windows") ? VolumeImpl.DOKANY : VolumeImpl.FUSE;
+	public static final VolumeImpl DEFAULT_PREFERRED_VOLUME_IMPL = SystemUtils.IS_OS_WINDOWS ? VolumeImpl.DOKANY : VolumeImpl.FUSE;
 	public static final UiTheme DEFAULT_THEME = UiTheme.LIGHT;
-	public static final KeychainBackend DEFAULT_KEYCHAIN_BACKEND = KeychainBackend.defaultBackend();
+	public static final KeychainBackend DEFAULT_KEYCHAIN_BACKEND = SystemUtils.IS_OS_WINDOWS ? KeychainBackend.WIN_SYSTEM_KEYCHAIN : SystemUtils.IS_OS_MAC ? KeychainBackend.MAC_SYSTEM_KEYCHAIN : KeychainBackend.GNOME;
 	public static final NodeOrientation DEFAULT_USER_INTERFACE_ORIENTATION = NodeOrientation.LEFT_TO_RIGHT;
 	private static final String DEFAULT_LICENSE_KEY = "";
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index 4e4abfbc9..0d58323ce 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -6,6 +6,7 @@ import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.KeychainBackend;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
+import org.cryptomator.integrations.keychain.KeychainAccessProvider;
 import org.cryptomator.keychain.KeychainAccessStrategy;
 import org.cryptomator.keychain.LinuxSystemKeychainAccess;
 import org.cryptomator.ui.common.FxController;
@@ -32,7 +33,9 @@ import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.Optional;
 import java.util.ResourceBundle;
+import java.util.Set;
 import java.util.concurrent.ExecutorService;
+import java.util.stream.Collectors;
 
 @PreferencesScoped
 public class GeneralPreferencesController implements FxController {
@@ -48,7 +51,7 @@ public class GeneralPreferencesController implements FxController {
 	private final ResourceBundle resourceBundle;
 	private final Application application;
 	private final Environment environment;
-	private Optional<KeychainAccessStrategy> keychain;
+	private final Set<KeychainAccessProvider> keychainAccessProviders;
 	public ChoiceBox<UiTheme> themeChoiceBox;
 	public ChoiceBox<KeychainBackend> keychainBackendChoiceBox;
 	public CheckBox startHiddenCheckbox;
@@ -59,11 +62,11 @@ public class GeneralPreferencesController implements FxController {
 	public RadioButton nodeOrientationRtl;
 
 	@Inject
-	GeneralPreferencesController(Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, Optional<KeychainAccessStrategy> keychain, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment) {
+	GeneralPreferencesController(Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, Set<KeychainAccessProvider> keychainAccessProviders, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment) {
 		this.settings = settings;
 		this.trayMenuSupported = trayMenuSupported;
 		this.autoStartStrategy = autoStartStrategy;
-		this.keychain = keychain;
+		this.keychainAccessProviders = keychainAccessProviders;
 		this.selectedTabProperty = selectedTabProperty;
 		this.licenseHolder = licenseHolder;
 		this.executor = executor;
@@ -96,16 +99,15 @@ public class GeneralPreferencesController implements FxController {
 		nodeOrientation.selectedToggleProperty().addListener(this::toggleNodeOrientation);
 
 		keychainBackendChoiceBox.getItems().addAll(getAvailableBackends());
-		if (keychain.isPresent() && SystemUtils.IS_OS_LINUX) {
-			keychainBackendChoiceBox.setValue(LinuxSystemKeychainAccess.getBackendActivated());
-		}
-		if (keychain.isPresent() && (SystemUtils.IS_OS_MAC || SystemUtils.IS_OS_WINDOWS)) {
-			keychainBackendChoiceBox.setValue(Arrays.stream(KeychainBackend.supportedBackends()).findFirst().orElseThrow(IllegalStateException::new));
-		}
 		keychainBackendChoiceBox.setConverter(new KeychainBackendConverter(resourceBundle));
 		keychainBackendChoiceBox.valueProperty().bindBidirectional(settings.keychainBackend());
 	}
 
+	private KeychainBackend[] getAvailableBackends() {
+		var namesOfAvailableProviders = keychainAccessProviders.stream().map(KeychainAccessProvider::getClass).map(Class::getName).collect(Collectors.toUnmodifiableSet());
+		return Arrays.stream(KeychainBackend.values()).filter(value -> namesOfAvailableProviders.contains(value.getProviderClass())).toArray(KeychainBackend[]::new);
+	}
+
 	public boolean isTrayMenuSupported() {
 		return this.trayMenuSupported;
 	}
@@ -183,7 +185,7 @@ public class GeneralPreferencesController implements FxController {
 
 		@Override
 		public String toString(KeychainBackend impl) {
-			return resourceBundle.getString(impl.getDisplayName());
+			return resourceBundle.getString("preferences.general.keychainBackend." + impl.getProviderClass());
 		}
 
 		@Override
@@ -215,17 +217,4 @@ public class GeneralPreferencesController implements FxController {
 		}
 	}
 
-	private KeychainBackend[] getAvailableBackends() {
-		if (!keychain.isPresent()) {
-			return new KeychainBackend[]{};
-		}
-		if (SystemUtils.IS_OS_LINUX) {
-			EnumSet<KeychainBackend> backends = LinuxSystemKeychainAccess.getAvailableKeychainBackends();
-			return backends.toArray(KeychainBackend[]::new);
-		}
-		if (SystemUtils.IS_OS_MAC || SystemUtils.IS_OS_WINDOWS) {
-			return KeychainBackend.supportedBackends();
-		}
-		return new KeychainBackend[]{};
-	}
 }
diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index 3805399aa..e391d263a 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -144,10 +144,10 @@ preferences.general.debugLogging=Enable debug logging
 preferences.general.debugDirectory=Reveal log files
 preferences.general.autoStart=Launch Cryptomator on system start
 preferences.general.keychainBackend=Store passwords with
-preferences.general.keychainBackend.gnome=Gnome Keyring
-preferences.general.keychainBackend.kde=KDE KWallet
-preferences.general.keychainBackend.macSystemKeychain=macOS Keychain Access
-preferences.general.keychainBackend.winSystemKeychain=Windows Data Protection Keychain
+preferences.general.keychainBackend.org.cryptomator.linux.keychain.SecretServiceKeychainAccess=Gnome Keyring
+preferences.general.keychainBackend.org.cryptomator.linux.keychain.KDEWalletKeychainAccess=KDE KWallet
+preferences.general.keychainBackend.org.cryptomator.macos.keychain.MacSystemKeychainAccess=macOS Keychain Access
+preferences.general.keychainBackend.org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess=Windows Data Protection Keychain
 preferences.general.interfaceOrientation=Interface Orientation
 preferences.general.interfaceOrientation.ltr=Left to Right
 preferences.general.interfaceOrientation.rtl=Right to Left
diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt
index 3674e5e05..65d2cdb2c 100644
--- a/main/ui/src/main/resources/license/THIRD-PARTY.txt
+++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt
@@ -12,81 +12,81 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see http://www.gnu.org/licenses/.
 
 Cryptomator uses 53 third-party dependencies under the following licenses:
-	Apache License v2.0:
-		- HKDF-RFC5869 (at.favre.lib:hkdf:1.1.0 - https://github.com/patrickfav/hkdf)
-		- jffi (com.github.jnr:jffi:1.2.23 - http://github.com/jnr/jffi)
-		- jnr-a64asm (com.github.jnr:jnr-a64asm:1.0.0 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm)
-		- jnr-constants (com.github.jnr:jnr-constants:0.9.15 - http://github.com/jnr/jnr-constants)
-		- jnr-enxio (com.github.jnr:jnr-enxio:0.28 - http://github.com/jnr/jnr-enxio)
-		- jnr-ffi (com.github.jnr:jnr-ffi:2.1.12 - http://github.com/jnr/jnr-ffi)
-		- jnr-unixsocket (com.github.jnr:jnr-unixsocket:0.33 - http://github.com/jnr/jnr-unixsocket)
-		- FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/)
-		- Gson (com.google.code.gson:gson:2.8.6 - https://github.com/google/gson/gson)
-		- Dagger (com.google.dagger:dagger:2.22 - https://github.com/google/dagger)
-		- error-prone annotations (com.google.errorprone:error_prone_annotations:2.3.4 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations)
-		- Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess)
-		- Guava: Google Core Libraries for Java (com.google.guava:guava:29.0-jre - https://github.com/google/guava/guava)
-		- Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture)
-		- J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - https://github.com/google/j2objc/)
-		- Apache Commons CLI (commons-cli:commons-cli:1.4 - http://commons.apache.org/proper/commons-cli/)
-		- Apache Commons IO (commons-io:commons-io:2.6 - http://commons.apache.org/proper/commons-io/)
-		- javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/)
-		- Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna)
-		- Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna)
-		- Apache Commons Lang (org.apache.commons:commons-lang3:3.11 - https://commons.apache.org/proper/commons-lang/)
-		- Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.13 - http://hc.apache.org/httpcomponents-core-ga)
-		- Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.21.3 - http://jackrabbit.apache.org/jackrabbit-webdav/)
-		- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-		- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-		- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-		- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-		- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-		- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-		- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-		- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-	BSD:
-		- asm (org.ow2.asm:asm:7.1 - http://asm.ow2.org/)
-		- asm-analysis (org.ow2.asm:asm-analysis:7.1 - http://asm.ow2.org/)
-		- asm-commons (org.ow2.asm:asm-commons:7.1 - http://asm.ow2.org/)
-		- asm-tree (org.ow2.asm:asm-tree:7.1 - http://asm.ow2.org/)
-		- asm-util (org.ow2.asm:asm-util:7.1 - http://asm.ow2.org/)
-	Eclipse Public License - Version 1.0:
-		- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-		- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-		- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-		- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-		- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-		- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-		- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-		- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.31.v20200723 - http://www.eclipse.org/jetty)
-	Eclipse Public License - v 2.0:
-		- jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
-	GPLv2:
-		- jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
-	GPLv2+CE:
-		- Java Servlet API (javax.servlet:javax.servlet-api:3.1.0 - http://servlet-spec.java.net)
-		- javafx-base (org.openjfx:javafx-base:14 - https://openjdk.java.net/projects/openjfx/javafx-base/)
-		- javafx-controls (org.openjfx:javafx-controls:14 - https://openjdk.java.net/projects/openjfx/javafx-controls/)
-		- javafx-fxml (org.openjfx:javafx-fxml:14 - https://openjdk.java.net/projects/openjfx/javafx-fxml/)
-		- javafx-graphics (org.openjfx:javafx-graphics:14 - https://openjdk.java.net/projects/openjfx/javafx-graphics/)
-	LGPL 2.1:
-		- dbus-java (com.github.hypfvieh:dbus-java:3.2.3 - https://github.com/hypfvieh/dbus-java/dbus-java)
-		- jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
-		- Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna)
-		- Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna)
-	MIT License:
-		- java jwt (com.auth0:java-jwt:3.10.3 - https://github.com/auth0/java-jwt)
-		- java-utils (com.github.hypfvieh:java-utils:1.0.6 - https://github.com/hypfvieh/java-utils)
-		- jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - http://github.com/jnr/jnr-x86asm)
-		- jnr-fuse (com.github.serceman:jnr-fuse:0.5.4 - no url defined)
-		- zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - https://github.com/nulab/zxcvbn4j)
-		- secret-service (de.swiesend:secret-service:1.1.0 - https://github.com/swiesend/secret-service)
-		- Checker Qual (org.checkerframework:checker-qual:2.11.1 - https://checkerframework.org)
-		- kdewallet (org.purejava:kdewallet:1.1.1 - https://github.com/purejava/kdewallet)
-		- SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org)
-	The BSD 2-Clause License:
-		- EasyBind (com.tobiasdiez:easybind:2.1.0 - https://github.com/tobiasdiez/EasyBind)
+        Apache License v2.0:
+			- HKDF-RFC5869 (at.favre.lib:hkdf:1.1.0 - https://github.com/patrickfav/hkdf)
+			- jffi (com.github.jnr:jffi:1.2.23 - http://github.com/jnr/jffi)
+			- jnr-a64asm (com.github.jnr:jnr-a64asm:1.0.0 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm)
+			- jnr-constants (com.github.jnr:jnr-constants:0.9.15 - http://github.com/jnr/jnr-constants)
+			- jnr-enxio (com.github.jnr:jnr-enxio:0.28 - http://github.com/jnr/jnr-enxio)
+			- jnr-ffi (com.github.jnr:jnr-ffi:2.1.12 - http://github.com/jnr/jnr-ffi)
+			- jnr-unixsocket (com.github.jnr:jnr-unixsocket:0.33 - http://github.com/jnr/jnr-unixsocket)
+			- FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/)
+			- Gson (com.google.code.gson:gson:2.8.6 - https://github.com/google/gson/gson)
+			- Dagger (com.google.dagger:dagger:2.22 - https://github.com/google/dagger)
+			- error-prone annotations (com.google.errorprone:error_prone_annotations:2.3.4 - http://nexus.sonatype.org/oss-repository-hosting.html/error_prone_parent/error_prone_annotations)
+			- Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess)
+			- Guava: Google Core Libraries for Java (com.google.guava:guava:30.0-jre - https://github.com/google/guava/guava)
+			- Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture)
+			- J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - https://github.com/google/j2objc/)
+			- Apache Commons CLI (commons-cli:commons-cli:1.4 - http://commons.apache.org/proper/commons-cli/)
+			- Apache Commons IO (commons-io:commons-io:2.6 - http://commons.apache.org/proper/commons-io/)
+			- javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/)
+			- Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna)
+			- Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna)
+			- Apache Commons Lang (org.apache.commons:commons-lang3:3.11 - https://commons.apache.org/proper/commons-lang/)
+			- Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.13 - http://hc.apache.org/httpcomponents-core-ga)
+			- Jackrabbit WebDAV Library (org.apache.jackrabbit:jackrabbit-webdav:2.21.3 - http://jackrabbit.apache.org/jackrabbit-webdav/)
+			- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+        BSD:
+			- asm (org.ow2.asm:asm:7.1 - http://asm.ow2.org/)
+			- asm-analysis (org.ow2.asm:asm-analysis:7.1 - http://asm.ow2.org/)
+			- asm-commons (org.ow2.asm:asm-commons:7.1 - http://asm.ow2.org/)
+			- asm-tree (org.ow2.asm:asm-tree:7.1 - http://asm.ow2.org/)
+			- asm-util (org.ow2.asm:asm-util:7.1 - http://asm.ow2.org/)
+        Eclipse Public License - Version 1.0:
+			- Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+			- Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.31.v20200723 - http://www.eclipse.org/jetty)
+        Eclipse Public License - v 2.0:
+			- jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
+        GPLv2:
+			- jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
+        GPLv2+CE:
+			- Java Servlet API (javax.servlet:javax.servlet-api:3.1.0 - http://servlet-spec.java.net)
+			- javafx-base (org.openjfx:javafx-base:14 - https://openjdk.java.net/projects/openjfx/javafx-base/)
+			- javafx-controls (org.openjfx:javafx-controls:14 - https://openjdk.java.net/projects/openjfx/javafx-controls/)
+			- javafx-fxml (org.openjfx:javafx-fxml:14 - https://openjdk.java.net/projects/openjfx/javafx-fxml/)
+			- javafx-graphics (org.openjfx:javafx-graphics:14 - https://openjdk.java.net/projects/openjfx/javafx-graphics/)
+        LGPL 2.1:
+			- dbus-java (com.github.hypfvieh:dbus-java:3.2.3 - https://github.com/hypfvieh/dbus-java/dbus-java)
+			- jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
+			- Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna)
+			- Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna)
+        MIT License:
+			- java jwt (com.auth0:java-jwt:3.10.3 - https://github.com/auth0/java-jwt)
+			- java-utils (com.github.hypfvieh:java-utils:1.0.6 - https://github.com/hypfvieh/java-utils)
+			- jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - http://github.com/jnr/jnr-x86asm)
+			- jnr-fuse (com.github.serceman:jnr-fuse:0.5.4 - no url defined)
+			- zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - https://github.com/nulab/zxcvbn4j)
+			- secret-service (de.swiesend:secret-service:1.1.0 - https://github.com/swiesend/secret-service)
+			- Checker Qual (org.checkerframework:checker-qual:3.5.0 - https://checkerframework.org)
+			- kdewallet (org.purejava:kdewallet:1.1.1 - https://github.com/purejava/kdewallet)
+			- SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org)
+        The BSD 2-Clause License:
+			- EasyBind (com.tobiasdiez:easybind:2.1.0 - https://github.com/tobiasdiez/EasyBind)
 
 Cryptomator uses other third-party assets under the following licenses:
-	SIL OFL 1.1 License:
-		- Font Awesome 5.12.0 (https://fontawesome.com/)
+SIL OFL 1.1 License:
+- Font Awesome 5.12.0 (https://fontawesome.com/)

From 82a42ea183d0f6de48f5483b33d2213ba335fa69 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 2 Nov 2020 14:03:39 +0100
Subject: [PATCH 145/169] Removed keychain module. Implemented new
 KeychainManager in various UI controller classes

---
 .../common}/keychain/KeychainManager.java     |  40 ++--
 .../common/keychain/KeychainModule.java       |   4 +-
 .../NoKeychainAccessProviderException.java    |  13 ++
 .../common}/keychain/KeychainManagerTest.java |  11 +-
 .../common}/keychain/MapKeychainAccess.java   |   6 +-
 main/keychain/pom.xml                         |  69 ------
 .../keychain/KeychainAccessException.java     |  12 -
 .../keychain/KeychainAccessStrategy.java      |  46 ----
 .../cryptomator/keychain/KeychainModule.java  |  45 ----
 .../LinuxKDEWalletKeychainAccessImpl.java     | 126 -----------
 .../LinuxSecretServiceKeychainAccessImpl.java |  81 -------
 .../keychain/LinuxSystemKeychainAccess.java   | 106 ---------
 .../keychain/MacSystemKeychainAccess.java     |  57 -----
 .../WindowsProtectedKeychainAccess.java       | 209 ------------------
 .../WindowsProtectedKeychainAccessTest.java   |  56 -----
 main/keychain/src/test/resources/log4j2.xml   |  33 ---
 main/pom.xml                                  |  18 --
 main/ui/pom.xml                               |   4 -
 .../ChangePasswordController.java             |  12 +-
 .../cryptomator/ui/common/VaultService.java   |   6 +-
 .../ForgetPasswordController.java             |  13 +-
 .../ui/launcher/UiLauncherModule.java         |   3 +-
 .../VaultDetailLockedController.java          |  16 +-
 .../ui/migration/MigrationRunController.java  |  16 +-
 .../GeneralPreferencesController.java         |   5 -
 .../ui/unlock/UnlockController.java           |   8 +-
 .../cryptomator/ui/unlock/UnlockModule.java   |  16 +-
 .../cryptomator/ui/unlock/UnlockWorkflow.java |  12 +-
 .../MasterkeyOptionsController.java           |  36 +--
 .../main/resources/license/THIRD-PARTY.txt    |   9 +-
 30 files changed, 126 insertions(+), 962 deletions(-)
 rename main/{keychain/src/main/java/org/cryptomator => commons/src/main/java/org/cryptomator/common}/keychain/KeychainManager.java (73%)
 create mode 100644 main/commons/src/main/java/org/cryptomator/common/keychain/NoKeychainAccessProviderException.java
 rename main/{keychain/src/test/java/org/cryptomator => commons/src/test/java/org/cryptomator/common}/keychain/KeychainManagerTest.java (76%)
 rename main/{keychain/src/test/java/org/cryptomator => commons/src/test/java/org/cryptomator/common}/keychain/MapKeychainAccess.java (86%)
 delete mode 100644 main/keychain/pom.xml
 delete mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessException.java
 delete mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
 delete mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
 delete mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
 delete mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java
 delete mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/LinuxSystemKeychainAccess.java
 delete mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
 delete mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java
 delete mode 100644 main/keychain/src/test/java/org/cryptomator/keychain/WindowsProtectedKeychainAccessTest.java
 delete mode 100644 main/keychain/src/test/resources/log4j2.xml

diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainManager.java b/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java
similarity index 73%
rename from main/keychain/src/main/java/org/cryptomator/keychain/KeychainManager.java
rename to main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java
index 515195232..e91648f7d 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainManager.java
+++ b/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java
@@ -1,60 +1,75 @@
-package org.cryptomator.keychain;
+package org.cryptomator.common.keychain;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import org.cryptomator.integrations.keychain.KeychainAccessException;
+import org.cryptomator.integrations.keychain.KeychainAccessProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javafx.application.Platform;
+import javafx.beans.binding.ObjectExpression;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import java.util.Arrays;
 
-public class KeychainManager implements KeychainAccessStrategy {
+@Singleton
+public class KeychainManager implements KeychainAccessProvider {
 
 	private static final Logger LOG = LoggerFactory.getLogger(KeychainManager.class);
 
-	private final KeychainAccessStrategy keychain;
+	private final ObjectExpression<KeychainAccessProvider> keychain;
 	private LoadingCache<String, BooleanProperty> passphraseStoredProperties;
 
-	KeychainManager(KeychainAccessStrategy keychain) {
-		assert keychain.isSupported();
-		this.keychain = keychain;
+	@Inject
+	KeychainManager(ObjectExpression<KeychainAccessProvider> selectedKeychain) {
+		this.keychain = selectedKeychain;
 		this.passphraseStoredProperties = CacheBuilder.newBuilder() //
 				.weakValues() //
 				.build(CacheLoader.from(this::createStoredPassphraseProperty));
+		keychain.addListener(ignored -> passphraseStoredProperties.invalidateAll());
+	}
+
+	private KeychainAccessProvider getKeychainOrFail() throws KeychainAccessException {
+		var result = keychain.getValue();
+		if (result == null) {
+			throw new NoKeychainAccessProviderException();
+		}
+		return result;
 	}
 
 	@Override
 	public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
-		keychain.storePassphrase(key, passphrase);
+		getKeychainOrFail().storePassphrase(key, passphrase);
 		setPassphraseStored(key, true);
 	}
 
 	@Override
 	public char[] loadPassphrase(String key) throws KeychainAccessException {
-		char[] passphrase = keychain.loadPassphrase(key);
+		char[] passphrase = getKeychainOrFail().loadPassphrase(key);
 		setPassphraseStored(key, passphrase != null);
 		return passphrase;
 	}
 
 	@Override
 	public void deletePassphrase(String key) throws KeychainAccessException {
-		keychain.deletePassphrase(key);
+		getKeychainOrFail().deletePassphrase(key);
 		setPassphraseStored(key, false);
 	}
 
 	@Override
 	public void changePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
-		keychain.changePassphrase(key, passphrase);
+		getKeychainOrFail().changePassphrase(key, passphrase);
 		setPassphraseStored(key, true);
 	}
 
 	@Override
 	public boolean isSupported() {
-		return true;
+		return keychain.getValue() != null;
 	}
 
 	/**
@@ -69,7 +84,7 @@ public class KeychainManager implements KeychainAccessStrategy {
 	public boolean isPassphraseStored(String key) throws KeychainAccessException {
 		char[] storedPw = null;
 		try {
-			storedPw = keychain.loadPassphrase(key);
+			storedPw = getKeychainOrFail().loadPassphrase(key);
 			return storedPw != null;
 		} finally {
 			if (storedPw != null) {
@@ -107,7 +122,6 @@ public class KeychainManager implements KeychainAccessStrategy {
 
 	private BooleanProperty createStoredPassphraseProperty(String key) {
 		try {
-			LOG.warn("LOAD"); // TODO remove
 			return new SimpleBooleanProperty(isPassphraseStored(key));
 		} catch (KeychainAccessException e) {
 			return new SimpleBooleanProperty(false);
diff --git a/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainModule.java b/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainModule.java
index 895781c8f..4e88fe027 100644
--- a/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainModule.java
@@ -8,6 +8,8 @@ import org.cryptomator.integrations.keychain.KeychainAccessProvider;
 import javax.inject.Singleton;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.ObjectBinding;
+import javafx.beans.binding.ObjectExpression;
+import javafx.beans.value.ObservableValue;
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -29,7 +31,7 @@ public class KeychainModule {
 
 	@Provides
 	@Singleton
-	static ObjectBinding<KeychainAccessProvider> provideKeychainAccessProvider(Settings settings, Set<KeychainAccessProvider> providers) {
+	static ObjectExpression<KeychainAccessProvider> provideKeychainAccessProvider(Settings settings, Set<KeychainAccessProvider> providers) {
 		return Bindings.createObjectBinding(() -> {
 			var selectedProviderClass = settings.keychainBackend().get().getProviderClass();
 			var selectedProvider = providers.stream().filter(provider -> provider.getClass().getName().equals(selectedProviderClass)).findAny();
diff --git a/main/commons/src/main/java/org/cryptomator/common/keychain/NoKeychainAccessProviderException.java b/main/commons/src/main/java/org/cryptomator/common/keychain/NoKeychainAccessProviderException.java
new file mode 100644
index 000000000..c14b81076
--- /dev/null
+++ b/main/commons/src/main/java/org/cryptomator/common/keychain/NoKeychainAccessProviderException.java
@@ -0,0 +1,13 @@
+package org.cryptomator.common.keychain;
+
+import org.cryptomator.integrations.keychain.KeychainAccessException;
+
+/**
+ * Thrown by {@link KeychainManager} if attempted to access a keychain despite no supported keychain access provider being available.
+ */
+public class NoKeychainAccessProviderException extends KeychainAccessException {
+
+	public NoKeychainAccessProviderException() {
+		super("Did not find any supported keychain access provider.");
+	}
+}
diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/KeychainManagerTest.java b/main/commons/src/test/java/org/cryptomator/common/keychain/KeychainManagerTest.java
similarity index 76%
rename from main/keychain/src/test/java/org/cryptomator/keychain/KeychainManagerTest.java
rename to main/commons/src/test/java/org/cryptomator/common/keychain/KeychainManagerTest.java
index 8577b0977..e82e67e2d 100644
--- a/main/keychain/src/test/java/org/cryptomator/keychain/KeychainManagerTest.java
+++ b/main/commons/src/test/java/org/cryptomator/common/keychain/KeychainManagerTest.java
@@ -1,23 +1,26 @@
-package org.cryptomator.keychain;
+package org.cryptomator.common.keychain;
 
 
+import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 
-class KeychainManagerTest {
+public class KeychainManagerTest {
 
 	@Test
 	public void testStoreAndLoad() throws KeychainAccessException {
-		KeychainManager keychainManager = new KeychainManager(new MapKeychainAccess());
+		KeychainManager keychainManager = new KeychainManager(new SimpleObjectProperty<>(new MapKeychainAccess()));
 		keychainManager.storePassphrase("test", "asd");
 		Assertions.assertArrayEquals("asd".toCharArray(), keychainManager.loadPassphrase("test"));
 	}
@@ -34,7 +37,7 @@ class KeychainManagerTest {
 
 		@Test
 		public void testPropertyChangesWhenStoringPassword() throws KeychainAccessException, InterruptedException {
-			KeychainManager keychainManager = new KeychainManager(new MapKeychainAccess());
+			KeychainManager keychainManager = new KeychainManager(new SimpleObjectProperty<>(new MapKeychainAccess()));
 			ReadOnlyBooleanProperty property = keychainManager.getPassphraseStoredProperty("test");
 			Assertions.assertEquals(false, property.get());
 
diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java b/main/commons/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java
similarity index 86%
rename from main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java
rename to main/commons/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java
index 26b301377..c571ad716 100644
--- a/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java
+++ b/main/commons/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java
@@ -3,12 +3,14 @@
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the accompanying LICENSE file.
  *******************************************************************************/
-package org.cryptomator.keychain;
+package org.cryptomator.common.keychain;
+
+import org.cryptomator.integrations.keychain.KeychainAccessProvider;
 
 import java.util.HashMap;
 import java.util.Map;
 
-class MapKeychainAccess implements KeychainAccessStrategy {
+class MapKeychainAccess implements KeychainAccessProvider {
 
 	private final Map<String, char[]> map = new HashMap<>();
 
diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml
deleted file mode 100644
index c70d7cacb..000000000
--- a/main/keychain/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.cryptomator</groupId>
-		<artifactId>main</artifactId>
-		<version>1.6.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>keychain</artifactId>
-	<name>System Keychain Access</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>commons</artifactId>
-		</dependency>
-
-		<!-- JavaFx -->
-		<dependency>
-			<groupId>org.openjfx</groupId>
-			<artifactId>javafx-base</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.openjfx</groupId>
-			<artifactId>javafx-graphics</artifactId>
-		</dependency>
-
-		<!-- Apache -->
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-		</dependency>
-
-		<!-- Google -->
-		<dependency>
-			<groupId>com.google.code.gson</groupId>
-			<artifactId>gson</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-		</dependency>
-
-		<!-- DI -->
-		<dependency>
-			<groupId>com.google.dagger</groupId>
-			<artifactId>dagger</artifactId>
-		</dependency>
-
-		<!-- secret-service lib -->
-		<dependency>
-			<groupId>de.swiesend</groupId>
-			<artifactId>secret-service</artifactId>
-		</dependency>
-
-		<!-- kdewallet lib -->
-		<dependency>
-			<groupId>org.purejava</groupId>
-			<artifactId>kdewallet</artifactId>
-		</dependency>
-
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-simple</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>
\ No newline at end of file
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessException.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessException.java
deleted file mode 100644
index b4f0cf5c8..000000000
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessException.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.cryptomator.keychain;
-
-/**
- * Indicates an error during communication with the operating system's keychain.
- */
-public class KeychainAccessException extends Exception {
-
-	KeychainAccessException(Throwable cause) {
-		super(cause);
-	}
-
-}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
deleted file mode 100644
index 553ce4eab..000000000
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
+++ /dev/null
@@ -1,46 +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.keychain;
-
-public interface KeychainAccessStrategy {
-
-	/**
-	 * Associates a passphrase with a given key.
-	 *
-	 * @param key Key used to retrieve the passphrase via {@link #loadPassphrase(String)}.
-	 * @param passphrase The secret to store in this keychain.
-	 */
-	void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException;
-
-	/**
-	 * @param key Unique key previously used while {@link #storePassphrase(String, CharSequence) storing a passphrase}.
-	 * @return The stored passphrase for the given key or <code>null</code> if no value for the given key could be found.
-	 */
-	char[] loadPassphrase(String key) throws KeychainAccessException;
-
-	/**
-	 * Deletes a passphrase with a given key.
-	 *
-	 * @param key Unique key previously used while {@link #storePassphrase(String, CharSequence) storing a passphrase}.
-	 */
-	void deletePassphrase(String key) throws KeychainAccessException;
-
-	/**
-	 * Updates a passphrase with a given key. Noop, if there is no item for the given key.
-	 *
-	 * @param key Unique key previously used while {@link #storePassphrase(String, CharSequence) storing a passphrase}.
-	 * @param passphrase The secret to be updated in this keychain.
-	 */
-	void changePassphrase(String key, CharSequence passphrase) throws KeychainAccessException;
-
-	/**
-	 * @return <code>true</code> if this KeychainAccessStrategy works on the current machine.
-	 * @implNote This method must not throw any exceptions and should fail fast
-	 * returning <code>false</code> if it can't determine availability of the checked strategy
-	 */
-	boolean isSupported();
-
-}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
deleted file mode 100644
index 791eb1dd0..000000000
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
+++ /dev/null
@@ -1,45 +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.keychain;
-
-import dagger.Binds;
-import dagger.Module;
-import dagger.Provides;
-import dagger.multibindings.IntoSet;
-import org.cryptomator.common.JniModule;
-
-import javax.inject.Singleton;
-import java.util.Optional;
-import java.util.Set;
-
-@Module(includes = {JniModule.class})
-public abstract class KeychainModule {
-
-	@Binds
-	@IntoSet
-	abstract KeychainAccessStrategy bindMacSystemKeychainAccess(MacSystemKeychainAccess keychainAccessStrategy);
-
-	@Binds
-	@IntoSet
-	abstract KeychainAccessStrategy bindWindowsProtectedKeychainAccess(WindowsProtectedKeychainAccess keychainAccessStrategy);
-
-	@Binds
-	@IntoSet
-	abstract KeychainAccessStrategy bindLinuxSystemKeychainAccess(LinuxSystemKeychainAccess keychainAccessStrategy);
-
-	@Provides
-	@Singleton
-	static Optional<KeychainAccessStrategy> provideSupportedKeychain(Set<KeychainAccessStrategy> keychainAccessStrategies) {
-		return keychainAccessStrategies.stream().filter(KeychainAccessStrategy::isSupported).findFirst();
-	}
-
-	@Provides
-	@Singleton
-	public static Optional<KeychainManager> provideKeychainManager(Optional<KeychainAccessStrategy> keychainAccess) {
-		return keychainAccess.map(KeychainManager::new);
-	}
-
-}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
deleted file mode 100644
index 1f74bd18d..000000000
--- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKDEWalletKeychainAccessImpl.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.cryptomator.keychain;
-
-import org.freedesktop.dbus.connections.impl.DBusConnection;
-import org.freedesktop.dbus.exceptions.DBusException;
-import org.kde.KWallet;
-import org.kde.Static;
-import org.purejava.KDEWallet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class LinuxKDEWalletKeychainAccessImpl implements KeychainAccessStrategy {
-
-	private static final Logger LOG = LoggerFactory.getLogger(LinuxKDEWalletKeychainAccessImpl.class);
-
-	private final String FOLDER_NAME = "Cryptomator";
-	private final String APP_NAME = "Cryptomator";
-	private DBusConnection connection;
-	private KDEWallet wallet;
-	private int handle = -1;
-
-	public LinuxKDEWalletKeychainAccessImpl() throws KeychainAccessException {
-		try {
-			connection = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
-		} catch (DBusException e) {
-			LOG.error("Connecting to D-Bus failed:", e);
-			throw new KeychainAccessException(e);
-		}
-	}
-
-	@Override
-	public boolean isSupported() {
-		try {
-			wallet = new KDEWallet(connection);
-			return wallet.isEnabled();
-		} catch (Exception e) {
-			LOG.error("A KDEWallet could not be created:", e);
-			return false;
-		}
-	}
-
-	@Override
-	public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
-		try {
-			if (walletIsOpen() && //
-					!(wallet.hasEntry(handle, FOLDER_NAME, key, APP_NAME) //
-							&& wallet.entryType(handle, FOLDER_NAME, key, APP_NAME) == 1) //
-					&& wallet.writePassword(handle, FOLDER_NAME, key, passphrase.toString(), APP_NAME) == 0) {
-				LOG.debug("Passphrase successfully stored.");
-			} else {
-				LOG.debug("Passphrase was not stored.");
-			}
-		} catch (Exception e) {
-			LOG.error("Storing the passphrase failed:", e);
-			throw new KeychainAccessException(e);
-		}
-	}
-
-	@Override
-	public char[] loadPassphrase(String key) throws KeychainAccessException {
-		String password = "";
-		try {
-			if (walletIsOpen()) {
-				password = wallet.readPassword(handle, FOLDER_NAME, key, APP_NAME);
-				LOG.debug("loadPassphrase: wallet is open.");
-			} else {
-				LOG.debug("loadPassphrase: wallet is closed.");
-			}
-			return (password.equals("")) ? null : password.toCharArray();
-		} catch (Exception e) {
-			LOG.error("Loading the passphrase failed:", e);
-			throw new KeychainAccessException(e);
-		}
-	}
-
-	@Override
-	public void deletePassphrase(String key) throws KeychainAccessException {
-		try {
-			if (walletIsOpen() //
-					&& wallet.hasEntry(handle, FOLDER_NAME, key, APP_NAME) //
-					&& wallet.entryType(handle, FOLDER_NAME, key, APP_NAME) == 1 //
-					&& wallet.removeEntry(handle, FOLDER_NAME, key, APP_NAME) == 0) {
-				LOG.debug("Passphrase successfully deleted.");
-			} else {
-				LOG.debug("Passphrase was not deleted.");
-			}
-		} catch (Exception e) {
-			LOG.error("Deleting the passphrase failed:", e);
-			throw new KeychainAccessException(e);
-		}
-	}
-
-	@Override
-	public void changePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
-		try {
-			if (walletIsOpen() //
-					&& wallet.hasEntry(handle, FOLDER_NAME, key, APP_NAME) //
-					&& wallet.entryType(handle, FOLDER_NAME, key, APP_NAME) == 1 //
-					&& wallet.writePassword(handle, FOLDER_NAME, key, passphrase.toString(), APP_NAME) == 0) {
-				LOG.debug("Passphrase successfully changed.");
-			} else {
-				LOG.debug("Passphrase could not be changed.");
-			}
-		} catch (Exception e) {
-			LOG.error("Changing the passphrase failed:", e);
-			throw new KeychainAccessException(e);
-		}
-	}
-
-	private boolean walletIsOpen() throws KeychainAccessException {
-		try {
-			if (wallet.isOpen(Static.DEFAULT_WALLET)) {
-				// This is needed due to KeechainManager loading the passphase directly
-				if (handle == -1) handle = wallet.open(Static.DEFAULT_WALLET, 0, APP_NAME);
-				return true;
-			}
-			wallet.openAsync(Static.DEFAULT_WALLET, 0, APP_NAME, false);
-			wallet.getSignalHandler().await(KWallet.walletAsyncOpened.class, Static.ObjectPaths.KWALLETD5, () -> null);
-			handle = wallet.getSignalHandler().getLastHandledSignal(KWallet.walletAsyncOpened.class, Static.ObjectPaths.KWALLETD5).handle;
-			LOG.debug("Wallet successfully initialized.");
-			return handle != -1;
-		} catch (Exception e) {
-			LOG.error("Asynchronous opening the wallet failed:", e);
-			throw new KeychainAccessException(e);
-		}
-	}
-}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java
deleted file mode 100644
index e422fff2e..000000000
--- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.cryptomator.keychain;
-
-import org.freedesktop.secret.simple.SimpleCollection;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-class LinuxSecretServiceKeychainAccessImpl implements KeychainAccessStrategy {
-
-	private final String LABEL_FOR_SECRET_IN_KEYRING = "Cryptomator";
-
-	@Override
-	public boolean isSupported() {
-		try (@SuppressWarnings("unused") SimpleCollection keyring = new SimpleCollection()) {
-			// seems like we're able to access the keyring.
-			return true;
-		} catch (IOException | RuntimeException e) {
-			return false;
-		}
-	}
-
-	@Override
-	public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
-		try (SimpleCollection keyring = new SimpleCollection()) {
-			List<String> list = keyring.getItems(createAttributes(key));
-			if (list == null) {
-				keyring.createItem(LABEL_FOR_SECRET_IN_KEYRING, passphrase, createAttributes(key));
-			} else {
-				changePassphrase(key, passphrase);
-			}
-		} catch (IOException e) {
-			throw new KeychainAccessException(e);
-		}
-	}
-
-	@Override
-	public char[] loadPassphrase(String key) throws KeychainAccessException {
-		try (SimpleCollection keyring = new SimpleCollection()) {
-			List<String> list = keyring.getItems(createAttributes(key));
-			if (list != null) {
-				return keyring.getSecret(list.get(0));
-			} else {
-				return null;
-			}
-		} catch (IOException e) {
-			throw new KeychainAccessException(e);
-		}
-	}
-
-	@Override
-	public void deletePassphrase(String key) throws KeychainAccessException {
-		try (SimpleCollection keyring = new SimpleCollection()) {
-			List<String> list = keyring.getItems(createAttributes(key));
-			if (list != null) {
-				keyring.deleteItem(list.get(0));
-			}
-		} catch (IOException e) {
-			throw new KeychainAccessException(e);
-		}
-	}
-
-	@Override
-	public void changePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
-		try (SimpleCollection keyring = new SimpleCollection()) {
-			List<String> list = keyring.getItems(createAttributes(key));
-			if (list != null) {
-				keyring.updateItem(list.get(0), LABEL_FOR_SECRET_IN_KEYRING, passphrase, createAttributes(key));
-			}
-		} catch (IOException e) {
-			throw new KeychainAccessException(e);
-		}
-	}
-
-	private Map<String, String> createAttributes(String key) {
-		Map<String, String> attributes = new HashMap();
-		attributes.put("Vault", key);
-		return attributes;
-	}
-}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSystemKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSystemKeychainAccess.java
deleted file mode 100644
index f49ea5d1d..000000000
--- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSystemKeychainAccess.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.cryptomator.keychain;
-
-import javafx.beans.property.ObjectProperty;
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.settings.KeychainBackend;
-import org.cryptomator.common.settings.Settings;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.util.EnumSet;
-import java.util.Optional;
-
-/**
- * A facade to LinuxSecretServiceKeychainAccessImpl and LinuxKDEWalletKeychainAccessImpl
- * that depend on libraries that are unavailable on Mac and Windows.
- */
-@Singleton
-public class LinuxSystemKeychainAccess implements KeychainAccessStrategy {
-
-	// the actual implementation is hidden in this delegate objects which are loaded via reflection,
-	// as it depends on libraries that aren't necessarily available:
-	private final Optional<KeychainAccessStrategy> delegate;
-	private final Settings settings;
-	private static EnumSet<KeychainBackend> availableKeychainBackends = EnumSet.noneOf(KeychainBackend.class);
-	private static KeychainBackend backendActivated = null;
-	private static boolean isGnomeKeyringAvailable;
-	private static boolean isKdeWalletAvailable;
-
-	@Inject
-	public LinuxSystemKeychainAccess(Settings settings) {
-		this.settings = settings;
-		this.delegate = constructKeychainAccess();
-	}
-
-	private Optional<KeychainAccessStrategy> constructKeychainAccess() {
-		try { // find out which backends are available
-			Class<?> clazz = Class.forName("org.cryptomator.keychain.LinuxSecretServiceKeychainAccessImpl");
-			KeychainAccessStrategy gnomeKeyring = (KeychainAccessStrategy) clazz.getDeclaredConstructor().newInstance();
-			if (gnomeKeyring.isSupported()) {
-				LinuxSystemKeychainAccess.availableKeychainBackends.add(KeychainBackend.GNOME);
-				LinuxSystemKeychainAccess.isGnomeKeyringAvailable = true;
-			}
-			clazz = Class.forName("org.cryptomator.keychain.LinuxKDEWalletKeychainAccessImpl");
-			KeychainAccessStrategy kdeWallet = (KeychainAccessStrategy) clazz.getDeclaredConstructor().newInstance();
-			if (kdeWallet.isSupported()) {
-				LinuxSystemKeychainAccess.availableKeychainBackends.add(KeychainBackend.KDE);
-				LinuxSystemKeychainAccess.isKdeWalletAvailable = true;
-			}
-
-			// load password backend setting as the preferred backend
-			ObjectProperty<KeychainBackend> pwSetting =  settings.keychainBackend();
-
-			// check for GNOME keyring first, as this gets precedence over
-			// KDE wallet as the former was implemented first
-			if (isGnomeKeyringAvailable && pwSetting.get().equals(KeychainBackend.GNOME)) {
-					pwSetting.setValue(KeychainBackend.GNOME);
-					LinuxSystemKeychainAccess.backendActivated = KeychainBackend.GNOME;
-					return Optional.of(gnomeKeyring);
-			}
-
-			if (isKdeWalletAvailable && pwSetting.get().equals(KeychainBackend.KDE)) {
-					pwSetting.setValue(KeychainBackend.KDE);
-					LinuxSystemKeychainAccess.backendActivated = KeychainBackend.KDE;
-					return Optional.of(kdeWallet);
-			}
-			return Optional.empty();
-		} catch (Exception e) {
-			return Optional.empty();
-		}
-	}
-
-	/* Getter/Setter */
-
-	public static EnumSet<KeychainBackend> getAvailableKeychainBackends() {
-		return availableKeychainBackends;
-	}
-
-	public static KeychainBackend getBackendActivated() {
-		return backendActivated;
-	}
-
-	@Override
-	public boolean isSupported() {
-		return SystemUtils.IS_OS_LINUX && delegate.map(KeychainAccessStrategy::isSupported).orElse(false);
-	}
-
-	@Override
-	public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
-		delegate.orElseThrow(IllegalStateException::new).storePassphrase(key, passphrase);
-	}
-
-	@Override
-	public char[] loadPassphrase(String key) throws KeychainAccessException {
-		return delegate.orElseThrow(IllegalStateException::new).loadPassphrase(key);
-	}
-
-	@Override
-	public void deletePassphrase(String key) throws KeychainAccessException {
-		delegate.orElseThrow(IllegalStateException::new).deletePassphrase(key);
-	}
-
-	@Override
-	public void changePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
-		delegate.orElseThrow(IllegalStateException::new).changePassphrase(key, passphrase);
-	}
-}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
deleted file mode 100644
index 39a6cd756..000000000
--- a/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
+++ /dev/null
@@ -1,57 +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.keychain;
-
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.jni.MacFunctions;
-import org.cryptomator.jni.MacKeychainAccess;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import java.util.Optional;
-
-@Singleton
-class MacSystemKeychainAccess implements KeychainAccessStrategy {
-
-	private final Optional<MacFunctions> macFunctions;
-
-	@Inject
-	public MacSystemKeychainAccess(Optional<MacFunctions> macFunctions) {
-		this.macFunctions = macFunctions;
-	}
-
-	private MacKeychainAccess keychain() {
-		return macFunctions.orElseThrow(IllegalStateException::new).keychainAccess();
-	}
-
-	@Override
-	public void storePassphrase(String key, CharSequence passphrase) {
-		keychain().storePassword(key, passphrase);
-	}
-
-	@Override
-	public char[] loadPassphrase(String key) {
-		return keychain().loadPassword(key);
-	}
-
-	@Override
-	public boolean isSupported() {
-		return SystemUtils.IS_OS_MAC_OSX && macFunctions.isPresent();
-	}
-
-	@Override
-	public void deletePassphrase(String key) {
-		keychain().deletePassword(key);
-	}
-
-	@Override
-	public void changePassphrase(String key, CharSequence passphrase) {
-		if (keychain().deletePassword(key)) {
-			keychain().storePassword(key, passphrase);
-		}
-	}
-
-}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java
deleted file mode 100644
index 6668104a4..000000000
--- a/main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java
+++ /dev/null
@@ -1,209 +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.keychain;
-
-import com.google.common.io.BaseEncoding;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import com.google.gson.JsonSerializer;
-import com.google.gson.annotations.SerializedName;
-import com.google.gson.reflect.TypeToken;
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.Environment;
-import org.cryptomator.jni.WinDataProtection;
-import org.cryptomator.jni.WinFunctions;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-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.UncheckedIOException;
-import java.io.Writer;
-import java.lang.reflect.Type;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-@Singleton
-class WindowsProtectedKeychainAccess implements KeychainAccessStrategy {
-
-	private static final Logger LOG = LoggerFactory.getLogger(WindowsProtectedKeychainAccess.class);
-	private static final Gson GSON = new GsonBuilder().setPrettyPrinting() //
-			.registerTypeHierarchyAdapter(byte[].class, new ByteArrayJsonAdapter()) //
-			.disableHtmlEscaping().create();
-
-	private final Optional<WinFunctions> winFunctions;
-	private final List<Path> keychainPaths;
-	private Map<String, KeychainEntry> keychainEntries;
-
-	@Inject
-	public WindowsProtectedKeychainAccess(Optional<WinFunctions> winFunctions, Environment environment) {
-		this.winFunctions = winFunctions;
-		this.keychainPaths = environment.getKeychainPath().collect(Collectors.toList());
-	}
-
-	private WinDataProtection dataProtection() {
-		return winFunctions.orElseThrow(IllegalStateException::new).dataProtection();
-	}
-
-	@Override
-	public void storePassphrase(String key, CharSequence passphrase) {
-		loadKeychainEntriesIfNeeded();
-		ByteBuffer buf = UTF_8.encode(CharBuffer.wrap(passphrase));
-		byte[] cleartext = new byte[buf.remaining()];
-		buf.get(cleartext);
-		KeychainEntry entry = new KeychainEntry();
-		entry.salt = generateSalt();
-		entry.ciphertext = dataProtection().protect(cleartext, entry.salt);
-		Arrays.fill(buf.array(), (byte) 0x00);
-		Arrays.fill(cleartext, (byte) 0x00);
-		keychainEntries.put(key, entry);
-		saveKeychainEntries();
-	}
-
-	@Override
-	public char[] loadPassphrase(String key) {
-		loadKeychainEntriesIfNeeded();
-		KeychainEntry entry = keychainEntries.get(key);
-		if (entry == null) {
-			return null;
-		}
-		byte[] cleartext = dataProtection().unprotect(entry.ciphertext, entry.salt);
-		if (cleartext == null) {
-			return null;
-		}
-		CharBuffer buf = UTF_8.decode(ByteBuffer.wrap(cleartext));
-		char[] passphrase = new char[buf.remaining()];
-		buf.get(passphrase);
-		Arrays.fill(cleartext, (byte) 0x00);
-		Arrays.fill(buf.array(), (char) 0x00);
-		return passphrase;
-	}
-
-	@Override
-	public void deletePassphrase(String key) {
-		loadKeychainEntriesIfNeeded();
-		keychainEntries.remove(key);
-		saveKeychainEntries();
-	}
-
-	@Override
-	public void changePassphrase(String key, CharSequence passphrase) {
-		loadKeychainEntriesIfNeeded();
-		if (keychainEntries.remove(key) != null) {
-			storePassphrase(key, passphrase);
-		}
-	}
-
-	@Override
-	public boolean isSupported() {
-		return SystemUtils.IS_OS_WINDOWS && winFunctions.isPresent() && !keychainPaths.isEmpty();
-	}
-
-	private byte[] generateSalt() {
-		byte[] result = new byte[2 * Long.BYTES];
-		UUID uuid = UUID.randomUUID();
-		ByteBuffer buf = ByteBuffer.wrap(result);
-		buf.putLong(uuid.getMostSignificantBits());
-		buf.putLong(uuid.getLeastSignificantBits());
-		return result;
-	}
-
-	private void loadKeychainEntriesIfNeeded() {
-		if (keychainEntries == null) {
-			for (Path keychainPath : keychainPaths) {
-				Optional<Map<String, KeychainEntry>> keychain = loadKeychainEntries(keychainPath);
-				if (keychain.isPresent()) {
-					keychainEntries = keychain.get();
-					break;
-				}
-			}
-		}
-		if (keychainEntries == null) {
-			LOG.info("Unable to load existing keychain file, creating new keychain.");
-			keychainEntries = new HashMap<>();
-		}
-	}
-
-	private Optional<Map<String, KeychainEntry>> loadKeychainEntries(Path keychainPath) {
-		LOG.debug("Attempting to load keychain from {}", keychainPath);
-		Type type = new TypeToken<Map<String, KeychainEntry>>() {
-		}.getType();
-		try (InputStream in = Files.newInputStream(keychainPath, StandardOpenOption.READ); //
-			 Reader reader = new InputStreamReader(in, UTF_8)) {
-			return Optional.of(GSON.fromJson(reader, type));
-		} catch (NoSuchFileException | JsonParseException e) {
-			return Optional.empty();
-		} catch (IOException e) {
-			throw new UncheckedIOException("Could not read keychain from path " + keychainPath, e);
-		}
-	}
-
-	private void saveKeychainEntries() {
-		if (keychainPaths.isEmpty()) {
-			throw new IllegalStateException("Can't save keychain if no keychain path is specified.");
-		}
-		saveKeychainEntries(keychainPaths.get(0));
-	}
-
-	private void saveKeychainEntries(Path keychainPath) {
-		try (OutputStream out = Files.newOutputStream(keychainPath, StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); //
-			 Writer writer = new OutputStreamWriter(out, UTF_8)) {
-			GSON.toJson(keychainEntries, writer);
-		} catch (IOException e) {
-			throw new UncheckedIOException("Could not read keychain from path " + keychainPath, e);
-		}
-	}
-
-	private static class KeychainEntry {
-
-		@SerializedName("ciphertext")
-		byte[] ciphertext;
-		@SerializedName("salt")
-		byte[] salt;
-	}
-
-	private static class ByteArrayJsonAdapter implements JsonSerializer<byte[]>, JsonDeserializer<byte[]> {
-
-		private static final BaseEncoding BASE64 = BaseEncoding.base64();
-
-		@Override
-		public byte[] deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-			return BASE64.decode(json.getAsString());
-		}
-
-		@Override
-		public JsonElement serialize(byte[] src, Type typeOfSrc, JsonSerializationContext context) {
-			return new JsonPrimitive(BASE64.encode(src));
-		}
-
-	}
-
-}
diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/WindowsProtectedKeychainAccessTest.java b/main/keychain/src/test/java/org/cryptomator/keychain/WindowsProtectedKeychainAccessTest.java
deleted file mode 100644
index aa5c2b2f4..000000000
--- a/main/keychain/src/test/java/org/cryptomator/keychain/WindowsProtectedKeychainAccessTest.java
+++ /dev/null
@@ -1,56 +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.keychain;
-
-import org.cryptomator.common.Environment;
-import org.cryptomator.jni.WinDataProtection;
-import org.cryptomator.jni.WinFunctions;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-import org.mockito.Mockito;
-import org.mockito.stubbing.Answer;
-
-import java.nio.file.Path;
-import java.util.Optional;
-import java.util.stream.Stream;
-
-public class WindowsProtectedKeychainAccessTest {
-
-	private WindowsProtectedKeychainAccess keychain;
-
-	@BeforeEach
-	public void setup(@TempDir Path tempDir) {
-		Path keychainPath = tempDir.resolve("keychainfile.tmp");
-		Environment env = Mockito.mock(Environment.class);
-		Mockito.when(env.getKeychainPath()).thenReturn(Stream.of(keychainPath));
-		WinFunctions winFunctions = Mockito.mock(WinFunctions.class);
-		WinDataProtection winDataProtection = Mockito.mock(WinDataProtection.class);
-		Mockito.when(winFunctions.dataProtection()).thenReturn(winDataProtection);
-		Answer<byte[]> answerReturningFirstArg = invocation -> ((byte[]) invocation.getArgument(0)).clone();
-		Mockito.when(winDataProtection.protect(Mockito.any(), Mockito.any())).thenAnswer(answerReturningFirstArg);
-		Mockito.when(winDataProtection.unprotect(Mockito.any(), Mockito.any())).thenAnswer(answerReturningFirstArg);
-		keychain = new WindowsProtectedKeychainAccess(Optional.of(winFunctions), env);
-	}
-
-	@Test
-	public void testStoreAndLoad() {
-		String storedPw1 = "topSecret";
-		String storedPw2 = "bottomSecret";
-		keychain.storePassphrase("myPassword", storedPw1);
-		keychain.storePassphrase("myOtherPassword", storedPw2);
-		String loadedPw1 = new String(keychain.loadPassphrase("myPassword"));
-		String loadedPw2 = new String(keychain.loadPassphrase("myOtherPassword"));
-		Assertions.assertEquals(storedPw1, loadedPw1);
-		Assertions.assertEquals(storedPw2, loadedPw2);
-		keychain.deletePassphrase("myPassword");
-		Assertions.assertNull(keychain.loadPassphrase("myPassword"));
-		Assertions.assertNotNull(keychain.loadPassphrase("myOtherPassword"));
-		Assertions.assertNull(keychain.loadPassphrase("nonExistingPassword"));
-	}
-
-}
diff --git a/main/keychain/src/test/resources/log4j2.xml b/main/keychain/src/test/resources/log4j2.xml
deleted file mode 100644
index 3e9a7bd67..000000000
--- a/main/keychain/src/test/resources/log4j2.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-  Copyright (c) 2014 Markus Kreusch
-  This file is licensed under the terms of the MIT license.
-  See the LICENSE.txt file for more info.
-  
-  Contributors:
-      Sebastian Stenzel - log4j config for WebDAV unit tests
--->
-<Configuration status="WARN">
-
-	<Appenders>
-		<Console name="Console" target="SYSTEM_OUT">
-			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n"/>
-			<ThresholdFilter level="WARN" onMatch="DENY" onMismatch="ACCEPT"/>
-		</Console>
-		<Console name="StdErr" target="SYSTEM_ERR">
-			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n"/>
-			<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
-		</Console>
-	</Appenders>
-
-	<Loggers>
-		<!-- show our own debug messages: -->
-		<Logger name="org.cryptomator" level="DEBUG"/>
-		<!-- mute dependencies: -->
-		<Root level="INFO">
-			<AppenderRef ref="Console"/>
-			<AppenderRef ref="StdErr"/>
-		</Root>
-	</Loggers>
-
-</Configuration>
diff --git a/main/pom.xml b/main/pom.xml
index c4bd8dcc4..625e2eb49 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -68,11 +68,6 @@
 				<artifactId>commons</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.cryptomator</groupId>
-				<artifactId>keychain</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.cryptomator</groupId>
 				<artifactId>ui</artifactId>
@@ -187,18 +182,6 @@
 				<version>${commons-lang3.version}</version>
 			</dependency>
 
-			<!-- Linux System Keychain -->
-			<dependency> <!-- deprecated: will be replaced by integrations-api -->
-				<groupId>de.swiesend</groupId>
-				<artifactId>secret-service</artifactId>
-				<version>${secret-service.version}</version>
-			</dependency>
-			<dependency> <!-- deprecated: will be replaced by integrations-api -->
-				<groupId>org.purejava</groupId>
-				<artifactId>kdewallet</artifactId>
-				<version>${kdewallet.version}</version>
-			</dependency>
-
 			<!-- JWT -->
 			<dependency>
 				<groupId>com.auth0</groupId>
@@ -280,7 +263,6 @@
 
 	<modules>
 		<module>commons</module>
-		<module>keychain</module>
 		<module>ui</module>
 		<module>launcher</module>
 	</modules>
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index 79b59eeec..7784ee802 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -10,10 +10,6 @@
 	<name>Cryptomator GUI</name>
 
 	<dependencies>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>keychain</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>commons</artifactId>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
index e1fc9c093..52cfe2b81 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java
@@ -1,10 +1,10 @@
 package org.cryptomator.ui.changepassword;
 
+import org.cryptomator.common.keychain.KeychainManager;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptofs.CryptoFileSystemProvider;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
-import org.cryptomator.keychain.KeychainAccessException;
-import org.cryptomator.keychain.KeychainManager;
+import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.ui.common.Animations;
 import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
@@ -36,14 +36,14 @@ public class ChangePasswordController implements FxController {
 	private final Vault vault;
 	private final ObjectProperty<CharSequence> newPassword;
 	private final ErrorComponent.Builder errorComponent;
-	private final Optional<KeychainManager> keychain;
+	private final KeychainManager keychain;
 
 	public NiceSecurePasswordField oldPasswordField;
 	public CheckBox finalConfirmationCheckbox;
 	public Button finishButton;
 
 	@Inject
-	public ChangePasswordController(@ChangePasswordWindow Stage window, @ChangePasswordWindow Vault vault, @Named("newPassword") ObjectProperty<CharSequence> newPassword, ErrorComponent.Builder errorComponent, Optional<KeychainManager> keychain) {
+	public ChangePasswordController(@ChangePasswordWindow Stage window, @ChangePasswordWindow Vault vault, @Named("newPassword") ObjectProperty<CharSequence> newPassword, ErrorComponent.Builder errorComponent, KeychainManager keychain) {
 		this.window = window;
 		this.vault = vault;
 		this.newPassword = newPassword;
@@ -82,9 +82,9 @@ public class ChangePasswordController implements FxController {
 	}
 
 	private void updatePasswordInSystemkeychain() {
-		if (keychain.isPresent()) {
+		if (keychain.isSupported()) {
 			try {
-				keychain.get().changePassphrase(vault.getId(), CharBuffer.wrap(newPassword.get()));
+				keychain.changePassphrase(vault.getId(), CharBuffer.wrap(newPassword.get()));
 				LOG.info("Successfully updated password in system keychain for {}", vault.getDisplayName());
 			} catch (KeychainAccessException e) {
 				LOG.error("Failed to update password in system keychain.", e);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java
index 2631c0f6a..35ed49870 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java
@@ -3,7 +3,6 @@ package org.cryptomator.ui.common;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.common.vaults.Volume;
-import org.cryptomator.keychain.KeychainManager;
 import org.cryptomator.ui.fxapp.FxApplicationScoped;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -14,7 +13,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
@@ -25,12 +23,10 @@ public class VaultService {
 	private static final Logger LOG = LoggerFactory.getLogger(VaultService.class);
 
 	private final ExecutorService executorService;
-	private final Optional<KeychainManager> keychain;
 
 	@Inject
-	public VaultService(ExecutorService executorService, Optional<KeychainManager> keychain) {
+	public VaultService(ExecutorService executorService) {
 		this.executorService = executorService;
-		this.keychain = keychain;
 	}
 
 	public void reveal(Vault vault) {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java
index 99f8cbc41..81d28f682 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java
@@ -1,8 +1,8 @@
 package org.cryptomator.ui.forgetPassword;
 
+import org.cryptomator.common.keychain.KeychainManager;
 import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.keychain.KeychainAccessException;
-import org.cryptomator.keychain.KeychainManager;
+import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.ui.common.FxController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -11,7 +11,6 @@ import javax.inject.Inject;
 import javafx.beans.property.BooleanProperty;
 import javafx.fxml.FXML;
 import javafx.stage.Stage;
-import java.util.Optional;
 
 @ForgetPasswordScoped
 public class ForgetPasswordController implements FxController {
@@ -20,11 +19,11 @@ public class ForgetPasswordController implements FxController {
 
 	private final Stage window;
 	private final Vault vault;
-	private final Optional<KeychainManager> keychain;
+	private final KeychainManager keychain;
 	private final BooleanProperty confirmedResult;
 
 	@Inject
-	public ForgetPasswordController(@ForgetPasswordWindow Stage window, @ForgetPasswordWindow Vault vault, Optional<KeychainManager> keychain, @ForgetPasswordWindow BooleanProperty confirmedResult) {
+	public ForgetPasswordController(@ForgetPasswordWindow Stage window, @ForgetPasswordWindow Vault vault, KeychainManager keychain, @ForgetPasswordWindow BooleanProperty confirmedResult) {
 		this.window = window;
 		this.vault = vault;
 		this.keychain = keychain;
@@ -38,9 +37,9 @@ public class ForgetPasswordController implements FxController {
 
 	@FXML
 	public void finish() {
-		if (keychain.isPresent()) {
+		if (keychain.isSupported()) {
 			try {
-				keychain.get().deletePassphrase(vault.getId());
+				keychain.deletePassphrase(vault.getId());
 				LOG.debug("Forgot password for vault {}.", vault.getDisplayName());
 				confirmedResult.setValue(true);
 			} catch (KeychainAccessException e) {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
index 9b8d6e776..2ac585763 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
@@ -3,7 +3,6 @@ package org.cryptomator.ui.launcher;
 import dagger.Module;
 import dagger.Provides;
 import org.cryptomator.common.JniModule;
-import org.cryptomator.keychain.KeychainModule;
 import org.cryptomator.ui.fxapp.FxApplicationComponent;
 import org.cryptomator.ui.traymenu.TrayMenuComponent;
 
@@ -13,7 +12,7 @@ import java.util.ResourceBundle;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 
-@Module(includes = {JniModule.class, KeychainModule.class}, subcomponents = {TrayMenuComponent.class, FxApplicationComponent.class})
+@Module(includes = {JniModule.class}, subcomponents = {TrayMenuComponent.class, FxApplicationComponent.class})
 public abstract class UiLauncherModule {
 
 	@Provides
diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
index 367aacc3a..e7da43938 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java
@@ -1,8 +1,8 @@
 package org.cryptomator.ui.mainwindow;
 
 import com.tobiasdiez.easybind.EasyBind;
+import org.cryptomator.common.keychain.KeychainManager;
 import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.keychain.KeychainManager;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.vaultoptions.VaultOptionsComponent;
@@ -22,19 +22,19 @@ public class VaultDetailLockedController implements FxController {
 	private final ReadOnlyObjectProperty<Vault> vault;
 	private final FxApplication application;
 	private final VaultOptionsComponent.Builder vaultOptionsWindow;
-	private final Optional<KeychainManager> keychainManagerOptional;
+	private final KeychainManager keychain;
 	private final Stage mainWindow;
 	private final BooleanExpression passwordSaved;
 
 	@Inject
-	VaultDetailLockedController(ObjectProperty<Vault> vault, FxApplication application, VaultOptionsComponent.Builder vaultOptionsWindow, Optional<KeychainManager> keychainManagerOptional, @MainWindow Stage mainWindow) {
+	VaultDetailLockedController(ObjectProperty<Vault> vault, FxApplication application, VaultOptionsComponent.Builder vaultOptionsWindow, KeychainManager keychain, @MainWindow Stage mainWindow) {
 		this.vault = vault;
 		this.application = application;
 		this.vaultOptionsWindow = vaultOptionsWindow;
-		this.keychainManagerOptional = keychainManagerOptional;
+		this.keychain = keychain;
 		this.mainWindow = mainWindow;
-		if (keychainManagerOptional.isPresent()) {
-			this.passwordSaved = BooleanExpression.booleanExpression(EasyBind.select(vault).selectObject(v -> keychainManagerOptional.get().getPassphraseStoredProperty(v.getId())));
+		if (keychain.isSupported()) {
+			this.passwordSaved = BooleanExpression.booleanExpression(EasyBind.select(vault).selectObject(v -> keychain.getPassphraseStoredProperty(v.getId())));
 		} else {
 			this.passwordSaved = new SimpleBooleanProperty(false);
 		}
@@ -65,8 +65,8 @@ public class VaultDetailLockedController implements FxController {
 	}
 
 	public boolean isPasswordSaved() {
-		if (keychainManagerOptional.isPresent() && vault.get() != null) {
-			return keychainManagerOptional.get().getPassphraseStoredProperty(vault.get().getId()).get();
+		if (keychain.isSupported() && vault.get() != null) {
+			return keychain.getPassphraseStoredProperty(vault.get().getId()).get();
 		} else return false;
 	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java
index 2bf4f49a1..830e15819 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java
@@ -1,6 +1,7 @@
 package org.cryptomator.ui.migration;
 
 import dagger.Lazy;
+import org.cryptomator.common.keychain.KeychainManager;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.cryptofs.FileNameTooLongException;
@@ -9,8 +10,7 @@ import org.cryptomator.cryptofs.migration.Migrators;
 import org.cryptomator.cryptofs.migration.api.MigrationContinuationListener;
 import org.cryptomator.cryptofs.migration.api.MigrationProgressListener;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
-import org.cryptomator.keychain.KeychainAccessException;
-import org.cryptomator.keychain.KeychainManager;
+import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.ui.common.Animations;
 import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
@@ -37,7 +37,6 @@ import javafx.scene.Scene;
 import javafx.scene.control.ContentDisplay;
 import javafx.stage.Stage;
 import java.util.Arrays;
-import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -55,7 +54,7 @@ public class MigrationRunController implements FxController {
 	private final Vault vault;
 	private final ExecutorService executor;
 	private final ScheduledExecutorService scheduler;
-	private final Optional<KeychainManager> keychain;
+	private final KeychainManager keychain;
 	private final ObjectProperty<FileSystemCapabilityChecker.Capability> missingCapability;
 	private final ErrorComponent.Builder errorComponent;
 	private final Lazy<Scene> startScene;
@@ -69,8 +68,7 @@ public class MigrationRunController implements FxController {
 	public NiceSecurePasswordField passwordField;
 
 	@Inject
-	public MigrationRunController(@MigrationWindow Stage window, @MigrationWindow Vault vault, ExecutorService executor, ScheduledExecutorService scheduler, Optional<KeychainManager> keychain, @Named("capabilityErrorCause") ObjectProperty<FileSystemCapabilityChecker.Capability> missingCapability, @FxmlScene(FxmlFile.MIGRATION_START) Lazy<Scene> startScene, @FxmlScene(FxmlFile.MIGRATION_SUCCESS) Lazy<Scene> successScene, @FxmlScene(FxmlFile.MIGRATION_CAPABILITY_ERROR) Lazy<Scene> capabilityErrorScene, @FxmlScene(FxmlFile.MIGRATION_IMPOSSIBLE) Lazy<Scene> impossibleScene, ErrorComponent.Builder errorComponent) {
-
+	public MigrationRunController(@MigrationWindow Stage window, @MigrationWindow Vault vault, ExecutorService executor, ScheduledExecutorService scheduler, KeychainManager keychain, @Named("capabilityErrorCause") ObjectProperty<FileSystemCapabilityChecker.Capability> missingCapability, @FxmlScene(FxmlFile.MIGRATION_START) Lazy<Scene> startScene, @FxmlScene(FxmlFile.MIGRATION_SUCCESS) Lazy<Scene> successScene, @FxmlScene(FxmlFile.MIGRATION_CAPABILITY_ERROR) Lazy<Scene> capabilityErrorScene, @FxmlScene(FxmlFile.MIGRATION_IMPOSSIBLE) Lazy<Scene> impossibleScene, ErrorComponent.Builder errorComponent) {
 		this.window = window;
 		this.vault = vault;
 		this.executor = executor;
@@ -88,7 +86,7 @@ public class MigrationRunController implements FxController {
 	}
 
 	public void initialize() {
-		if (keychain.isPresent()) {
+		if (keychain.isSupported()) {
 			loadStoredPassword();
 		}
 		migrationButtonDisabled.bind(vault.stateProperty().isNotEqualTo(VaultState.NEEDS_MIGRATION).or(passwordField.textProperty().isEmpty()));
@@ -167,10 +165,10 @@ public class MigrationRunController implements FxController {
 	}
 
 	private void loadStoredPassword() {
-		assert keychain.isPresent();
+		assert keychain.isSupported();
 		char[] storedPw = null;
 		try {
-			storedPw = keychain.get().loadPassphrase(vault.getId());
+			storedPw = keychain.loadPassphrase(vault.getId());
 			if (storedPw != null) {
 				passwordField.setPassword(storedPw);
 				passwordField.selectRange(storedPw.length, storedPw.length);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index 0d58323ce..208605f51 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -1,14 +1,11 @@
 package org.cryptomator.ui.preferences;
 
-import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.KeychainBackend;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
-import org.cryptomator.keychain.KeychainAccessStrategy;
-import org.cryptomator.keychain.LinuxSystemKeychainAccess;
 import org.cryptomator.ui.common.FxController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,9 +25,7 @@ import javafx.scene.control.RadioButton;
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
 import javafx.util.StringConverter;
-
 import java.util.Arrays;
-import java.util.EnumSet;
 import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.Set;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
index b64195d9a..5460cc149 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java
@@ -1,7 +1,7 @@
 package org.cryptomator.ui.unlock;
 
+import org.cryptomator.common.keychain.KeychainManager;
 import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.keychain.KeychainManager;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.UserInteractionLock;
 import org.cryptomator.ui.common.WeakBindings;
@@ -49,7 +49,7 @@ public class UnlockController implements FxController {
 	private final Optional<char[]> savedPassword;
 	private final UserInteractionLock<UnlockModule.PasswordEntry> passwordEntryLock;
 	private final ForgetPasswordComponent.Builder forgetPassword;
-	private final Optional<KeychainManager> keychain;
+	private final KeychainManager keychain;
 	private final ObjectBinding<ContentDisplay> unlockButtonContentDisplay;
 	private final BooleanBinding userInteractionDisabled;
 	private final BooleanProperty unlockButtonDisabled;
@@ -65,7 +65,7 @@ public class UnlockController implements FxController {
 	public Animation unlockAnimation;
 
 	@Inject
-	public UnlockController(@UnlockWindow Stage window, @UnlockWindow Vault vault, AtomicReference<char[]> password, @Named("savePassword") AtomicBoolean savePassword, @Named("savedPassword") Optional<char[]> savedPassword, UserInteractionLock<UnlockModule.PasswordEntry> passwordEntryLock, ForgetPasswordComponent.Builder forgetPassword, Optional<KeychainManager> keychain) {
+	public UnlockController(@UnlockWindow Stage window, @UnlockWindow Vault vault, AtomicReference<char[]> password, @Named("savePassword") AtomicBoolean savePassword, @Named("savedPassword") Optional<char[]> savedPassword, UserInteractionLock<UnlockModule.PasswordEntry> passwordEntryLock, ForgetPasswordComponent.Builder forgetPassword, KeychainManager keychain) {
 		this.window = window;
 		this.vault = vault;
 		this.password = password;
@@ -214,6 +214,6 @@ public class UnlockController implements FxController {
 	}
 
 	public boolean isKeychainAccessAvailable() {
-		return keychain.isPresent();
+		return keychain.isSupported();
 	}
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
index 102743e7f..1170569c7 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
@@ -4,9 +4,9 @@ import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.IntoMap;
+import org.cryptomator.common.keychain.KeychainManager;
 import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.keychain.KeychainAccessException;
-import org.cryptomator.keychain.KeychainManager;
+import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.ui.common.DefaultSceneFactory;
 import org.cryptomator.ui.common.FXMLLoaderFactory;
 import org.cryptomator.ui.common.FxController;
@@ -49,15 +49,17 @@ abstract class UnlockModule {
 	@Provides
 	@Named("savedPassword")
 	@UnlockScoped
-	static Optional<char[]> provideStoredPassword(Optional<KeychainManager> keychain, @UnlockWindow Vault vault) {
-		return keychain.map(k -> {
+	static Optional<char[]> provideStoredPassword(KeychainManager keychain, @UnlockWindow Vault vault) {
+		if (keychain.isSupported()) {
+			return Optional.empty();
+		} else {
 			try {
-				return k.loadPassphrase(vault.getId());
+				return Optional.ofNullable(keychain.loadPassphrase(vault.getId()));
 			} catch (KeychainAccessException e) {
 				LOG.error("Failed to load entry from system keychain.", e);
-				return null;
+				return Optional.empty();
 			}
-		});
+		}
 	}
 
 	@Provides
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index bdefb4ad3..9b95103ad 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -1,14 +1,14 @@
 package org.cryptomator.ui.unlock;
 
 import dagger.Lazy;
+import org.cryptomator.common.keychain.KeychainManager;
 import org.cryptomator.common.mountpoint.InvalidMountPointException;
 import org.cryptomator.common.vaults.MountPointRequirement;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultState;
 import org.cryptomator.common.vaults.Volume.VolumeException;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
-import org.cryptomator.keychain.KeychainAccessException;
-import org.cryptomator.keychain.KeychainManager;
+import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.ui.common.Animations;
 import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxmlFile;
@@ -53,14 +53,14 @@ public class UnlockWorkflow extends Task<Boolean> {
 	private final AtomicBoolean savePassword;
 	private final Optional<char[]> savedPassword;
 	private final UserInteractionLock<PasswordEntry> passwordEntryLock;
-	private final Optional<KeychainManager> keychain;
+	private final KeychainManager keychain;
 	private final Lazy<Scene> unlockScene;
 	private final Lazy<Scene> successScene;
 	private final Lazy<Scene> invalidMountPointScene;
 	private final ErrorComponent.Builder errorComponent;
 
 	@Inject
-	UnlockWorkflow(@UnlockWindow Stage window, @UnlockWindow Vault vault, VaultService vaultService, AtomicReference<char[]> password, @Named("savePassword") AtomicBoolean savePassword, @Named("savedPassword") Optional<char[]> savedPassword, UserInteractionLock<PasswordEntry> passwordEntryLock, Optional<KeychainManager> keychain, @FxmlScene(FxmlFile.UNLOCK) Lazy<Scene> unlockScene, @FxmlScene(FxmlFile.UNLOCK_SUCCESS) Lazy<Scene> successScene, @FxmlScene(FxmlFile.UNLOCK_INVALID_MOUNT_POINT) Lazy<Scene> invalidMountPointScene, ErrorComponent.Builder errorComponent) {
+	UnlockWorkflow(@UnlockWindow Stage window, @UnlockWindow Vault vault, VaultService vaultService, AtomicReference<char[]> password, @Named("savePassword") AtomicBoolean savePassword, @Named("savedPassword") Optional<char[]> savedPassword, UserInteractionLock<PasswordEntry> passwordEntryLock, KeychainManager keychain, @FxmlScene(FxmlFile.UNLOCK) Lazy<Scene> unlockScene, @FxmlScene(FxmlFile.UNLOCK_SUCCESS) Lazy<Scene> successScene, @FxmlScene(FxmlFile.UNLOCK_INVALID_MOUNT_POINT) Lazy<Scene> invalidMountPointScene, ErrorComponent.Builder errorComponent) {
 		this.window = window;
 		this.vault = vault;
 		this.vaultService = vaultService;
@@ -150,9 +150,9 @@ public class UnlockWorkflow extends Task<Boolean> {
 	}
 
 	private void savePasswordToSystemkeychain() {
-		if (keychain.isPresent()) {
+		if (keychain.isSupported()) {
 			try {
-				keychain.get().storePassphrase(vault.getId(), CharBuffer.wrap(password.get()));
+				keychain.storePassphrase(vault.getId(), CharBuffer.wrap(password.get()));
 			} catch (KeychainAccessException e) {
 				LOG.error("Failed to store passphrase in system keychain.", e);
 			}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java
index 4c08ad75a..ee38e1f18 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java
@@ -1,11 +1,13 @@
 package org.cryptomator.ui.vaultoptions;
 
+import org.cryptomator.common.keychain.KeychainManager;
 import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.keychain.KeychainAccessException;
-import org.cryptomator.keychain.KeychainManager;
+import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.ui.changepassword.ChangePasswordComponent;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.recoverykey.RecoveryKeyComponent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javafx.beans.binding.Bindings;
@@ -13,29 +15,32 @@ import javafx.beans.binding.BooleanExpression;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.fxml.FXML;
 import javafx.stage.Stage;
-import java.util.Optional;
 
 @VaultOptionsScoped
 public class MasterkeyOptionsController implements FxController {
 
+	private static final Logger LOG = LoggerFactory.getLogger(MasterkeyOptionsController.class);
+
 	private final Vault vault;
 	private final Stage window;
 	private final ChangePasswordComponent.Builder changePasswordWindow;
 	private final RecoveryKeyComponent.Builder recoveryKeyWindow;
-	private final Optional<KeychainManager> keychainManagerOptional;
+	private final KeychainManager keychain;
 	private final BooleanExpression passwordSaved;
 
 
 	@Inject
-	MasterkeyOptionsController(@VaultOptionsWindow Vault vault, @VaultOptionsWindow Stage window, ChangePasswordComponent.Builder changePasswordWindow, RecoveryKeyComponent.Builder recoveryKeyWindow, Optional<KeychainManager> keychainManagerOptional) {
+	MasterkeyOptionsController(@VaultOptionsWindow Vault vault, @VaultOptionsWindow Stage window, ChangePasswordComponent.Builder changePasswordWindow, RecoveryKeyComponent.Builder recoveryKeyWindow, KeychainManager keychain) {
 		this.vault = vault;
 		this.window = window;
 		this.changePasswordWindow = changePasswordWindow;
 		this.recoveryKeyWindow = recoveryKeyWindow;
-		this.keychainManagerOptional = keychainManagerOptional;
-		if (keychainManagerOptional.isPresent()) {
-			this.passwordSaved = Bindings.createBooleanBinding(this::isPasswordSaved, keychainManagerOptional.get().getPassphraseStoredProperty(vault.getId()));
-		} else this.passwordSaved = new SimpleBooleanProperty(false);
+		this.keychain = keychain;
+		if (keychain.isSupported()) {
+			this.passwordSaved = Bindings.createBooleanBinding(this::isPasswordSaved, keychain.getPassphraseStoredProperty(vault.getId()));
+		} else {
+			this.passwordSaved = new SimpleBooleanProperty(false);
+		}
 	}
 
 	@FXML
@@ -54,8 +59,13 @@ public class MasterkeyOptionsController implements FxController {
 	}
 
 	@FXML
-	public void removePasswordFromKeychain() throws KeychainAccessException {
-		keychainManagerOptional.get().deletePassphrase(vault.getId());
+	public void removePasswordFromKeychain() {
+		assert keychain.isSupported();
+		try {
+			keychain.deletePassphrase(vault.getId());
+		} catch (KeychainAccessException e) {
+			LOG.error("Failed to delete passphrase from system keychain.", e);
+		}
 		window.close();
 	}
 
@@ -64,8 +74,8 @@ public class MasterkeyOptionsController implements FxController {
 	}
 
 	public boolean isPasswordSaved() {
-		if (keychainManagerOptional.isPresent() && vault != null) {
-			return keychainManagerOptional.get().getPassphraseStoredProperty(vault.getId()).get();
+		if (keychain.isSupported() && vault != null) {
+			return keychain.getPassphraseStoredProperty(vault.getId()).get();
 		} else return false;
 	}
 }
diff --git a/main/ui/src/main/resources/license/THIRD-PARTY.txt b/main/ui/src/main/resources/license/THIRD-PARTY.txt
index 65d2cdb2c..1389d25a1 100644
--- a/main/ui/src/main/resources/license/THIRD-PARTY.txt
+++ b/main/ui/src/main/resources/license/THIRD-PARTY.txt
@@ -11,15 +11,12 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see http://www.gnu.org/licenses/.
 
-Cryptomator uses 53 third-party dependencies under the following licenses:
+Cryptomator uses 46 third-party dependencies under the following licenses:
         Apache License v2.0:
-			- HKDF-RFC5869 (at.favre.lib:hkdf:1.1.0 - https://github.com/patrickfav/hkdf)
 			- jffi (com.github.jnr:jffi:1.2.23 - http://github.com/jnr/jffi)
 			- jnr-a64asm (com.github.jnr:jnr-a64asm:1.0.0 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-a64asm)
 			- jnr-constants (com.github.jnr:jnr-constants:0.9.15 - http://github.com/jnr/jnr-constants)
-			- jnr-enxio (com.github.jnr:jnr-enxio:0.28 - http://github.com/jnr/jnr-enxio)
 			- jnr-ffi (com.github.jnr:jnr-ffi:2.1.12 - http://github.com/jnr/jnr-ffi)
-			- jnr-unixsocket (com.github.jnr:jnr-unixsocket:0.33 - http://github.com/jnr/jnr-unixsocket)
 			- FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/)
 			- Gson (com.google.code.gson:gson:2.8.6 - https://github.com/google/gson/gson)
 			- Dagger (com.google.dagger:dagger:2.22 - https://github.com/google/dagger)
@@ -70,19 +67,15 @@ Cryptomator uses 53 third-party dependencies under the following licenses:
 			- javafx-fxml (org.openjfx:javafx-fxml:14 - https://openjdk.java.net/projects/openjfx/javafx-fxml/)
 			- javafx-graphics (org.openjfx:javafx-graphics:14 - https://openjdk.java.net/projects/openjfx/javafx-graphics/)
         LGPL 2.1:
-			- dbus-java (com.github.hypfvieh:dbus-java:3.2.3 - https://github.com/hypfvieh/dbus-java/dbus-java)
 			- jnr-posix (com.github.jnr:jnr-posix:3.0.54 - http://nexus.sonatype.org/oss-repository-hosting.html/jnr-posix)
 			- Java Native Access (net.java.dev.jna:jna:5.1.0 - https://github.com/java-native-access/jna)
 			- Java Native Access Platform (net.java.dev.jna:jna-platform:5.1.0 - https://github.com/java-native-access/jna)
         MIT License:
 			- java jwt (com.auth0:java-jwt:3.10.3 - https://github.com/auth0/java-jwt)
-			- java-utils (com.github.hypfvieh:java-utils:1.0.6 - https://github.com/hypfvieh/java-utils)
 			- jnr-x86asm (com.github.jnr:jnr-x86asm:1.0.2 - http://github.com/jnr/jnr-x86asm)
 			- jnr-fuse (com.github.serceman:jnr-fuse:0.5.4 - no url defined)
 			- zxcvbn4j (com.nulab-inc:zxcvbn:1.3.0 - https://github.com/nulab/zxcvbn4j)
-			- secret-service (de.swiesend:secret-service:1.1.0 - https://github.com/swiesend/secret-service)
 			- Checker Qual (org.checkerframework:checker-qual:3.5.0 - https://checkerframework.org)
-			- kdewallet (org.purejava:kdewallet:1.1.1 - https://github.com/purejava/kdewallet)
 			- SLF4J API Module (org.slf4j:slf4j-api:1.7.30 - http://www.slf4j.org)
         The BSD 2-Clause License:
 			- EasyBind (com.tobiasdiez:easybind:2.1.0 - https://github.com/tobiasdiez/EasyBind)

From 14e056551da33c57e50daee89eb3028a76c4e5df Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 2 Nov 2020 14:07:21 +0100
Subject: [PATCH 146/169] no longer track coverage for deleted keychain module

---
 .github/workflows/build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8009aeb06..ba644902c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,7 +29,6 @@ jobs:
         run: |
           curl -o ~/codacy-coverage-reporter.jar https://repo.maven.apache.org/maven2/com/codacy/codacy-coverage-reporter/7.1.0/codacy-coverage-reporter-7.1.0-assembly.jar
           $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/commons/target/site/jacoco/jacoco.xml --partial
-          $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/keychain/target/site/jacoco/jacoco.xml --partial
           $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/ui/target/site/jacoco/jacoco.xml --partial
           $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/launcher/target/site/jacoco/jacoco.xml --partial
           $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar final

From 01522e8c972e5ef4e9af90bf4d981689819b3f1a Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 2 Nov 2020 14:49:57 +0100
Subject: [PATCH 147/169] Adding method to clean up _our_ tmp mounting dirs to
 mitigate #1061 and #1013

---
 .../TemporaryMountPointChooser.java           | 47 +++++++++++++++++--
 1 file changed, 43 insertions(+), 4 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index 60991b97e..7e8d0dfba 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -3,6 +3,8 @@ package org.cryptomator.common.mountpoint;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.settings.VaultSettings;
+import org.cryptomator.common.settings.VolumeImpl;
+import org.cryptomator.common.vaults.MountPointRequirement;
 import org.cryptomator.common.vaults.Volume;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -10,9 +12,12 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
+import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Optional;
 
 public class TemporaryMountPointChooser implements MountPointChooser {
@@ -42,21 +47,55 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 
 	@Override
 	public Optional<Path> chooseMountPoint(Volume caller) {
-		return this.environment.getMountPointsDir().map(this::choose);
+		return this.environment.getMountPointsDir().map(p -> choose(p, caller));
 	}
 
-	private Path choose(Path parent) {
-		String basename = this.vaultSettings.mountName().get();
+	private Path choose(Path parent, Volume caller) {
+		String basename = this.vaultSettings.mountName().get(); //TODO: this is a normalized name, but if we mount into a folder we do not need to normalize
 		for (int i = 0; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) {
 			Path mountPoint = parent.resolve(basename + "_" + i);
-			if (Files.notExists(mountPoint)) {
+			if (Files.notExists(mountPoint, LinkOption.NOFOLLOW_LINKS)) { //let's be explicit
 				return mountPoint;
+			} else {
+				try {
+					removeLeftOvers(mountPoint, caller);
+					return mountPoint;
+				} catch (IOException e) {
+					//NO-OP, try next
+				}
 			}
 		}
 		LOG.error("Failed to find feasible mountpoint at {}{}{}_x. Giving up after {} attempts.", parent, File.separator, basename, MAX_TMPMOUNTPOINT_CREATION_RETRIES);
 		return null;
 	}
 
+	//see https://github.com/cryptomator/cryptomator/issues/1013 and https://github.com/cryptomator/cryptomator/issues/1061
+	private void removeLeftOvers(Path mountPoint, Volume caller) throws IOException {
+		if (!Files.isDirectory(mountPoint, LinkOption.NOFOLLOW_LINKS)) {
+			throw new IOException(); //if not a directory, we do not touch it
+		}
+
+		if (VolumeImpl.DOKANY.equals(caller.getImplementationType())) {
+			try {
+				var attrTarget = Files.readAttributes(mountPoint, BasicFileAttributes.class); //we follow the link and see if it exists
+			} catch (IOException e) {
+				Files.delete(mountPoint); //broken link file, we delete it
+				return;
+			}
+		} else if (VolumeImpl.FUSE.equals(caller.getImplementationType())) {
+			try (DirectoryStream<Path> ds = Files.newDirectoryStream(mountPoint)) {
+				if (!ds.iterator().hasNext()) {
+					if (caller.getMountPointRequirement().equals(MountPointRequirement.PARENT_NO_MOUNT_POINT)) {
+						Files.delete(mountPoint);
+					}
+					return;
+				}
+			}
+		}
+
+		throw new IOException(); //in the default we do not touch anything
+	}
+
 	@Override
 	public boolean prepare(Volume caller, Path mountPoint) throws InvalidMountPointException {
 		// https://github.com/osxfuse/osxfuse/issues/306#issuecomment-245114592:

From d24734e16fd5f25bdb4f5d39090346a6faccc34e Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 2 Nov 2020 17:25:43 +0100
Subject: [PATCH 148/169] Revert "Adding method to clean up _our_ tmp mounting
 dirs to mitigate #1061 and #1013"

This reverts commit 01522e8c972e5ef4e9af90bf4d981689819b3f1a.
---
 .../TemporaryMountPointChooser.java           | 47 ++-----------------
 1 file changed, 4 insertions(+), 43 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
index 7e8d0dfba..60991b97e 100644
--- a/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
+++ b/main/commons/src/main/java/org/cryptomator/common/mountpoint/TemporaryMountPointChooser.java
@@ -3,8 +3,6 @@ package org.cryptomator.common.mountpoint;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.settings.VaultSettings;
-import org.cryptomator.common.settings.VolumeImpl;
-import org.cryptomator.common.vaults.MountPointRequirement;
 import org.cryptomator.common.vaults.Volume;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,12 +10,9 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
-import java.nio.file.LinkOption;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Optional;
 
 public class TemporaryMountPointChooser implements MountPointChooser {
@@ -47,55 +42,21 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 
 	@Override
 	public Optional<Path> chooseMountPoint(Volume caller) {
-		return this.environment.getMountPointsDir().map(p -> choose(p, caller));
+		return this.environment.getMountPointsDir().map(this::choose);
 	}
 
-	private Path choose(Path parent, Volume caller) {
-		String basename = this.vaultSettings.mountName().get(); //TODO: this is a normalized name, but if we mount into a folder we do not need to normalize
+	private Path choose(Path parent) {
+		String basename = this.vaultSettings.mountName().get();
 		for (int i = 0; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) {
 			Path mountPoint = parent.resolve(basename + "_" + i);
-			if (Files.notExists(mountPoint, LinkOption.NOFOLLOW_LINKS)) { //let's be explicit
+			if (Files.notExists(mountPoint)) {
 				return mountPoint;
-			} else {
-				try {
-					removeLeftOvers(mountPoint, caller);
-					return mountPoint;
-				} catch (IOException e) {
-					//NO-OP, try next
-				}
 			}
 		}
 		LOG.error("Failed to find feasible mountpoint at {}{}{}_x. Giving up after {} attempts.", parent, File.separator, basename, MAX_TMPMOUNTPOINT_CREATION_RETRIES);
 		return null;
 	}
 
-	//see https://github.com/cryptomator/cryptomator/issues/1013 and https://github.com/cryptomator/cryptomator/issues/1061
-	private void removeLeftOvers(Path mountPoint, Volume caller) throws IOException {
-		if (!Files.isDirectory(mountPoint, LinkOption.NOFOLLOW_LINKS)) {
-			throw new IOException(); //if not a directory, we do not touch it
-		}
-
-		if (VolumeImpl.DOKANY.equals(caller.getImplementationType())) {
-			try {
-				var attrTarget = Files.readAttributes(mountPoint, BasicFileAttributes.class); //we follow the link and see if it exists
-			} catch (IOException e) {
-				Files.delete(mountPoint); //broken link file, we delete it
-				return;
-			}
-		} else if (VolumeImpl.FUSE.equals(caller.getImplementationType())) {
-			try (DirectoryStream<Path> ds = Files.newDirectoryStream(mountPoint)) {
-				if (!ds.iterator().hasNext()) {
-					if (caller.getMountPointRequirement().equals(MountPointRequirement.PARENT_NO_MOUNT_POINT)) {
-						Files.delete(mountPoint);
-					}
-					return;
-				}
-			}
-		}
-
-		throw new IOException(); //in the default we do not touch anything
-	}
-
 	@Override
 	public boolean prepare(Volume caller, Path mountPoint) throws InvalidMountPointException {
 		// https://github.com/osxfuse/osxfuse/issues/306#issuecomment-245114592:

From 959dee153e7fb20be3a34e032815e14070759614 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 3 Nov 2020 10:03:14 +0100
Subject: [PATCH 149/169] fixing bug where stored password is not used

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

diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
index 1170569c7..da5e2884d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java
@@ -50,7 +50,7 @@ abstract class UnlockModule {
 	@Named("savedPassword")
 	@UnlockScoped
 	static Optional<char[]> provideStoredPassword(KeychainManager keychain, @UnlockWindow Vault vault) {
-		if (keychain.isSupported()) {
+		if (!keychain.isSupported()) {
 			return Optional.empty();
 		} else {
 			try {

From c760e63995828a4b9c8682e365c1fc886b69d295 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Tue, 3 Nov 2020 10:54:32 +0100
Subject: [PATCH 150/169] only use supported keychainAccessProviders

---
 .../org/cryptomator/common/keychain/KeychainModule.java    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainModule.java b/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainModule.java
index 4e88fe027..9ac343d36 100644
--- a/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainModule.java
+++ b/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainModule.java
@@ -7,9 +7,7 @@ import org.cryptomator.integrations.keychain.KeychainAccessProvider;
 
 import javax.inject.Singleton;
 import javafx.beans.binding.Bindings;
-import javafx.beans.binding.ObjectBinding;
 import javafx.beans.binding.ObjectExpression;
-import javafx.beans.value.ObservableValue;
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -26,7 +24,10 @@ public class KeychainModule {
 	@Provides
 	@Singleton
 	static Set<KeychainAccessProvider> provideSupportedKeychainAccessProviders(Set<ServiceLoader.Provider<KeychainAccessProvider>> availableFactories) {
-		return availableFactories.stream().map(ServiceLoader.Provider::get).collect(Collectors.toUnmodifiableSet());
+		return availableFactories.stream() //
+				.map(ServiceLoader.Provider::get) //
+				.filter(KeychainAccessProvider::isSupported) //
+				.collect(Collectors.toUnmodifiableSet());
 	}
 
 	@Provides

From 6ccd248675e96dfd6d1a8a8ea869797a51c2afed Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 3 Nov 2020 11:21:08 +0100
Subject: [PATCH 151/169] use maven profiles to build different buildkits

---
 .github/workflows/build.yml      |   9 +-
 main/buildkit/assembly-linux.xml |   7 --
 main/buildkit/assembly-mac.xml   |   7 --
 main/buildkit/assembly-win.xml   |   7 --
 main/buildkit/pom.xml            | 189 ++++++++++++++-----------------
 main/pom.xml                     |  44 ++++---
 6 files changed, 124 insertions(+), 139 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ba644902c..18337afbe 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,7 +7,6 @@ jobs:
   build:
     name: Build and Test
     runs-on: ubuntu-latest
-    #This check is case insensitive
     if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - uses: actions/checkout@v2
@@ -34,18 +33,22 @@ jobs:
           $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar final
         env:
           CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
-      - name: Assemble Buildkit
-        run: mvn -B package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease
+      - name: Assemble buildkit-linux.zip
+        run: mvn -B clean package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease,linux
       - name: Upload buildkit-linux.zip
         uses: actions/upload-artifact@v1
         with:
           name: buildkit-linux.zip
           path: main/buildkit/target/buildkit-linux.zip
+      - name: Assemble buildkit-mac.zip
+        run: mvn -B clean package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease,mac
       - name: Upload buildkit-mac.zip
         uses: actions/upload-artifact@v1
         with:
           name: buildkit-mac.zip
           path: main/buildkit/target/buildkit-mac.zip
+      - name: Assemble buildkit-win.zip
+        run: mvn -B clean package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease,win
       - name: Upload buildkit-win.zip
         uses: actions/upload-artifact@v1
         with:
diff --git a/main/buildkit/assembly-linux.xml b/main/buildkit/assembly-linux.xml
index 5d8bfc785..0764ada20 100644
--- a/main/buildkit/assembly-linux.xml
+++ b/main/buildkit/assembly-linux.xml
@@ -43,12 +43,5 @@
 			</includes>
 			<outputDirectory>libs</outputDirectory>
 		</fileSet>
-		<fileSet>
-			<directory>target/linux-libs</directory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-			<outputDirectory>libs</outputDirectory>
-		</fileSet>
 	</fileSets>
 </assembly>
\ No newline at end of file
diff --git a/main/buildkit/assembly-mac.xml b/main/buildkit/assembly-mac.xml
index c9057dcdd..c7a10f2ef 100644
--- a/main/buildkit/assembly-mac.xml
+++ b/main/buildkit/assembly-mac.xml
@@ -43,12 +43,5 @@
 			</includes>
 			<outputDirectory>libs</outputDirectory>
 		</fileSet>
-		<fileSet>
-			<directory>target/mac-libs</directory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-			<outputDirectory>libs</outputDirectory>
-		</fileSet>
 	</fileSets>
 </assembly>
\ No newline at end of file
diff --git a/main/buildkit/assembly-win.xml b/main/buildkit/assembly-win.xml
index 2e81782b3..e0ff7df4b 100644
--- a/main/buildkit/assembly-win.xml
+++ b/main/buildkit/assembly-win.xml
@@ -43,12 +43,5 @@
 			</includes>
 			<outputDirectory>libs</outputDirectory>
 		</fileSet>
-		<fileSet>
-			<directory>target/win-libs</directory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-			<outputDirectory>libs</outputDirectory>
-		</fileSet>
 	</fileSets>
 </assembly>
\ No newline at end of file
diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml
index 23059eb4a..19246123b 100644
--- a/main/buildkit/pom.xml
+++ b/main/buildkit/pom.xml
@@ -24,7 +24,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.1.0</version>
 				<executions>
 					<execution>
 						<id>copy-resources</id>
@@ -55,8 +54,8 @@
 
 			<!-- copy libraries to target/libs/: -->
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
-				<version>3.1.1</version>
 				<executions>
 					<execution>
 						<id>copy-libs</id>
@@ -65,110 +64,98 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
+							<includeScope>runtime</includeScope>
 							<outputDirectory>${project.build.directory}/libs</outputDirectory>
-							<excludeClassifiers>linux,mac,win</excludeClassifiers>
-							<excludeArtifactIds>dbus-java,secret-service,kdewallet,hkdf,java-utils</excludeArtifactIds>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy-linux-libs</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/linux-libs</outputDirectory>
-							<includeGroupIds>org.openjfx</includeGroupIds>
-							<classifier>linux</classifier>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy-linux-system-keychain-access</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/linux-libs</outputDirectory>
-							<includeArtifactIds>dbus-java,secret-service,kdewallet,hkdf,java-utils</includeArtifactIds>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy-mac-libs</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/mac-libs</outputDirectory>
-							<includeGroupIds>org.openjfx</includeGroupIds>
-							<classifier>mac</classifier>
-						</configuration>
-					</execution>
-					<execution>
-						<id>copy-win-libs</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/win-libs</outputDirectory>
-							<includeGroupIds>org.openjfx</includeGroupIds>
-							<classifier>win</classifier>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<!-- create buildkit.zip: -->
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.1.1</version>
-				<executions>
-					<execution>
-						<id>assemble-linux</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<descriptors>
-								<descriptor>assembly-linux.xml</descriptor>
-							</descriptors>
-							<appendAssemblyId>false</appendAssemblyId>
-							<finalName>buildkit-linux</finalName>
-						</configuration>
-					</execution>
-					<execution>
-						<id>assemble-mac</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<descriptors>
-								<descriptor>assembly-mac.xml</descriptor>
-							</descriptors>
-							<appendAssemblyId>false</appendAssemblyId>
-							<finalName>buildkit-mac</finalName>
-						</configuration>
-					</execution>
-					<execution>
-						<id>assemble-win</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-						<configuration>
-							<descriptors>
-								<descriptor>assembly-win.xml</descriptor>
-							</descriptors>
-							<appendAssemblyId>false</appendAssemblyId>
-							<finalName>buildkit-win</finalName>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
 		</plugins>
 	</build>
+
+	<profiles>
+		<profile>
+			<id>linux</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>assemble-linux</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptors>
+										<descriptor>assembly-linux.xml</descriptor>
+									</descriptors>
+									<appendAssemblyId>false</appendAssemblyId>
+									<finalName>buildkit-linux</finalName>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>mac</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>assemble-mac</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptors>
+										<descriptor>assembly-mac.xml</descriptor>
+									</descriptors>
+									<appendAssemblyId>false</appendAssemblyId>
+									<finalName>buildkit-mac</finalName>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+
+		<profile>
+			<id>win</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>assemble-win</id>
+								<phase>package</phase>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<configuration>
+									<descriptors>
+										<descriptor>assembly-win.xml</descriptor>
+									</descriptors>
+									<appendAssemblyId>false</appendAssemblyId>
+									<finalName>buildkit-win</finalName>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>
\ No newline at end of file
diff --git a/main/pom.xml b/main/pom.xml
index 625e2eb49..838b871de 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -291,6 +291,9 @@
 				<os>
 					<family>mac</family>
 				</os>
+				<property>
+					<name>idea.version</name>
+				</property>
 			</activation>
 			<dependencies>
 				<dependency>
@@ -306,6 +309,9 @@
 					<family>unix</family>
 					<name>Linux</name>
 				</os>
+				<property>
+					<name>idea.version</name>
+				</property>
 			</activation>
 			<dependencies>
 				<dependency>
@@ -320,6 +326,9 @@
 				<os>
 					<family>windows</family>
 				</os>
+				<property>
+					<name>idea.version</name>
+				</property>
 			</activation>
 			<dependencies>
 				<dependency>
@@ -334,20 +343,29 @@
 		<pluginManagement>
 			<plugins>
 				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>3.8.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-resources-plugin</artifactId>
+					<version>3.2.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-dependency-plugin</artifactId>
 					<version>3.1.2</version>
-					<executions>
-						<execution>
-							<id>copy-libs</id>
-							<goals>
-								<goal>copy-dependencies</goal>
-							</goals>
-							<configuration>
-								<outputDirectory>${project.build.directory}/libs</outputDirectory>
-								<includeScope>runtime</includeScope>
-							</configuration>
-						</execution>
-					</executions>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-assembly-plugin</artifactId>
+					<version>3.3.0</version>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.22.2</version>
 				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
@@ -397,7 +415,6 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
 				<configuration>
 					<release>14</release>
 					<annotationProcessorPaths>
@@ -412,7 +429,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.22.2</version>
 			</plugin>
 		</plugins>
 	</build>

From b382e436e29b38f59eaaf7061146a28bcb24788e Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 3 Nov 2020 11:27:10 +0100
Subject: [PATCH 152/169] minor CI fixes

---
 .github/workflows/build.yml | 8 ++++----
 main/buildkit/pom.xml       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 18337afbe..b847d0b4b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,21 +38,21 @@ jobs:
       - name: Upload buildkit-linux.zip
         uses: actions/upload-artifact@v1
         with:
-          name: buildkit-linux.zip
+          name: buildkit-linux
           path: main/buildkit/target/buildkit-linux.zip
       - name: Assemble buildkit-mac.zip
         run: mvn -B clean package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease,mac
       - name: Upload buildkit-mac.zip
         uses: actions/upload-artifact@v1
         with:
-          name: buildkit-mac.zip
+          name: buildkit-mac
           path: main/buildkit/target/buildkit-mac.zip
       - name: Assemble buildkit-win.zip
-        run: mvn -B clean package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease,win
+        run: mvn -B clean package -DskipTests --file main/pom.xml --resume-from=buildkit -Prelease,windows
       - name: Upload buildkit-win.zip
         uses: actions/upload-artifact@v1
         with:
-          name: buildkit-win.zip
+          name: buildkit-win
           path: main/buildkit/target/buildkit-win.zip
           
   release:
diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml
index 19246123b..d26fe2d60 100644
--- a/main/buildkit/pom.xml
+++ b/main/buildkit/pom.xml
@@ -131,7 +131,7 @@
 		</profile>
 
 		<profile>
-			<id>win</id>
+			<id>windows</id>
 			<build>
 				<plugins>
 					<plugin>

From 28c40b227745a2741d5c9bcde0a7a3f2630ebf03 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 4 Nov 2020 14:13:53 +0100
Subject: [PATCH 153/169] WHY?

---
 .../org/cryptomator/common/keychain/KeychainManager.java     | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java b/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java
index e91648f7d..b861eeaba 100644
--- a/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java
+++ b/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java
@@ -5,8 +5,6 @@ import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -20,8 +18,6 @@ import java.util.Arrays;
 @Singleton
 public class KeychainManager implements KeychainAccessProvider {
 
-	private static final Logger LOG = LoggerFactory.getLogger(KeychainManager.class);
-
 	private final ObjectExpression<KeychainAccessProvider> keychain;
 	private LoadingCache<String, BooleanProperty> passphraseStoredProperties;
 
@@ -99,7 +95,6 @@ public class KeychainManager implements KeychainAccessProvider {
 			if (Platform.isFxApplicationThread()) {
 				property.set(value);
 			} else {
-				LOG.warn("");
 				Platform.runLater(() -> property.set(value));
 			}
 		}

From f4cee6d161a70ac33c60bf563cdb0afff5ccfbef Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 4 Nov 2020 14:15:28 +0100
Subject: [PATCH 154/169] made KeychainManager immutable [ci skip]

---
 .../java/org/cryptomator/common/keychain/KeychainManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java b/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java
index b861eeaba..537b83577 100644
--- a/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java
+++ b/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java
@@ -19,7 +19,7 @@ import java.util.Arrays;
 public class KeychainManager implements KeychainAccessProvider {
 
 	private final ObjectExpression<KeychainAccessProvider> keychain;
-	private LoadingCache<String, BooleanProperty> passphraseStoredProperties;
+	private final LoadingCache<String, BooleanProperty> passphraseStoredProperties;
 
 	@Inject
 	KeychainManager(ObjectExpression<KeychainAccessProvider> selectedKeychain) {

From 86cba5e8a7924089a0d871e3b7c684b614231991 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 4 Nov 2020 16:11:16 +0100
Subject: [PATCH 155/169] partial revert of 6ccd2486

---
 main/buildkit/pom.xml | 55 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml
index d26fe2d60..4dde902b9 100644
--- a/main/buildkit/pom.xml
+++ b/main/buildkit/pom.xml
@@ -66,6 +66,7 @@
 						<configuration>
 							<includeScope>runtime</includeScope>
 							<outputDirectory>${project.build.directory}/libs</outputDirectory>
+							<excludeClassifiers>linux,mac,win</excludeClassifiers>
 						</configuration>
 					</execution>
 				</executions>
@@ -98,6 +99,24 @@
 							</execution>
 						</executions>
 					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-linux-libs</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${project.build.directory}/libs</outputDirectory>
+									<includeGroupIds>org.openjfx</includeGroupIds>
+									<classifier>linux</classifier>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>
@@ -126,6 +145,24 @@
 							</execution>
 						</executions>
 					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-mac-libs</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${project.build.directory}/libs</outputDirectory>
+									<includeGroupIds>org.openjfx</includeGroupIds>
+									<classifier>mac</classifier>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>
@@ -154,6 +191,24 @@
 							</execution>
 						</executions>
 					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-dependency-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>copy-win-libs</id>
+								<phase>prepare-package</phase>
+								<goals>
+									<goal>copy-dependencies</goal>
+								</goals>
+								<configuration>
+									<outputDirectory>${project.build.directory}/libs</outputDirectory>
+									<includeGroupIds>org.openjfx</includeGroupIds>
+									<classifier>win</classifier>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
 				</plugins>
 			</build>
 		</profile>

From 18b408a83aee493be1cb27e5af255c05677d68ae Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 5 Nov 2020 11:15:39 +0100
Subject: [PATCH 156/169] Adjusted keychain display names [ci skip]

---
 main/ui/src/main/resources/i18n/strings.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/resources/i18n/strings.properties b/main/ui/src/main/resources/i18n/strings.properties
index e391d263a..e42ac171d 100644
--- a/main/ui/src/main/resources/i18n/strings.properties
+++ b/main/ui/src/main/resources/i18n/strings.properties
@@ -145,9 +145,9 @@ preferences.general.debugDirectory=Reveal log files
 preferences.general.autoStart=Launch Cryptomator on system start
 preferences.general.keychainBackend=Store passwords with
 preferences.general.keychainBackend.org.cryptomator.linux.keychain.SecretServiceKeychainAccess=Gnome Keyring
-preferences.general.keychainBackend.org.cryptomator.linux.keychain.KDEWalletKeychainAccess=KDE KWallet
+preferences.general.keychainBackend.org.cryptomator.linux.keychain.KDEWalletKeychainAccess=KDE Wallet
 preferences.general.keychainBackend.org.cryptomator.macos.keychain.MacSystemKeychainAccess=macOS Keychain Access
-preferences.general.keychainBackend.org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess=Windows Data Protection Keychain
+preferences.general.keychainBackend.org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess=Windows Data Protection
 preferences.general.interfaceOrientation=Interface Orientation
 preferences.general.interfaceOrientation.ltr=Left to Right
 preferences.general.interfaceOrientation.rtl=Right to Left

From 343794c1fee7a657a2b11c7c54ca5bfb93fd64f0 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Thu, 5 Nov 2020 17:03:35 +0100
Subject: [PATCH 157/169] Redo "Added UI error messages"

This reverts commit d331c302
---
 .../preferences/GeneralPreferencesController.java | 15 ++++++++++++++-
 .../RecoveryKeyCreationController.java            |  8 +++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index 208605f51..4e551afce 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -1,12 +1,16 @@
 package org.cryptomator.ui.preferences;
 
+import dagger.Lazy;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.KeychainBackend;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
+import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -19,11 +23,13 @@ import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.geometry.NodeOrientation;
+import javafx.scene.Scene;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.Toggle;
 import javafx.scene.control.ToggleGroup;
+import javafx.stage.Stage;
 import javafx.util.StringConverter;
 import java.util.Arrays;
 import java.util.Optional;
@@ -37,6 +43,7 @@ public class GeneralPreferencesController implements FxController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(GeneralPreferencesController.class);
 
+	private final Stage window;
 	private final Settings settings;
 	private final boolean trayMenuSupported;
 	private final Optional<AutoStartStrategy> autoStartStrategy;
@@ -47,6 +54,8 @@ public class GeneralPreferencesController implements FxController {
 	private final Application application;
 	private final Environment environment;
 	private final Set<KeychainAccessProvider> keychainAccessProviders;
+	private final Lazy<Scene> preferencesScene;
+	private final ErrorComponent.Builder errorComponent;
 	public ChoiceBox<UiTheme> themeChoiceBox;
 	public ChoiceBox<KeychainBackend> keychainBackendChoiceBox;
 	public CheckBox startHiddenCheckbox;
@@ -57,7 +66,8 @@ public class GeneralPreferencesController implements FxController {
 	public RadioButton nodeOrientationRtl;
 
 	@Inject
-	GeneralPreferencesController(Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, Set<KeychainAccessProvider> keychainAccessProviders, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment) {
+	GeneralPreferencesController(@PreferencesWindow Stage window, Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, Set<KeychainAccessProvider> keychainAccessProviders, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment, @FxmlScene(FxmlFile.PREFERENCES) Lazy<Scene> preferencesScene, ErrorComponent.Builder errorComponent) {
+		this.window = window;
 		this.settings = settings;
 		this.trayMenuSupported = trayMenuSupported;
 		this.autoStartStrategy = autoStartStrategy;
@@ -68,6 +78,8 @@ public class GeneralPreferencesController implements FxController {
 		this.resourceBundle = resourceBundle;
 		this.application = application;
 		this.environment = environment;
+		this.preferencesScene = preferencesScene;
+		this.errorComponent = errorComponent;
 	}
 
 	@FXML
@@ -129,6 +141,7 @@ public class GeneralPreferencesController implements FxController {
 			toggleTask.setOnFailed(event -> {
 				autoStartCheckbox.setSelected(!enableAutoStart); // restore previous state
 				LOG.error("Failed to toggle autostart.", event.getSource().getException());
+				errorComponent.cause(event.getSource().getException()).window(window).returnToScene(preferencesScene.get()).build().showErrorScene();
 			});
 			executor.execute(toggleTask);
 		});
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
index de756d899..0e50c5e8a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
@@ -4,6 +4,7 @@ import dagger.Lazy;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.cryptolib.api.InvalidPassphraseException;
 import org.cryptomator.ui.common.Animations;
+import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.FxmlFile;
 import org.cryptomator.ui.common.FxmlScene;
@@ -31,16 +32,20 @@ public class RecoveryKeyCreationController implements FxController {
 	private final ExecutorService executor;
 	private final RecoveryKeyFactory recoveryKeyFactory;
 	private final StringProperty recoveryKeyProperty;
+	private final Lazy<Scene> createScene;
+	private final ErrorComponent.Builder errorComponent;
 	public NiceSecurePasswordField passwordField;
 
 	@Inject
-	public RecoveryKeyCreationController(@RecoveryKeyWindow Stage window, @FxmlScene(FxmlFile.RECOVERYKEY_SUCCESS) Lazy<Scene> successScene, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey) {
+	public RecoveryKeyCreationController(@RecoveryKeyWindow Stage window, @FxmlScene(FxmlFile.RECOVERYKEY_SUCCESS) Lazy<Scene> successScene, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @FxmlScene(FxmlFile.RECOVERYKEY_CREATE) Lazy<Scene> createScene, ErrorComponent.Builder errorComponent) {
 		this.window = window;
 		this.successScene = successScene;
 		this.vault = vault;
 		this.executor = executor;
 		this.recoveryKeyFactory = recoveryKeyFactory;
 		this.recoveryKeyProperty = recoveryKey;
+		this.createScene = createScene;
+		this.errorComponent = errorComponent;
 	}
 
 	@FXML
@@ -59,6 +64,7 @@ public class RecoveryKeyCreationController implements FxController {
 				Animations.createShakeWindowAnimation(window).play();
 			} else {
 				LOG.error("Creation of recovery key failed.", task.getException());
+				errorComponent.cause(task.getException()).window(window).returnToScene(createScene.get()).build().showErrorScene();
 			}
 		});
 		executor.submit(task);

From 313f8b36d2712d637362455cb974a07955c9b2f2 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Thu, 5 Nov 2020 17:11:35 +0100
Subject: [PATCH 158/169] Replaced dependency with call to getter

---
 .../ui/preferences/GeneralPreferencesController.java   | 10 ++--------
 .../ui/recoverykey/RecoveryKeyCreationController.java  |  6 ++----
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
index 4e551afce..496ada2ce 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.preferences;
 
-import dagger.Lazy;
 import org.cryptomator.common.Environment;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.KeychainBackend;
@@ -9,8 +8,6 @@ import org.cryptomator.common.settings.UiTheme;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
 import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -23,7 +20,6 @@ import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.geometry.NodeOrientation;
-import javafx.scene.Scene;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.RadioButton;
@@ -54,7 +50,6 @@ public class GeneralPreferencesController implements FxController {
 	private final Application application;
 	private final Environment environment;
 	private final Set<KeychainAccessProvider> keychainAccessProviders;
-	private final Lazy<Scene> preferencesScene;
 	private final ErrorComponent.Builder errorComponent;
 	public ChoiceBox<UiTheme> themeChoiceBox;
 	public ChoiceBox<KeychainBackend> keychainBackendChoiceBox;
@@ -66,7 +61,7 @@ public class GeneralPreferencesController implements FxController {
 	public RadioButton nodeOrientationRtl;
 
 	@Inject
-	GeneralPreferencesController(@PreferencesWindow Stage window, Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, Set<KeychainAccessProvider> keychainAccessProviders, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment, @FxmlScene(FxmlFile.PREFERENCES) Lazy<Scene> preferencesScene, ErrorComponent.Builder errorComponent) {
+	GeneralPreferencesController(@PreferencesWindow Stage window, Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, Set<KeychainAccessProvider> keychainAccessProviders, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment, ErrorComponent.Builder errorComponent) {
 		this.window = window;
 		this.settings = settings;
 		this.trayMenuSupported = trayMenuSupported;
@@ -78,7 +73,6 @@ public class GeneralPreferencesController implements FxController {
 		this.resourceBundle = resourceBundle;
 		this.application = application;
 		this.environment = environment;
-		this.preferencesScene = preferencesScene;
 		this.errorComponent = errorComponent;
 	}
 
@@ -141,7 +135,7 @@ public class GeneralPreferencesController implements FxController {
 			toggleTask.setOnFailed(event -> {
 				autoStartCheckbox.setSelected(!enableAutoStart); // restore previous state
 				LOG.error("Failed to toggle autostart.", event.getSource().getException());
-				errorComponent.cause(event.getSource().getException()).window(window).returnToScene(preferencesScene.get()).build().showErrorScene();
+				errorComponent.cause(event.getSource().getException()).window(window).returnToScene(window.getScene()).build().showErrorScene();
 			});
 			executor.execute(toggleTask);
 		});
diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
index 0e50c5e8a..902f2cd50 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyCreationController.java
@@ -32,19 +32,17 @@ public class RecoveryKeyCreationController implements FxController {
 	private final ExecutorService executor;
 	private final RecoveryKeyFactory recoveryKeyFactory;
 	private final StringProperty recoveryKeyProperty;
-	private final Lazy<Scene> createScene;
 	private final ErrorComponent.Builder errorComponent;
 	public NiceSecurePasswordField passwordField;
 
 	@Inject
-	public RecoveryKeyCreationController(@RecoveryKeyWindow Stage window, @FxmlScene(FxmlFile.RECOVERYKEY_SUCCESS) Lazy<Scene> successScene, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @FxmlScene(FxmlFile.RECOVERYKEY_CREATE) Lazy<Scene> createScene, ErrorComponent.Builder errorComponent) {
+	public RecoveryKeyCreationController(@RecoveryKeyWindow Stage window, @FxmlScene(FxmlFile.RECOVERYKEY_SUCCESS) Lazy<Scene> successScene, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, ErrorComponent.Builder errorComponent) {
 		this.window = window;
 		this.successScene = successScene;
 		this.vault = vault;
 		this.executor = executor;
 		this.recoveryKeyFactory = recoveryKeyFactory;
 		this.recoveryKeyProperty = recoveryKey;
-		this.createScene = createScene;
 		this.errorComponent = errorComponent;
 	}
 
@@ -64,7 +62,7 @@ public class RecoveryKeyCreationController implements FxController {
 				Animations.createShakeWindowAnimation(window).play();
 			} else {
 				LOG.error("Creation of recovery key failed.", task.getException());
-				errorComponent.cause(task.getException()).window(window).returnToScene(createScene.get()).build().showErrorScene();
+				errorComponent.cause(task.getException()).window(window).returnToScene(window.getScene()).build().showErrorScene();
 			}
 		});
 		executor.submit(task);

From c0e2d0129777b8f80f0cee40ad9bd9f1cb2a8501 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 5 Nov 2020 17:49:39 +0100
Subject: [PATCH 159/169] Migrated from deprecated MacFunctions to
 UiAppearanceProvider for UI theme switching

---
 main/pom.xml                                  |  4 +-
 .../cryptomator/ui/fxapp/FxApplication.java   | 70 ++++++++++++-------
 .../ui/launcher/UiLauncherModule.java         | 10 +++
 .../ui/traymenu/TrayIconController.java       | 21 ++++--
 .../ui/traymenu/TrayImageFactory.java         | 17 ++---
 5 files changed, 78 insertions(+), 44 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index 838b871de..7d54dbf90 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -25,9 +25,9 @@
 
 		<!-- cryptomator dependencies -->
 		<cryptomator.cryptofs.version>1.9.12</cryptomator.cryptofs.version>
-		<cryptomator.integrations.version>0.1.4</cryptomator.integrations.version>
+		<cryptomator.integrations.version>0.1.5</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>0.1.0-beta1</cryptomator.integrations.win.version>
-		<cryptomator.integrations.mac.version>0.1.0-beta1</cryptomator.integrations.mac.version>
+		<cryptomator.integrations.mac.version>0.1.0-beta2</cryptomator.integrations.mac.version>
 		<cryptomator.integrations.linux.version>0.1.0-beta1</cryptomator.integrations.linux.version>
 		<cryptomator.jni.version>2.2.3</cryptomator.jni.version>
 		<cryptomator.fuse.version>1.2.5</cryptomator.fuse.version>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
index decf50718..6d6a36fd7 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
@@ -6,8 +6,10 @@ import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
 import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.jni.JniException;
-import org.cryptomator.jni.MacApplicationUiAppearance;
+import org.cryptomator.integrations.uiappearance.Theme;
+import org.cryptomator.integrations.uiappearance.UiAppearanceException;
+import org.cryptomator.integrations.uiappearance.UiAppearanceListener;
+import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
 import org.cryptomator.jni.MacApplicationUiState;
 import org.cryptomator.jni.MacFunctions;
 import org.cryptomator.ui.common.VaultService;
@@ -42,20 +44,21 @@ public class FxApplication extends Application {
 	private final Provider<UnlockComponent.Builder> unlockWindowBuilderProvider;
 	private final Provider<QuitComponent.Builder> quitWindowBuilderProvider;
 	private final Optional<MacFunctions> macFunctions;
+	private final Optional<UiAppearanceProvider> appearanceProvider;
 	private final VaultService vaultService;
 	private final LicenseHolder licenseHolder;
 	private final BooleanBinding hasVisibleStages;
-
-	private Optional<String> macApperanceObserverIdentifier = Optional.empty();
+	private final UiAppearanceListener systemInterfaceThemeListener = this::systemInterfaceThemeChanged;
 
 	@Inject
-	FxApplication(Settings settings, Lazy<MainWindowComponent> mainWindow, Lazy<PreferencesComponent> preferencesWindow, Provider<UnlockComponent.Builder> unlockWindowBuilderProvider, Provider<QuitComponent.Builder> quitWindowBuilderProvider, Optional<MacFunctions> macFunctions, VaultService vaultService, LicenseHolder licenseHolder, ObservableSet<Stage> visibleStages) {
+	FxApplication(Settings settings, Lazy<MainWindowComponent> mainWindow, Lazy<PreferencesComponent> preferencesWindow, Provider<UnlockComponent.Builder> unlockWindowBuilderProvider, Provider<QuitComponent.Builder> quitWindowBuilderProvider, Optional<MacFunctions> macFunctions, Optional<UiAppearanceProvider> appearanceProvider, VaultService vaultService, LicenseHolder licenseHolder, ObservableSet<Stage> visibleStages) {
 		this.settings = settings;
 		this.mainWindow = mainWindow;
 		this.preferencesWindow = preferencesWindow;
 		this.unlockWindowBuilderProvider = unlockWindowBuilderProvider;
 		this.quitWindowBuilderProvider = quitWindowBuilderProvider;
 		this.macFunctions = macFunctions;
+		this.appearanceProvider = appearanceProvider;
 		this.vaultService = vaultService;
 		this.licenseHolder = licenseHolder;
 		this.hasVisibleStages = Bindings.isNotEmpty(visibleStages);
@@ -67,7 +70,7 @@ public class FxApplication extends Application {
 
 		EasyBind.subscribe(hasVisibleStages, this::hasVisibleStagesChanged);
 
-		settings.theme().addListener(this::themeChanged);
+		settings.theme().addListener(this::appThemeChanged);
 		loadSelectedStyleSheet(settings.theme().get());
 	}
 
@@ -116,45 +119,60 @@ public class FxApplication extends Application {
 		return vaultService;
 	}
 
-	private void themeChanged(@SuppressWarnings("unused") ObservableValue<? extends UiTheme> observable, @SuppressWarnings("unused") UiTheme oldValue, UiTheme newValue) {
-		if (macApperanceObserverIdentifier.isPresent()) {
-			macFunctions.map(MacFunctions::uiAppearance).ifPresent(uiAppearance -> uiAppearance.removeListener(macApperanceObserverIdentifier.get()));
-			macApperanceObserverIdentifier = Optional.empty();
-		}
+	private void appThemeChanged(@SuppressWarnings("unused") ObservableValue<? extends UiTheme> observable, @SuppressWarnings("unused") UiTheme oldValue, UiTheme newValue) {
+		appearanceProvider.ifPresent(appearanceProvider -> {
+			try {
+				appearanceProvider.removeListener(systemInterfaceThemeListener);
+			} catch (UiAppearanceException e) {
+				LOG.error("Failed to disable automatic theme switching.");
+			}
+		});
 		loadSelectedStyleSheet(newValue);
 	}
 
 	private void loadSelectedStyleSheet(UiTheme desiredTheme) {
 		UiTheme theme = licenseHolder.isValidLicense() ? desiredTheme : UiTheme.LIGHT;
 		switch (theme) {
-			case LIGHT -> setToLightTheme();
-			case DARK -> setToDarkTheme();
+			case LIGHT -> applyLightTheme();
+			case DARK -> applyDarkTheme();
 			case AUTOMATIC -> {
-				macFunctions.map(MacFunctions::uiAppearance).ifPresent(uiAppearance -> {
-					macApperanceObserverIdentifier = Optional.of(uiAppearance.addListener(this::macInterfaceThemeChanged));
+				appearanceProvider.ifPresent(appearanceProvider -> {
+					try {
+						appearanceProvider.addListener(systemInterfaceThemeListener);
+					} catch (UiAppearanceException e) {
+						LOG.error("Failed to enable automatic theme switching.");
+					}
 				});
-				macInterfaceThemeChanged();
+				applySystemTheme();
 			}
 		}
 	}
 
-	private void macInterfaceThemeChanged() {
-		macFunctions.map(MacFunctions::uiAppearance).ifPresent(uiAppearance -> {
-			switch (uiAppearance.getCurrentInterfaceStyle()) {
-				case LIGHT -> setToLightTheme();
-				case DARK -> setToDarkTheme();
-			}
+	private void systemInterfaceThemeChanged(Theme theme) {
+		switch (theme) {
+			case LIGHT -> applyLightTheme();
+			case DARK -> applyDarkTheme();
+		}
+	}
+
+	private void applySystemTheme() {
+		appearanceProvider.ifPresent(appearanceProvider -> {
+			systemInterfaceThemeChanged(appearanceProvider.getSystemTheme());
 		});
 	}
 
-	private void setToLightTheme() {
+	private void applyLightTheme() {
 		Application.setUserAgentStylesheet(getClass().getResource("/css/light_theme.css").toString());
-		macFunctions.map(MacFunctions::uiAppearance).ifPresent(JniException.ignore(MacApplicationUiAppearance::setToAqua));
+		appearanceProvider.ifPresent(appearanceProvider -> {
+			appearanceProvider.adjustToTheme(Theme.LIGHT);
+		});
 	}
 
-	private void setToDarkTheme() {
+	private void applyDarkTheme() {
 		Application.setUserAgentStylesheet(getClass().getResource("/css/dark_theme.css").toString());
-		macFunctions.map(MacFunctions::uiAppearance).ifPresent(JniException.ignore(MacApplicationUiAppearance::setToDarkAqua));
+		appearanceProvider.ifPresent(appearanceProvider -> {
+			appearanceProvider.adjustToTheme(Theme.DARK);
+		});
 	}
 
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
index 2ac585763..492d5028c 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
@@ -3,18 +3,28 @@ package org.cryptomator.ui.launcher;
 import dagger.Module;
 import dagger.Provides;
 import org.cryptomator.common.JniModule;
+import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
 import org.cryptomator.ui.fxapp.FxApplicationComponent;
+import org.cryptomator.ui.fxapp.FxApplicationScoped;
 import org.cryptomator.ui.traymenu.TrayMenuComponent;
 
 import javax.inject.Named;
 import javax.inject.Singleton;
+import java.util.Optional;
 import java.util.ResourceBundle;
+import java.util.ServiceLoader;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 
 @Module(includes = {JniModule.class}, subcomponents = {TrayMenuComponent.class, FxApplicationComponent.class})
 public abstract class UiLauncherModule {
 
+	@Provides
+	@Singleton
+	static Optional<UiAppearanceProvider> provideAppearanceProvider() {
+		return ServiceLoader.load(UiAppearanceProvider.class).findFirst();
+	}
+
 	@Provides
 	@Singleton
 	static ResourceBundle provideLocalization() {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java
index 13183a36e..b7231c948 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java
@@ -1,6 +1,9 @@
 package org.cryptomator.ui.traymenu;
 
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.integrations.uiappearance.Theme;
+import org.cryptomator.integrations.uiappearance.UiAppearanceException;
+import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
 import org.cryptomator.jni.MacFunctions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,20 +20,26 @@ public class TrayIconController {
 	private static final Logger LOG = LoggerFactory.getLogger(TrayIconController.class);
 
 	private final TrayImageFactory imageFactory;
+	private final Optional<UiAppearanceProvider> appearanceProvider;
 	private final TrayMenuController trayMenuController;
 	private final TrayIcon trayIcon;
-	private final Optional<MacFunctions> macFunctions;
 
 	@Inject
-	TrayIconController(TrayImageFactory imageFactory, TrayMenuController trayMenuController, Optional<MacFunctions> macFunctions) {
+	TrayIconController(TrayImageFactory imageFactory, TrayMenuController trayMenuController, Optional<UiAppearanceProvider> appearanceProvider) {
 		this.trayMenuController = trayMenuController;
 		this.imageFactory = imageFactory;
+		this.appearanceProvider = appearanceProvider;
 		this.trayIcon = new TrayIcon(imageFactory.loadImage(), "Cryptomator", trayMenuController.getMenu());
-		this.macFunctions = macFunctions;
 	}
 
 	public void initializeTrayIcon() {
-		macFunctions.map(MacFunctions::uiAppearance).ifPresent(uiAppearance -> uiAppearance.addListener(this::macInterfaceThemeChanged));
+		appearanceProvider.ifPresent(appearanceProvider -> {
+			try {
+				appearanceProvider.addListener(this::systemInterfaceThemeChanged);
+			} catch (UiAppearanceException e) {
+				LOG.error("Failed to enable automatic tray icon theme switching.");
+			}
+		});
 
 		trayIcon.setImageAutoSize(true);
 		if (SystemUtils.IS_OS_WINDOWS) {
@@ -47,8 +56,8 @@ public class TrayIconController {
 		trayMenuController.initTrayMenu();
 	}
 
-	private void macInterfaceThemeChanged() {
-		trayIcon.setImage(imageFactory.loadImage());
+	private void systemInterfaceThemeChanged(Theme theme) {
+		trayIcon.setImage(imageFactory.loadImage()); // TODO refactor "theme" is re-queried in loadImage()
 	}
 
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayImageFactory.java b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayImageFactory.java
index cbdf651b4..d9fcdfc29 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayImageFactory.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayImageFactory.java
@@ -1,9 +1,8 @@
 package org.cryptomator.ui.traymenu;
 
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.jni.MacApplicationUiAppearance;
-import org.cryptomator.jni.MacApplicationUiInterfaceStyle;
-import org.cryptomator.jni.MacFunctions;
+import org.cryptomator.integrations.uiappearance.Theme;
+import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
 
 import javax.inject.Inject;
 import java.awt.Image;
@@ -13,11 +12,11 @@ import java.util.Optional;
 @TrayMenuScoped
 class TrayImageFactory {
 
-	private final Optional<MacFunctions> macFunctions;
+	private final Optional<UiAppearanceProvider> appearanceProvider;
 
 	@Inject
-	TrayImageFactory(Optional<MacFunctions> macFunctions) {
-		this.macFunctions = macFunctions;
+	TrayImageFactory(Optional<UiAppearanceProvider> appearanceProvider) {
+		this.appearanceProvider = appearanceProvider;
 	}
 
 	public Image loadImage() {
@@ -26,10 +25,8 @@ class TrayImageFactory {
 	}
 
 	private String getMacResourceName() {
-		MacApplicationUiInterfaceStyle interfaceStyle = macFunctions.map(MacFunctions::uiAppearance) //
-				.map(MacApplicationUiAppearance::getCurrentInterfaceStyle) //
-				.orElse(MacApplicationUiInterfaceStyle.LIGHT);
-		return switch (interfaceStyle) {
+		var theme = appearanceProvider.map(UiAppearanceProvider::getSystemTheme).orElse(Theme.LIGHT);
+		return switch (theme) {
 			case DARK -> "/img/tray_icon_mac_white.png";
 			case LIGHT -> "/img/tray_icon_mac_black.png";
 		};

From 603bf99b25cd4c0f49ddc8cba248b38281562fd9 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 6 Nov 2020 14:18:23 +0100
Subject: [PATCH 160/169] Replaced MacFunctionsUiState using new integrations
 api

---
 main/pom.xml                                        |  4 ++--
 .../org/cryptomator/ui/fxapp/FxApplication.java     | 13 ++++++-------
 .../org/cryptomator/ui/launcher/UiLauncher.java     | 12 +++++-------
 .../cryptomator/ui/launcher/UiLauncherModule.java   |  8 +++++++-
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index 7d54dbf90..de425bb3a 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -25,9 +25,9 @@
 
 		<!-- cryptomator dependencies -->
 		<cryptomator.cryptofs.version>1.9.12</cryptomator.cryptofs.version>
-		<cryptomator.integrations.version>0.1.5</cryptomator.integrations.version>
+		<cryptomator.integrations.version>0.1.6</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>0.1.0-beta1</cryptomator.integrations.win.version>
-		<cryptomator.integrations.mac.version>0.1.0-beta2</cryptomator.integrations.mac.version>
+		<cryptomator.integrations.mac.version>0.1.0-beta3</cryptomator.integrations.mac.version>
 		<cryptomator.integrations.linux.version>0.1.0-beta1</cryptomator.integrations.linux.version>
 		<cryptomator.jni.version>2.2.3</cryptomator.jni.version>
 		<cryptomator.fuse.version>1.2.5</cryptomator.fuse.version>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
index 6d6a36fd7..650254649 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
@@ -6,12 +6,11 @@ import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
 import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.integrations.tray.TrayIntegrationProvider;
 import org.cryptomator.integrations.uiappearance.Theme;
 import org.cryptomator.integrations.uiappearance.UiAppearanceException;
 import org.cryptomator.integrations.uiappearance.UiAppearanceListener;
 import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
-import org.cryptomator.jni.MacApplicationUiState;
-import org.cryptomator.jni.MacFunctions;
 import org.cryptomator.ui.common.VaultService;
 import org.cryptomator.ui.mainwindow.MainWindowComponent;
 import org.cryptomator.ui.preferences.PreferencesComponent;
@@ -43,7 +42,7 @@ public class FxApplication extends Application {
 	private final Lazy<PreferencesComponent> preferencesWindow;
 	private final Provider<UnlockComponent.Builder> unlockWindowBuilderProvider;
 	private final Provider<QuitComponent.Builder> quitWindowBuilderProvider;
-	private final Optional<MacFunctions> macFunctions;
+	private final Optional<TrayIntegrationProvider> trayIntegration;
 	private final Optional<UiAppearanceProvider> appearanceProvider;
 	private final VaultService vaultService;
 	private final LicenseHolder licenseHolder;
@@ -51,13 +50,13 @@ public class FxApplication extends Application {
 	private final UiAppearanceListener systemInterfaceThemeListener = this::systemInterfaceThemeChanged;
 
 	@Inject
-	FxApplication(Settings settings, Lazy<MainWindowComponent> mainWindow, Lazy<PreferencesComponent> preferencesWindow, Provider<UnlockComponent.Builder> unlockWindowBuilderProvider, Provider<QuitComponent.Builder> quitWindowBuilderProvider, Optional<MacFunctions> macFunctions, Optional<UiAppearanceProvider> appearanceProvider, VaultService vaultService, LicenseHolder licenseHolder, ObservableSet<Stage> visibleStages) {
+	FxApplication(Settings settings, Lazy<MainWindowComponent> mainWindow, Lazy<PreferencesComponent> preferencesWindow, Provider<UnlockComponent.Builder> unlockWindowBuilderProvider, Provider<QuitComponent.Builder> quitWindowBuilderProvider, Optional<TrayIntegrationProvider> trayIntegration, Optional<UiAppearanceProvider> appearanceProvider, VaultService vaultService, LicenseHolder licenseHolder, ObservableSet<Stage> visibleStages) {
 		this.settings = settings;
 		this.mainWindow = mainWindow;
 		this.preferencesWindow = preferencesWindow;
 		this.unlockWindowBuilderProvider = unlockWindowBuilderProvider;
 		this.quitWindowBuilderProvider = quitWindowBuilderProvider;
-		this.macFunctions = macFunctions;
+		this.trayIntegration = trayIntegration;
 		this.appearanceProvider = appearanceProvider;
 		this.vaultService = vaultService;
 		this.licenseHolder = licenseHolder;
@@ -81,9 +80,9 @@ public class FxApplication extends Application {
 
 	private void hasVisibleStagesChanged(boolean newValue) {
 		if (newValue) {
-			macFunctions.map(MacFunctions::uiState).ifPresent(MacApplicationUiState::transformToForegroundApplication);
+			trayIntegration.ifPresent(TrayIntegrationProvider::restoredFromTray);
 		} else {
-			macFunctions.map(MacFunctions::uiState).ifPresent(MacApplicationUiState::transformToAgentApplication);
+			trayIntegration.ifPresent(TrayIntegrationProvider::minimizedToTray);
 		}
 	}
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncher.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncher.java
index ad98fe226..ecef51dbf 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncher.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncher.java
@@ -2,9 +2,7 @@ package org.cryptomator.ui.launcher;
 
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.jni.JniException;
-import org.cryptomator.jni.MacApplicationUiState;
-import org.cryptomator.jni.MacFunctions;
+import org.cryptomator.integrations.tray.TrayIntegrationProvider;
 import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.traymenu.TrayMenuComponent;
 import org.slf4j.Logger;
@@ -29,16 +27,16 @@ public class UiLauncher {
 	private final TrayMenuComponent.Builder trayComponent;
 	private final FxApplicationStarter fxApplicationStarter;
 	private final AppLaunchEventHandler launchEventHandler;
-	private final Optional<MacFunctions> macFunctions;
+	private final Optional<TrayIntegrationProvider> trayIntegration;
 
 	@Inject
-	public UiLauncher(Settings settings, ObservableList<Vault> vaults, TrayMenuComponent.Builder trayComponent, FxApplicationStarter fxApplicationStarter, AppLaunchEventHandler launchEventHandler, Optional<MacFunctions> macFunctions) {
+	public UiLauncher(Settings settings, ObservableList<Vault> vaults, TrayMenuComponent.Builder trayComponent, FxApplicationStarter fxApplicationStarter, AppLaunchEventHandler launchEventHandler, Optional<TrayIntegrationProvider> trayIntegration) {
 		this.settings = settings;
 		this.vaults = vaults;
 		this.trayComponent = trayComponent;
 		this.fxApplicationStarter = fxApplicationStarter;
 		this.launchEventHandler = launchEventHandler;
-		this.macFunctions = macFunctions;
+		this.trayIntegration = trayIntegration;
 	}
 
 	public void launch() {
@@ -53,7 +51,7 @@ public class UiLauncher {
 		// show window on start?
 		if (hasTrayIcon && settings.startHidden().get()) {
 			LOG.debug("Hiding application...");
-			macFunctions.map(MacFunctions::uiState).ifPresent(JniException.ignore(MacApplicationUiState::transformToAgentApplication));
+			trayIntegration.ifPresent(TrayIntegrationProvider::minimizedToTray);
 		} else {
 			showMainWindowAsync(hasTrayIcon);
 		}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
index 492d5028c..fdf31b491 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
@@ -3,9 +3,9 @@ package org.cryptomator.ui.launcher;
 import dagger.Module;
 import dagger.Provides;
 import org.cryptomator.common.JniModule;
+import org.cryptomator.integrations.tray.TrayIntegrationProvider;
 import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
 import org.cryptomator.ui.fxapp.FxApplicationComponent;
-import org.cryptomator.ui.fxapp.FxApplicationScoped;
 import org.cryptomator.ui.traymenu.TrayMenuComponent;
 
 import javax.inject.Named;
@@ -25,6 +25,12 @@ public abstract class UiLauncherModule {
 		return ServiceLoader.load(UiAppearanceProvider.class).findFirst();
 	}
 
+	@Provides
+	@Singleton
+	static Optional<TrayIntegrationProvider> provideTrayIntegrationProvider() {
+		return ServiceLoader.load(TrayIntegrationProvider.class).findFirst();
+	}
+
 	@Provides
 	@Singleton
 	static ResourceBundle provideLocalization() {

From a121c7d0fe63df05e5d7830f725bfc143a9d44d8 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Fri, 6 Nov 2020 14:42:21 +0100
Subject: [PATCH 161/169] added tooltip to path in vault list cell

---
 main/ui/src/main/resources/fxml/vault_list_cell.fxml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/main/ui/src/main/resources/fxml/vault_list_cell.fxml b/main/ui/src/main/resources/fxml/vault_list_cell.fxml
index 659772c7c..e86f084c1 100644
--- a/main/ui/src/main/resources/fxml/vault_list_cell.fxml
+++ b/main/ui/src/main/resources/fxml/vault_list_cell.fxml
@@ -3,6 +3,7 @@
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <HBox xmlns:fx="http://javafx.com/fxml"
@@ -21,7 +22,11 @@
 		</VBox>
 		<VBox spacing="4" HBox.hgrow="ALWAYS">
 			<Label styleClass="header-label" text="${controller.vault.displayName}"/>
-			<Label styleClass="detail-label" text="${controller.vault.displayablePath}" textOverrun="CENTER_ELLIPSIS"/>
+			<Label styleClass="detail-label" text="${controller.vault.displayablePath}" textOverrun="CENTER_ELLIPSIS">
+				<tooltip>
+					<Tooltip text="${controller.vault.displayablePath}"/>
+				</tooltip>
+			</Label>
 		</VBox>
 	</children>
 </HBox>

From ce131e4653d5666f633b8507f3d5b770a4a1f7f1 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 6 Nov 2020 14:46:32 +0100
Subject: [PATCH 162/169] Implemented AutoStart integration for macOS

---
 .../ui/launcher/UiLauncherModule.java         |  8 +++++++
 .../ui/preferences/AutoStartMacStrategy.java  | 22 +++++++++++--------
 .../ui/preferences/AutoStartModule.java       |  8 ++++---
 .../ui/preferences/AutoStartStrategy.java     |  1 +
 .../ui/preferences/AutoStartWinStrategy.java  |  2 ++
 5 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
index fdf31b491..63f119291 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
@@ -3,6 +3,7 @@ package org.cryptomator.ui.launcher;
 import dagger.Module;
 import dagger.Provides;
 import org.cryptomator.common.JniModule;
+import org.cryptomator.integrations.autostart.AutoStartProvider;
 import org.cryptomator.integrations.tray.TrayIntegrationProvider;
 import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
 import org.cryptomator.ui.fxapp.FxApplicationComponent;
@@ -25,6 +26,13 @@ public abstract class UiLauncherModule {
 		return ServiceLoader.load(UiAppearanceProvider.class).findFirst();
 	}
 
+	@Provides
+	@Singleton
+	static Optional<AutoStartProvider> provideAutostartProvider() {
+		return ServiceLoader.load(AutoStartProvider.class).findFirst();
+	}
+
+
 	@Provides
 	@Singleton
 	static Optional<TrayIntegrationProvider> provideTrayIntegrationProvider() {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartMacStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartMacStrategy.java
index 0bc469a77..7eeb2a72d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartMacStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartMacStrategy.java
@@ -1,5 +1,7 @@
 package org.cryptomator.ui.preferences;
 
+import org.cryptomator.integrations.autostart.AutoStartProvider;
+import org.cryptomator.integrations.autostart.ToggleAutoStartFailedException;
 import org.cryptomator.jni.MacFunctions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -7,36 +9,38 @@ import org.slf4j.LoggerFactory;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
+@Deprecated
 class AutoStartMacStrategy implements AutoStartStrategy {
 
 	private static final Logger LOG = LoggerFactory.getLogger(AutoStartMacStrategy.class);
 
-	private final MacFunctions macFunctions;
+	private final AutoStartProvider autoStartProvider;
 
-	public AutoStartMacStrategy(MacFunctions macFunctions) {
-		this.macFunctions = macFunctions;
+	public AutoStartMacStrategy(AutoStartProvider autoStartProvider) {
+		this.autoStartProvider = autoStartProvider;
 	}
 
 	@Override
 	public CompletionStage<Boolean> isAutoStartEnabled() {
-		boolean enabled = macFunctions.launchServices().isLoginItemEnabled();
-		return CompletableFuture.completedFuture(enabled);
+		return CompletableFuture.completedFuture(autoStartProvider.isEnabled());
 	}
 
 	@Override
 	public void enableAutoStart() throws TogglingAutoStartFailedException {
-		if (macFunctions.launchServices().enableLoginItem()) {
+		try {
+			autoStartProvider.enable();
 			LOG.debug("Added login item.");
-		} else {
+		} catch (ToggleAutoStartFailedException e) {
 			throw new TogglingAutoStartFailedException("Failed to add login item.");
 		}
 	}
 
 	@Override
 	public void disableAutoStart() throws TogglingAutoStartFailedException {
-		if (macFunctions.launchServices().disableLoginItem()) {
+		try {
+			autoStartProvider.disable();
 			LOG.debug("Removed login item.");
-		} else {
+		} catch (ToggleAutoStartFailedException e) {
 			throw new TogglingAutoStartFailedException("Failed to remove login item.");
 		}
 	}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java
index fa01756ab..c84ad5ac8 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java
@@ -4,18 +4,20 @@ import dagger.Module;
 import dagger.Provides;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
+import org.cryptomator.integrations.autostart.AutoStartProvider;
 import org.cryptomator.jni.MacFunctions;
 
 import java.util.Optional;
 
+@Deprecated
 @Module
 abstract class AutoStartModule {
 
 	@Provides
 	@PreferencesScoped
-	public static Optional<AutoStartStrategy> provideAutoStartStrategy(Optional<MacFunctions> macFunctions, Environment env) {
-		if (SystemUtils.IS_OS_MAC_OSX && macFunctions.isPresent()) {
-			return Optional.of(new AutoStartMacStrategy(macFunctions.get()));
+	public static Optional<AutoStartStrategy> provideAutoStartStrategy(Optional<AutoStartProvider> autoStartProvider) {
+		if (SystemUtils.IS_OS_MAC_OSX && autoStartProvider.isPresent()) {
+			return Optional.of(new AutoStartMacStrategy(autoStartProvider.get()));
 		} else if (SystemUtils.IS_OS_WINDOWS) {
 			Optional<String> exeName = ProcessHandle.current().info().command();
 			return exeName.map(AutoStartWinStrategy::new);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java
index 64ad27abc..9848e58f8 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartStrategy.java
@@ -2,6 +2,7 @@ package org.cryptomator.ui.preferences;
 
 import java.util.concurrent.CompletionStage;
 
+@Deprecated
 public interface AutoStartStrategy {
 
 	CompletionStage<Boolean> isAutoStartEnabled();
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
index 438c468bd..b3c0a4674 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartWinStrategy.java
@@ -25,7 +25,9 @@ import java.util.concurrent.TimeUnit;
  * To disable it, first it is determined by an internal state, which strategies must be used and in the second step those are executed.
  *
  * @apiNote This class is not thread safe, hence it should be avoided to call its methods simultaniously by different threads.
+ * @deprecated To be moved to integration-win project
  */
+@Deprecated
 class AutoStartWinStrategy implements AutoStartStrategy {
 
 	private static final Logger LOG = LoggerFactory.getLogger(AutoStartWinStrategy.class);

From 084c1881ba264ce655420e7f96ebd8966d53b0c7 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 6 Nov 2020 14:47:47 +0100
Subject: [PATCH 163/169] removed unused imports [ci skip]

---
 .../org/cryptomator/ui/preferences/AutoStartMacStrategy.java    | 1 -
 .../java/org/cryptomator/ui/preferences/AutoStartModule.java    | 2 --
 .../java/org/cryptomator/ui/traymenu/TrayIconController.java    | 1 -
 3 files changed, 4 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartMacStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartMacStrategy.java
index 7eeb2a72d..26811cdf2 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartMacStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartMacStrategy.java
@@ -2,7 +2,6 @@ package org.cryptomator.ui.preferences;
 
 import org.cryptomator.integrations.autostart.AutoStartProvider;
 import org.cryptomator.integrations.autostart.ToggleAutoStartFailedException;
-import org.cryptomator.jni.MacFunctions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java
index c84ad5ac8..7f6406f22 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AutoStartModule.java
@@ -3,9 +3,7 @@ package org.cryptomator.ui.preferences;
 import dagger.Module;
 import dagger.Provides;
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.Environment;
 import org.cryptomator.integrations.autostart.AutoStartProvider;
-import org.cryptomator.jni.MacFunctions;
 
 import java.util.Optional;
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java
index b7231c948..6c790ea06 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java
@@ -4,7 +4,6 @@ import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.integrations.uiappearance.Theme;
 import org.cryptomator.integrations.uiappearance.UiAppearanceException;
 import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
-import org.cryptomator.jni.MacFunctions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

From e9fa1d64767b8ecab1ba7253f2699d501e66bc04 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 6 Nov 2020 14:53:45 +0100
Subject: [PATCH 164/169] removed old jni dependency

---
 README.md                                     |  4 ++-
 main/buildkit/assembly-linux.xml              |  7 ----
 main/buildkit/assembly-mac.xml                |  7 ----
 main/buildkit/assembly-win.xml                |  7 ----
 .../src/main/resources/ffi-version.txt        |  1 -
 main/commons/pom.xml                          |  4 ---
 .../org/cryptomator/common/JniModule.java     | 33 -------------------
 main/pom.xml                                  |  6 ----
 main/ui/pom.xml                               |  4 ---
 .../ui/launcher/UiLauncherModule.java         |  3 +-
 10 files changed, 4 insertions(+), 72 deletions(-)
 delete mode 100644 main/buildkit/src/main/resources/ffi-version.txt
 delete mode 100644 main/commons/src/main/java/org/cryptomator/common/JniModule.java

diff --git a/README.md b/README.md
index 091b6af8c..e07ab285f 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,9 @@ For more information on the security details visit [cryptomator.org](https://doc
 
 ```
 cd main
-mvn clean install -Prelease
+mvn clean install -Prelease,windows
+# or mvn clean install -Prelease,mac
+# or mvn clean install -Prelease,linux
 ```
 
 This will build all the jars and bundle them together with their OS-specific dependencies under `main/buildkit/target`. This can now be used to build native packages.
diff --git a/main/buildkit/assembly-linux.xml b/main/buildkit/assembly-linux.xml
index 0764ada20..1e16da9e2 100644
--- a/main/buildkit/assembly-linux.xml
+++ b/main/buildkit/assembly-linux.xml
@@ -14,13 +14,6 @@
 			</includes>
 			<outputDirectory>libs</outputDirectory>
 		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>ffi-version.txt</include>
-			</includes>
-			<outputDirectory>libs</outputDirectory>
-		</fileSet>
 		<fileSet>
 			<directory>target/</directory>
 			<includes>
diff --git a/main/buildkit/assembly-mac.xml b/main/buildkit/assembly-mac.xml
index c7a10f2ef..4a01f4067 100644
--- a/main/buildkit/assembly-mac.xml
+++ b/main/buildkit/assembly-mac.xml
@@ -14,13 +14,6 @@
 			</includes>
 			<outputDirectory>libs</outputDirectory>
 		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>ffi-version.txt</include>
-			</includes>
-			<outputDirectory>libs</outputDirectory>
-		</fileSet>
 		<fileSet>
 			<directory>target/</directory>
 			<includes>
diff --git a/main/buildkit/assembly-win.xml b/main/buildkit/assembly-win.xml
index e0ff7df4b..0297f3ec4 100644
--- a/main/buildkit/assembly-win.xml
+++ b/main/buildkit/assembly-win.xml
@@ -14,13 +14,6 @@
 			</includes>
 			<outputDirectory>libs</outputDirectory>
 		</fileSet>
-		<fileSet>
-			<directory>target/</directory>
-			<includes>
-				<include>ffi-version.txt</include>
-			</includes>
-			<outputDirectory>libs</outputDirectory>
-		</fileSet>
 		<fileSet>
 			<directory>target/</directory>
 			<includes>
diff --git a/main/buildkit/src/main/resources/ffi-version.txt b/main/buildkit/src/main/resources/ffi-version.txt
deleted file mode 100644
index 1853c270c..000000000
--- a/main/buildkit/src/main/resources/ffi-version.txt
+++ /dev/null
@@ -1 +0,0 @@
-${cryptomator.jni.version}
\ No newline at end of file
diff --git a/main/commons/pom.xml b/main/commons/pom.xml
index 7eaccf881..28a42ec07 100644
--- a/main/commons/pom.xml
+++ b/main/commons/pom.xml
@@ -31,10 +31,6 @@
 			<groupId>org.cryptomator</groupId>
 			<artifactId>integrations-api</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>jni</artifactId>
-		</dependency>
 
 		<!-- JavaFx -->
 		<dependency>
diff --git a/main/commons/src/main/java/org/cryptomator/common/JniModule.java b/main/commons/src/main/java/org/cryptomator/common/JniModule.java
deleted file mode 100644
index aaeda2964..000000000
--- a/main/commons/src/main/java/org/cryptomator/common/JniModule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2019 Skymatic GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the accompanying LICENSE file.
- *******************************************************************************/
-package org.cryptomator.common;
-
-import dagger.Module;
-import dagger.Provides;
-import org.cryptomator.jni.JniFunctions;
-import org.cryptomator.jni.MacFunctions;
-import org.cryptomator.jni.WinFunctions;
-
-import javax.inject.Singleton;
-import java.util.Optional;
-
-@Module
-@Deprecated
-public class JniModule {
-
-	@Provides
-	@Singleton
-	Optional<MacFunctions> provideOptionalMacFunctions() {
-		return JniFunctions.macFunctions();
-	}
-
-	@Provides
-	@Singleton
-	Optional<WinFunctions> provideOptionalWinFunctions() {
-		return JniFunctions.winFunctions();
-	}
-
-}
diff --git a/main/pom.xml b/main/pom.xml
index de425bb3a..ae8070a29 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -29,7 +29,6 @@
 		<cryptomator.integrations.win.version>0.1.0-beta1</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>0.1.0-beta3</cryptomator.integrations.mac.version>
 		<cryptomator.integrations.linux.version>0.1.0-beta1</cryptomator.integrations.linux.version>
-		<cryptomator.jni.version>2.2.3</cryptomator.jni.version>
 		<cryptomator.fuse.version>1.2.5</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.1.15</cryptomator.dokany.version>
 		<cryptomator.webdav.version>1.0.12</cryptomator.webdav.version>
@@ -125,11 +124,6 @@
 				<artifactId>integrations-linux</artifactId>
 				<version>${cryptomator.integrations.linux.version}</version>
 			</dependency>
-			<dependency> <!-- deprecated: will be replaced by integrations-api -->
-				<groupId>org.cryptomator</groupId>
-				<artifactId>jni</artifactId>
-				<version>${cryptomator.jni.version}</version>
-			</dependency>
 
 			<!-- JavaFX -->
 			<dependency>
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index 7784ee802..9e63fb4b0 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -14,10 +14,6 @@
 			<groupId>org.cryptomator</groupId>
 			<artifactId>commons</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>jni</artifactId>
-		</dependency>
 
 		<!-- JavaFx -->
 		<dependency>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
index 63f119291..f4bed076b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
@@ -2,7 +2,6 @@ package org.cryptomator.ui.launcher;
 
 import dagger.Module;
 import dagger.Provides;
-import org.cryptomator.common.JniModule;
 import org.cryptomator.integrations.autostart.AutoStartProvider;
 import org.cryptomator.integrations.tray.TrayIntegrationProvider;
 import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
@@ -17,7 +16,7 @@ import java.util.ServiceLoader;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 
-@Module(includes = {JniModule.class}, subcomponents = {TrayMenuComponent.class, FxApplicationComponent.class})
+@Module(subcomponents = {TrayMenuComponent.class, FxApplicationComponent.class})
 public abstract class UiLauncherModule {
 
 	@Provides

From 3a5937b35fb6bd7ba92d8adf7f2f636e7e5d1d08 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Fri, 6 Nov 2020 17:09:44 +0100
Subject: [PATCH 165/169] Added runLater to implementation of
 ErrorComponent#showErrorScene()

---
 .../java/org/cryptomator/ui/common/ErrorComponent.java   | 9 +++++++++
 .../java/org/cryptomator/ui/unlock/UnlockWorkflow.java   | 4 +---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java
index 6a50ee44a..285270b4c 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java
@@ -4,6 +4,7 @@ import dagger.BindsInstance;
 import dagger.Subcomponent;
 
 import javax.annotation.Nullable;
+import javafx.application.Platform;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
@@ -16,6 +17,14 @@ public interface ErrorComponent {
 	Scene scene();
 
 	default void showErrorScene() {
+		if (Platform.isFxApplicationThread()) {
+			show();
+		} else {
+			Platform.runLater(this::show);
+		}
+	}
+
+	private void show() {
 		Stage stage = window();
 		stage.setScene(scene());
 		stage.show();
diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
index 9b95103ad..8cb7e0752 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
@@ -209,9 +209,7 @@ public class UnlockWorkflow extends Task<Boolean> {
 
 	private void handleGenericError(Throwable e) {
 		LOG.error("Unlock failed for technical reasons.", e);
-		Platform.runLater(() -> {
-			errorComponent.cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene();
-		});
+		errorComponent.cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene();
 	}
 
 	private void wipePassword(char[] pw) {

From 459f2ea2c3b335b6a83c31ff3b42825a42a47878 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 6 Nov 2020 17:42:45 +0100
Subject: [PATCH 166/169] Updating Dokany-nio-adapter dependency

References #1228
---
 main/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/pom.xml b/main/pom.xml
index ae8070a29..d52c5aa50 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -30,7 +30,7 @@
 		<cryptomator.integrations.mac.version>0.1.0-beta3</cryptomator.integrations.mac.version>
 		<cryptomator.integrations.linux.version>0.1.0-beta1</cryptomator.integrations.linux.version>
 		<cryptomator.fuse.version>1.2.5</cryptomator.fuse.version>
-		<cryptomator.dokany.version>1.1.15</cryptomator.dokany.version>
+		<cryptomator.dokany.version>1.2.0</cryptomator.dokany.version>
 		<cryptomator.webdav.version>1.0.12</cryptomator.webdav.version>
 
 		<!-- 3rd party dependencies -->

From 5b55318e5254078c642331a277a108ba3fb08129 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 6 Nov 2020 18:45:14 +0100
Subject: [PATCH 167/169] Bumping integrations-linux dependency, removing
 unused legacy property

closes #1308
---
 main/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index d52c5aa50..ba75f0da6 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -28,7 +28,7 @@
 		<cryptomator.integrations.version>0.1.6</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>0.1.0-beta1</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>0.1.0-beta3</cryptomator.integrations.mac.version>
-		<cryptomator.integrations.linux.version>0.1.0-beta1</cryptomator.integrations.linux.version>
+		<cryptomator.integrations.linux.version>0.1.0-beta2</cryptomator.integrations.linux.version>
 		<cryptomator.fuse.version>1.2.5</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.2.0</cryptomator.dokany.version>
 		<cryptomator.webdav.version>1.0.12</cryptomator.webdav.version>
@@ -36,7 +36,6 @@
 		<!-- 3rd party dependencies -->
 		<javafx.version>14</javafx.version>
 		<commons-lang3.version>3.11</commons-lang3.version>
-		<secret-service.version>1.1.0</secret-service.version>
 		<kdewallet.version>1.1.1</kdewallet.version>
 		<jwt.version>3.10.3</jwt.version>
 		<easybind.version>2.1.0</easybind.version>

From 2f8d4568fc7a23b853cb0ec76e5896a68cf1f5d8 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Fri, 6 Nov 2020 17:41:42 +0100
Subject: [PATCH 168/169] Updating CryptoFS Dependency.

Closes #1293
---
 main/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/pom.xml b/main/pom.xml
index ba75f0da6..633127b8c 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -24,7 +24,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>1.9.12</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>1.9.13</cryptomator.cryptofs.version>
 		<cryptomator.integrations.version>0.1.6</cryptomator.integrations.version>
 		<cryptomator.integrations.win.version>0.1.0-beta1</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>0.1.0-beta3</cryptomator.integrations.mac.version>

From bcea1a4b32738d650574745a8a2493396fb39a81 Mon Sep 17 00:00:00 2001
From: Armin Schrenk <armin.schrenk@skymatic.de>
Date: Mon, 9 Nov 2020 11:17:52 +0100
Subject: [PATCH 169/169] Bumping dependencies: * javafx to 15 *
 webdav-nio-server to 1.0.13

---
 main/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index 633127b8c..58602a62d 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -31,10 +31,10 @@
 		<cryptomator.integrations.linux.version>0.1.0-beta2</cryptomator.integrations.linux.version>
 		<cryptomator.fuse.version>1.2.5</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.2.0</cryptomator.dokany.version>
-		<cryptomator.webdav.version>1.0.12</cryptomator.webdav.version>
+		<cryptomator.webdav.version>1.0.13</cryptomator.webdav.version>
 
 		<!-- 3rd party dependencies -->
-		<javafx.version>14</javafx.version>
+		<javafx.version>15</javafx.version>
 		<commons-lang3.version>3.11</commons-lang3.version>
 		<kdewallet.version>1.1.1</kdewallet.version>
 		<jwt.version>3.10.3</jwt.version>