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 01/59] 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 e2e7755af26b03b3809cb292296251ee0686b506 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Sat, 18 Jul 2020 18:57:11 +0200
Subject: [PATCH 02/59] 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 03/59] 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 04/59] 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 05/59] 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 06/59] 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 07/59] 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 08/59] 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 8374599183ffe77d76784675290c6d074ea71efe Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Sun, 26 Jul 2020 23:02:26 +0200
Subject: [PATCH 09/59] 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 10/59] 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 570482521ad4c572e1db046dbe331cdd6d24498b Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 29 Jul 2020 22:14:51 +0200
Subject: [PATCH 11/59] 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 12/59] 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 13/59] 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 14/59] 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 597899d2bf363175ce292228e032ae5727f4b3a2 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 11 Aug 2020 02:23:42 +0200
Subject: [PATCH 15/59] 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 ce262b691a3b7dbc05f7f71285df5072017474e0 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 11 Aug 2020 02:44:00 +0200
Subject: [PATCH 16/59] 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 17/59] 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 18/59] 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 19/59] 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 20/59] 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 21/59] 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 22/59] 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 724b20c826923433348d34fc399aec64e85faae1 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 12 Aug 2020 21:42:35 +0200
Subject: [PATCH 23/59] 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 24/59] 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 25/59] 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 26/59] 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 4110057fa188bc07043ee68c6800a1eac9a4bfaf Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Thu, 13 Aug 2020 19:32:04 +0200
Subject: [PATCH 27/59] 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 6aa14fcfb11c2b52f34dae12fc45820d2b8b62dc Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Sun, 16 Aug 2020 18:42:59 +0200
Subject: [PATCH 28/59] 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 29/59] 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 30/59] 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 31/59] 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 32/59] 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 33/59] 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 34/59] 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 35/59] 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 36/59] 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 1ef359e68b005964ed7e5ebcee4cb3be24c1ee07 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 19 Aug 2020 15:45:54 +0200
Subject: [PATCH 37/59] 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 5dac594cc922d701f0147da5672335813edd6324 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Thu, 20 Aug 2020 23:58:21 +0200
Subject: [PATCH 38/59] 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 39/59] 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 6f542ac8b85bfbcbcf32ca0d8f4e30a83bd07f95 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Fri, 21 Aug 2020 21:54:33 +0200
Subject: [PATCH 40/59] 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 41/59] 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 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 42/59] 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 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 43/59] 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 44/59] 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 45/59] 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 46/59] 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 9657a13912d0e68f68f54235dd68cceb7a0c93e0 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Mon, 28 Sep 2020 23:33:39 +0200
Subject: [PATCH 47/59] 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 354de225edf9a91f5528b12c682c46de6f733bcf Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 30 Sep 2020 14:09:01 +0200
Subject: [PATCH 48/59] 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 ab538cd21573de70aa7d100382a8a70c25eeccaf Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Tue, 6 Oct 2020 19:31:03 +0200
Subject: [PATCH 49/59] 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 50/59] 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 51/59] 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 b5efe39eb88a99c8d3266d36dc63f8fd5036d265 Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Wed, 7 Oct 2020 18:06:05 +0200
Subject: [PATCH 52/59] 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 53/59] 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 6b6867b826f474e5926afb65c1ce2d3c8a58366d Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Thu, 8 Oct 2020 18:51:03 +0200
Subject: [PATCH 54/59] 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 55/59] 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 56/59] 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 598bec305038d87803e5a35d3e748d88f1880ddc Mon Sep 17 00:00:00 2001
From: JaniruTEC <JaniruTEC@gmail.com>
Date: Mon, 12 Oct 2020 21:34:23 +0200
Subject: [PATCH 57/59] 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 58/59] 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 59/59] 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>