preparing 1.5.12

Merge pull request #1518 from cryptomator/fix/1515-suppressed-messages
Fixed suppressed "invalid mountpoint" messages
2026-09-22 07:54:19 +00:00 · 2021-01-27 15:30:56 +01:00 · 2021-01-27 15:22:47 +01:00 · 2021-01-27 12:37:50 +01:00 · 2021-01-27 12:36:22 +01:00 · 2021-01-25 21:38:46 +01:00
120 changed files with 2552 additions and 1025 deletions
@@ -5,18 +5,12 @@ labels: type:bug
 ---

 <!--
-⚠️⚠️⚠️ READ CAREFULLY ⚠️⚠️⚠️
+Please make sure to:
+- Comply with our code of conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md
+- Search for existing similar issues first: https://github.com/cryptomator/cryptomator/issues?q=

-Do you want to ask a QUESTION? Are you looking for SUPPORT?
-We're happy to help you via our support channels! Please read: https://github.com/cryptomator/cryptomator/blob/develop/SUPPORT.md
-
-By filing an issue, you are expected to comply with our code of conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md
-
-Of course, we also expect you to search for existing similar issues first! ;) https://github.com/cryptomator/cryptomator/issues?q=
-
-⚠️ IMPORTANT: If you don't stick to this template, the issue will get closed. To proof that you read this, please remove the X from the following line:
+⚠️ IMPORTANT: If you don't stick to this template, the issue will get closed.
 -->
-<!-- oooXooo -->

 ### Description

@@ -24,7 +18,7 @@ Of course, we also expect you to search for existing similar issues first! ;) ht

 ### System Setup

-* Operating system and version: [Windows/macOS/Linux + Version]
+* Operating system and version: [Windows/macOS/Linux + Version ( + Desktop Environment, if Linux)]
 * Cryptomator version: [Shown in the settings]
 * Volume type: [Dokany/FUSE/WebDAV, shown in the settings]

@@ -51,7 +45,6 @@ Of course, we also expect you to search for existing similar issues first! ;) ht
 [Any additional information, log files, screenshots, configuration, or data that might be necessary to reproduce the issue.]

 <!--
-
 If you want to add the log file or screenshots, please add them as attachments. If your log file seems empty and doesn't show any errors, you may enable the debug mode first. Here is how to do that: https://community.cryptomator.org/t/how-do-i-enable-debug-mode/36

 Then reproduce the problem to ensure all important information is contained in there. You may use test data or redact sensitive information from the log file.
@@ -60,5 +53,4 @@ Log file location:
 - Windows: %appdata%/Cryptomator
 - macOS: ~/Library/Logs/Cryptomator
 - Linux: ~/.local/share/Cryptomator/logs
-
 -->
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Help & Support
+    url: https://community.cryptomator.org/
+    about: You will find answers in our community forum
+  - name: User Manual
+    url: https://docs.cryptomator.org/
+    about: Read the Cryptomator documentation here
@@ -5,14 +5,9 @@ labels: type:feature-request
 ---

 <!--
-
-Do you want to ask a QUESTION? Are you looking for SUPPORT?
-We're happy to help you via our support channels! Please read: https://github.com/cryptomator/cryptomator/blob/develop/SUPPORT.md
-
-By filing a feature request, you are expected to comply with our code of conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md
-
-Of course, we also expect you to search for existing similar feature requests first! ;)
-
+Please make sure to:
+- Comply with our code of conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md
+- Search for existing similar issues first: https://github.com/cryptomator/cryptomator/issues?q=
 -->

 ### Summary
@@ -29,4 +24,4 @@ Of course, we also expect you to search for existing similar feature requests fi

 ### Additional Context

-[Add any other context or screenshots about the feature request here.]
+[Add any other context or screenshots about the feature request here.]
@@ -6,20 +6,32 @@ on:

 jobs:
  closeTemplateViolation:
-    name: Close bug reports that violate the issue template
+    name: Validate bug report against issue template
    runs-on: ubuntu-latest
+    if: contains(github.event.issue.labels.*.name, 'type:bug')
    steps:
-      - if: |
-          contains(github.event.issue.labels.*.name, 'type:bug')
-          && (
-            !contains(github.event.issue.body, '<!-- oooooo -->')
-            || !contains(github.event.issue.body, '### Description')
-          )
-        name: Close Issue
+      - name: Check "Description"
+        if: |
+          !contains(github.event.issue.body, env.MUST_CONTAIN)
+          || contains(toJson(github.event.issue.body), env.MUST_NOT_CONTAIN)
+        run: exit 1
+        env:
+          MUST_CONTAIN: '### Description'
+          MUST_NOT_CONTAIN: '### Description\r\n\r\n[Summarize your problem.]\r\n\r\n### System Setup'
+      - name: Check "Steps to Reproduce"
+        if: |
+          !contains(github.event.issue.body, env.MUST_CONTAIN)
+          || contains(toJson(github.event.issue.body), env.MUST_NOT_CONTAIN)
+        run: exit 1
+        env:
+          MUST_CONTAIN: '### Steps to Reproduce'
+          MUST_NOT_CONTAIN: '### Steps to Reproduce\r\n\r\n1. [First step]\r\n2. [Second step]\r\n3. [and so on…]\r\n\r\n#### Expected Behavior'
+      - name: Close issue if one of the checks failed
+        if: ${{ failure() }}
        uses: peter-evans/close-issue@v1
        with:
          comment: |
            This bug report did ignore our issue template. 😞
            Auto-closing this issue, since it is most likely not useful.

-            _This decision was made by a bot. If you think the bot is wrong, let us know and we'll reopen this issue._
+            _This decision was made by a bot. If you think the bot is wrong, let us know and we'll reopen this issue._
@@ -2,7 +2,7 @@
  <configuration default="false" name="Cryptomator Linux" type="Application" factoryName="Application">
    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
    <module name="launcher" />
-    <option name="VM_PARAMETERS" value="-Djdk.gtk.version=2 -Duser.language=en -Dcryptomator.settingsPath=&quot;~/.config/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/.config/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/.local/share/Cryptomator/logs&quot; -Dcryptomator.mountPointsDir=&quot;~/.local/share/Cryptomator/mnt&quot; -Xss20m -Xmx512m" />
+    <option name="VM_PARAMETERS" value="-Djdk.gtk.version=2 -Duser.language=en -Dcryptomator.settingsPath=&quot;~/.config/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/.config/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/.local/share/Cryptomator/logs&quot; -Dcryptomator.mountPointsDir=&quot;~/.local/share/Cryptomator/mnt&quot; -Dcryptomator.showTrayIcon=true -Xss20m -Xmx512m" />
    <method v="2">
      <option name="Make" enabled="true" />
    </method>
@@ -2,7 +2,7 @@
  <configuration default="false" name="Cryptomator Linux Dev" type="Application" factoryName="Application">
    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
    <module name="launcher" />
-    <option name="VM_PARAMETERS" value="-Djdk.gtk.version=2 -Duser.language=en -Dcryptomator.settingsPath=&quot;~/.config/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/.config/Cryptomator-Dev/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/.local/share/Cryptomator-Dev/logs&quot; -Dcryptomator.mountPointsDir=&quot;~/.local/share/Cryptomator-Dev/mnt&quot; -Dfuse.experimental=&quot;true&quot; -Xss20m -Xmx512m" />
+    <option name="VM_PARAMETERS" value="-Djdk.gtk.version=2 -Duser.language=en -Dcryptomator.settingsPath=&quot;~/.config/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/.config/Cryptomator-Dev/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/.local/share/Cryptomator-Dev/logs&quot; -Dcryptomator.mountPointsDir=&quot;~/.local/share/Cryptomator-Dev/mnt&quot; -Dcryptomator.showTrayIcon=true -Dfuse.experimental=&quot;true&quot; -Xss20m -Xmx512m" />
    <method v="2">
      <option name="Make" enabled="true" />
    </method>
@@ -2,7 +2,7 @@
  <configuration default="false" name="Cryptomator Windows" type="Application" factoryName="Application">
    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
    <module name="launcher" />
-    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/AppData/Roaming/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator&quot; -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; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m" />
    <method v="2">
      <option name="Make" enabled="true" />
    </method>
@@ -2,7 +2,7 @@
  <configuration default="false" name="Cryptomator Windows Dev" type="Application" factoryName="Application">
    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
    <module name="launcher" />
-    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/AppData/Roaming/Cryptomator-Dev/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator-Dev&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator-Dev/keychain.json&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator-Dev&quot; -Dfuse.experimental=&quot;true&quot; -Xss2m -Xmx512m" />
+    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/AppData/Roaming/Cryptomator-Dev/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator-Dev&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator-Dev/keychain.json&quot; -Dcryptomator.mountPointsDir=&quot;~/Cryptomator-Dev&quot; -Dfuse.experimental=&quot;true&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m" />
    <method v="2">
      <option name="Make" enabled="true" />
    </method>
@@ -5,8 +5,7 @@
    </envs>
    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
    <module name="launcher" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/Library/Application Support/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator&quot; -Dcryptomator.mountPointsDir=&quot;/Volumes/&quot; -Xss2m -Xmx512m -ea" />
+    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/Library/Application Support/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m -ea" />
    <method v="2">
      <option name="Make" enabled="true" />
    </method>
@@ -5,7 +5,7 @@
    </envs>
    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
    <module name="launcher" />
-    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/Library/Application Support/Cryptomator-Dev/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator-Dev&quot; -Dcryptomator.mountPointsDir=&quot;/Volumes/&quot; -Dfuse.experimental=&quot;true&quot; -Xss2m -Xmx512m -ea" />
+    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/Library/Application Support/Cryptomator-Dev/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator-Dev&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m -ea" />
    <method v="2">
      <option name="Make" enabled="true" />
    </method>
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.9</version>
+		<version>1.6.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>buildkit</artifactId>
 	<packaging>pom</packaging>
@@ -7,6 +7,6 @@ java \
 	-Dcryptomator.logDir="~/.local/share/Cryptomator/logs" \
 	-Dcryptomator.mountPointsDir="~/.local/share/Cryptomator/mnt" \
 	-Djdk.gtk.version=2 \
-	-Xss20m \
+	-Xss2m \
 	-Xmx512m \
-	org.cryptomator.launcher.Cryptomator
+	org.cryptomator.launcher.Cryptomator
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.9</version>
+		<version>1.6.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>commons</artifactId>
 	<name>Cryptomator Commons</name>
@@ -21,14 +21,13 @@ import java.util.stream.StreamSupport;
 public class Environment {

 	private static final Logger LOG = LoggerFactory.getLogger(Environment.class);
-	private static final String USER_HOME = System.getProperty("user.home");
 	private static final Path RELATIVE_HOME_DIR = Paths.get("~");
-	private static final Path ABSOLUTE_HOME_DIR = Paths.get(USER_HOME);
 	private static final char PATH_LIST_SEP = ':';
 	private static final int DEFAULT_MIN_PW_LENGTH = 8;

 	@Inject
 	public Environment() {
+		LOG.debug("user.home: {}", System.getProperty("user.home"));
 		LOG.debug("java.library.path: {}", System.getProperty("java.library.path"));
 		LOG.debug("user.language: {}", System.getProperty("user.language"));
 		LOG.debug("user.region: {}", System.getProperty("user.region"));
@@ -40,6 +39,7 @@ public class Environment {
 		LOG.debug("cryptomator.mountPointsDir: {}", System.getProperty("cryptomator.mountPointsDir"));
 		LOG.debug("cryptomator.minPwLength: {}", System.getProperty("cryptomator.minPwLength"));
 		LOG.debug("cryptomator.buildNumber: {}", System.getProperty("cryptomator.buildNumber"));
+		LOG.debug("cryptomator.showTrayIcon: {}", System.getProperty("cryptomator.showTrayIcon"));
 		LOG.debug("fuse.experimental: {}", Boolean.getBoolean("fuse.experimental"));
 	}

@@ -75,6 +75,11 @@ public class Environment {
 		return getInt("cryptomator.minPwLength", DEFAULT_MIN_PW_LENGTH);
 	}

+	public boolean showTrayIcon() {
+		return Boolean.getBoolean("cryptomator.showTrayIcon");
+	}
+
+	@Deprecated // TODO: remove as soon as custom mount path works properly on Win+Fuse
 	public boolean useExperimentalFuse() {
 		return Boolean.getBoolean("fuse.experimental");
 	}
@@ -92,8 +97,13 @@ public class Environment {
 		String value = System.getProperty(propertyName);
 		return Optional.ofNullable(value).map(Paths::get);
 	}
-	// visible for testing

+	// visible for testing
+	Path getHomeDir() {
+		return getPath("user.home").orElseThrow();
+	}
+
+	// visible for testing
 	Stream<Path> getPaths(String propertyName) {
 		Stream<String> rawSettingsPaths = getRawList(propertyName, PATH_LIST_SEP);
 		return rawSettingsPaths.filter(Predicate.not(Strings::isNullOrEmpty)).map(Paths::get).map(this::replaceHomeDir);
@@ -101,7 +111,7 @@ public class Environment {

 	private Path replaceHomeDir(Path path) {
 		if (path.startsWith(RELATIVE_HOME_DIR)) {
-			return ABSOLUTE_HOME_DIR.resolve(RELATIVE_HOME_DIR.relativize(path));
+			return getHomeDir().resolve(RELATIVE_HOME_DIR.relativize(path));
 		} else {
 			return path;
 		}
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the accompanying LICENSE file.
- *******************************************************************************/
-package org.cryptomator.common;
-
-import com.google.common.base.Throwables;
-
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Supplier;
-import java.util.function.UnaryOperator;
-
-public final class LazyInitializer {
-
-	private LazyInitializer() {
-	}
-
-	/**
-	 * Same as {@link #initializeLazily(AtomicReference, SupplierThrowingException, Class)} except that no checked exception may be thrown by the factory function.
-	 *
-	 * @param <T> Type of the value
-	 * @param reference A reference to a maybe not yet initialized value.
-	 * @param factory A factory providing a value for the reference, if it doesn't exist yet. The factory may be invoked multiple times, but only one result will survive.
-	 * @return The initialized value
-	 */
-	public static <T> T initializeLazily(AtomicReference<T> reference, Supplier<T> factory) {
-		SupplierThrowingException<T, RuntimeException> factoryThrowingRuntimeExceptions = () -> factory.get();
-		return initializeLazily(reference, factoryThrowingRuntimeExceptions, RuntimeException.class);
-	}
-
-	/**
-	 * Threadsafe lazy initialization pattern as proposed on http://stackoverflow.com/a/30247202/4014509
-	 *
-	 * @param <T> Type of the value
-	 * @param <E> Type of the any expected exception that may occur during initialization
-	 * @param reference A reference to a maybe not yet initialized value.
-	 * @param factory A factory providing a value for the reference, if it doesn't exist yet. The factory may be invoked multiple times, but only one result will survive.
-	 * @param exceptionType Expected exception type.
-	 * @return The initialized value
-	 * @throws E Exception thrown by the factory function.
-	 */
-	public static <T, E extends Exception> T initializeLazily(AtomicReference<T> reference, SupplierThrowingException<T, E> factory, Class<E> exceptionType) throws E {
-		final T existing = reference.get();
-		if (existing != null) {
-			return existing;
-		} else {
-			try {
-				return reference.updateAndGet(invokeFactoryIfNull(factory));
-			} catch (InitializationException e) {
-				Throwables.throwIfUnchecked(e.getCause());
-				Throwables.throwIfInstanceOf(e.getCause(), exceptionType);
-				throw e;
-			}
-		}
-	}
-
-	private static <T, E extends Exception> UnaryOperator<T> invokeFactoryIfNull(SupplierThrowingException<T, E> factory) throws InitializationException {
-		return currentValue -> {
-			if (currentValue == null) {
-				try {
-					return factory.get();
-				} catch (Exception e) {
-					throw new InitializationException(e);
-				}
-			} else {
-				return currentValue;
-			}
-		};
-	}
-
-	private static class InitializationException extends RuntimeException {
-
-		public InitializationException(Throwable cause) {
-			super(cause);
-		}
-
-	}
-}
@@ -8,9 +8,7 @@ import javax.inject.Inject;
 import java.nio.file.Path;
 import java.util.Optional;

-public class AvailableDriveLetterChooser implements MountPointChooser {
-
-	public static final int PRIORITY = 200;
+class AvailableDriveLetterChooser implements MountPointChooser {

 	private final WindowsDriveLetters windowsDriveLetters;

@@ -28,9 +26,4 @@ public class AvailableDriveLetterChooser implements MountPointChooser {
 	public Optional<Path> chooseMountPoint(Volume caller) {
 		return this.windowsDriveLetters.getAvailableDriveLetterPath();
 	}
-
-	@Override
-	public int getPriority() {
-		return PRIORITY;
-	}
 }
@@ -9,9 +9,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Optional;

-public class CustomDriveLetterChooser implements MountPointChooser {
-
-	public static final int PRIORITY = 100;
+class CustomDriveLetterChooser implements MountPointChooser {

 	private final VaultSettings vaultSettings;

@@ -29,9 +27,4 @@ public class CustomDriveLetterChooser implements MountPointChooser {
 	public Optional<Path> chooseMountPoint(Volume caller) {
 		return this.vaultSettings.getWinDriveLetter().map(letter -> letter.charAt(0) + ":\\").map(Paths::get);
 	}
-
-	@Override
-	public int getPriority() {
-		return PRIORITY;
-	}
 }
@@ -20,9 +20,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Optional;

-public class CustomMountPointChooser implements MountPointChooser {
-
-	public static final int PRIORITY = 0;
+class CustomMountPointChooser implements MountPointChooser {

 	private static final Logger LOG = LoggerFactory.getLogger(CustomMountPointChooser.class);

@@ -94,8 +92,4 @@ public class CustomMountPointChooser implements MountPointChooser {
 		}
 	}

-	@Override
-	public int getPriority() {
-		return PRIORITY;
-	}
 }
@@ -1,64 +0,0 @@
-package org.cryptomator.common.mountpoint;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.nio.file.DirectoryNotEmptyException;
-import java.nio.file.Files;
-import java.nio.file.LinkOption;
-import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
-
-public class IrregularUnmountCleaner {
-
-	public static Logger LOG = LoggerFactory.getLogger(IrregularUnmountCleaner.class);
-
-	public static void removeIrregularUnmountDebris(Path dirContainingMountPoints) {
-		IOException cleanupFailed = new IOException("Cleanup failed");
-
-		try {
-			LOG.debug("Performing cleanup of mountpoint dir {}.", dirContainingMountPoints);
-			for (Path p : Files.newDirectoryStream(dirContainingMountPoints)) {
-				try {
-					var attr = Files.readAttributes(p, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS);
-					if (attr.isOther() && attr.isDirectory()) { // yes, this is possible with windows junction points -.-
-						Files.delete(p);
-					} else if (attr.isDirectory()) {
-						deleteEmptyDir(p);
-					} else if (attr.isSymbolicLink()) {
-						deleteDeadLink(p);
-					} else {
-						LOG.debug("Found non-directory element in mountpoint dir: {}", p);
-					}
-				} catch (IOException e) {
-					cleanupFailed.addSuppressed(e);
-				}
-			}
-
-			if (cleanupFailed.getSuppressed().length > 0) {
-				throw cleanupFailed;
-			}
-		} catch (IOException e) {
-			LOG.warn("Unable to perform cleanup of mountpoint dir {}.", dirContainingMountPoints, e);
-		}
-
-	}
-
-	private static void deleteEmptyDir(Path dir) throws IOException {
-		assert Files.isDirectory(dir, LinkOption.NOFOLLOW_LINKS);
-		try {
-			Files.delete(dir); // attempt to delete dir non-recursively (will fail, if there are contents)
-		} catch (DirectoryNotEmptyException e) {
-			LOG.info("Found non-empty directory in mountpoint dir: {}", dir);
-		}
-	}
-
-	private static void deleteDeadLink(Path symlink) throws IOException {
-		assert Files.isSymbolicLink(symlink);
-		if (Files.notExists(symlink)) { // following link: target does not exist
-			Files.delete(symlink);
-		}
-	}
-
-}
@@ -0,0 +1,42 @@
+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;
+import java.util.Optional;
+
+class MacVolumeMountChooser implements MountPointChooser {
+
+	private static final Path VOLUME_PATH = Path.of("/Volumes");
+
+	private final VaultSettings vaultSettings;
+	private final MountPointHelper helper;
+
+	@Inject
+	public MacVolumeMountChooser(VaultSettings vaultSettings, MountPointHelper helper) {
+		this.vaultSettings = vaultSettings;
+		this.helper = helper;
+	}
+
+	@Override
+	public boolean isApplicable(Volume caller) {
+		return SystemUtils.IS_OS_MAC;
+	}
+
+	@Override
+	public Optional<Path> chooseMountPoint(Volume caller) {
+		return Optional.of(helper.chooseTemporaryMountPoint(vaultSettings, VOLUME_PATH));
+	}
+
+	@Override
+	public boolean prepare(Volume caller, Path mountPoint) {
+		// 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.
+		// Therefore we don't need to prepare anything.
+		return false;
+	}
+}
@@ -47,7 +47,7 @@ import java.util.SortedSet;
 * If the preparation succeeds {@link #cleanup(Volume, Path)} can be used after unmount to do any
 * remaining cleanup.
 */
-public interface MountPointChooser extends Comparable<MountPointChooser> {
+public interface MountPointChooser {

 	/**
 	 * Called by the {@link Volume} to determine whether this MountPointChooser is
@@ -135,35 +135,4 @@ public interface MountPointChooser extends Comparable<MountPointChooser> {
 		//NO-OP
 	}

-	/**
-	 * Called by the {@link MountPointChooserModule} to sort the available MPCs
-	 * 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.<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.
-	 */
-	int getPriority();
-
-	/**
-	 * 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}
-	 *
-	 * @implNote This default implementation sorts the MPCs in ascending order
-	 * of their {@link #getPriority() priority.}
-	 */
-	@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());
-	}
 }
@@ -1,15 +1,17 @@
 package org.cryptomator.common.mountpoint;

-import com.google.common.collect.ImmutableSortedSet;
+import com.google.common.collect.Iterables;
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
-import dagger.multibindings.IntoSet;
+import dagger.multibindings.IntKey;
+import dagger.multibindings.IntoMap;
 import org.cryptomator.common.vaults.PerVault;

 import javax.inject.Named;
-import java.util.Set;
-import java.util.SortedSet;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;

 /**
 * Dagger-Module for {@link MountPointChooser MountPointChoosers.}<br>
@@ -21,30 +23,40 @@ import java.util.SortedSet;
 public abstract class MountPointChooserModule {

 	@Binds
-	@IntoSet
+	@IntoMap
+	@IntKey(0)
 	@PerVault
 	public abstract MountPointChooser bindCustomMountPointChooser(CustomMountPointChooser chooser);

 	@Binds
-	@IntoSet
+	@IntoMap
+	@IntKey(100)
 	@PerVault
 	public abstract MountPointChooser bindCustomDriveLetterChooser(CustomDriveLetterChooser chooser);

 	@Binds
-	@IntoSet
+	@IntoMap
+	@IntKey(101)
+	@PerVault
+	public abstract MountPointChooser bindMacVolumeMountChooser(MacVolumeMountChooser chooser);
+
+	@Binds
+	@IntoMap
+	@IntKey(200)
 	@PerVault
 	public abstract MountPointChooser bindAvailableDriveLetterChooser(AvailableDriveLetterChooser chooser);

 	@Binds
-	@IntoSet
+	@IntoMap
+	@IntKey(999)
 	@PerVault
 	public abstract MountPointChooser bindTemporaryMountPointChooser(TemporaryMountPointChooser chooser);

 	@Provides
 	@PerVault
 	@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);
+	public static Iterable<MountPointChooser> provideOrderedMountPointChoosers(Map<Integer, MountPointChooser> choosers) {
+		SortedMap<Integer, MountPointChooser> sortedChoosers = new TreeMap<>(choosers);
+		return Iterables.unmodifiableIterable(sortedChoosers.values());
 	}
 }
@@ -0,0 +1,120 @@
+package org.cryptomator.common.mountpoint;
+
+import org.cryptomator.common.Environment;
+import org.cryptomator.common.settings.VaultSettings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.Optional;
+
+@Singleton
+class MountPointHelper {
+
+	public static Logger LOG = LoggerFactory.getLogger(MountPointHelper.class);
+	private static final int MAX_TMPMOUNTPOINT_CREATION_RETRIES = 10;
+
+	private final Optional<Path> tmpMountPointDir;
+	private volatile boolean unmountDebrisCleared = false;
+
+	@Inject
+	public MountPointHelper(Environment env) {
+		this.tmpMountPointDir = env.getMountPointsDir();
+	}
+
+	public Path chooseTemporaryMountPoint(VaultSettings vaultSettings, Path parentDir) {
+		String basename = vaultSettings.mountName().get();
+		//regular
+		Path mountPoint = parentDir.resolve(basename);
+		if (Files.notExists(mountPoint)) {
+			return mountPoint;
+		}
+		//with id
+		mountPoint = parentDir.resolve(basename + " (" + vaultSettings.getId() + ")");
+		if (Files.notExists(mountPoint)) {
+			return mountPoint;
+		}
+		//with id and count
+		for (int i = 1; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) {
+			mountPoint = parentDir.resolve(basename + "_(" + vaultSettings.getId() + ")_" + i);
+			if (Files.notExists(mountPoint)) {
+				return mountPoint;
+			}
+		}
+		LOG.error("Failed to find feasible mountpoint at {}{}{}_x. Giving up after {} attempts.", parentDir, File.separator, basename, MAX_TMPMOUNTPOINT_CREATION_RETRIES);
+		return null;
+	}
+
+	public synchronized void clearIrregularUnmountDebrisIfNeeded() {
+		if (unmountDebrisCleared || tmpMountPointDir.isEmpty()) {
+			return; // nothing to do
+		}
+		if (Files.exists(tmpMountPointDir.get(), LinkOption.NOFOLLOW_LINKS)) {
+			clearIrregularUnmountDebris(tmpMountPointDir.get());
+		}
+		unmountDebrisCleared = true;
+	}
+
+	private void clearIrregularUnmountDebris(Path dirContainingMountPoints) {
+		IOException cleanupFailed = new IOException("Cleanup failed");
+
+		try {
+			LOG.debug("Performing cleanup of mountpoint dir {}.", dirContainingMountPoints);
+			for (Path p : Files.newDirectoryStream(dirContainingMountPoints)) {
+				try {
+					var attr = Files.readAttributes(p, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS);
+					if (attr.isOther() && attr.isDirectory()) { // yes, this is possible with windows junction points -.-
+						Files.delete(p);
+					} else if (attr.isDirectory()) {
+						deleteEmptyDir(p);
+					} else if (attr.isSymbolicLink()) {
+						deleteDeadLink(p);
+					} else {
+						LOG.debug("Found non-directory element in mountpoint dir: {}", p);
+					}
+				} catch (IOException e) {
+					cleanupFailed.addSuppressed(e);
+				}
+			}
+
+			if (cleanupFailed.getSuppressed().length > 0) {
+				throw cleanupFailed;
+			}
+		} catch (IOException e) {
+			LOG.warn("Unable to perform cleanup of mountpoint dir {}.", dirContainingMountPoints, e);
+		} finally {
+			unmountDebrisCleared = true;
+		}
+	}
+
+	private void deleteEmptyDir(Path dir) throws IOException {
+		assert Files.isDirectory(dir, LinkOption.NOFOLLOW_LINKS);
+		try {
+			ensureIsEmpty(dir);
+			Files.delete(dir); // attempt to delete dir non-recursively (will fail, if there are contents)
+		} catch (DirectoryNotEmptyException e) {
+			LOG.info("Found non-empty directory in mountpoint dir: {}", dir);
+		}
+	}
+
+	private void deleteDeadLink(Path symlink) throws IOException {
+		assert Files.isSymbolicLink(symlink);
+		if (Files.notExists(symlink)) { // following link: target does not exist
+			Files.delete(symlink);
+		}
+	}
+
+	private void ensureIsEmpty(Path dir) throws IOException {
+		if (Files.newDirectoryStream(dir).iterator().hasNext()) {
+			throw new DirectoryNotEmptyException(dir.toString());
+		}
+	}
+}
@@ -1,6 +1,5 @@
 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;
@@ -8,27 +7,24 @@ 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;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.Optional;

-public class TemporaryMountPointChooser implements MountPointChooser {
-
-	public static final int PRIORITY = 300;
+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;
+	private final MountPointHelper helper;

 	@Inject
-	public TemporaryMountPointChooser(VaultSettings vaultSettings, Environment environment) {
+	public TemporaryMountPointChooser(VaultSettings vaultSettings, Environment environment, MountPointHelper helper) {
 		this.vaultSettings = vaultSettings;
 		this.environment = environment;
+		this.helper = helper;
 	}

 	@Override
@@ -42,41 +38,15 @@ public class TemporaryMountPointChooser implements MountPointChooser {

 	@Override
 	public Optional<Path> chooseMountPoint(Volume caller) {
-		return this.environment.getMountPointsDir().map(this::choose);
-	}
-
-	private Path choose(Path parent) {
-		String basename = this.vaultSettings.mountName().get();
-		//regular
-		Path mountPoint = parent.resolve(basename);
-		if (Files.notExists(mountPoint)) {
-			return mountPoint;
-		}
-		//with id
-		mountPoint = parent.resolve(basename + " (" +vaultSettings.getId() + ")");
-		if (Files.notExists(mountPoint)) {
-			return mountPoint;
-		}
-		//with id and count
-		for (int i = 1; i < MAX_TMPMOUNTPOINT_CREATION_RETRIES; i++) {
-			mountPoint = parent.resolve(basename + "_(" +vaultSettings.getId() + ")_"+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);
-		return null;
+		assert environment.getMountPointsDir().isPresent();
+		//clean leftovers of not-regularly unmounted vaults
+		//see https://github.com/cryptomator/cryptomator/issues/1013 and https://github.com/cryptomator/cryptomator/issues/1061
+		helper.clearIrregularUnmountDebrisIfNeeded();
+		return this.environment.getMountPointsDir().map(dir -> this.helper.chooseTemporaryMountPoint(this.vaultSettings, dir));
 	}

 	@Override
 	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.
-		if (SystemUtils.IS_OS_MAC && mountPoint.getParent().equals(Paths.get("/Volumes"))) {
-			return false;
-		}
-
 		try {
 			switch (caller.getMountPointRequirement()) {
 				case PARENT_NO_MOUNT_POINT -> {
@@ -114,8 +84,4 @@ public class TemporaryMountPointChooser implements MountPointChooser {
 		}
 	}

-	@Override
-	public int getPriority() {
-		return PRIORITY;
-	}
 }
@@ -9,6 +9,7 @@
 package org.cryptomator.common.settings;

 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.Environment;

 import javafx.beans.Observable;
 import javafx.beans.property.BooleanProperty;
@@ -39,7 +40,8 @@ public class Settings {
 	public static final UiTheme DEFAULT_THEME = UiTheme.LIGHT;
 	public static final KeychainBackend DEFAULT_KEYCHAIN_BACKEND = SystemUtils.IS_OS_WINDOWS ? KeychainBackend.WIN_SYSTEM_KEYCHAIN : SystemUtils.IS_OS_MAC ? KeychainBackend.MAC_SYSTEM_KEYCHAIN : KeychainBackend.GNOME;
 	public static final NodeOrientation DEFAULT_USER_INTERFACE_ORIENTATION = NodeOrientation.LEFT_TO_RIGHT;
-	private static final String DEFAULT_LICENSE_KEY = "";
+	public static final String DEFAULT_LICENSE_KEY = "";
+	public static final boolean DEFAULT_SHOW_MINIMIZE_BUTTON = false;

 	private final ObservableList<VaultSettings> directories = FXCollections.observableArrayList(VaultSettings::observables);
 	private final BooleanProperty askedForUpdateCheck = new SimpleBooleanProperty(DEFAULT_ASKED_FOR_UPDATE_CHECK);
@@ -54,13 +56,17 @@ public class Settings {
 	private final ObjectProperty<KeychainBackend> keychainBackend = new SimpleObjectProperty<>(DEFAULT_KEYCHAIN_BACKEND);
 	private final ObjectProperty<NodeOrientation> userInterfaceOrientation = new SimpleObjectProperty<>(DEFAULT_USER_INTERFACE_ORIENTATION);
 	private final StringProperty licenseKey = new SimpleStringProperty(DEFAULT_LICENSE_KEY);
+	private final BooleanProperty showMinimizeButton = new SimpleBooleanProperty(DEFAULT_SHOW_MINIMIZE_BUTTON);
+	private final BooleanProperty showTrayIcon;

 	private Consumer<Settings> saveCmd;

 	/**
 	 * Package-private constructor; use {@link SettingsProvider}.
 	 */
-	Settings() {
+	Settings(Environment env) {
+		this.showTrayIcon = new SimpleBooleanProperty(env.showTrayIcon());
+
 		directories.addListener(this::somethingChanged);
 		askedForUpdateCheck.addListener(this::somethingChanged);
 		checkForUpdates.addListener(this::somethingChanged);
@@ -74,6 +80,8 @@ public class Settings {
 		keychainBackend.addListener(this::somethingChanged);
 		userInterfaceOrientation.addListener(this::somethingChanged);
 		licenseKey.addListener(this::somethingChanged);
+		showMinimizeButton.addListener(this::somethingChanged);
+		showTrayIcon.addListener(this::somethingChanged);
 	}

 	void setSaveCmd(Consumer<Settings> saveCmd) {
@@ -141,4 +149,12 @@ public class Settings {
 	public StringProperty licenseKey() {
 		return licenseKey;
 	}
+
+	public BooleanProperty showMinimizeButton() {
+		return showMinimizeButton;
+	}
+
+	public BooleanProperty showTrayIcon() {
+		return showTrayIcon;
+	}
 }
@@ -9,19 +9,29 @@ import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
+import org.cryptomator.common.Environment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javafx.geometry.NodeOrientation;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

+@Singleton
 public class SettingsJsonAdapter extends TypeAdapter<Settings> {

 	private static final Logger LOG = LoggerFactory.getLogger(SettingsJsonAdapter.class);

 	private final VaultSettingsJsonAdapter vaultSettingsJsonAdapter = new VaultSettingsJsonAdapter();
+	private final Environment env;
+
+	@Inject
+	public SettingsJsonAdapter(Environment env) {
+		this.env = env;
+	}

 	@Override
 	public void write(JsonWriter out, Settings value) throws IOException {
@@ -40,6 +50,8 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 		out.name("uiOrientation").value(value.userInterfaceOrientation().get().name());
 		out.name("keychainBackend").value(value.keychainBackend().get().name());
 		out.name("licenseKey").value(value.licenseKey().get());
+		out.name("showMinimizeButton").value(value.showMinimizeButton().get());
+		out.name("showTrayIcon").value(value.showTrayIcon().get());
 		out.endObject();
 	}

@@ -53,7 +65,7 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {

 	@Override
 	public Settings read(JsonReader in) throws IOException {
-		Settings settings = new Settings();
+		Settings settings = new Settings(env);

 		in.beginObject();
 		while (in.hasNext()) {
@@ -72,6 +84,8 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 				case "uiOrientation" -> settings.userInterfaceOrientation().set(parseUiOrientation(in.nextString()));
 				case "keychainBackend" -> settings.keychainBackend().set(parseKeychainBackend(in.nextString()));
 				case "licenseKey" -> settings.licenseKey().set(in.nextString());
+				case "showMinimizeButton" -> settings.showMinimizeButton().set(in.nextBoolean());
+				case "showTrayIcon" -> settings.showTrayIcon().set(in.nextBoolean());
 				default -> {
 					LOG.warn("Unsupported vault setting found in JSON: " + name);
 					in.skipValue();
@@ -137,5 +151,4 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 		in.endArray();
 		return result;
 	}
-
 }
@@ -8,13 +8,13 @@
 *******************************************************************************/
 package org.cryptomator.common.settings;

+import com.google.common.base.Suppliers;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonParser;
 import org.cryptomator.common.Environment;
-import org.cryptomator.common.LazyInitializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -48,14 +48,15 @@ public class SettingsProvider implements Supplier<Settings> {
 	private static final long SAVE_DELAY_MS = 1000;

 	private final AtomicReference<ScheduledFuture<?>> scheduledSaveCmd = new AtomicReference<>();
-	private final AtomicReference<Settings> settings = new AtomicReference<>();
-	private final SettingsJsonAdapter settingsJsonAdapter = new SettingsJsonAdapter();
+	private final Supplier<Settings> settings = Suppliers.memoize(this::load);
+	private final SettingsJsonAdapter settingsJsonAdapter;
 	private final Environment env;
 	private final ScheduledExecutorService scheduler;
 	private final Gson gson;

 	@Inject
-	public SettingsProvider(Environment env, ScheduledExecutorService scheduler) {
+	public SettingsProvider(SettingsJsonAdapter settingsJsonAdapter, Environment env, ScheduledExecutorService scheduler) {
+		this.settingsJsonAdapter = settingsJsonAdapter;
 		this.env = env;
 		this.scheduler = scheduler;
 		this.gson = new GsonBuilder() //
@@ -66,11 +67,11 @@ public class SettingsProvider implements Supplier<Settings> {

 	@Override
 	public Settings get() {
-		return LazyInitializer.initializeLazily(settings, this::load);
+		return settings.get();
 	}

 	private Settings load() {
-		Settings settings = env.getSettingsPath().flatMap(this::tryLoad).findFirst().orElse(new Settings());
+		Settings settings = env.getSettingsPath().flatMap(this::tryLoad).findFirst().orElse(new Settings(env));
 		settings.setSaveCmd(this::scheduleSave);
 		return settings;
 	}
@@ -90,7 +91,7 @@ public class SettingsProvider implements Supplier<Settings> {
 			}
 		} catch (NoSuchFileException e) {
 			return Stream.empty();
-		} catch (IOException e) {
+		} catch (IOException | JsonParseException e) {
 			LOG.warn("Exception while loading settings from " + path, e);
 			return Stream.empty();
 		}
@@ -1,50 +1,36 @@
 package org.cryptomator.common.vaults;

-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
 import org.cryptomator.common.mountpoint.InvalidMountPointException;
 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 {

-	private final SortedSet<MountPointChooser> choosers;
+	private final Iterable<MountPointChooser> choosers;

 	protected Path mountPoint;
-
-	//Cleanup
 	private boolean cleanupRequired;
 	private MountPointChooser usedChooser;

-	public AbstractVolume(SortedSet<MountPointChooser> choosers) {
+	public AbstractVolume(Iterable<MountPointChooser> choosers) {
 		this.choosers = choosers;
 	}

 	protected Path determineMountPoint() throws InvalidMountPointException {
-		SortedSet<MountPointChooser> checkedChoosers = new TreeSet<>(); //Natural order
-		for (MountPointChooser chooser : this.choosers) {
-			if (!chooser.isApplicable(this)) {
-				continue;
-			}
-
+		var applicableChoosers = Iterables.filter(choosers, c -> c.isApplicable(this));
+		for (var chooser : applicableChoosers) {
 			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
+			if (chosenPath.isEmpty()) { // chooser couldn't find a feasible mountpoint
 				continue;
 			}
-			this.cleanupRequired = chooser.prepare(this, chosenPath.get()); //Fail entirely if an Exception occurs
+			this.cleanupRequired = chooser.prepare(this, chosenPath.get());
 			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 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.isBlank() ? "<No applicable MPC>" : checked));
+		throw new InvalidMountPointException(String.format("No feasible MountPoint found by choosers: %s", applicableChoosers));
 	}

 	protected void cleanupMountPoint() {
@@ -13,7 +13,6 @@ import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
 import javax.inject.Named;
-import java.util.SortedSet;
 import java.util.concurrent.ExecutorService;

 public class DokanyVolume extends AbstractVolume {
@@ -28,7 +27,7 @@ public class DokanyVolume extends AbstractVolume {
 	private Mount mount;

 	@Inject
-	public DokanyVolume(VaultSettings vaultSettings, ExecutorService executorService, @Named("orderedMountPointChoosers") SortedSet<MountPointChooser> choosers) {
+	public DokanyVolume(VaultSettings vaultSettings, ExecutorService executorService, @Named("orderedMountPointChoosers") Iterable<MountPointChooser> choosers) {
 		super(choosers);
 		this.vaultSettings = vaultSettings;
 		this.mountFactory = new MountFactory(executorService);
@@ -42,7 +41,6 @@ public class DokanyVolume extends AbstractVolume {
 	@Override
 	public void mount(CryptoFileSystem fs, String mountFlags) throws InvalidMountPointException, VolumeException {
 		this.mountPoint = determineMountPoint();
-		String mountName = vaultSettings.mountName().get();
 		try {
 			this.mount = mountFactory.mount(fs.getPath("/"), mountPoint, vaultSettings.mountName().get(), FS_TYPE_NAME, mountFlags.strip());
 		} catch (MountFailedException e) {
@@ -54,19 +52,35 @@ public class DokanyVolume extends AbstractVolume {
 	}

 	@Override
-	public void reveal() throws VolumeException {
-		boolean success = mount.reveal();
-		if (!success) {
-			throw new VolumeException("Reveal failed.");
+	public void reveal(Revealer revealer) throws VolumeException {
+		try {
+			mount.reveal(revealer::reveal);
+		} catch (Exception e) {
+			throw new VolumeException(e);
 		}
 	}

 	@Override
-	public void unmount() {
-		mount.close();
+	public void unmount() throws VolumeException {
+		try {
+			mount.unmount();
+		} catch (IllegalStateException e) {
+			throw new VolumeException("Unmount Failed.", e);
+		}
 		cleanupMountPoint();
 	}

+	@Override
+	public void unmountForced() {
+		mount.unmountForced();
+		cleanupMountPoint();
+	}
+
+	@Override
+	public boolean supportsForcedUnmount() {
+		return true;
+	}
+
 	@Override
 	public boolean isSupported() {
 		return DokanyVolume.isSupportedStatic();
@@ -1,6 +1,6 @@
 package org.cryptomator.common.vaults;

-import com.google.common.base.Splitter;
+import com.google.common.collect.Iterators;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.mountpoint.InvalidMountPointException;
 import org.cryptomator.common.mountpoint.MountPointChooser;
@@ -18,16 +18,19 @@ import org.slf4j.LoggerFactory;
 import javax.inject.Inject;
 import javax.inject.Named;
 import java.nio.file.Path;
-import java.util.SortedSet;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;

 public class FuseVolume extends AbstractVolume {

 	private static final Logger LOG = LoggerFactory.getLogger(FuseVolume.class);
+	private static final Pattern NON_WHITESPACE_OR_QUOTED = Pattern.compile("[^\\s\"']+|\"([^\"]*)\"|'([^']*)'"); // Thanks to https://stackoverflow.com/a/366532

 	private Mount mount;

 	@Inject
-	public FuseVolume(@Named("orderedMountPointChoosers") SortedSet<MountPointChooser> choosers) {
+	public FuseVolume(@Named("orderedMountPointChoosers") Iterable<MountPointChooser> choosers) {
 		super(choosers);
 	}

@@ -51,15 +54,28 @@ public class FuseVolume extends AbstractVolume {
 	}

 	private String[] splitFlags(String str) {
-		return Splitter.on(' ').splitToList(str).toArray(String[]::new);
+		List<String> flags = new ArrayList<>();
+		var matches = Iterators.peekingIterator(NON_WHITESPACE_OR_QUOTED.matcher(str).results().iterator());
+		while (matches.hasNext()) {
+			String flag = matches.next().group();
+			// check if flag is missing its argument:
+			if (flag.endsWith("=") && matches.hasNext() && matches.peek().group(1) != null) { // next is "double quoted"
+				// next is "double quoted" and flag is missing its argument
+				flag += matches.next().group(1);
+			} else if (flag.endsWith("=") && matches.hasNext() && matches.peek().group(2) != null) {
+				// next is 'single quoted' and flag is missing its argument
+				flag += matches.next().group(2);
+			}
+			flags.add(flag);
+		}
+		return flags.toArray(String[]::new);
 	}

 	@Override
-	public void reveal() throws VolumeException {
+	public void reveal(Revealer revealer) throws VolumeException {
 		try {
-			mount.revealInFileManager();
-		} catch (CommandFailedException e) {
-			LOG.debug("Revealing the vault in file manger failed: " + e.getMessage());
+			mount.reveal(revealer::reveal);
+		} catch (Exception e) {
 			throw new VolumeException(e);
 		}
 	}
@@ -10,7 +10,6 @@ package org.cryptomator.common.vaults;

 import com.google.common.base.Strings;
 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;
@@ -100,16 +99,12 @@ public class Vault {
 	// Commands
 	// ********************************************************************************/

-	private CryptoFileSystem getCryptoFileSystem(CharSequence passphrase) throws NoSuchFileException, IOException, InvalidPassphraseException, CryptoException {
-		return LazyInitializer.initializeLazily(cryptoFileSystem, () -> unlockCryptoFileSystem(passphrase), IOException.class);
-	}
-
-	private CryptoFileSystem unlockCryptoFileSystem(CharSequence passphrase) throws NoSuchFileException, IOException, InvalidPassphraseException, CryptoException {
+	private CryptoFileSystem createCryptoFileSystem(CharSequence passphrase) throws NoSuchFileException, IOException, InvalidPassphraseException, CryptoException {
 		Set<FileSystemFlags> flags = EnumSet.noneOf(FileSystemFlags.class);
 		if (vaultSettings.usesReadOnlyMode().get()) {
 			flags.add(FileSystemFlags.READONLY);
 		}
-		if (vaultSettings.filenameLengthLimit().get() == -1) {
+		if (!flags.contains(FileSystemFlags.READONLY) && vaultSettings.filenameLengthLimit().get() == -1) {
 			LOG.debug("Determining file name length limitations...");
 			int limit = new FileSystemCapabilityChecker().determineSupportedFileNameLength(getPath());
 			vaultSettings.filenameLengthLimit().set(limit);
@@ -126,18 +121,8 @@ public class Vault {
 		return CryptoFileSystemProvider.newFileSystem(getPath(), fsProps);
 	}

-	public synchronized void unlock(CharSequence passphrase) throws CryptoException, IOException, VolumeException, InvalidMountPointException {
-		CryptoFileSystem fs = getCryptoFileSystem(passphrase);
-		volume = volumeProvider.get();
-		volume.mount(fs, getEffectiveMountFlags());
-	}
-
-	public synchronized void lock(boolean forced) throws VolumeException {
-		if (forced && volume.supportsForcedUnmount()) {
-			volume.unmountForced();
-		} else {
-			volume.unmount();
-		}
+	private void destroyCryptoFileSystem() {
+		LOG.trace("Trying to close associated CryptoFS...");
 		CryptoFileSystem fs = cryptoFileSystem.getAndSet(null);
 		if (fs != null) {
 			try {
@@ -148,8 +133,33 @@ public class Vault {
 		}
 	}

-	public void reveal() throws VolumeException {
-		volume.reveal();
+	public synchronized void unlock(CharSequence passphrase) throws CryptoException, IOException, VolumeException, InvalidMountPointException {
+		if (cryptoFileSystem.get() == null) {
+			CryptoFileSystem fs = createCryptoFileSystem(passphrase);
+			cryptoFileSystem.set(fs);
+			try {
+				volume = volumeProvider.get();
+				volume.mount(fs, getEffectiveMountFlags());
+			} catch (Exception e) {
+				destroyCryptoFileSystem();
+				throw e;
+			}
+		} else {
+			throw new IllegalStateException("Already unlocked.");
+		}
+	}
+
+	public synchronized void lock(boolean forced) throws VolumeException {
+		if (forced && volume.supportsForcedUnmount()) {
+			volume.unmountForced();
+		} else {
+			volume.unmount();
+		}
+		destroyCryptoFileSystem();
+	}
+
+	public void reveal(Volume.Revealer vaultRevealer) throws VolumeException {
+		volume.reveal(vaultRevealer);
 	}

 	// ******************************************************************************
@@ -101,7 +101,7 @@ public class VaultModule {
 		if (readOnly.get()) {
 			flags.append(" -ordonly");
 		}
-		flags.append(" -ovolname=").append(mountName.get());
+		flags.append(" -ovolname=").append('"').append(mountName.get()).append('"');
 		flags.append(" -oatomic_o_trunc");
 		flags.append(" -oauto_xattr");
 		flags.append(" -oauto_cache");
@@ -156,9 +156,9 @@ public class VaultModule {
 		//See: https://github.com/billziss-gh/winfsp/issues/319
 		if (!readOnly.get()) {
 			flags.append(" -ouid=-1");
-			flags.append(" -ogid=-1");
+			flags.append(" -ogid=11");
 		}
-		flags.append(" -ovolname=").append(mountName.get());
+		flags.append(" -ovolname=").append('"').append(mountName.get()).append('"');
 		//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);
@@ -34,7 +34,15 @@ public interface Volume {
 	 */
 	void mount(CryptoFileSystem fs, String mountFlags) throws IOException, VolumeException, InvalidMountPointException;

-	void reveal() throws VolumeException;
+	/**
+	 * Reveals the mounted volume.
+	 * <p>
+	 * The given {@code revealer} might be used to do it, but not necessarily.
+	 *
+	 * @param revealer An object capable of revealing the location of the mounted vault to view the content (e.g. in the default file browser).
+	 * @throws VolumeException
+	 */
+	void reveal(Revealer revealer) throws VolumeException;

 	void unmount() throws VolumeException;

@@ -79,4 +87,14 @@ public interface Volume {

 	}

+	/**
+	 * Hides and unifies the different Revealer implementations in the different nio-adapters.
+	 */
+	@FunctionalInterface
+	interface Revealer {
+
+		void reveal(Path p) throws VolumeException;
+
+	}
+
 }
@@ -17,6 +17,7 @@ import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.file.Path;
 import java.util.Optional;
+import java.util.function.Supplier;

 public class WebDavVolume implements Volume {

@@ -25,21 +26,27 @@ public class WebDavVolume implements Volume {
 	private final Provider<WebDavServer> serverProvider;
 	private final VaultSettings vaultSettings;
 	private final Settings settings;
+	private final WindowsDriveLetters windowsDriveLetters;

 	private WebDavServer server;
 	private WebDavServletController servlet;
 	private Mounter.Mount mount;
-	private Path mountPoint;

 	@Inject
-	public WebDavVolume(Provider<WebDavServer> serverProvider, VaultSettings vaultSettings, Settings settings) {
+	public WebDavVolume(Provider<WebDavServer> serverProvider, VaultSettings vaultSettings, Settings settings, WindowsDriveLetters windowsDriveLetters) {
 		this.serverProvider = serverProvider;
 		this.vaultSettings = vaultSettings;
 		this.settings = settings;
+		this.windowsDriveLetters = windowsDriveLetters;
 	}

 	@Override
 	public void mount(CryptoFileSystem fs, String mountFlags) throws VolumeException {
+		startServlet(fs);
+		mountServlet();
+	}
+
+	private void startServlet(CryptoFileSystem fs){
 		if (server == null) {
 			server = serverProvider.get();
 		}
@@ -50,32 +57,38 @@ public class WebDavVolume implements Volume {
 		String urlConformMountName = acceptable.negate().collapseFrom(vaultSettings.mountName().get(), '_');
 		servlet = server.createWebDavServlet(fs.getPath("/"), vaultSettings.getId() + "/" + urlConformMountName);
 		servlet.start();
-		mount();
 	}

-	private void mount() throws VolumeException {
+	private void mountServlet() throws VolumeException {
 		if (servlet == null) {
 			throw new IllegalStateException("Mounting requires unlocked WebDAV servlet.");
 		}
+
+		//on windows, prevent an automatic drive letter selection in the upstream library. Either we choose already a specifc one or there is no free.
+		Supplier<String> driveLetterSupplier;
+		if(System.getProperty("os.name").toLowerCase().contains("windows") && vaultSettings.winDriveLetter().isEmpty().get()) {
+			driveLetterSupplier = () -> windowsDriveLetters.getAvailableDriveLetter().orElse(null);
+		} else {
+			driveLetterSupplier = () -> vaultSettings.winDriveLetter().get();
+		}
+
 		MountParams mountParams = MountParams.create() //
-				.withWindowsDriveLetter(vaultSettings.winDriveLetter().get()) //
+				.withWindowsDriveLetter(driveLetterSupplier.get()) //
 				.withPreferredGvfsScheme(settings.preferredGvfsScheme().get().getPrefix())//
 				.withWebdavHostname(getLocalhostAliasOrNull()) //
 				.build();
 		try {
 			this.mount = servlet.mount(mountParams); // might block this thread for a while
 		} catch (Mounter.CommandFailedException e) {
-			e.printStackTrace();
 			throw new VolumeException(e);
 		}
 	}

 	@Override
-	public void reveal() throws VolumeException {
+	public void reveal(Revealer revealer) throws VolumeException {
 		try {
-			mount.reveal();
-		} catch (Mounter.CommandFailedException e) {
-			e.printStackTrace();
+			mount.reveal(revealer::reveal);
+		} catch (Exception e) {
 			throw new VolumeException(e);
 		}
 	}
@@ -102,7 +115,7 @@ public class WebDavVolume implements Volume {

 	@Override
 	public Optional<Path> getMountPoint() {
-		return Optional.ofNullable(mountPoint); //TODO
+		return mount.getMountPoint();
 	}

 	@Override
@@ -8,6 +8,7 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;

 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -20,14 +21,10 @@ class EnvironmentTest {

 	private Environment env;

-	@BeforeAll
-	static void init() {
-		System.setProperty("user.home", "/home/testuser");
-	}
-
 	@BeforeEach
-	void initEach() {
-		env = new Environment();
+	void init() {
+		env = Mockito.spy(new Environment());
+		Mockito.when(env.getHomeDir()).thenReturn(Path.of("/home/testuser"));
 	}

 	@Test
@@ -5,16 +5,19 @@
 *******************************************************************************/
 package org.cryptomator.common.settings;

+import org.cryptomator.common.Environment;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.Mockito;

 import java.io.IOException;

 public class SettingsJsonAdapterTest {

-	private final SettingsJsonAdapter adapter = new SettingsJsonAdapter();
+	private final Environment env = Mockito.mock(Environment.class);
+	private final SettingsJsonAdapter adapter = new SettingsJsonAdapter(env);

 	@Test
 	public void testDeserialize() throws IOException {
@@ -5,6 +5,7 @@
 *******************************************************************************/
 package org.cryptomator.common.settings;

+import org.cryptomator.common.Environment;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;

@@ -14,8 +15,10 @@ public class SettingsTest {

 	@Test
 	public void testAutoSave() {
+		Environment env = Mockito.mock(Environment.class);
 		@SuppressWarnings("unchecked") Consumer<Settings> changeListener = Mockito.mock(Consumer.class);
-		Settings settings = new Settings();
+
+		Settings settings = new Settings(env);
 		settings.setSaveCmd(changeListener);
 		VaultSettings vaultSettings = VaultSettings.withRandomId();
 		Mockito.verify(changeListener, Mockito.times(0)).accept(settings);
@@ -43,7 +43,7 @@ public class VaultModuleTest {

 		StringBinding result = module.provideDefaultMountFlags(settings, vaultSettings);

-		MatcherAssert.assertThat(result.get(), CoreMatchers.containsString("-ovolname=TEST"));
+		MatcherAssert.assertThat(result.get(), CoreMatchers.containsString("-ovolname=\"TEST\""));
 		MatcherAssert.assertThat(result.get(), CoreMatchers.containsString("-ordonly"));
 	}

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.9</version>
+		<version>1.6.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>launcher</artifactId>
 	<name>Cryptomator Launcher</name>
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
-	<version>1.5.9</version>
+	<version>1.5.12</version>
 	<packaging>pom</packaging>
 	<name>Cryptomator</name>

@@ -26,17 +26,17 @@
 		<!-- cryptomator dependencies -->
 		<cryptomator.cryptofs.version>1.9.13</cryptomator.cryptofs.version>
 		<cryptomator.integrations.version>0.1.6</cryptomator.integrations.version>
-		<cryptomator.integrations.win.version>0.1.0-beta1</cryptomator.integrations.win.version>
+		<cryptomator.integrations.win.version>0.2.1</cryptomator.integrations.win.version>
 		<cryptomator.integrations.mac.version>0.1.0-beta3</cryptomator.integrations.mac.version>
-		<cryptomator.integrations.linux.version>0.1.0-beta2</cryptomator.integrations.linux.version>
-		<cryptomator.fuse.version>1.2.5</cryptomator.fuse.version>
-		<cryptomator.dokany.version>1.2.0</cryptomator.dokany.version>
-		<cryptomator.webdav.version>1.0.13</cryptomator.webdav.version>
+		<cryptomator.integrations.linux.version>0.1.1</cryptomator.integrations.linux.version>
+		<cryptomator.fuse.version>1.2.8</cryptomator.fuse.version>
+		<cryptomator.dokany.version>1.2.3</cryptomator.dokany.version>
+		<cryptomator.webdav.version>1.1.1</cryptomator.webdav.version>

 		<!-- 3rd party dependencies -->
 		<javafx.version>15</javafx.version>
 		<commons-lang3.version>3.11</commons-lang3.version>
-		<jwt.version>3.11.0</jwt.version>
+		<jwt.version>3.12.0</jwt.version>
 		<easybind.version>2.1.0</easybind.version>
 		<guava.version>30.0-jre</guava.version>
 		<dagger.version>2.29.1</dagger.version>
@@ -223,6 +223,13 @@
 				<version>${javafx.version}</version>
 				<scope>test</scope>
 			</dependency>
+
+			<!-- TODO: temporary fix for XXE attack, can be removed once java-jwt is updated -->
+			<dependency>
+				<groupId>com.fasterxml.jackson.core</groupId>
+				<artifactId>jackson-databind</artifactId>
+				<version>2.10.5.1</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>

@@ -325,6 +332,32 @@
 				</dependency>
 			</dependencies>
 		</profile>
+		<profile>
+			<id>dependency-check</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.owasp</groupId>
+						<artifactId>dependency-check-maven</artifactId>
+						<version>6.0.3</version>
+						<configuration>
+							<cveValidForHours>24</cveValidForHours>
+							<failBuildOnCVSS>0</failBuildOnCVSS>
+							<skipTestScope>true</skipTestScope>
+							<detail>true</detail>
+							<suppressionFile>suppression.xml</suppressionFile>
+						</configuration>
+						<executions>
+							<execution>
+								<goals>
+									<goal>check</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>

 	<build>
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file lists false positives found by org.owasp:dependency-check-maven build plugin -->
+<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.2.xsd">
+	<suppress>
+		<notes><![CDATA[ Upstream fix backported from 2.11.0 to 2.10.5.1, see https://github.com/FasterXML/jackson-databind/issues/2589#issuecomment-714833837. ]]></notes>
+		<gav>com.fasterxml.jackson.core:jackson-databind:2.10.5.1</gav>
+		<cve>CVE-2020-25649</cve>
+	</suppress>
+	<suppress>
+		<notes><![CDATA[ Suppress known vulnerabilities in FUSE libraries for fuse-nio-adapter. For more info, see suppression.xml of https://github.com/cryptomator/fuse-nio-adapter ]]></notes>
+		<gav regex="true">^org\.cryptomator:fuse-nio-adapter:.*$</gav>
+		<cvssBelow>9</cvssBelow>
+	</suppress>
+	<suppress>
+		<notes><![CDATA[ Suppress known vulnerabilities in FUSE libraries for jnr-fuse (dependency of fuse-nio-adapter). ]]></notes>
+		<gav regex="true">^com\.github\.serceman:jnr-fuse:.*$</gav>
+		<cvssBelow>9</cvssBelow>
+	</suppress>
+</suppressions>
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.9</version>
+		<version>1.6.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>ui</artifactId>
 	<name>Cryptomator GUI</name>
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.addvaultwizard;

-import com.tobiasdiez.easybind.EasyBind;
 import dagger.Lazy;
 import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
@@ -84,11 +83,11 @@ public class CreateNewVaultLocationController implements FxController {
 	public void initialize() {
 		predefinedLocationToggler.selectedToggleProperty().addListener(this::togglePredefinedLocation);
 		usePresetPath.bind(predefinedLocationToggler.selectedToggleProperty().isNotEqualTo(customRadioButton));
-		EasyBind.subscribe(vaultPath, this::vaultPathDidChange);
+		vaultPath.addListener(this::vaultPathDidChange);
 	}

-	private void vaultPathDidChange(Path newValue) {
-		if (newValue != null && !Files.notExists(newValue)) {
+	private void vaultPathDidChange(@SuppressWarnings("unused") ObservableValue<? extends Path> observable, @SuppressWarnings("unused") Path oldValue, Path newValue) {
+		if (!Files.notExists(newValue)) {
 			warningText.set(resourceBundle.getString("addvaultwizard.new.fileAlreadyExists"));
 		} else {
 			warningText.set(null);
@@ -11,6 +11,8 @@ public enum FxmlFile {
 	CHANGEPASSWORD("/fxml/changepassword.fxml"), //
 	ERROR("/fxml/error.fxml"), //
 	FORGET_PASSWORD("/fxml/forget_password.fxml"), //
+	LOCK_FORCED("/fxml/lock_forced.fxml"), //
+	LOCK_FAILED("/fxml/lock_failed.fxml"), //
 	MAIN_WINDOW("/fxml/main_window.fxml"), //
 	MIGRATION_CAPABILITY_ERROR("/fxml/migration_capability_error.fxml"), //
 	MIGRATION_IMPOSSIBLE("/fxml/migration_impossible.fxml"),
@@ -0,0 +1,25 @@
+package org.cryptomator.ui.common;
+
+import dagger.Lazy;
+import org.cryptomator.common.vaults.Volume;
+import org.cryptomator.ui.fxapp.FxApplicationScoped;
+
+import javax.inject.Inject;
+import javafx.application.Application;
+import java.nio.file.Path;
+
+@FxApplicationScoped
+public class HostServiceRevealer implements Volume.Revealer {
+
+	private final Lazy<Application> application;
+
+	@Inject
+	public HostServiceRevealer(Lazy<Application> application) {
+		this.application = application;
+	}
+
+	@Override
+	public void reveal(Path p) throws Volume.VolumeException {
+		application.get().getHostServices().showDocument(p.toUri().toString());
+	}
+}
@@ -23,10 +23,12 @@ public class VaultService {
 	private static final Logger LOG = LoggerFactory.getLogger(VaultService.class);

 	private final ExecutorService executorService;
+	private final HostServiceRevealer vaultRevealer;

 	@Inject
-	public VaultService(ExecutorService executorService) {
+	public VaultService(ExecutorService executorService, HostServiceRevealer vaultRevealer) {
 		this.executorService = executorService;
+		this.vaultRevealer = vaultRevealer;
 	}

 	public void reveal(Vault vault) {
@@ -39,7 +41,7 @@ public class VaultService {
 	 * @param vault The vault to reveal
 	 */
 	public Task<Vault> createRevealTask(Vault vault) {
-		Task<Vault> task = new RevealVaultTask(vault);
+		Task<Vault> task = new RevealVaultTask(vault, vaultRevealer);
 		task.setOnSucceeded(evt -> LOG.info("Revealed {}", vault.getDisplayName()));
 		task.setOnFailed(evt -> LOG.error("Failed to reveal " + vault.getDisplayName(), evt.getSource().getException()));
 		return task;
@@ -65,6 +67,7 @@ public class VaultService {
 	public Task<Vault> createLockTask(Vault vault, boolean forced) {
 		Task<Vault> task = new LockVaultTask(vault, forced);
 		task.setOnSucceeded(evt -> LOG.info("Locked {}", vault.getDisplayName()));
+		task.setOnFailed(evt -> LOG.info("Failed to lock {}.", vault.getDisplayName(), evt.getSource().getException()));
 		return task;
 	}

@@ -98,19 +101,22 @@ public class VaultService {
 	private static class RevealVaultTask extends Task<Vault> {

 		private final Vault vault;
+		private final Volume.Revealer revealer;

 		/**
 		 * @param vault The vault to lock
+		 * @param revealer The object to use to show the vault content to the user.
 		 */
-		public RevealVaultTask(Vault vault) {
+		public RevealVaultTask(Vault vault, Volume.Revealer revealer) {
 			this.vault = vault;
+			this.revealer = revealer;

 			setOnFailed(evt -> LOG.error("Failed to reveal " + vault.getDisplayName(), getException()));
 		}

 		@Override
 		protected Vault call() throws Volume.VolumeException {
-			vault.reveal();
+			vault.reveal(revealer);
 			return vault;
 		}
 	}
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.fxapp;

-import com.tobiasdiez.easybind.EasyBind;
 import dagger.Lazy;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.Settings;
@@ -12,6 +11,7 @@ import org.cryptomator.integrations.uiappearance.UiAppearanceException;
 import org.cryptomator.integrations.uiappearance.UiAppearanceListener;
 import org.cryptomator.integrations.uiappearance.UiAppearanceProvider;
 import org.cryptomator.ui.common.VaultService;
+import org.cryptomator.ui.lock.LockComponent;
 import org.cryptomator.ui.mainwindow.MainWindowComponent;
 import org.cryptomator.ui.preferences.PreferencesComponent;
 import org.cryptomator.ui.preferences.SelectedPreferencesTab;
@@ -27,10 +27,13 @@ import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.value.ObservableValue;
-import javafx.collections.ObservableSet;
+import javafx.collections.ObservableList;
 import javafx.stage.Stage;
+import javafx.stage.Window;
 import java.awt.desktop.QuitResponse;
 import java.util.Optional;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;

@FxApplicationScoped
 public class FxApplication extends Application {
@@ -40,34 +43,38 @@ public class FxApplication extends Application {
 	private final Settings settings;
 	private final Lazy<MainWindowComponent> mainWindow;
 	private final Lazy<PreferencesComponent> preferencesWindow;
+	private final Lazy<QuitComponent> quitWindow;
 	private final Provider<UnlockComponent.Builder> unlockWindowBuilderProvider;
-	private final Provider<QuitComponent.Builder> quitWindowBuilderProvider;
+	private final Provider<LockComponent.Builder> lockWindowBuilderProvider;
 	private final Optional<TrayIntegrationProvider> trayIntegration;
 	private final Optional<UiAppearanceProvider> appearanceProvider;
 	private final VaultService vaultService;
 	private final LicenseHolder licenseHolder;
-	private final BooleanBinding hasVisibleStages;
+	private final ObservableList<Window> visibleWindows;
+	private final BooleanBinding hasVisibleWindows;
 	private final UiAppearanceListener systemInterfaceThemeListener = this::systemInterfaceThemeChanged;

 	@Inject
-	FxApplication(Settings settings, Lazy<MainWindowComponent> mainWindow, Lazy<PreferencesComponent> preferencesWindow, Provider<UnlockComponent.Builder> unlockWindowBuilderProvider, Provider<QuitComponent.Builder> quitWindowBuilderProvider, Optional<TrayIntegrationProvider> trayIntegration, Optional<UiAppearanceProvider> appearanceProvider, VaultService vaultService, LicenseHolder licenseHolder, ObservableSet<Stage> visibleStages) {
+	FxApplication(Settings settings, Lazy<MainWindowComponent> mainWindow, Lazy<PreferencesComponent> preferencesWindow, Provider<UnlockComponent.Builder> unlockWindowBuilderProvider, Provider<LockComponent.Builder> lockWindowBuilderProvider, Lazy<QuitComponent> quitWindow, Optional<TrayIntegrationProvider> trayIntegration, Optional<UiAppearanceProvider> appearanceProvider, VaultService vaultService, LicenseHolder licenseHolder) {
 		this.settings = settings;
 		this.mainWindow = mainWindow;
 		this.preferencesWindow = preferencesWindow;
 		this.unlockWindowBuilderProvider = unlockWindowBuilderProvider;
-		this.quitWindowBuilderProvider = quitWindowBuilderProvider;
+		this.lockWindowBuilderProvider = lockWindowBuilderProvider;
+		this.quitWindow = quitWindow;
 		this.trayIntegration = trayIntegration;
 		this.appearanceProvider = appearanceProvider;
 		this.vaultService = vaultService;
 		this.licenseHolder = licenseHolder;
-		this.hasVisibleStages = Bindings.isNotEmpty(visibleStages);
+		this.visibleWindows = Stage.getWindows().filtered(Window::isShowing);
+		this.hasVisibleWindows = Bindings.isNotEmpty(visibleWindows);
 	}

 	public void start() {
 		LOG.trace("FxApplication.start()");
 		Platform.setImplicitExit(false);

-		EasyBind.subscribe(hasVisibleStages, this::hasVisibleStagesChanged);
+		hasVisibleWindows.addListener(this::hasVisibleStagesChanged);

 		settings.theme().addListener(this::appThemeChanged);
 		loadSelectedStyleSheet(settings.theme().get());
@@ -78,7 +85,8 @@ public class FxApplication extends Application {
 		throw new UnsupportedOperationException("Use start() instead.");
 	}

-	private void hasVisibleStagesChanged(boolean newValue) {
+	private void hasVisibleStagesChanged(@SuppressWarnings("unused") ObservableValue<? extends Boolean> observableValue, @SuppressWarnings("unused") boolean oldValue, boolean newValue) {
+		LOG.warn("has visible stages: {}", newValue);
 		if (newValue) {
 			trayIntegration.ifPresent(TrayIntegrationProvider::restoredFromTray);
 		} else {
@@ -93,11 +101,14 @@ public class FxApplication extends Application {
 		});
 	}

-	public void showMainWindow() {
+	public CompletionStage<Stage> showMainWindow() {
+		CompletableFuture<Stage> future = new CompletableFuture<>();
 		Platform.runLater(() -> {
-			mainWindow.get().showMainWindow();
+			var win = mainWindow.get().showMainWindow();
 			LOG.debug("Showing MainWindow");
+			future.complete(win);
 		});
+		return future;
 	}

 	public void startUnlockWorkflow(Vault vault, Optional<Stage> owner) {
@@ -107,9 +118,16 @@ public class FxApplication extends Application {
 		});
 	}

+	public void startLockWorkflow(Vault vault, Optional<Stage> owner) {
+		Platform.runLater(() -> {
+			lockWindowBuilderProvider.get().vault(vault).owner(owner).build().startLockWorkflow();
+			LOG.debug("Start lock workflow for {}", vault.getDisplayName());
+		});
+	}
+
 	public void showQuitWindow(QuitResponse response) {
 		Platform.runLater(() -> {
-			quitWindowBuilderProvider.get().quitResponse(response).build().showQuitWindow();
+			quitWindow.get().showQuitWindow(response);
 			LOG.debug("Showing QuitWindow");
 		});
 	}
@@ -5,11 +5,8 @@
 *******************************************************************************/
 package org.cryptomator.ui.fxapp;

-import dagger.BindsInstance;
 import dagger.Subcomponent;

-import javax.inject.Named;
-
@FxApplicationScoped
@Subcomponent(modules = FxApplicationModule.class)
 public interface FxApplicationComponent {
@@ -19,9 +16,6 @@ public interface FxApplicationComponent {
 	@Subcomponent.Builder
 	interface Builder {

-		@BindsInstance
-		Builder trayMenuSupported(@Named("trayMenuSupported") boolean trayMenuSupported);
-
 		FxApplicationComponent build();
 	}

@@ -11,6 +11,7 @@ import dagger.Provides;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.StageFactory;
+import org.cryptomator.ui.lock.LockComponent;
 import org.cryptomator.ui.mainwindow.MainWindowComponent;
 import org.cryptomator.ui.preferences.PreferencesComponent;
 import org.cryptomator.ui.quit.QuitComponent;
@@ -18,7 +19,6 @@ import org.cryptomator.ui.unlock.UnlockComponent;

 import javax.inject.Named;
 import javafx.application.Application;
-import javafx.collections.FXCollections;
 import javafx.collections.ObservableSet;
 import javafx.scene.image.Image;
 import javafx.stage.Stage;
@@ -28,15 +28,9 @@ import java.io.UncheckedIOException;
 import java.util.Collections;
 import java.util.List;

-@Module(includes = {UpdateCheckerModule.class}, subcomponents = {MainWindowComponent.class, PreferencesComponent.class, UnlockComponent.class, QuitComponent.class, ErrorComponent.class})
+@Module(includes = {UpdateCheckerModule.class}, subcomponents = {MainWindowComponent.class, PreferencesComponent.class, UnlockComponent.class, LockComponent.class, QuitComponent.class, ErrorComponent.class})
 abstract class FxApplicationModule {

-	@Provides
-	@FxApplicationScoped
-	static ObservableSet<Stage> provideVisibleStages() {
-		return FXCollections.observableSet();
-	}
-
 	@Provides
 	@Named("windowIcons")
 	@FxApplicationScoped
@@ -56,16 +50,9 @@ abstract class FxApplicationModule {

 	@Provides
 	@FxApplicationScoped
-	static StageFactory provideStageFactory(@Named("windowIcons") List<Image> windowIcons, ObservableSet<Stage> visibleStages) {
+	static StageFactory provideStageFactory(@Named("windowIcons") List<Image> windowIcons) {
 		return new StageFactory(stage -> {
 			stage.getIcons().addAll(windowIcons);
-			stage.showingProperty().addListener((observableValue, wasShowing, isShowing) -> {
-				if (isShowing) {
-					visibleStages.add(stage);
-				} else {
-					visibleStages.remove(stage);
-				}
-			});
 		});
 	}

@@ -88,4 +75,8 @@ abstract class FxApplicationModule {
 		return builder.build();
 	}

+	@Provides
+	static QuitComponent provideQuitComponent(QuitComponent.Builder builder) {
+		return builder.build();
+	}
 }
@@ -34,15 +34,15 @@ class AppLaunchEventHandler {
 		this.vaultListManager = vaultListManager;
 	}

-	public void startHandlingLaunchEvents(boolean hasTrayIcon) {
-		executorService.submit(() -> handleLaunchEvents(hasTrayIcon));
+	public void startHandlingLaunchEvents() {
+		executorService.submit(this::handleLaunchEvents);
 	}

-	private void handleLaunchEvents(boolean hasTrayIcon) {
+	private void handleLaunchEvents() {
 		try {
 			while (!Thread.interrupted()) {
 				AppLaunchEvent event = launchEventQueue.take();
-				handleLaunchEvent(hasTrayIcon, event);
+				handleLaunchEvent(event);
 			}
 		} catch (InterruptedException e) {
 			LOG.warn("Interrupted launch event handler.");
@@ -50,10 +50,10 @@ class AppLaunchEventHandler {
 		}
 	}

-	private void handleLaunchEvent(boolean hasTrayIcon, AppLaunchEvent event) {
+	private void handleLaunchEvent(AppLaunchEvent event) {
 		switch (event.getType()) {
-			case REVEAL_APP -> fxApplicationStarter.get(hasTrayIcon).thenAccept(FxApplication::showMainWindow);
-			case OPEN_FILE -> fxApplicationStarter.get(hasTrayIcon).thenRun(() -> {
+			case REVEAL_APP -> fxApplicationStarter.get().thenAccept(FxApplication::showMainWindow);
+			case OPEN_FILE -> fxApplicationStarter.get().thenRun(() -> {
 				Platform.runLater(() -> {
 					event.getPathsToOpen().forEach(this::addVault);
 				});
@@ -83,7 +83,7 @@ public class AppLifecycleListener {
 		if (allowQuitWithoutPrompt.get()) {
 			decoratedQuitResponse.performQuit();
 		} else {
-			fxApplicationStarter.get(true).thenAccept(app -> app.showQuitWindow(decoratedQuitResponse));
+			fxApplicationStarter.get().thenAccept(app -> app.showQuitWindow(decoratedQuitResponse));
 		}
 	}

@@ -113,11 +113,11 @@ public class AppLifecycleListener {
 	}

 	private void showPreferencesWindow(@SuppressWarnings("unused") EventObject actionEvent) {
-		fxApplicationStarter.get(true).thenAccept(app -> app.showPreferencesWindow(SelectedPreferencesTab.ANY));
+		fxApplicationStarter.get().thenAccept(app -> app.showPreferencesWindow(SelectedPreferencesTab.ANY));
 	}

 	private void showAboutWindow(@SuppressWarnings("unused") AboutEvent aboutEvent) {
-		fxApplicationStarter.get(true).thenAccept(app -> app.showPreferencesWindow(SelectedPreferencesTab.ABOUT));
+		fxApplicationStarter.get().thenAccept(app -> app.showPreferencesWindow(SelectedPreferencesTab.ABOUT));
 	}

 	private void forceUnmountRemainingVaults() {
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.launcher;

+import dagger.Lazy;
 import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.fxapp.FxApplicationComponent;
 import org.slf4j.Logger;
@@ -18,37 +19,36 @@ public class FxApplicationStarter {

 	private static final Logger LOG = LoggerFactory.getLogger(FxApplicationStarter.class);

-	private final FxApplicationComponent.Builder fxAppComponent;
+	private final Lazy<FxApplicationComponent> fxAppComponent;
 	private final ExecutorService executor;
 	private final AtomicBoolean started;
 	private final CompletableFuture<FxApplication> future;

 	@Inject
-	public FxApplicationStarter(FxApplicationComponent.Builder fxAppComponent, ExecutorService executor) {
+	public FxApplicationStarter(Lazy<FxApplicationComponent> fxAppComponent, ExecutorService executor) {
 		this.fxAppComponent = fxAppComponent;
 		this.executor = executor;
 		this.started = new AtomicBoolean();
 		this.future = new CompletableFuture<>();
 	}

-	public CompletionStage<FxApplication> get(boolean hasTrayIcon) {
+	public CompletionStage<FxApplication> get() {
 		if (!started.getAndSet(true)) {
-			start(hasTrayIcon);
+			start();
 		}
 		return future;
 	}

-	private void start(boolean hasTrayIcon) {
+	private void start() {
 		executor.submit(() -> {
 			LOG.debug("Starting JavaFX runtime...");
 			Platform.startup(() -> {
 				assert Platform.isFxApplicationThread();
 				LOG.info("JavaFX Runtime started.");
-				FxApplication app = fxAppComponent.trayMenuSupported(hasTrayIcon).build().application();
+				FxApplication app = fxAppComponent.get().application();
 				app.start();
 				future.complete(app);
 			});
 		});
 	}
-
 }
@@ -1,7 +1,6 @@
 package org.cryptomator.ui.launcher;

-import org.cryptomator.common.Environment;
-import org.cryptomator.common.mountpoint.IrregularUnmountCleaner;
+import dagger.Lazy;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.integrations.tray.TrayIntegrationProvider;
@@ -16,8 +15,6 @@ import javafx.collections.ObservableList;
 import java.awt.Desktop;
 import java.awt.SystemTray;
 import java.awt.desktop.AppReopenedListener;
-import java.nio.file.Files;
-import java.nio.file.LinkOption;
 import java.util.Collection;
 import java.util.Optional;

@@ -28,66 +25,66 @@ public class UiLauncher {

 	private final Settings settings;
 	private final ObservableList<Vault> vaults;
-	private final TrayMenuComponent.Builder trayComponent;
+	private final Lazy<TrayMenuComponent> trayMenu;
 	private final FxApplicationStarter fxApplicationStarter;
 	private final AppLaunchEventHandler launchEventHandler;
 	private final Optional<TrayIntegrationProvider> trayIntegration;
-	private final Environment env;

 	@Inject
-	public UiLauncher(Settings settings, ObservableList<Vault> vaults, TrayMenuComponent.Builder trayComponent, FxApplicationStarter fxApplicationStarter, AppLaunchEventHandler launchEventHandler, Optional<TrayIntegrationProvider> trayIntegration, Environment env) {
+	public UiLauncher(Settings settings, ObservableList<Vault> vaults, Lazy<TrayMenuComponent> trayMenu, FxApplicationStarter fxApplicationStarter, AppLaunchEventHandler launchEventHandler, Optional<TrayIntegrationProvider> trayIntegration) {
 		this.settings = settings;
 		this.vaults = vaults;
-		this.trayComponent = trayComponent;
+		this.trayMenu = trayMenu;
 		this.fxApplicationStarter = fxApplicationStarter;
 		this.launchEventHandler = launchEventHandler;
 		this.trayIntegration = trayIntegration;
-		this.env = env;
 	}

 	public void launch() {
-		final boolean hasTrayIcon;
-		if (SystemTray.isSupported()) {
-			trayComponent.build().addIconToSystemTray();
-			hasTrayIcon = true;
+		boolean hidden = settings.startHidden().get();
+		if (SystemTray.isSupported() && settings.showTrayIcon().get()) {
+			trayMenu.get().initializeTrayIcon();
+			launch(true, hidden);
 		} else {
-			hasTrayIcon = false;
+			launch(false, hidden);
 		}
+	}

-		// show window on start?
-		if (hasTrayIcon && settings.startHidden().get()) {
+	private void launch(boolean withTrayIcon, boolean hidden) {
+		// start hidden, minimized or normal?
+		if (withTrayIcon && hidden) {
 			LOG.debug("Hiding application...");
 			trayIntegration.ifPresent(TrayIntegrationProvider::minimizedToTray);
+		} else if (!withTrayIcon && hidden) {
+			LOG.debug("Minimizing application...");
+			showMainWindowAsync(true);
 		} else {
-			showMainWindowAsync(hasTrayIcon);
+			LOG.debug("Showing application...");
+			showMainWindowAsync(false);
 		}

 		// register app reopen listener
-		Desktop.getDesktop().addAppEventListener((AppReopenedListener) e -> showMainWindowAsync(hasTrayIcon));
-
-		//clean leftovers of not-regularly unmounted vaults
-		//see https://github.com/cryptomator/cryptomator/issues/1013 and https://github.com/cryptomator/cryptomator/issues/1061
-		env.getMountPointsDir().filter(path -> Files.exists(path, LinkOption.NOFOLLOW_LINKS)).ifPresent(IrregularUnmountCleaner::removeIrregularUnmountDebris);
+		Desktop.getDesktop().addAppEventListener((AppReopenedListener) e -> showMainWindowAsync(false));

 		// auto unlock
 		Collection<Vault> vaultsToAutoUnlock = vaults.filtered(this::shouldAttemptAutoUnlock);
 		if (!vaultsToAutoUnlock.isEmpty()) {
-			fxApplicationStarter.get(hasTrayIcon).thenAccept(app -> {
+			fxApplicationStarter.get().thenAccept(app -> {
 				for (Vault vault : vaultsToAutoUnlock) {
 					app.startUnlockWorkflow(vault, Optional.empty());
 				}
 			});
 		}

-		launchEventHandler.startHandlingLaunchEvents(hasTrayIcon);
+		launchEventHandler.startHandlingLaunchEvents();
 	}

 	private boolean shouldAttemptAutoUnlock(Vault vault) {
 		return vault.isLocked() && vault.getVaultSettings().unlockAfterStartup().get();
 	}

-	private void showMainWindowAsync(boolean hasTrayIcon) {
-		fxApplicationStarter.get(hasTrayIcon).thenAccept(FxApplication::showMainWindow);
+	private void showMainWindowAsync(boolean minimize) {
+		fxApplicationStarter.get().thenCompose(FxApplication::showMainWindow).thenAccept(win -> win.setIconified(minimize));
 	}

 }
@@ -19,6 +19,18 @@ import java.util.concurrent.BlockingQueue;
@Module(subcomponents = {TrayMenuComponent.class, FxApplicationComponent.class})
 public abstract class UiLauncherModule {

+	@Provides
+	@Singleton
+	static TrayMenuComponent provideTrayMenuComponent(TrayMenuComponent.Builder builder) {
+		return builder.build();
+	}
+
+	@Provides
+	@Singleton
+	static FxApplicationComponent provideFxApplicationComponent(FxApplicationComponent.Builder builder) {
+		return builder.build();
+	}
+
 	@Provides
 	@Singleton
 	static Optional<UiAppearanceProvider> provideAppearanceProvider() {
@@ -0,0 +1,39 @@
+package org.cryptomator.ui.lock;
+
+import dagger.BindsInstance;
+import dagger.Subcomponent;
+import org.cryptomator.common.vaults.Vault;
+
+import javax.inject.Named;
+import javafx.stage.Stage;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+
+
+@LockScoped
+@Subcomponent(modules = {LockModule.class})
+public interface LockComponent {
+
+	ExecutorService defaultExecutorService();
+
+	LockWorkflow lockWorkflow();
+
+	default Future<Void> startLockWorkflow() {
+		LockWorkflow workflow = lockWorkflow();
+		defaultExecutorService().submit(workflow);
+		return workflow;
+	}
+
+	@Subcomponent.Builder
+	interface Builder {
+
+		@BindsInstance
+		LockComponent.Builder vault(@LockWindow Vault vault);
+
+		@BindsInstance
+		LockComponent.Builder owner(@Named("lockWindowOwner") Optional<Stage> owner);
+
+		LockComponent build();
+	}
+}
@@ -0,0 +1,31 @@
+package org.cryptomator.ui.lock;
+
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FxController;
+
+import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
+
+@LockScoped
+public class LockFailedController implements FxController {
+
+	private final Stage window;
+	private final Vault vault;
+
+	@Inject
+	public LockFailedController(@LockWindow Stage window, @LockWindow Vault vault) {
+		this.window = window;
+		this.vault = vault;
+	}
+
+	@FXML
+	public void close() {
+		window.close();
+	}
+
+	// ----- Getter & Setter -----
+	public String getVaultName() {
+		return vault.getDisplayName();
+	}
+}
@@ -0,0 +1,57 @@
+package org.cryptomator.ui.lock;
+
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.UserInteractionLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javafx.fxml.FXML;
+import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
+
+@LockScoped
+public class LockForcedController implements FxController {
+
+	private static final Logger LOG = LoggerFactory.getLogger(LockForcedController.class);
+
+	private final Stage window;
+	private final Vault vault;
+	private final UserInteractionLock<LockModule.ForceLockDecision> forceLockDecisionLock;
+
+	@Inject
+	public LockForcedController(@LockWindow Stage window, @LockWindow Vault vault, UserInteractionLock<LockModule.ForceLockDecision> forceLockDecisionLock) {
+		this.window = window;
+		this.vault = vault;
+		this.forceLockDecisionLock = forceLockDecisionLock;
+		this.window.setOnHiding(this::windowClosed);
+	}
+
+	@FXML
+	public void cancel() {
+		forceLockDecisionLock.interacted(LockModule.ForceLockDecision.CANCEL);
+		window.close();
+	}
+
+	@FXML
+	public void confirmForcedLock() {
+		forceLockDecisionLock.interacted(LockModule.ForceLockDecision.FORCE);
+		window.close();
+	}
+
+	private void windowClosed(WindowEvent windowEvent) {
+		// if not already interacted, set the decision to CANCEL
+		if (forceLockDecisionLock.awaitingInteraction().get()) {
+			LOG.debug("Lock canceled in force-lock-phase by user.");
+			forceLockDecisionLock.interacted(LockModule.ForceLockDecision.CANCEL);
+		}
+	}
+
+	// ----- Getter & Setter -----
+
+	public String getVaultName() {
+		return vault.getDisplayName();
+	}
+
+}
@@ -0,0 +1,89 @@
+package org.cryptomator.ui.lock;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.Provides;
+import dagger.multibindings.IntoMap;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.common.DefaultSceneFactory;
+import org.cryptomator.ui.common.FXMLLoaderFactory;
+import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.common.FxControllerKey;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
+import org.cryptomator.ui.common.StageFactory;
+import org.cryptomator.ui.common.UserInteractionLock;
+
+import javax.inject.Named;
+import javax.inject.Provider;
+import javafx.scene.Scene;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import java.util.Map;
+import java.util.Optional;
+import java.util.ResourceBundle;
+
+@Module
+abstract class LockModule {
+
+	enum ForceLockDecision {
+		CANCEL,
+		FORCE;
+	}
+
+	@Provides
+	@LockScoped
+	static UserInteractionLock<LockModule.ForceLockDecision> provideForceLockDecisionLock() {
+		return new UserInteractionLock<>(null);
+	}
+
+	@Provides
+	@LockWindow
+	@LockScoped
+	static FXMLLoaderFactory provideFxmlLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) {
+		return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle);
+	}
+
+	@Provides
+	@LockWindow
+	@LockScoped
+	static Stage provideWindow(StageFactory factory, @LockWindow Vault vault, @Named("lockWindowOwner") Optional<Stage> owner) {
+		Stage stage = factory.create();
+		stage.setTitle(vault.getDisplayName());
+		stage.setResizable(false);
+		if (owner.isPresent()) {
+			stage.initOwner(owner.get());
+			stage.initModality(Modality.WINDOW_MODAL);
+		} else {
+			stage.initModality(Modality.APPLICATION_MODAL);
+		}
+		return stage;
+	}
+
+	@Provides
+	@FxmlScene(FxmlFile.LOCK_FORCED)
+	@LockScoped
+	static Scene provideForceLockScene(@LockWindow FXMLLoaderFactory fxmlLoaders) {
+		return fxmlLoaders.createScene("/fxml/lock_forced.fxml");
+	}
+
+	@Provides
+	@FxmlScene(FxmlFile.LOCK_FAILED)
+	@LockScoped
+	static Scene provideLockFailedScene(@LockWindow FXMLLoaderFactory fxmlLoaders) {
+		return fxmlLoaders.createScene("/fxml/lock_failed.fxml");
+	}
+
+	// ------------------
+
+	@Binds
+	@IntoMap
+	@FxControllerKey(LockForcedController.class)
+	abstract FxController bindLockForcedController(LockForcedController controller);
+
+	@Binds
+	@IntoMap
+	@FxControllerKey(LockFailedController.class)
+	abstract FxController bindLockFailedController(LockFailedController controller);
+
+}
@@ -0,0 +1,13 @@
+package org.cryptomator.ui.lock;
+
+import javax.inject.Scope;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Scope
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@interface LockScoped {
+
+}
@@ -0,0 +1,14 @@
+package org.cryptomator.ui.lock;
+
+import javax.inject.Qualifier;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+@Qualifier
+@Documented
+@Retention(RUNTIME)
+@interface LockWindow {
+
+}
@@ -0,0 +1,105 @@
+package org.cryptomator.ui.lock;
+
+import dagger.Lazy;
+import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.common.vaults.VaultState;
+import org.cryptomator.common.vaults.Volume;
+import org.cryptomator.ui.common.FxmlFile;
+import org.cryptomator.ui.common.FxmlScene;
+import org.cryptomator.ui.common.UserInteractionLock;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javafx.application.Platform;
+import javafx.concurrent.Task;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+import javafx.stage.Window;
+
+/**
+ * The sequence of actions performed and checked during lock of a vault.
+ * <p>
+ * This class implements the Task interface, sucht that it can run in the background with some possible forground operations/requests to the ui, without blocking the main app.
+ * If the task state is
+ * <li>succeeded, the vault was successfully locked;</li>
+ * <li>canceled, the lock was canceled;</li>
+ * <li>failed, the lock failed due to an exception.</li>
+ */
+public class LockWorkflow extends Task<Void> {
+
+	private static final Logger LOG = LoggerFactory.getLogger(LockWorkflow.class);
+
+	private final Stage lockWindow;
+	private final Vault vault;
+	private final UserInteractionLock<LockModule.ForceLockDecision> forceLockDecisionLock;
+	private final Lazy<Scene> lockForcedScene;
+	private final Lazy<Scene> lockFailedScene;
+
+	@Inject
+	public LockWorkflow(@LockWindow Stage lockWindow, @LockWindow Vault vault, UserInteractionLock<LockModule.ForceLockDecision> forceLockDecisionLock, @FxmlScene(FxmlFile.LOCK_FORCED) Lazy<Scene> lockForcedScene, @FxmlScene(FxmlFile.LOCK_FAILED) Lazy<Scene> lockFailedScene) {
+		this.lockWindow = lockWindow;
+		this.vault = vault;
+		this.forceLockDecisionLock = forceLockDecisionLock;
+		this.lockForcedScene = lockForcedScene;
+		this.lockFailedScene = lockFailedScene;
+	}
+
+	@Override
+	protected Void call() throws Volume.VolumeException, InterruptedException {
+		try {
+			vault.lock(false);
+		} catch (Volume.VolumeException e) {
+			LOG.debug("Regular lock of {} failed.", vault.getDisplayName(), e);
+			var decision = askUserForAction();
+			switch (decision) {
+				case FORCE -> vault.lock(true);
+				case CANCEL -> cancel(false);
+			}
+		}
+		return null;
+	}
+
+	private LockModule.ForceLockDecision askUserForAction() throws InterruptedException {
+		// show forcedLock dialogue ...
+		Platform.runLater(() -> {
+			lockWindow.setScene(lockForcedScene.get());
+			lockWindow.show();
+			Window owner = lockWindow.getOwner();
+			if (owner != null) {
+				lockWindow.setX(owner.getX() + (owner.getWidth() - lockWindow.getWidth()) / 2);
+				lockWindow.setY(owner.getY() + (owner.getHeight() - lockWindow.getHeight()) / 2);
+			} else {
+				lockWindow.centerOnScreen();
+			}
+		});
+		// ... and wait for answer
+		return forceLockDecisionLock.awaitInteraction();
+	}
+
+	@Override
+	protected void scheduled() {
+		vault.setState(VaultState.PROCESSING);
+	}
+
+	@Override
+	protected void succeeded() {
+		LOG.info("Lock of {} succeeded.", vault.getDisplayName());
+		vault.setState(VaultState.LOCKED);
+	}
+
+	@Override
+	protected void failed() {
+		LOG.warn("Failed to lock {}.", vault.getDisplayName());
+		vault.setState(VaultState.UNLOCKED);
+		lockWindow.setScene(lockFailedScene.get());
+		lockWindow.show();
+	}
+
+	@Override
+	protected void cancelled() {
+		LOG.debug("Lock of {} canceled.", vault.getDisplayName());
+		vault.setState(VaultState.UNLOCKED);
+	}
+
+}
@@ -26,7 +26,6 @@ public interface MainWindowComponent {
 	default Stage showMainWindow() {
 		Stage stage = window();
 		stage.setScene(scene().get());
-		stage.setIconified(false);
 		stage.show();
 		stage.toFront();
 		stage.requestFocus();
@@ -7,13 +7,14 @@ import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.fxapp.UpdateChecker;
 import org.cryptomator.ui.launcher.AppLifecycleListener;
 import org.cryptomator.ui.preferences.SelectedPreferencesTab;
+import org.cryptomator.ui.traymenu.TrayMenuComponent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
-import javax.inject.Named;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
+import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.fxml.FXML;
 import javafx.scene.layout.HBox;
 import javafx.stage.Stage;
@@ -23,32 +24,31 @@ public class MainWindowTitleController implements FxController {

 	private static final Logger LOG = LoggerFactory.getLogger(MainWindowTitleController.class);

-	public HBox titleBar;
-
 	private final AppLifecycleListener appLifecycle;
 	private final Stage window;
 	private final FxApplication application;
-	private final boolean minimizeToSysTray;
+	private final boolean trayMenuInitialized;
 	private final UpdateChecker updateChecker;
 	private final BooleanBinding updateAvailable;
 	private final LicenseHolder licenseHolder;
 	private final Settings settings;
-	private final BooleanBinding debugModeEnabled;
+	private final BooleanBinding showMinimizeButton;

+	public HBox titleBar;
 	private double xOffset;
 	private double yOffset;

 	@Inject
-	MainWindowTitleController(AppLifecycleListener appLifecycle, @MainWindow Stage window, FxApplication application, @Named("trayMenuSupported") boolean minimizeToSysTray, UpdateChecker updateChecker, LicenseHolder licenseHolder, Settings settings) {
+	MainWindowTitleController(AppLifecycleListener appLifecycle, @MainWindow Stage window, FxApplication application, TrayMenuComponent trayMenu, UpdateChecker updateChecker, LicenseHolder licenseHolder, Settings settings) {
 		this.appLifecycle = appLifecycle;
 		this.window = window;
 		this.application = application;
-		this.minimizeToSysTray = minimizeToSysTray;
+		this.trayMenuInitialized = trayMenu.isInitialized();
 		this.updateChecker = updateChecker;
 		this.updateAvailable = updateChecker.latestVersionProperty().isNotNull();
 		this.licenseHolder = licenseHolder;
 		this.settings = settings;
-		this.debugModeEnabled = Bindings.createBooleanBinding(this::isDebugModeEnabled, settings.debugMode());
+		this.showMinimizeButton = Bindings.createBooleanBinding(this::isShowMinimizeButton, settings.showMinimizeButton(), settings.showTrayIcon());
 	}

 	@FXML
@@ -71,7 +71,7 @@ public class MainWindowTitleController implements FxController {

 	@FXML
 	public void close() {
-		if (minimizeToSysTray) {
+		if (trayMenuInitialized) {
 			window.close();
 		} else {
 			appLifecycle.quit();
@@ -112,15 +112,24 @@ public class MainWindowTitleController implements FxController {
 		return updateAvailable.get();
 	}

-	public boolean isMinimizeToSysTray() {
-		return minimizeToSysTray;
+	public boolean isTrayIconPresent() {
+		return trayMenuInitialized;
 	}

-	public BooleanBinding debugModeEnabledProperty() {
-		return debugModeEnabled;
+	public ReadOnlyBooleanProperty debugModeEnabledProperty() {
+		return settings.debugMode();
 	}

 	public boolean isDebugModeEnabled() {
-		return settings.debugMode().get();
+		return debugModeEnabledProperty().get();
+	}
+
+	public BooleanBinding showMinimizeButtonProperty() {
+		return showMinimizeButton;
+	}
+
+	public boolean isShowMinimizeButton() {
+		// always show the minimize button if no tray icon is present OR it is explicitily enabled
+		return !trayMenuInitialized || settings.showMinimizeButton().get();
 	}
 }
@@ -6,25 +6,32 @@ import com.google.common.cache.LoadingCache;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.VaultService;
+import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.stats.VaultStatisticsComponent;

 import javax.inject.Inject;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.ReadOnlyObjectProperty;
 import javafx.fxml.FXML;
+import javafx.stage.Stage;
+import java.util.Optional;

@MainWindowScoped
 public class VaultDetailUnlockedController implements FxController {

 	private final ReadOnlyObjectProperty<Vault> vault;
+	private final FxApplication application;
 	private final VaultService vaultService;
+	private final Stage mainWindow;
 	private final LoadingCache<Vault, VaultStatisticsComponent> vaultStats;
 	private final VaultStatisticsComponent.Builder vaultStatsBuilder;

 	@Inject
-	public VaultDetailUnlockedController(ObjectProperty<Vault> vault, VaultService vaultService, VaultStatisticsComponent.Builder vaultStatsBuilder) {
+	public VaultDetailUnlockedController(ObjectProperty<Vault> vault, FxApplication application, VaultService vaultService, VaultStatisticsComponent.Builder vaultStatsBuilder, @MainWindow Stage mainWindow) {
 		this.vault = vault;
+		this.application = application;
 		this.vaultService = vaultService;
+		this.mainWindow = mainWindow;
 		this.vaultStats = CacheBuilder.newBuilder().weakValues().build(CacheLoader.from(this::buildVaultStats));
 		this.vaultStatsBuilder = vaultStatsBuilder;
 	}
@@ -40,8 +47,7 @@ public class VaultDetailUnlockedController implements FxController {

 	@FXML
 	public void lock() {
-		vaultService.lock(vault.get(), false);
-		// TODO count lock attempts, and allow forced lock
+		application.startLockWorkflow(vault.get(), Optional.of(mainWindow));
 	}

 	@FXML
@@ -1,6 +1,5 @@
 package org.cryptomator.ui.mainwindow;

-import com.tobiasdiez.easybind.EasyBind;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.common.vaults.VaultListManager;
 import org.cryptomator.ui.addvaultwizard.AddVaultWizardComponent;
@@ -13,6 +12,7 @@ import javax.inject.Inject;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -41,7 +41,7 @@ public class VaultListController implements FxController {
 		this.removeVault = removeVault;
 		this.noVaultSelected = selectedVault.isNull();
 		this.emptyVaultList = Bindings.isEmpty(vaults);
-		EasyBind.subscribe(selectedVault, this::selectedVaultDidChange);
+		selectedVault.addListener(this::selectedVaultDidChange);
 	}

 	public void initialize() {
@@ -58,10 +58,11 @@ public class VaultListController implements FxController {
 		});
 	}

-	private void selectedVaultDidChange(Vault newValue) {
-		if (newValue != null) {
-			VaultListManager.redetermineVaultState(newValue);
+	private void selectedVaultDidChange(@SuppressWarnings("unused") ObservableValue<? extends Vault> observableValue, @SuppressWarnings("unused") Vault oldValue, Vault newValue) {
+		if (newValue == null) {
+			return;
 		}
+		VaultListManager.redetermineVaultState(newValue);
 	}

 	@FXML
@@ -1,46 +0,0 @@
-package org.cryptomator.ui.preferences;
-
-import org.cryptomator.integrations.autostart.AutoStartProvider;
-import org.cryptomator.integrations.autostart.ToggleAutoStartFailedException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-
-@Deprecated
-class AutoStartMacStrategy implements AutoStartStrategy {
-
-	private static final Logger LOG = LoggerFactory.getLogger(AutoStartMacStrategy.class);
-
-	private final AutoStartProvider autoStartProvider;
-
-	public AutoStartMacStrategy(AutoStartProvider autoStartProvider) {
-		this.autoStartProvider = autoStartProvider;
-	}
-
-	@Override
-	public CompletionStage<Boolean> isAutoStartEnabled() {
-		return CompletableFuture.completedFuture(autoStartProvider.isEnabled());
-	}
-
-	@Override
-	public void enableAutoStart() throws TogglingAutoStartFailedException {
-		try {
-			autoStartProvider.enable();
-			LOG.debug("Added login item.");
-		} catch (ToggleAutoStartFailedException e) {
-			throw new TogglingAutoStartFailedException("Failed to add login item.");
-		}
-	}
-
-	@Override
-	public void disableAutoStart() throws TogglingAutoStartFailedException {
-		try {
-			autoStartProvider.disable();
-			LOG.debug("Removed login item.");
-		} catch (ToggleAutoStartFailedException e) {
-			throw new TogglingAutoStartFailedException("Failed to remove login item.");
-		}
-	}
-}
@@ -1,27 +0,0 @@
-package org.cryptomator.ui.preferences;
-
-import dagger.Module;
-import dagger.Provides;
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.integrations.autostart.AutoStartProvider;
-
-import java.util.Optional;
-
-@Deprecated
-@Module
-abstract class AutoStartModule {
-
-	@Provides
-	@PreferencesScoped
-	public static Optional<AutoStartStrategy> provideAutoStartStrategy(Optional<AutoStartProvider> autoStartProvider) {
-		if (SystemUtils.IS_OS_MAC_OSX && autoStartProvider.isPresent()) {
-			return Optional.of(new AutoStartMacStrategy(autoStartProvider.get()));
-		} else if (SystemUtils.IS_OS_WINDOWS) {
-			Optional<String> exeName = ProcessHandle.current().info().command();
-			return exeName.map(AutoStartWinStrategy::new);
-		} else {
-			return Optional.empty();
-		}
-	}
-
-}
@@ -1,25 +0,0 @@
-package org.cryptomator.ui.preferences;
-
-import java.util.concurrent.CompletionStage;
-
-@Deprecated
-public interface AutoStartStrategy {
-
-	CompletionStage<Boolean> isAutoStartEnabled();
-
-	void enableAutoStart() throws TogglingAutoStartFailedException;
-
-	void disableAutoStart() throws TogglingAutoStartFailedException;
-
-	class TogglingAutoStartFailedException extends Exception {
-
-		public TogglingAutoStartFailedException(String message) {
-			super(message);
-		}
-
-		public TogglingAutoStartFailedException(String message, Throwable cause) {
-			super(message, cause);
-		}
-
-	}
-}
@@ -1,209 +0,0 @@
-package org.cryptomator.ui.preferences;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-/**
- * OS specific class to check, en- and disable the auto start on Windows.
- * <p>
- * Two strategies are implemented for this feature, the first uses the registry and the second one the autostart folder.
- * <p>
- * The registry strategy checks/add/removes at the registry key {@value HKCU_AUTOSTART_KEY} an entry for Cryptomator.
- * The folder strategy checks/add/removes at the location {@value WINDOWS_START_MENU_ENTRY}.
- * <p>
- * To check if the feature is active, both strategies are applied.
- * To enable the feature, first the registry is tried and only on failure the autostart folder is used.
- * To disable it, first it is determined by an internal state, which strategies must be used and in the second step those are executed.
- *
- * @apiNote This class is not thread safe, hence it should be avoided to call its methods simultaniously by different threads.
- * @deprecated To be moved to integration-win project
- */
-@Deprecated
-class AutoStartWinStrategy implements AutoStartStrategy {
-
-	private static final Logger LOG = LoggerFactory.getLogger(AutoStartWinStrategy.class);
-	private static final String HKCU_AUTOSTART_KEY = "\"HKCU\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run\"";
-	private static final String AUTOSTART_VALUE = "Cryptomator";
-	private static final String WINDOWS_START_MENU_ENTRY = "\\AppData\\Roaming\\Microsoft\\Windows\\Start Menu\\Programs\\Cryptomator.lnk";
-
-	private final String exePath;
-
-	private boolean activatedUsingFolder;
-	private boolean activatedUsingRegistry;
-
-	public AutoStartWinStrategy(String exePath) {
-		this.exePath = exePath;
-		this.activatedUsingFolder = false;
-		this.activatedUsingRegistry = false;
-	}
-
-	@Override
-	public CompletionStage<Boolean> isAutoStartEnabled() {
-		return isAutoStartEnabledUsingRegistry().thenCombine(isAutoStartEnabledUsingFolder(), (bReg, bFolder) -> bReg || bFolder);
-	}
-
-	private CompletableFuture<Boolean> isAutoStartEnabledUsingFolder() {
-		Path autoStartEntry = Path.of(System.getProperty("user.home") + WINDOWS_START_MENU_ENTRY);
-		this.activatedUsingFolder = Files.exists(autoStartEntry);
-		return CompletableFuture.completedFuture(activatedUsingFolder);
-	}
-
-	private CompletableFuture<Boolean> isAutoStartEnabledUsingRegistry() {
-		ProcessBuilder regQuery = new ProcessBuilder("reg", "query", HKCU_AUTOSTART_KEY, //
-				"/v", AUTOSTART_VALUE);
-		try {
-			Process proc = regQuery.start();
-			return proc.onExit().thenApply(p -> {
-				this.activatedUsingRegistry = p.exitValue() == 0;
-				return activatedUsingRegistry;
-			});
-		} catch (IOException e) {
-			LOG.debug("Failed to query {} from registry key {}", AUTOSTART_VALUE, HKCU_AUTOSTART_KEY);
-			return CompletableFuture.completedFuture(false);
-		}
-	}
-
-	@Override
-	public void enableAutoStart() throws TogglingAutoStartFailedException {
-		try {
-			enableAutoStartUsingRegistry().thenAccept((Void v) -> this.activatedUsingRegistry = true).exceptionallyCompose(e -> {
-				LOG.debug("Falling back to using autostart folder.");
-				return this.enableAutoStartUsingFolder();
-			}).thenAccept((Void v) -> this.activatedUsingFolder = true).get();
-		} catch (InterruptedException e) {
-			Thread.currentThread().interrupt();
-			throw new TogglingAutoStartFailedException("Execution of enabling auto start setting was interrupted.");
-		} catch (ExecutionException e) {
-			throw new TogglingAutoStartFailedException("Enabling auto start failed both using registry and auto start folder.");
-		}
-	}
-
-	private CompletableFuture<Void> enableAutoStartUsingRegistry() {
-		ProcessBuilder regAdd = new ProcessBuilder("reg", "add", HKCU_AUTOSTART_KEY, //
-				"/v", AUTOSTART_VALUE, //
-				"/t", "REG_SZ", //
-				"/d", "\"" + exePath + "\"", //
-				"/f");
-		try {
-			Process proc = regAdd.start();
-			boolean finishedInTime = waitForProcessOrCancel(proc, 5, TimeUnit.SECONDS);
-			if (finishedInTime && proc.exitValue() == 0) {
-				LOG.debug("Added {} to registry key {}.", AUTOSTART_VALUE, HKCU_AUTOSTART_KEY);
-				return CompletableFuture.completedFuture(null);
-			} else {
-				throw new IOException("Process exited with error code " + proc.exitValue());
-			}
-		} catch (IOException e) {
-			LOG.debug("Registry could not be edited to set auto start.", e);
-			return CompletableFuture.failedFuture(new SystemCommandException("Adding registry value failed."));
-		}
-	}
-
-	private CompletableFuture<Void> enableAutoStartUsingFolder() {
-		String autoStartFolderEntry = System.getProperty("user.home") + WINDOWS_START_MENU_ENTRY;
-		String createShortcutCommand = "$s=(New-Object -COM WScript.Shell).CreateShortcut('" + autoStartFolderEntry + "');$s.TargetPath='" + exePath + "';$s.Save();";
-		ProcessBuilder shortcutAdd = new ProcessBuilder("cmd", "/c", "Start powershell " + createShortcutCommand);
-		try {
-			Process proc = shortcutAdd.start();
-			boolean finishedInTime = waitForProcessOrCancel(proc, 5, TimeUnit.SECONDS);
-			if (finishedInTime && proc.exitValue() == 0) {
-				LOG.debug("Created file {} for auto start.", autoStartFolderEntry);
-				return CompletableFuture.completedFuture(null);
-			} else {
-				throw new IOException("Process exited with error code " + proc.exitValue());
-			}
-		} catch (IOException e) {
-			LOG.debug("Adding entry to auto start folder failed.", e);
-			return CompletableFuture.failedFuture(new SystemCommandException("Adding entry to auto start folder failed."));
-		}
-	}
-
-
-	@Override
-	public void disableAutoStart() throws TogglingAutoStartFailedException {
-		if (activatedUsingRegistry) {
-			disableAutoStartUsingRegistry().whenComplete((voit, ex) -> {
-				if (ex == null) {
-					this.activatedUsingRegistry = false;
-				}
-			});
-		}
-
-		if (activatedUsingFolder) {
-			disableAutoStartUsingFolder().whenComplete((voit, ex) -> {
-				if (ex == null) {
-					this.activatedUsingFolder = false;
-				}
-			});
-		}
-
-		if (activatedUsingRegistry || activatedUsingFolder) {
-			throw new TogglingAutoStartFailedException("Disabling auto start failed using registry and/or auto start folder.");
-		}
-	}
-
-	public CompletableFuture<Void> disableAutoStartUsingRegistry() {
-		ProcessBuilder regRemove = new ProcessBuilder("reg", "delete", HKCU_AUTOSTART_KEY, //
-				"/v", AUTOSTART_VALUE, //
-				"/f");
-		try {
-			Process proc = regRemove.start();
-			boolean finishedInTime = waitForProcessOrCancel(proc, 5, TimeUnit.SECONDS);
-			if (finishedInTime && proc.exitValue() == 0) {
-				LOG.debug("Removed {} from registry key {}.", AUTOSTART_VALUE, HKCU_AUTOSTART_KEY);
-				return CompletableFuture.completedFuture(null);
-			} else {
-				throw new IOException("Process exited with error code " + proc.exitValue());
-			}
-		} catch (IOException e) {
-			LOG.debug("Registry could not be edited to remove auto start.", e);
-			return CompletableFuture.failedFuture(new SystemCommandException("Removing registry value failed."));
-		}
-	}
-
-	private CompletableFuture<Void> disableAutoStartUsingFolder() {
-		try {
-			Files.delete(Path.of(WINDOWS_START_MENU_ENTRY));
-			LOG.debug("Successfully deleted {}.", WINDOWS_START_MENU_ENTRY);
-			return CompletableFuture.completedFuture(null);
-		} catch (NoSuchFileException e) {
-			//that is also okay
-			return CompletableFuture.completedFuture(null);
-		} catch (IOException e) {
-			LOG.debug("Failed to delete entry from auto start folder.", e);
-			return CompletableFuture.failedFuture(e);
-		}
-	}
-
-	private static boolean waitForProcessOrCancel(Process proc, int timeout, TimeUnit timeUnit) {
-		boolean finishedInTime = false;
-		try {
-			finishedInTime = proc.waitFor(timeout, timeUnit);
-		} catch (InterruptedException e) {
-			LOG.error("Timeout while reading registry", e);
-			Thread.currentThread().interrupt();
-		} finally {
-			if (!finishedInTime) {
-				proc.destroyForcibly();
-			}
-		}
-		return finishedInTime;
-	}
-
-	private class SystemCommandException extends RuntimeException {
-
-		public SystemCommandException(String msg) {
-			super(msg);
-		}
-	}
-
-}
@@ -1,5 +1,6 @@
 package org.cryptomator.ui.preferences;

+import com.google.common.base.CharMatcher;
 import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
@@ -10,6 +11,7 @@ import javafx.application.Application;
 import javafx.beans.value.ObservableValue;
 import javafx.fxml.FXML;
 import javafx.scene.control.TextArea;
+import javafx.scene.control.TextFormatter;

@PreferencesScoped
 public class DonationKeyPreferencesController implements FxController {
@@ -32,6 +34,15 @@ public class DonationKeyPreferencesController implements FxController {
 	public void initialize() {
 		donationKeyField.setText(licenseHolder.getLicenseKey().orElse(null));
 		donationKeyField.textProperty().addListener(this::registrationKeyChanged);
+		donationKeyField.setTextFormatter(new TextFormatter<>(this::checkVaultNameLength));
+	}
+
+	private TextFormatter.Change checkVaultNameLength(TextFormatter.Change change) {
+		if (change.isContentChange()) {
+			var strippedText = CharMatcher.whitespace().removeFrom(change.getText());
+			change.setText(strippedText);
+		}
+		return change;
 	}

 	private void registrationKeyChanged(@SuppressWarnings("unused") ObservableValue<? extends String> observable, @SuppressWarnings("unused") String oldValue, String newValue) {
@@ -5,19 +5,19 @@ import org.cryptomator.common.LicenseHolder;
 import org.cryptomator.common.settings.KeychainBackend;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.UiTheme;
+import org.cryptomator.integrations.autostart.AutoStartProvider;
+import org.cryptomator.integrations.autostart.ToggleAutoStartFailedException;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
 import org.cryptomator.ui.common.ErrorComponent;
 import org.cryptomator.ui.common.FxController;
+import org.cryptomator.ui.traymenu.TrayMenuComponent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import javax.inject.Inject;
-import javax.inject.Named;
 import javafx.application.Application;
-import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.value.ObservableValue;
-import javafx.concurrent.Task;
 import javafx.fxml.FXML;
 import javafx.geometry.NodeOrientation;
 import javafx.scene.control.CheckBox;
@@ -31,7 +31,6 @@ import java.util.Arrays;
 import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.Set;
-import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;

@PreferencesScoped
@@ -41,11 +40,11 @@ public class GeneralPreferencesController implements FxController {

 	private final Stage window;
 	private final Settings settings;
+	private final boolean trayMenuInitialized;
 	private final boolean trayMenuSupported;
-	private final Optional<AutoStartStrategy> autoStartStrategy;
+	private final Optional<AutoStartProvider> autoStartProvider;
 	private final ObjectProperty<SelectedPreferencesTab> selectedTabProperty;
 	private final LicenseHolder licenseHolder;
-	private final ExecutorService executor;
 	private final ResourceBundle resourceBundle;
 	private final Application application;
 	private final Environment environment;
@@ -53,6 +52,8 @@ public class GeneralPreferencesController implements FxController {
 	private final ErrorComponent.Builder errorComponent;
 	public ChoiceBox<UiTheme> themeChoiceBox;
 	public ChoiceBox<KeychainBackend> keychainBackendChoiceBox;
+	public CheckBox showMinimizeButtonCheckbox;
+	public CheckBox showTrayIconCheckbox;
 	public CheckBox startHiddenCheckbox;
 	public CheckBox debugModeCheckbox;
 	public CheckBox autoStartCheckbox;
@@ -60,16 +61,17 @@ public class GeneralPreferencesController implements FxController {
 	public RadioButton nodeOrientationLtr;
 	public RadioButton nodeOrientationRtl;

+
 	@Inject
-	GeneralPreferencesController(@PreferencesWindow Stage window, Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional<AutoStartStrategy> autoStartStrategy, Set<KeychainAccessProvider> keychainAccessProviders, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor, ResourceBundle resourceBundle, Application application, Environment environment, ErrorComponent.Builder errorComponent) {
+	GeneralPreferencesController(@PreferencesWindow Stage window, Settings settings, TrayMenuComponent trayMenu, Optional<AutoStartProvider> autoStartProvider, Set<KeychainAccessProvider> keychainAccessProviders, ObjectProperty<SelectedPreferencesTab> selectedTabProperty, LicenseHolder licenseHolder, ResourceBundle resourceBundle, Application application, Environment environment, ErrorComponent.Builder errorComponent) {
 		this.window = window;
 		this.settings = settings;
-		this.trayMenuSupported = trayMenuSupported;
-		this.autoStartStrategy = autoStartStrategy;
+		this.trayMenuInitialized = trayMenu.isInitialized();
+		this.trayMenuSupported = trayMenu.isSupported();
+		this.autoStartProvider = autoStartProvider;
 		this.keychainAccessProviders = keychainAccessProviders;
 		this.selectedTabProperty = selectedTabProperty;
 		this.licenseHolder = licenseHolder;
-		this.executor = executor;
 		this.resourceBundle = resourceBundle;
 		this.application = application;
 		this.environment = environment;
@@ -85,15 +87,15 @@ public class GeneralPreferencesController implements FxController {
 		themeChoiceBox.valueProperty().bindBidirectional(settings.theme());
 		themeChoiceBox.setConverter(new UiThemeConverter(resourceBundle));

+		showMinimizeButtonCheckbox.selectedProperty().bindBidirectional(settings.showMinimizeButton());
+
+		showTrayIconCheckbox.selectedProperty().bindBidirectional(settings.showTrayIcon());
+
 		startHiddenCheckbox.selectedProperty().bindBidirectional(settings.startHidden());

 		debugModeCheckbox.selectedProperty().bindBidirectional(settings.debugMode());

-		autoStartStrategy.ifPresent(autoStart -> {
-			autoStart.isAutoStartEnabled().thenAccept(enabled -> {
-				Platform.runLater(() -> autoStartCheckbox.setSelected(enabled));
-			});
-		});
+		autoStartProvider.ifPresent(autoStart -> autoStartCheckbox.setSelected(autoStart.isEnabled()));

 		nodeOrientationLtr.setSelected(settings.userInterfaceOrientation().get() == NodeOrientation.LEFT_TO_RIGHT);
 		nodeOrientationRtl.setSelected(settings.userInterfaceOrientation().get() == NodeOrientation.RIGHT_TO_LEFT);
@@ -109,12 +111,16 @@ public class GeneralPreferencesController implements FxController {
 		return Arrays.stream(KeychainBackend.values()).filter(value -> namesOfAvailableProviders.contains(value.getProviderClass())).toArray(KeychainBackend[]::new);
 	}

+	public boolean isTrayMenuInitialized() {
+		return trayMenuInitialized;
+	}
+
 	public boolean isTrayMenuSupported() {
-		return this.trayMenuSupported;
+		return trayMenuSupported;
 	}

 	public boolean isAutoStartSupported() {
-		return autoStartStrategy.isPresent();
+		return autoStartProvider.isPresent();
 	}

 	private void toggleNodeOrientation(@SuppressWarnings("unused") ObservableValue<? extends Toggle> observable, @SuppressWarnings("unused") Toggle oldValue, Toggle newValue) {
@@ -129,15 +135,19 @@ public class GeneralPreferencesController implements FxController {

 	@FXML
 	public void toggleAutoStart() {
-		autoStartStrategy.ifPresent(autoStart -> {
+		autoStartProvider.ifPresent(autoStart -> {
 			boolean enableAutoStart = autoStartCheckbox.isSelected();
-			Task<Void> toggleTask = new ToggleAutoStartTask(autoStart, enableAutoStart);
-			toggleTask.setOnFailed(event -> {
+			try {
+				if (enableAutoStart) {
+					autoStart.enable();
+				} else {
+					autoStart.disable();
+				}
+			} catch (ToggleAutoStartFailedException e) {
 				autoStartCheckbox.setSelected(!enableAutoStart); // restore previous state
-				LOG.error("Failed to toggle autostart.", event.getSource().getException());
-				errorComponent.cause(event.getSource().getException()).window(window).returnToScene(window.getScene()).build().showErrorScene();
-			});
-			executor.execute(toggleTask);
+				LOG.error("Failed to toggle autostart.", e);
+				errorComponent.cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene();
+			}
 		});
 	}

@@ -175,6 +185,7 @@ public class GeneralPreferencesController implements FxController {
 		public UiTheme fromString(String string) {
 			throw new UnsupportedOperationException();
 		}
+
 	}

 	private static class KeychainBackendConverter extends StringConverter<KeychainBackend> {
@@ -194,29 +205,6 @@ public class GeneralPreferencesController implements FxController {
 		public KeychainBackend fromString(String string) {
 			throw new UnsupportedOperationException();
 		}
+
 	}
-
-	private static class ToggleAutoStartTask extends Task<Void> {
-
-		private final AutoStartStrategy autoStart;
-		private final boolean enable;
-
-		public ToggleAutoStartTask(AutoStartStrategy autoStart, boolean enable) {
-			this.autoStart = autoStart;
-			this.enable = enable;
-
-			setOnFailed(event -> LOG.error("Failed to toggle Autostart", getException()));
-		}
-
-		@Override
-		protected Void call() throws Exception {
-			if (enable) {
-				autoStart.enableAutoStart();
-			} else {
-				autoStart.disableAutoStart();
-			}
-			return null;
-		}
-	}
-
 }
@@ -20,7 +20,7 @@ import javafx.stage.Stage;
 import java.util.Map;
 import java.util.ResourceBundle;

-@Module(includes = {AutoStartModule.class})
+@Module
 abstract class PreferencesModule {

 	@Provides
@@ -5,7 +5,6 @@
 *******************************************************************************/
 package org.cryptomator.ui.quit;

-import dagger.BindsInstance;
 import dagger.Lazy;
 import dagger.Subcomponent;
 import org.cryptomator.ui.common.FxmlFile;
@@ -25,7 +24,10 @@ public interface QuitComponent {
 	@FxmlScene(FxmlFile.QUIT)
 	Lazy<Scene> scene();

-	default Stage showQuitWindow() {
+	QuitController controller();
+
+	default Stage showQuitWindow(QuitResponse response) {
+		controller().updateQuitRequest(response);
 		Stage stage = window();
 		stage.setScene(scene().get());
 		stage.show();
@@ -36,9 +38,6 @@ public interface QuitComponent {
 	@Subcomponent.Builder
 	interface Builder {

-		@BindsInstance
-		Builder quitResponse(QuitResponse response);
-
 		QuitComponent build();
 	}

@@ -16,6 +16,8 @@ import javafx.stage.Stage;
 import java.awt.desktop.QuitResponse;
 import java.util.Collection;
 import java.util.concurrent.ExecutorService;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;

@QuitScoped
@@ -24,26 +26,40 @@ public class QuitController implements FxController {
 	private static final Logger LOG = LoggerFactory.getLogger(QuitController.class);

 	private final Stage window;
-	private final QuitResponse response;
 	private final ObservableList<Vault> unlockedVaults;
 	private final ExecutorService executorService;
 	private final VaultService vaultService;
+	private final AtomicReference<QuitResponse> quitResponse = new AtomicReference<>();
 	public Button lockAndQuitButton;

 	@Inject
-	QuitController(@QuitWindow Stage window, QuitResponse response, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService) {
+	QuitController(@QuitWindow Stage window, ObservableList<Vault> vaults, ExecutorService executorService, VaultService vaultService) {
 		this.window = window;
-		this.response = response;
 		this.unlockedVaults = vaults.filtered(Vault::isUnlocked);
 		this.executorService = executorService;
 		this.vaultService = vaultService;
+		window.setOnCloseRequest(windowEvent -> cancel());
+	}
+
+	public void updateQuitRequest(QuitResponse newResponse) {
+		var oldResponse = quitResponse.getAndSet(newResponse);
+		if (oldResponse != null) {
+			oldResponse.cancelQuit();
+		}
+	}
+
+	private void respondToQuitRequest(Consumer<QuitResponse> action) {
+		var response = quitResponse.getAndSet(null);
+		if (response != null) {
+			action.accept(response);
+		}
 	}

 	@FXML
 	public void cancel() {
 		LOG.info("Quitting application canceled by user.");
 		window.close();
-		response.cancelQuit();
+		respondToQuitRequest(QuitResponse::cancelQuit);
 	}

 	@FXML
@@ -56,16 +72,16 @@ public class QuitController implements FxController {
 			LOG.info("Locked {}", lockAllTask.getValue().stream().map(Vault::getDisplayName).collect(Collectors.joining(", ")));
 			if (unlockedVaults.isEmpty()) {
 				window.close();
-				response.performQuit();
+				respondToQuitRequest(QuitResponse::performQuit);
 			}
 		});
 		lockAllTask.setOnFailed(evt -> {
 			LOG.warn("Locking failed", lockAllTask.getException());
 			lockAndQuitButton.setDisable(false);
 			lockAndQuitButton.setContentDisplay(ContentDisplay.TEXT_ONLY);
-			// TODO: show force lock or force quit scene (and DO NOT cancelQuit() here!)
-			// see https://github.com/cryptomator/cryptomator/blob/1.4.16/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java#L151-L163
-			response.cancelQuit();
+			// TODO: show force lock or force quit scene (and DO NOT cancelQuit() here!) (see https://github.com/cryptomator/cryptomator/pull/1416)
+			window.close();
+			respondToQuitRequest(QuitResponse::cancelQuit);
 		});
 		executorService.execute(lockAllTask);
 	}
@@ -43,7 +43,7 @@ abstract class QuitModule {
 	@Provides
 	@FxmlScene(FxmlFile.QUIT)
 	@QuitScoped
-	static Scene provideUnlockScene(@QuitWindow FXMLLoaderFactory fxmlLoaders) {
+	static Scene provideQuitScene(@QuitWindow FXMLLoaderFactory fxmlLoaders) {
 		return fxmlLoaders.createScene("/fxml/quit.fxml");
 	}

@@ -1,5 +1,6 @@
 package org.cryptomator.ui.traymenu;

+import com.google.common.base.Preconditions;
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.integrations.uiappearance.Theme;
 import org.cryptomator.integrations.uiappearance.UiAppearanceException;
@@ -22,6 +23,7 @@ public class TrayIconController {
 	private final Optional<UiAppearanceProvider> appearanceProvider;
 	private final TrayMenuController trayMenuController;
 	private final TrayIcon trayIcon;
+	private volatile boolean initialized;

 	@Inject
 	TrayIconController(TrayImageFactory imageFactory, TrayMenuController trayMenuController, Optional<UiAppearanceProvider> appearanceProvider) {
@@ -31,7 +33,9 @@ public class TrayIconController {
 		this.trayIcon = new TrayIcon(imageFactory.loadImage(), "Cryptomator", trayMenuController.getMenu());
 	}

-	public void initializeTrayIcon() {
+	public synchronized void initializeTrayIcon() throws IllegalStateException {
+		Preconditions.checkState(!initialized);
+
 		appearanceProvider.ifPresent(appearanceProvider -> {
 			try {
 				appearanceProvider.addListener(this::systemInterfaceThemeChanged);
@@ -53,10 +57,15 @@ public class TrayIconController {
 		}

 		trayMenuController.initTrayMenu();
+
+		this.initialized = true;
 	}

 	private void systemInterfaceThemeChanged(Theme theme) {
 		trayIcon.setImage(imageFactory.loadImage()); // TODO refactor "theme" is re-queried in loadImage()
 	}

+	public boolean isInitialized() {
+		return initialized;
+	}
 }
@@ -5,19 +5,38 @@
 *******************************************************************************/
 package org.cryptomator.ui.traymenu;

+import dagger.Lazy;
 import dagger.Subcomponent;
-
 import java.awt.SystemTray;

@TrayMenuScoped
@Subcomponent
 public interface TrayMenuComponent {

-	TrayIconController trayIconController();
+	Lazy<TrayIconController> trayIconController();

-	default void addIconToSystemTray() {
-		assert SystemTray.isSupported();
-		trayIconController().initializeTrayIcon();
+	/**
+	 * @return <code>true</code> if a tray icon can be installed
+	 */
+	default boolean isSupported() {
+		return SystemTray.isSupported();
+	}
+
+	/**
+	 * @return <code>true</code> if a tray icon has been installed
+	 */
+	default boolean isInitialized() {
+		return isSupported() && trayIconController().get().isInitialized();
+	}
+
+	/**
+	 * Installs a tray icon to the system tray.
+	 *
+	 * @throws IllegalStateException If already added
+	 */
+	default void initializeTrayIcon() throws IllegalStateException {
+		assert isSupported();
+		trayIconController().get().initializeTrayIcon();
 	}

 	@Subcomponent.Builder
@@ -1,6 +1,7 @@
 package org.cryptomator.ui.traymenu;

 import org.cryptomator.common.vaults.Vault;
+import org.cryptomator.ui.fxapp.FxApplication;
 import org.cryptomator.ui.launcher.AppLifecycleListener;
 import org.cryptomator.ui.launcher.FxApplicationStarter;
 import org.cryptomator.ui.preferences.SelectedPreferencesTab;
@@ -103,32 +104,36 @@ class TrayMenuController {
 		return actionEvent -> consumer.accept(vault);
 	}

-	private void unlockVault(Vault vault) {
-		fxApplicationStarter.get(true).thenAccept(app -> app.startUnlockWorkflow(vault, Optional.empty()));
-	}
-
-	private void lockVault(Vault vault) {
-		fxApplicationStarter.get(true).thenAccept(app -> app.getVaultService().lock(vault, false));
-	}
-
-	private void lockAllVaults(ActionEvent actionEvent) {
-		fxApplicationStarter.get(true).thenAccept(app -> app.getVaultService().lockAll(vaults.filtered(Vault::isUnlocked), false));
-	}
-
-	private void revealVault(Vault vault) {
-		fxApplicationStarter.get(true).thenAccept(app -> app.getVaultService().reveal(vault));
-	}
-
-	void showMainWindow(@SuppressWarnings("unused") ActionEvent actionEvent) {
-		fxApplicationStarter.get(true).thenAccept(app -> app.showMainWindow());
-	}
-
-	private void showPreferencesWindow(@SuppressWarnings("unused") EventObject actionEvent) {
-		fxApplicationStarter.get(true).thenAccept(app -> app.showPreferencesWindow(SelectedPreferencesTab.ANY));
-	}
-
 	private void quitApplication(EventObject actionEvent) {
 		appLifecycle.quit();
 	}

+	private void unlockVault(Vault vault) {
+		showMainAppAndThen(app -> app.startUnlockWorkflow(vault, Optional.empty()));
+	}
+
+	private void lockVault(Vault vault) {
+		showMainAppAndThen(app -> app.startLockWorkflow(vault, Optional.empty()));
+	}
+
+	private void lockAllVaults(ActionEvent actionEvent) {
+		showMainAppAndThen(app -> app.getVaultService().lockAll(vaults.filtered(Vault::isUnlocked), false));
+	}
+
+	private void revealVault(Vault vault) {
+		showMainAppAndThen(app -> app.getVaultService().reveal(vault));
+	}
+
+	void showMainWindow(@SuppressWarnings("unused") ActionEvent actionEvent) {
+		showMainAppAndThen(app -> app.showMainWindow());
+	}
+
+	private void showPreferencesWindow(@SuppressWarnings("unused") EventObject actionEvent) {
+		showMainAppAndThen(app -> app.showPreferencesWindow(SelectedPreferencesTab.ANY));
+	}
+
+	private void showMainAppAndThen(Consumer<FxApplication> action) {
+		fxApplicationStarter.get().thenAccept(action);
+	}
+
 }
@@ -31,6 +31,7 @@ import javafx.scene.image.ImageView;
 import javafx.scene.transform.Rotate;
 import javafx.scene.transform.Translate;
 import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
 import javafx.util.Duration;
 import java.util.Arrays;
 import java.util.Optional;
@@ -78,7 +79,7 @@ public class UnlockController implements FxController {
 		this.userInteractionDisabled = passwordEntryLock.awaitingInteraction().not();
 		this.unlockButtonDisabled = new SimpleBooleanProperty();
 		this.vaultName = WeakBindings.bindString(vault.displayNameProperty());
-		this.window.setOnCloseRequest(windowEvent -> cancel());
+		this.window.setOnHiding(this::windowClosed);
 	}

 	@FXML
@@ -128,14 +129,18 @@ public class UnlockController implements FxController {
 		passwordEntryLock.awaitingInteraction().addListener(observable -> stopUnlockAnimation());
 	}

-
 	@FXML
 	public void cancel() {
-		LOG.debug("Unlock canceled by user.");
 		window.close();
-		passwordEntryLock.interacted(UnlockModule.PasswordEntry.CANCELED);
 	}

+	private void windowClosed(WindowEvent windowEvent) {
+		// if not already interacted, mark this workflow as cancelled:
+		if (passwordEntryLock.awaitingInteraction().get()) {
+			LOG.debug("Unlock canceled by user.");
+			passwordEntryLock.interacted(UnlockModule.PasswordEntry.CANCELED);
+		}
+	}

 	@FXML
 	public void unlock() {
@@ -165,15 +165,7 @@ public class UnlockWorkflow extends Task<Boolean> {
 		assert requirement != MountPointRequirement.PARENT_OPT_MOUNT_POINT; //Not implemented anywhere (yet)

 		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
+		// TODO: apply https://openjdk.java.net/jeps/8213076 in future JDK versions
 		if (cause instanceof NotDirectoryException) {
 			if (requirement == MountPointRequirement.PARENT_NO_MOUNT_POINT) {
 				LOG.error("Unlock failed. Parent folder is missing: {}", cause.getMessage());
@@ -182,28 +174,23 @@ public class UnlockWorkflow extends Task<Boolean> {
 			}
 			showInvalidMountPointScene();
 			return;
-		}
-
-		if (cause instanceof FileAlreadyExistsException) {
+		} else if (cause instanceof FileAlreadyExistsException) {
 			LOG.error("Unlock failed. Mountpoint already exists: {}", cause.getMessage());
 			showInvalidMountPointScene();
 			return;
-		}
-
-		if (cause instanceof DirectoryNotEmptyException) {
+		} else if (cause instanceof DirectoryNotEmptyException) {
 			LOG.error("Unlock failed. Mountpoint not an empty directory: {}", cause.getMessage());
 			showInvalidMountPointScene();
 			return;
+		} else {
+			handleGenericError(impExc);
 		}
-
-		//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());
+			window.show();
 		});
 	}

@@ -39,7 +39,7 @@ public class GeneralVaultOptionsController implements FxController {
 	public void initialize() {
 		vaultName.textProperty().set(vault.getVaultSettings().displayName().get());
 		vaultName.focusedProperty().addListener(this::trimVaultNameOnFocusLoss);
-		vaultName.setTextFormatter(new TextFormatter<>(this::checkVaultNameLength));
+		vaultName.setTextFormatter(new TextFormatter<>(this::removeWhitespaces));
 		unlockOnStartupCheckbox.selectedProperty().bindBidirectional(vault.getVaultSettings().unlockAfterStartup());
 		actionAfterUnlockChoiceBox.getItems().addAll(WhenUnlocked.values());
 		actionAfterUnlockChoiceBox.valueProperty().bindBidirectional(vault.getVaultSettings().actionAfterUnlock());
@@ -53,7 +53,7 @@ public class GeneralVaultOptionsController implements FxController {
 		}
 	}

-	private TextFormatter.Change checkVaultNameLength(TextFormatter.Change change) {
+	private TextFormatter.Change removeWhitespaces(TextFormatter.Change change) {
 		if (change.isContentChange() && change.getControlNewText().length() > VAULTNAME_TRUNCATE_THRESHOLD) {
 			return null; // reject any change that would lead to a text exceeding threshold
 		} else {
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.shape.Circle?>
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
+	  fx:controller="org.cryptomator.ui.lock.LockFailedController"
+	  minWidth="400"
+	  maxWidth="400"
+	  minHeight="145"
+	  spacing="12">
+	<padding>
+		<Insets topRightBottomLeft="12"/>
+	</padding>
+	<children>
+		<HBox spacing="12" alignment="CENTER_LEFT" VBox.vgrow="ALWAYS">
+			<StackPane alignment="CENTER" HBox.hgrow="NEVER">
+				<Circle styleClass="glyph-icon-red" radius="24"/>
+				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="TIMES" glyphSize="24"/>
+			</StackPane>
+			<VBox spacing="6">
+				<Label styleClass="label-large" text="%lock.fail.heading"/>
+				<FormattedLabel format="%lock.fail.message" arg1="${controller.vaultName}" wrapText="true"/>
+			</VBox>
+		</HBox>
+		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
+			<Button text="OK" defaultButton="false" VBox.vgrow="ALWAYS" cancelButton="true" onAction="#close"/>
+		</VBox>
+	</children>
+</VBox>
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
+<?import org.cryptomator.ui.controls.FormattedLabel?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ButtonBar?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.shape.Circle?>
+<VBox xmlns:fx="http://javafx.com/fxml"
+	  xmlns="http://javafx.com/javafx"
+	  fx:controller="org.cryptomator.ui.lock.LockForcedController"
+	  minWidth="400"
+	  maxWidth="400"
+	  minHeight="145"
+	  spacing="12">
+	<padding>
+		<Insets topRightBottomLeft="12"/>
+	</padding>
+	<children>
+		<HBox spacing="12" alignment="CENTER_LEFT" VBox.vgrow="ALWAYS">
+			<StackPane alignment="CENTER" HBox.hgrow="NEVER">
+				<Circle styleClass="glyph-icon-orange" radius="24"/>
+				<FontAwesome5IconView styleClass="glyph-icon-white" glyph="EXCLAMATION" glyphSize="24"/>
+			</StackPane>
+			<VBox spacing="6">
+				<Label styleClass="label-large" text="%lock.forced.heading"/>
+				<FormattedLabel format="%lock.forced.message" arg1="${controller.vaultName}" wrapText="true"/>
+			</VBox>
+		</HBox>
+
+		<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
+			<ButtonBar buttonMinWidth="120" buttonOrder="+CI">
+				<buttons>
+					<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" defaultButton="true" cancelButton="true" onAction="#cancel"/>
+					<!-- TODO: third button with retry? -->
+					<Button text="%lock.forced.confirmBtn" ButtonBar.buttonData="FINISH" onAction="#confirmForcedLock"/>
+				</buttons>
+			</ButtonBar>
+		</VBox>
+	</children>
+</VBox>
@@ -54,7 +54,7 @@
 				<Tooltip text="%main.preferencesBtn.tooltip"/>
 			</tooltip>
 		</Button>
-		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#minimize" focusTraversable="false" visible="${!controller.minimizeToSysTray}" managed="${!controller.minimizeToSysTray}">
+		<Button contentDisplay="GRAPHIC_ONLY" mnemonicParsing="false" onAction="#minimize" focusTraversable="false" visible="${controller.showMinimizeButton}" managed="${controller.showMinimizeButton}">
 			<graphic>
 				<FontAwesome5IconView glyph="WINDOW_MINIMIZE" glyphSize="12"/>
 			</graphic>
@@ -22,7 +22,7 @@
 			</ImageView>
 			<VBox spacing="3" HBox.hgrow="ALWAYS" alignment="CENTER_LEFT">
 				<FormattedLabel styleClass="label-large" format="Cryptomator %s" arg1="${controller.applicationVersion}"/>
-				<Label text="© 2016 – 2020 Skymatic GmbH"/>
+				<Label text="© 2016 – 2021 Skymatic GmbH"/>
 			</VBox>
 		</HBox>

@@ -32,7 +32,11 @@
 			<RadioButton fx:id="nodeOrientationRtl" text="%preferences.general.interfaceOrientation.rtl" alignment="CENTER_RIGHT" toggleGroup="${nodeOrientation}"/>
 		</HBox>

-		<CheckBox fx:id="startHiddenCheckbox" text="%preferences.general.startHidden" visible="${controller.trayMenuSupported}" managed="${controller.trayMenuSupported}"/>
+		<CheckBox fx:id="showMinimizeButtonCheckbox" text="%preferences.general.showMinimizeButton" visible="${controller.trayMenuInitialized}" managed="${controller.trayMenuInitialized}"/>
+
+		<CheckBox fx:id="showTrayIconCheckbox" text="%preferences.general.showTrayIcon" visible="${controller.trayMenuSupported}" managed="${controller.trayMenuSupported}"/>
+
+		<CheckBox fx:id="startHiddenCheckbox" text="%preferences.general.startHidden" />

 		<HBox spacing="6" alignment="CENTER_LEFT">
 			<CheckBox fx:id="debugModeCheckbox" text="%preferences.general.debugLogging"/>
@@ -108,6 +108,15 @@ unlock.error.heading=Unable to unlock vault
 unlock.error.invalidMountPoint.notExisting=Mount point "%s" is not a directory, not empty or does not exist.
 unlock.error.invalidMountPoint.existing=Mount point "%s" already exists or parent folder is missing.

+# Lock
+## Force
+lock.forced.heading=Graceful lock failed
+lock.forced.message=Locking "%s" was blocked by pending operations or open files. You can force lock this vault, however interrupting I/O may result in the loss of unsaved data.
+lock.forced.confirmBtn=Force Lock
+## Failure
+lock.fail.heading=Locking vault failed.
+lock.fail.message=Vault "%s" could not be locked. Ensure unsaved work is saved elsewhere and important Read/Write operations are finished. In order to close the vault, kill the Cryptomator process.
+
 # Migration
 migration.title=Upgrade Vault
 ## Start
@@ -141,6 +150,8 @@ preferences.general.theme.automatic=Automatic
 preferences.general.theme.light=Light
 preferences.general.theme.dark=Dark
 preferences.general.unlockThemes=Unlock dark mode
+preferences.general.showMinimizeButton=Show minimize button
+preferences.general.showTrayIcon=Show tray icon (requires restart)
 preferences.general.startHidden=Hide window when starting Cryptomator
 preferences.general.debugLogging=Enable debug logging
 preferences.general.debugDirectory=Reveal log files
@@ -101,10 +101,18 @@ unlock.unlockBtn=افتح
 unlock.success.message=تم فتح المخزن "%s" بنجاح! يمكنك الوصول إليه الآن.
 unlock.success.rememberChoice=تذكر اختياري ولا تظهر هذا مرة أخرى
 unlock.success.revealBtn=افتح الحافظة
-## Invalid Mount Point
+## Failure
+unlock.error.heading=غير قادر على فتح الخزنة
+### Invalid Mount Point
 unlock.error.invalidMountPoint.notExisting=نقطة التحميل ليست مجلد فارغ أو غير موجودة: %s
 unlock.error.invalidMountPoint.existing=نقطة/مجلد التحميل موجود بالفعل أو المجلد الأصل مفقود: %s

+# Lock
+## Force
+lock.forced.confirmBtn=فرض القفل
+## Failure
+lock.fail.heading=فشلت عملية اقفال الخزنة.
+
 # Migration
 migration.title=ترقية الحافظة
 ## Start
@@ -170,8 +178,12 @@ preferences.donationKey.getDonationKey=الحصول على مفتاح تبرع
 preferences.about=حول البرنامج

 # Vault Statistics
+stats.cacheHitRate=معدل استخدام الكاش
 ## Read
+stats.read.throughput.idle=قراءة: خامل
+stats.decr.total.data.none=تم فك تشفير البيانات:-
 ## Write
+stats.encr.total.data.none=البيانات المشفرة: -

 # Main Window
 main.closeBtn.tooltip=إغلاق
@@ -201,9 +213,11 @@ main.vaultDetail.accessLocation=يمكن الوصول إلى محتويات مخ
 main.vaultDetail.revealBtn=اظهار القرص
 main.vaultDetail.lockBtn=قفل
 main.vaultDetail.bytesPerSecondRead=قراءة:
+main.vaultDetail.bytesPerSecondWritten=كتابة:
 main.vaultDetail.throughput.idle=خمول
 main.vaultDetail.throughput.kbps=%.1f كيلوبايت/ث
 main.vaultDetail.throughput.mbps=%.1f ميجابايت/ث
+main.vaultDetail.stats=إحصائيات الخزنة
 ### Missing
 main.vaultDetail.missing.info=لم يتمكن Cryptomator من العثور على خزنة في هذا المسار.
 main.vaultDetail.missing.recheck=إعادة الفحص
@@ -85,13 +85,30 @@ removeVault.confirmBtn=Ukloni Sef
 # Change Password
 changepassword.title=Promjeni lozinku
 changepassword.enterOldPassword=Unesi trenutnu lozinku za "%s"
+changepassword.finalConfirmation=Razumijem da neću moći pristupiti svojim podacima ako zaboravim lozinku

 # Forget Password
+forgetPassword.title=Zaboravili ste šifru
+forgetPassword.information=Ovo će izbrisati sačuvanu lozinku ovog sefa iz vaše sistemske pohrane.
+forgetPassword.confirmBtn=Zaboravili ste šifru

 # Unlock
+unlock.title=Otključaj sef
+unlock.passwordPrompt=Unesite lozinku za "%s":
+unlock.savePassword=Snimi lozinku
 unlock.unlockBtn=Otključaj
 ## Success
-## Invalid Mount Point
+unlock.success.message=Uspješno ste otključali "%s"! Vaš sef je sada dostupan.
+unlock.success.rememberChoice=Zapamtite izbor, ne pokazujte ovo ponovo
+unlock.success.revealBtn=Otkrij sef
+## Failure
+unlock.error.heading=Sef nije moguće otključati
+### Invalid Mount Point
+unlock.error.invalidMountPoint.notExisting=Tačka postavljanja "%s" nije direktorij, nije prazna ili ne postoji.
+
+# Lock
+## Force
+## Failure

 # Migration
 ## Start
@@ -125,6 +142,9 @@ main.vaultlist.addVaultBtn=Dodaj sef
 main.vaultDetail.unlockNowBtn=Otključaj sada
 ### Unlocked
 main.vaultDetail.lockBtn=Zaključaj
+main.vaultDetail.bytesPerSecondRead=Čitaj:
+main.vaultDetail.bytesPerSecondWritten=Piši:
+main.vaultDetail.stats=Statistika sefa
 ### Missing
 ### Needs Migration

@@ -17,6 +17,7 @@ generic.error.title=S'ha produït un error inesperat
 generic.error.instruction=Això no hauria d'haver passat. Si us plau, informeu del text de l'error i inclogueu una descripció de quins passos han dut a aquest error.

 # Defaults
+defaults.vault.vaultName=Caixa forta

 # Tray Menu
 traymenu.showMainWindow=Mostra
@@ -44,6 +45,7 @@ addvaultwizard.new.directoryPickerLabel=Ubicació personalitzada
 addvaultwizard.new.directoryPickerButton=Trieu…
 addvaultwizard.new.directoryPickerTitle=Seleccioneu el directori
 addvaultwizard.new.fileAlreadyExists=No es pot crear una caixa forta en aquest camí perquè ja hi ha algun objecte.
+addvaultwizard.new.locationDoesNotExist=No ha estat possible crear la caixa forta en aquest camí perquè, si més no, un component no existeix.
 addvaultwizard.new.invalidName=El nom de la caixa forta no és vàlid. Si us plau, escribiu un mom de directori amb caràcters estàndard.
 ### Password
 addvaultwizard.new.createVaultBtn=Crea la caixa forta
@@ -99,10 +101,21 @@ unlock.unlockBtn=Desbloqueja
 unlock.success.message="%s" s'ha desbloquejat correctament! Ja es pot accedir a la caixa forta.
 unlock.success.rememberChoice=Recorda l'elecció. No ho tornis a mostrar.
 unlock.success.revealBtn=Mostra la caixa forta
-## Invalid Mount Point
+## Failure
+unlock.error.heading=No ha estat possible desblocar la caixa forta
+### Invalid Mount Point
 unlock.error.invalidMountPoint.notExisting=El punt de muntatge no és un directori buit, o no existeix: %s
 unlock.error.invalidMountPoint.existing=El punt de muntatge o la carpeta ja existeix, o no es pot accedir al directori superior: %s

+# Lock
+## Force
+lock.forced.heading=Ha fallat el blocatge
+lock.forced.message=No s'ha blocat "%s" perquè hi ha operacions pendents o fitxers oberts. Podeu forçar-ne el blocatge però heu de saber que interrompre l'entrada/sortida pot produir la pèrdua de dades.
+lock.forced.confirmBtn=Força el blocatge
+## Failure
+lock.fail.heading=Ha fallat el blocatge de la caixa forta.
+lock.fail.message=La caixa forta "%s" no s'ha pogut blocar. Assegureu-vos que el treball s'ha desat en algun altre lloc i que les operacions de lectura/escriptura han acabat. Per tal de tancar la caixa, mateu el procés Cryptomator.
+
 # Migration
 migration.title=Actualitza la caixa forta
 ## Start
@@ -132,13 +145,21 @@ preferences.title=Preferències
 ## General
 preferences.general=General
 preferences.general.theme=Apariència
+preferences.general.theme.automatic=Automàtic
 preferences.general.theme.light=Clar
 preferences.general.theme.dark=Fosc
 preferences.general.unlockThemes=Desbloqueja el tema fosc
-preferences.general.startHidden=Amaga la finestra al iniciar Cryptomator
+preferences.general.showMinimizeButton=Mostra el botó de minimitzar
+preferences.general.showTrayIcon=Mostra la icona en la barra (cal reiniciar)
+preferences.general.startHidden=Amaga la finestra quan s'inicia Cryptomator
 preferences.general.debugLogging=Habilita el registre de depuració
 preferences.general.debugDirectory=Mostra els fitxers de registres
 preferences.general.autoStart=Executa Cryptomator en engegar el sistema
+preferences.general.keychainBackend=Desar contrasenyes amb
+preferences.general.keychainBackend.org.cryptomator.linux.keychain.SecretServiceKeychainAccess=Anell de claus de Gnome
+preferences.general.keychainBackend.org.cryptomator.linux.keychain.KDEWalletKeychainAccess=Cartera de KDE
+preferences.general.keychainBackend.org.cryptomator.macos.keychain.MacSystemKeychainAccess=Accés a clauers macOS
+preferences.general.keychainBackend.org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess=Windows Data Protection
 preferences.general.interfaceOrientation=Orientació de la interfície
 preferences.general.interfaceOrientation.ltr=Esquerra a dreta
 preferences.general.interfaceOrientation.rtl=Dreta a esquerra
@@ -162,38 +183,73 @@ preferences.donationKey.getDonationKey=Obtingau una clau de donació
 preferences.about=Quant a

 # Vault Statistics
+stats.title=Estadístiques per a %s
+stats.cacheHitRate=Relació d'encerts de la memòria cau
 ## Read
+stats.read.throughput.idle=Llegit: inactiu
+stats.read.throughput.kibs=Llegit: %.2f kiB/s
+stats.read.throughput.mibs=Llegit: %.2f MiB/s
+stats.read.total.data.none=Dades llegides: -
+stats.read.total.data.kib=Dades llegides: %.1f kiB
+stats.read.total.data.mib=Dades llegides: %.1f MiB
+stats.read.total.data.gib=Dades llegides: %.1f GiB
+stats.decr.total.data.none=Dades desxifrades: -
+stats.decr.total.data.kib=Dades desxifrades: %.1f kiB
+stats.decr.total.data.mib=Dades desxifrades: %.1f MiB
+stats.decr.total.data.gib=Dades desxifrades: %.1f GiB
+stats.read.accessCount=Lectures en total: %d
 ## Write
+stats.write.throughput.idle=Escriu: inactiu
+stats.write.throughput.kibs=Escriu: %.2f kiB/s
+stats.write.throughput.mibs=Escriu: %.2f MiB/s
+stats.write.total.data.none=Dades llegides: -
+stats.write.total.data.kib=Dades escrites: %.1f kiB
+stats.write.total.data.mib=Dades escrites: %.1f MiB
+stats.write.total.data.gib=Dades escrites: %.1f GiB
+stats.encr.total.data.none=Dades xifrades: -
+stats.encr.total.data.kib=Dades xifrades: %.1f kiB
+stats.encr.total.data.mib=Dades xifrades: %.1f MiB
+stats.encr.total.data.gib=Dades xifrades: %.1f GiB
+stats.write.accessCount=Total escrits: %d

 # Main Window
 main.closeBtn.tooltip=Tanca
 main.minimizeBtn.tooltip=Minimitza
 main.preferencesBtn.tooltip=Preferències
+main.debugModeEnabled.tooltip=Mode depuració activat
 main.donationKeyMissing.tooltip=Si us plau, considereu fer una donació
 ## Drag 'n' Drop
 main.dropZone.dropVault=Afegeix aquesta caixa forta
 main.dropZone.unknownDragboardContent=Si voleu afegir una caixa forta, arrossegueu-la a aquesta finestra
 ## Vault List
 main.vaultlist.emptyList.onboardingInstruction=Feu clic aquí per afegir una caixa forta
+main.vaultlist.contextMenu.remove=Elimina la caixa forta…
 main.vaultlist.addVaultBtn=Afegir una caixa forta
 ## Vault Detail
 ### Welcome
 main.vaultDetail.welcomeOnboarding=Gràcies per escollir Cryptomator per protegir els vostres fitxers. Si vos cal ajuda, llegiu les nostres guies per donar els Primers passos:
 ### Locked
 main.vaultDetail.lockedStatus=BLOQUEJADA
+main.vaultDetail.unlockBtn=Desbloca…
 main.vaultDetail.unlockNowBtn=Desbloqueja ara
 main.vaultDetail.optionsBtn=Opcions de la caixa forta
+main.vaultDetail.passwordSavedInKeychain=Contrasenya desada
 ### Unlocked
 main.vaultDetail.unlockedStatus=DESBLOQUEJADA
 main.vaultDetail.accessLocation=Els continguts de la vostra caixa forta són accessibles aquí:
 main.vaultDetail.revealBtn=Mostra la unitat
 main.vaultDetail.lockBtn=Bloqueja
 main.vaultDetail.bytesPerSecondRead=Lectura:
+main.vaultDetail.bytesPerSecondWritten=Escriu:
 main.vaultDetail.throughput.idle=inactiu
 main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
+main.vaultDetail.stats=Estadístiques de la caixa forta
 ### Missing
 main.vaultDetail.missing.info=Cryptomator no ha trobat una caixa forta en aquest camí.
+main.vaultDetail.missing.recheck=Torna a comprovar
+main.vaultDetail.missing.remove=Eliminar de la llista de la caixa forta…
+main.vaultDetail.missing.changeLocation=Canvia la localització de la caixa forta…
 ### Needs Migration
 main.vaultDetail.migrateButton=Actualitza la caixa forta
 main.vaultDetail.migratePrompt=Per accedir a la vostra caixa forta abans cal actualitzar-la al nou format
@@ -212,7 +268,7 @@ wrongFileAlert.link=Per rebre assistència, visiteu
 ## General
 vaultOptions.general=General
 vaultOptions.general.vaultName=Nom de la caixa forta
-vaultOptions.general.unlockAfterStartup=Desbloqueja la caixa forta al iniciar Cryptomator
+vaultOptions.general.unlockAfterStartup=Desbloqueja la caixa forta quan s'inicia Cryptomator
 vaultOptions.general.actionAfterUnlock=Després d'un desbloqueig correcte
 vaultOptions.general.actionAfterUnlock.ignore=No facis res
 vaultOptions.general.actionAfterUnlock.reveal=Mostra la unitat
@@ -231,6 +287,7 @@ vaultOptions.mount.mountPoint.directoryPickerTitle=Esculliu un directori buit
 ## Master Key
 vaultOptions.masterkey=Contrasenya
 vaultOptions.masterkey.changePasswordBtn=Canvi de contrasenya
+vaultOptions.masterkey.forgetSavedPasswordBtn=Oblida la contrasenya desada
 vaultOptions.masterkey.recoveryKeyExpanation=La clau de recuperació és l'unic mitjà de restaurar l'accès a la caixa forta en cas de perdre la contrasenya.
 vaultOptions.masterkey.showRecoveryKeyBtn=Mostra la clau de recuperació
 vaultOptions.masterkey.recoverPasswordBtn=Recupera la contrasenya
@@ -101,9 +101,15 @@ unlock.unlockBtn=Odemknout
 unlock.success.message=Trezor "%s" byl úspěšně odemčen a nyní je dostupný.
 unlock.success.rememberChoice=Pamatovat si volbu, nezobrazovat to znovu
 unlock.success.revealBtn=Zobrazit trezor
-## Invalid Mount Point
-unlock.error.invalidMountPoint.notExisting=Připojovací bod není prázdnou složkou nebo neexistuje: %s
-unlock.error.invalidMountPoint.existing=Připojovací bod/složka již existuje nebo nadřazená složka chybí: %s
+## Failure
+unlock.error.heading=Nelze odemknout trezor
+### Invalid Mount Point
+unlock.error.invalidMountPoint.notExisting=Připojovací bod %s není složkou, není prázdný nebo neexistuje.
+unlock.error.invalidMountPoint.existing=Připojovací bod %s již existuje nebo nadřazená složka chybí.
+
+# Lock
+## Force
+## Failure

 # Migration
 migration.title=Upgrade trezoru
@@ -138,6 +144,8 @@ preferences.general.theme.automatic=Automaticky
 preferences.general.theme.light=Světlý
 preferences.general.theme.dark=Tmavý
 preferences.general.unlockThemes=Odemknout tmavý režim
+preferences.general.showMinimizeButton=Zobrazit tlačítko minimalizovat
+preferences.general.showTrayIcon=Zobrazit ikonu v liště (vyžaduje restart)
 preferences.general.startHidden=Skrýt okno Cryptomatoru při spuštění
 preferences.general.debugLogging=Ladicí režim
 preferences.general.debugDirectory=Ukázat soubory se záznamy událostí (log)
@@ -101,10 +101,21 @@ unlock.unlockBtn=Entsperren
 unlock.success.message=„%s“ erfolgreich entsperrt! Nun kannst du auf deinen Tresor zugreifen.
 unlock.success.rememberChoice=Auswahl speichern und nicht mehr anzeigen
 unlock.success.revealBtn=Tresor anzeigen
-## Invalid Mount Point
+## Failure
+unlock.error.heading=Tresor konnte nicht entsperrt werden
+### Invalid Mount Point
 unlock.error.invalidMountPoint.notExisting=Einhängepunkt ist kein leeres Verzeichnis oder existiert nicht: %s
 unlock.error.invalidMountPoint.existing=Einhängepunkt/Ordner bereits vorhanden oder übergeordneter Ordner fehlt: %s

+# Lock
+## Force
+lock.forced.heading=Sperren fehlgeschlagen
+lock.forced.message=Aufgrund von Zugriffen laufender Prozesse oder geöffneter Dateien konnte „%s“ nicht gesperrt werden. Du kannst das Sperren dieses Tresors erzwingen, allerdings kann dies zum Verlust ungespeicherter Daten führen.
+lock.forced.confirmBtn=Sperren erzwingen
+## Failure
+lock.fail.heading=Tresor konnte nicht gesperrt werden.
+lock.fail.message=Der Tresor „%s“ konnte nicht gesperrt werden. Stellen Sie sicher, dass Sie Ihre ungespeicherten Arbeit an anderer Stelle speichern und wichtige Lese-/Schreibvorgänge abgeschlossen sind. Um den Tresor zu schließen, beenden Sie den Cryptomator-Prozess.
+
 # Migration
 migration.title=Tresor aktualisieren
 ## Start
@@ -138,6 +149,8 @@ preferences.general.theme.automatic=Automatisch
 preferences.general.theme.light=Hell
 preferences.general.theme.dark=Dunkel
 preferences.general.unlockThemes=Dunklen Modus freischalten
+preferences.general.showMinimizeButton=Minimieren-Schaltfläche anzeigen
+preferences.general.showTrayIcon=Symbol im Infobereich anzeigen (Neustart erforderlich)
 preferences.general.startHidden=Cryptomator im Hintergrund starten
 preferences.general.debugLogging=Diagnoseprotokoll aktivieren
 preferences.general.debugDirectory=Protokolldateien anzeigen
@@ -273,7 +286,7 @@ vaultOptions.mount.mountPoint.directoryPickerButton=Durchsuchen …
 vaultOptions.mount.mountPoint.directoryPickerTitle=Wähle ein leeres Verzeichnis
 ## Master Key
 vaultOptions.masterkey=Passwort
-vaultOptions.masterkey.changePasswordBtn=Password ändern
+vaultOptions.masterkey.changePasswordBtn=Passwort ändern
 vaultOptions.masterkey.forgetSavedPasswordBtn=Gespeichertes Passwort vergessen
 vaultOptions.masterkey.recoveryKeyExpanation=Bei Verlust deines Passworts ist ein Wiederherstellungsschlüssel deine einzige Möglichkeit, den Zugriff auf einen Tresor wiederherzustellen.
 vaultOptions.masterkey.showRecoveryKeyBtn=Wiederherstellungsschlüssel anzeigen
@@ -101,10 +101,21 @@ unlock.unlockBtn=Ξεκλείδωμα
 unlock.success.message="%s" ξεκλειδώθηκε επιτυχώς! Το vault σας είναι διαθέσιμο.
 unlock.success.rememberChoice=Απομνημόνευση επιλογής, μην ρωτήσεις ξανά
 unlock.success.revealBtn=Αποκάλυψη Vault
-## Invalid Mount Point
+## Failure
+unlock.error.heading=Αδυναμία ξεκλειδώματος vault
+### Invalid Mount Point
 unlock.error.invalidMountPoint.notExisting=Το σημείο προσάρτησης δεν είναι κενός φάκελος ή δεν υπάρχει: %s
 unlock.error.invalidMountPoint.existing=Το σημείο/φάκελος προσάρτησης υπάρχει ήδη ή ο γονικός φάκελος λείπει: %s

+# Lock
+## Force
+lock.forced.heading=Το κανονικό κλείδωμα απέτυχε
+lock.forced.message=Το κλείδωμα "%s" μπλοκαρίστηκε από εκκρεμείς διεργασίες ή ανοιχτά αρχεία. Μπορείτε να εξαναγκάσετε το κλείδωμα του vault, αλλά η διακοπή Ι/Ο ενδέχεται να οδηγήσει σε απώλεια μη αποθηκευμένων δεδομένων.
+lock.forced.confirmBtn=Εξαναγκασμένο κλείδωμα
+## Failure
+lock.fail.heading=Το κλείδωμα του vault απέτυχε.
+lock.fail.message=Το Vault "%s" δεν κλειδώθηκε. Εξασφαλίστε την αποθήκευση της εργασίας σε άλλο σημείο και πως οι σημαντικές διεργασίας Ανάγνωσης/Εγγραφής έχουν ολοκληρωθεί. Για να κλείσετε το vault, τερματίστε τη διεργασία του Cryptomator.
+
 # Migration
 migration.title=Αναβάθμιση Vault
 ## Start
@@ -101,10 +101,21 @@ unlock.unlockBtn=Desbloquear
 unlock.success.message=¡"%s" se desbloqueó con éxito! La bóveda ya es accesible.
 unlock.success.rememberChoice=Recordar opción y no mostrar de nuevo
 unlock.success.revealBtn=Revelar bóveda
-## Invalid Mount Point
+## Failure
+unlock.error.heading=No se puede desbloquear la bóveda
+### Invalid Mount Point
 unlock.error.invalidMountPoint.notExisting=El punto de montaje no es un directorio vacío o no existe: %s
 unlock.error.invalidMountPoint.existing=El punto de montaje/carpeta ya existe o falta la carpeta padre: %s

+# Lock
+## Force
+lock.forced.heading=Bloqueo automático fallido
+lock.forced.message=El bloqueo de "%s" fue bloqueado por operaciones pendientes o archivos abiertos. Puede forzar el bloqueo de esta bóveda, sin embargo, interrumpir la I/O puede provocar la pérdida de datos no guardados.
+lock.forced.confirmBtn=Forzar bloqueo
+## Failure
+lock.fail.heading=Falló al bloquear la bóveda.
+lock.fail.message=No se pudo bloquear la bóveda "%s". Asegúrese de que el trabajo no guardado se ha guardado en otro lugar y las operaciones de lectura/escritura importantes han finalizado. Para cerrar la bóveda termine el proceso de Cryptomator.
+
 # Migration
 migration.title=Mejorar bóveda
 ## Start
@@ -138,6 +149,8 @@ preferences.general.theme.automatic=Automático
 preferences.general.theme.light=Claro
 preferences.general.theme.dark=Oscuro
 preferences.general.unlockThemes=Desbloquear el modo oscuro
+preferences.general.showMinimizeButton=Mostrar botón minimizar
+preferences.general.showTrayIcon=Mostrar icono de bandeja (requiere reiniciar)
 preferences.general.startHidden=Ocultar ventana al iniciar Cryptomator
 preferences.general.debugLogging=Habilitar registro de depuración
 preferences.general.debugDirectory=Revelar archivos de registro
@@ -227,9 +240,11 @@ main.vaultDetail.accessLocation=El contenido de la bóveda es accesible aquí:
 main.vaultDetail.revealBtn=Revelar unidad
 main.vaultDetail.lockBtn=Bloquear
 main.vaultDetail.bytesPerSecondRead=Leído:
+main.vaultDetail.bytesPerSecondWritten=Escritura:
 main.vaultDetail.throughput.idle=inactivo
 main.vaultDetail.throughput.kbps=%.1f kiB/s
 main.vaultDetail.throughput.mbps=%.1f MiB/s
+main.vaultDetail.stats=Estadísticas de la bóveda
 ### Missing
 main.vaultDetail.missing.info=Cryptomator no pudo encontrar una bóveda en esta ruta.
 main.vaultDetail.missing.recheck=Volver a comprobar
@@ -101,10 +101,21 @@ unlock.unlockBtn=Déverrouiller
 unlock.success.message=“%s” déverrouillé ! Le contenu de votre coffre est maintenant accessible.
 unlock.success.rememberChoice=Se souvenir de mon choix et ne plus me demander
 unlock.success.revealBtn=Révéler le coffre
-## Invalid Mount Point
-unlock.error.invalidMountPoint.notExisting=Le point de montage %s n'est pas un répertoire vide ou n'existe pas
+## Failure
+unlock.error.heading=Impossible de déverrouiller le coffre
+### Invalid Mount Point
+unlock.error.invalidMountPoint.notExisting=Le point de montage «%s» n'est pas un répertoire, n'est pas vide ou n'existe pas.
 unlock.error.invalidMountPoint.existing=Le point de montage/le répertoire existe déjà ou le répertoire parent est manquant: %s

+# Lock
+## Force
+lock.forced.heading=Le verrouillage normal a échoué
+lock.forced.message=Le verrouillage de «%s» a été bloqué par des opérations en attente ou des fichiers ouverts. Vous pouvez forcer le verrouillage de ce coffre, mais l'interruption d'E/S peut entraîner la perte de données non enregistrées.
+lock.forced.confirmBtn=Forcer le verrouillage
+## Failure
+lock.fail.heading=Le verrouillage du coffre a échoué.
+lock.fail.message=Le coffre-fort "%s" n'a pas pu être verrouillé. Assurez-vous que le travail non sauvegardé est sauvegardé ailleurs et que les opérations importantes de lecture/écriture sont bien terminées. Pour fermer le coffre-fort, tuez le processus Cryptomator.
+
 # Migration
 migration.title=Mettre à jour le coffre
 ## Start
@@ -138,6 +149,8 @@ preferences.general.theme.automatic=Automatique
 preferences.general.theme.light=Clair
 preferences.general.theme.dark=Sombre
 preferences.general.unlockThemes=Débloquer le mode nuit
+preferences.general.showMinimizeButton=Afficher le bouton de réduction
+preferences.general.showTrayIcon=Afficher l'icône de la barre des tâches (redémarrage requis)
 preferences.general.startHidden=Démarrer Cryptomator en mode caché
 preferences.general.debugLogging=Activer les logs debug
 preferences.general.debugDirectory=Afficher le journal
@@ -171,7 +184,7 @@ preferences.about=A propos

 # Vault Statistics
 stats.title=Statistiques sur %s
-stats.cacheHitRate=Taux de réussite de la cache
+stats.cacheHitRate=Taux de réussite du cache
 ## Read
 stats.read.throughput.idle=Lecture : inactif
 stats.read.throughput.kibs=Lecture : %.2f kiB/s
@@ -227,9 +240,11 @@ main.vaultDetail.accessLocation=Le contenu de votre coffre est accessible ici :
 main.vaultDetail.revealBtn=Révéler le lecteur
 main.vaultDetail.lockBtn=Verrouiller
 main.vaultDetail.bytesPerSecondRead=Lecture :
+main.vaultDetail.bytesPerSecondWritten=Écriture:
 main.vaultDetail.throughput.idle=inactif
 main.vaultDetail.throughput.kbps=%.1fkB/s
 main.vaultDetail.throughput.mbps=%.1fMB/s
+main.vaultDetail.stats=Statistiques du coffre
 ### Missing
 main.vaultDetail.missing.info=Cryptomateur n'a pas pu trouver de coffre-fort dans ce chemin d'accès.
 main.vaultDetail.missing.recheck=Revérifier
@@ -17,9 +17,11 @@ generic.error.title=कोई अनपेक्षित त्रुटि ह
 generic.error.instruction=ऐसा नहीं होना चाहिए था। कृपया नीचे त्रुटि पाठ की रिपोर्ट करें और इस त्रुटि के लिए क्या कदम उठाए, इसका विवरण शामिल करें।

 # Defaults
+defaults.vault.vaultName=गुप्त तिजोरी

 # Tray Menu
 traymenu.showMainWindow=दिखाएँ
+traymenu.showPreferencesWindow=प्राथमिकताएं
 traymenu.lockAllVaults=सभी को लॉक करें
 traymenu.quitApplication=बाहर निकलें
 traymenu.vault.unlock=अनलॉक करें
@@ -42,9 +44,21 @@ addvaultwizard.new.locationPrompt=…
 addvaultwizard.new.directoryPickerLabel=अपने पसंद की जगह डालें
 addvaultwizard.new.directoryPickerButton=चुनें…
 addvaultwizard.new.directoryPickerTitle=निर्देशिका चुनें
+addvaultwizard.new.fileAlreadyExists=तिजोरी इस रास्ते पर नहीं बनाई जा सकती क्योंकि कुछ वस्तु पहले से मौजूद है।
+addvaultwizard.new.locationDoesNotExist=तिजोरी इस रास्ते पर नहीं बनाई जा सकती क्योंकि कम से कम एक पथ घटक मौजूद नहीं है।
+addvaultwizard.new.invalidName=अमान्य वॉल्ट नाम। कृपया एक नियमित निर्देशिका नाम पर विचार करें।
 ### Password
 addvaultwizard.new.createVaultBtn=वॉल्ट बनाएं
+addvaultwizard.new.generateRecoveryKeyChoice=आप अपने पासवर्ड के बिना अपने डेटा तक नहीं पहुंच पाएंगे। क्या आप उस वक़्त के लिए एक पुनर्प्राप्ति कुंजी चाहते हैं जब आप अपना पासवर्ड खो देते हैं?
+addvaultwizard.new.generateRecoveryKeyChoice.yes=हाँ कृपया, पछतावा से बेहतर सुरक्षा
+addvaultwizard.new.generateRecoveryKeyChoice.no=नहीं धन्यवाद, मैं अपना पासवर्ड नहीं खोऊंगा
 ### Information
+addvault.new.readme.storageLocation.fileName=IMPORTANT.rtf
+addvault.new.readme.storageLocation.1=⚠️  तिजोरी की फ़ाइलें  ⚠️
+addvault.new.readme.storageLocation.2=यह आपकी तिजोरी का भंडारण स्थान है।
+addvault.new.readme.storageLocation.3=ऐसा न करें
+addvault.new.readme.storageLocation.4=•  इस निर्देशिका के भीतर किसी भी फाइल को बदल दें या
+addvault.new.readme.storageLocation.5=•  • इस डायरेक्टरी में एन्क्रिप्शन के लिए कोई भी फाइल पेस्ट करें।
 ## Existing
 addvaultwizard.existing.chooseBtn=चुनें…
 ## Success
@@ -59,7 +73,12 @@ changepassword.title=पासवर्ड बदलें
 # Unlock
 unlock.unlockBtn=अनलॉक करें
 ## Success
-## Invalid Mount Point
+## Failure
+### Invalid Mount Point
+
+# Lock
+## Force
+## Failure

 # Migration
 migration.title=वाउल्ट को अपग्रेड करें
@@ -70,6 +89,7 @@ migration.title=वाउल्ट को अपग्रेड करें
 ## Impossible

 # Preferences
+preferences.title=प्राथमिकताएं
 ## General
 preferences.general=सामान्य
 ## Volume
@@ -83,6 +103,7 @@ preferences.general=सामान्य

 # Main Window
 main.closeBtn.tooltip=बंद करें
+main.preferencesBtn.tooltip=प्राथमिकताएं
 ## Drag 'n' Drop
 ## Vault List
 main.vaultlist.addVaultBtn=वाउल्ट डालें
@@ -26,7 +26,12 @@

 # Unlock
 ## Success
-## Invalid Mount Point
+## Failure
+### Invalid Mount Point
+
+# Lock
+## Force
+## Failure

 # Migration
 ## Start
@@ -0,0 +1,308 @@
+# Locale Specific CSS files such as CJK, RTL,...
+additionalStyleSheets=
+
+# Generics
+## Button
+generic.button.apply=Alkalmaz
+generic.button.back=Vissza
+generic.button.cancel=Mégse
+generic.button.change=Változtat
+generic.button.close=Bezár
+generic.button.copy=Másolás
+generic.button.copied=Másolva!
+generic.button.done=Kész
+generic.button.next=Következő
+generic.button.print=Nyomtatás
+## Error
+generic.error.title=Egy váratlan hiba történt
+generic.error.instruction=Ennek nem lett volna szabad megtörténnie. Kérjük jelezze a hibát az alábbi szöveggel valamint a hiba reprodukálásához szükséges lépésekkel.
+
+# Defaults
+defaults.vault.vaultName=Széf
+
+# Tray Menu
+traymenu.showMainWindow=Megmutatás
+traymenu.showPreferencesWindow=Beállítások
+traymenu.lockAllVaults=Az összes zárolása
+traymenu.quitApplication=Kilépés
+traymenu.vault.unlock=Feloldás
+traymenu.vault.lock=Zárolás
+traymenu.vault.reveal=Megmutatás
+
+# Add Vault Wizard
+addvaultwizard.title=Széf hozzáadása
+## Welcome
+addvaultwizard.welcome.newButton=Új széf létrehozása
+addvaultwizard.welcome.existingButton=Meglévő széf megnyitása
+## New
+### Name
+addvaultwizard.new.nameInstruction=Válasszon egy nevet az új széf számára
+addvaultwizard.new.namePrompt=A széf neve
+### Location
+addvaultwizard.new.locationInstruction=Hova mentse a Cryptomator a széf titkosított fájljait?
+addvaultwizard.new.locationLabel=Tárolási hely
+addvaultwizard.new.locationPrompt=…
+addvaultwizard.new.directoryPickerLabel=Egyedi hely
+addvaultwizard.new.directoryPickerButton=Választás…
+addvaultwizard.new.directoryPickerTitle=Könyvtár kiválasztása
+addvaultwizard.new.fileAlreadyExists=Nem lehet a széfet létrehozni ezen a helyen, mert egy fájl már létezik itt.
+addvaultwizard.new.locationDoesNotExist=Nem lehet a széfet létrehozni ezen a helyen, mert az útvonal legalább egy darabja nem létezik.
+addvaultwizard.new.invalidName=Érvénytelen széf elnevezés. Kérjük vegye figyelembe a szabályos könyvtárelnevezésre vonatkozó szabályokat.
+### Password
+addvaultwizard.new.createVaultBtn=Széf létrehozása
+addvaultwizard.new.generateRecoveryKeyChoice=Nem fog tudni hozzáférni az adataihoz a jelszó nélkül. Akar egy visszaállítási kulcsot arra az esetre, ha elveszíti a jelszavát?
+addvaultwizard.new.generateRecoveryKeyChoice.yes=Igen kérem, jobb félni, mint megijedni.
+addvaultwizard.new.generateRecoveryKeyChoice.no=Nem köszönöm, nem fogom elveszíteni a jelszavam.
+### Information
+addvault.new.readme.storageLocation.fileName=FONTOS.rtf
+addvault.new.readme.storageLocation.1=⚠️  SZÉF FÁJLOK  ⚠️
+addvault.new.readme.storageLocation.2=Ez a széfjének a tárolási helye.
+addvault.new.readme.storageLocation.3=NE
+addvault.new.readme.storageLocation.4=•  ne módosítson semmilyen fájlt ebbe a könyvtárba
+addvault.new.readme.storageLocation.5=•  ne tegyen titkosítani való fájlokat ebbe a könyvtárba
+addvault.new.readme.storageLocation.6=Ha fájlokat akr titkosítani és a széf tartalmát akarja szerkeszteni akkor tegye a következőt:
+addvault.new.readme.storageLocation.7=1.  Adja hozzá a széfet a Cryptomator-hoz.
+addvault.new.readme.storageLocation.8=2.  Nyissa meg a széfet a Cryptomator-ban.
+addvault.new.readme.storageLocation.9=3.  Nyissa meg a hozzáférési helyet a "Megjelenítés" gombra való kattintással.
+addvault.new.readme.storageLocation.10=Ha segítségre van szüksége, akkor látogasson el a dokumentáció oldalára: %s
+addvault.new.readme.accessLocation.fileName=ÜDVÖZÖLJÜK.rtf
+addvault.new.readme.accessLocation.1=🔐️  TITKOSÍTOTT KÖTET  🔐️
+addvault.new.readme.accessLocation.2=Ez a széf hozzáférési helye.
+addvault.new.readme.accessLocation.3=Bármilyen, a kötethez hozzáadott fájl titkosításra kerül a Cryptomator által. Úgy dolgozhat vele, mint minden más meghajtóval/mappával. Ez az egyetlen dekódolt tartalmi nézet. A fájlai folyamatosan titkosítva maradnak a merevlemezén.
+addvault.new.readme.accessLocation.4=Bátran eltávolíthatja ezt a fájlt.
+## Existing
+addvaultwizard.existing.instruction=Válassza ki a már létező széfjéhez tartozó "masterkey.cryptomator" fájlt.
+addvaultwizard.existing.chooseBtn=Kiválaszt…
+addvaultwizard.existing.filePickerTitle=Mesterkulcs fájl kiválasztása
+## Success
+addvaultwizard.success.nextStepsInstructions=Széf létrehozva "%s".\nA tartalom eléréséhez, vagy hozzáadásához fel kell oldania a széfet. Alternatív megoldásként később bármikor feloldhatja.
+addvaultwizard.success.unlockNow=Azonnali feloldás
+
+# Remove Vault
+removeVault.title=Széf eltávolitása
+removeVault.information=Ez kizárolag a Cryptomator-ból távolitja el ezt a széfet. Később hozzáadhatja újra. A titkosított fájlokat nem törli a merevlemezről.
+removeVault.confirmBtn=Széf eltávolitása
+
+# Change Password
+changepassword.title=Jelszó megváltoztatása
+changepassword.enterOldPassword=Írja be a jelenlegi jelszavat a következő széfhez "%s"
+changepassword.finalConfirmation=Megértettem, hogy nem fogok hozzáférni az adataimhoz amennyiben elfelejtem a jelszavam
+
+# Forget Password
+forgetPassword.title=Jelszó elfelejtése
+forgetPassword.information=Eltávolítja a széf mentett jelszavát a rendszere kulcstartójából.
+forgetPassword.confirmBtn=Jelszó elfelejtése
+
+# Unlock
+unlock.title=Széf feloldása
+unlock.passwordPrompt=Írja be a jelszavát a következő széfhez "%s":
+unlock.savePassword=Jelszó mentése
+unlock.unlockBtn=Feloldás
+## Success
+unlock.success.message="%s" sikreresen feloldásra került! Mostmár hozzáférhet a széféhez.
+unlock.success.rememberChoice=Jegyezze meg a választást és ne mutassa többet
+unlock.success.revealBtn=Széf megjelenítése
+## Failure
+unlock.error.heading=Nem lehet feloldani a széfet
+### Invalid Mount Point
+unlock.error.invalidMountPoint.notExisting=A csatolási pont "%s" nem egy könyvtár, nem üres vagy nem létezik.
+unlock.error.invalidMountPoint.existing=A csatolási pont "%s" már létezik vagy a already exists or szülőmappa hiányzik.
+
+# Migration
+migration.title=Széf frissítése
+## Start
+migration.start.prompt=A "%s" széf formátuma frissítésre szorul. A folytatás előtt győződjön meg arról, hogy nincs függőben lévő szinkronizálás, amely befolyásolja ezt a széfet.
+migration.start.confirm=Igen, a széfem teljes mértékben szinkronizálva van
+## Run
+migration.run.enterPassword=Írja be a jelszót a következőhöz Enter the password for "%s"
+migration.run.startMigrationBtn=Széf migrációja
+migration.run.progressHint=Ez eltarthat egy darabig…
+## Sucess
+migration.success.nextStepsInstructions=A "%s" sikeresen migrálva. \nMost már feloldhatja a széfet.
+migration.success.unlockNow=Azonnali feloldás
+## Missing file system capabilities
+migration.error.missingFileSystemCapabilities.title=Nem támogatott fájlrendszer
+migration.error.missingFileSystemCapabilities.description=A migráció nem kezdődött el, mert a széf nem megfelelő fájlrendszeren található.
+migration.error.missingFileSystemCapabilities.reason.LONG_FILENAMES=A fájlrendszer nem támogatja a hosszú fájlneveket.
+migration.error.missingFileSystemCapabilities.reason.LONG_PATHS=A fájlrendszer nem támogatja a hosszú útvonalakat.
+migration.error.missingFileSystemCapabilities.reason.READ_ACCESS=A fájlrendszer nem teszi lehetővé az olvasást.
+migration.error.missingFileSystemCapabilities.reason.WRITE_ACCESS=A fájlrendszer nem teszi lehetővé az írást.
+## Impossible
+migration.impossible.heading=A széf frissítése sikertelen
+migration.impossible.reason=A széfet nem lehet automatikusan frissíteni, mert a tárolási helye vagy a hozzáférési pontja nem kompatibilis.
+migration.impossible.moreInfo=A széf továbbra is megnyitható marad egy régebbi verzióval. A széf kézi frissítésével kapcsolatos utasításokért keresse fel a következő címet:
+
+# Preferences
+preferences.title=Beállítások
+## General
+preferences.general=Általános
+preferences.general.theme=Megjelenés
+preferences.general.theme.automatic=Autómatikus
+preferences.general.theme.light=Világos
+preferences.general.theme.dark=Sötét
+preferences.general.unlockThemes=Sötét mód feloldása
+preferences.general.startHidden=Az ablak elrejtése a Cryptomator indítása után
+preferences.general.debugLogging=Hibakeresési naplózás engedélyezése
+preferences.general.debugDirectory=Naplófájlok megjelenítése
+preferences.general.autoStart=Cryptomator indítása a rendszerrel együtt
+preferences.general.keychainBackend=Itt tárolja a jelszavakat
+preferences.general.keychainBackend.org.cryptomator.linux.keychain.SecretServiceKeychainAccess=Gnome Keyring
+preferences.general.keychainBackend.org.cryptomator.linux.keychain.KDEWalletKeychainAccess=KDE Wallet
+preferences.general.keychainBackend.org.cryptomator.macos.keychain.MacSystemKeychainAccess=macOS Keychain Access
+preferences.general.keychainBackend.org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess=Windows Data Protection
+preferences.general.interfaceOrientation=Felhasználói felület orientációja
+preferences.general.interfaceOrientation.ltr=Balról jobbra
+preferences.general.interfaceOrientation.rtl=Jobbról balra
+## Volume
+preferences.volume=Virtuális meghajtó
+preferences.volume.type=Kötet tipusa
+preferences.volume.webdav.port=WebDAV Port
+preferences.volume.webdav.scheme=WebDAV Scheme
+## Updates
+preferences.updates=Frissítések
+preferences.updates.currentVersion=Jelenlegi verzió: %s
+preferences.updates.autoUpdateCheck=Frissítések autómatikus keresése
+preferences.updates.checkNowBtn=Ellenőrzés most
+preferences.updates.updateAvailable=Frissítés a %s verzióra elérhető.
+## Donation Key
+preferences.donationKey=Adomány
+preferences.donationKey.registeredFor=Regisztrálva %s számára
+preferences.donationKey.noDonationKey=Nem található érvényes adománykulcs. Mint egy licenckulcs, csak olyan nagyszerű emberek számára, akik ingyenes szofvereket használnak. ;-)
+preferences.donationKey.getDonationKey=Adománykulcs beszerzése
+## About
+preferences.about=Rólunk
+
+# Vault Statistics
+stats.title=Statisztika ehhez %s
+stats.cacheHitRate=Gyorsítótár találati arány
+## Read
+stats.read.throughput.idle=Olvasás: tétlen
+stats.read.throughput.kibs=Olvasás: %.2f kiB/s
+stats.read.throughput.mibs=Olvasás: %.2f MiB/s
+stats.read.total.data.none=Olvasott adat: -
+stats.read.total.data.kib=Olvasott adat: %.1f kiB
+stats.read.total.data.mib=Olvasott adat: %.1f MiB
+stats.read.total.data.gib=Olvasott adat: %.1f GiB
+stats.decr.total.data.none=Dekódolt adat: -
+stats.decr.total.data.kib=Dekódolt adat: %.1f kiB
+stats.decr.total.data.mib=Dekódolt adat: %.1f MiB
+stats.decr.total.data.gib=Dekódolt adat: %.1f GiB
+stats.read.accessCount=Összes olvasás: %d
+## Write
+stats.write.throughput.idle=Írás: tétlen
+stats.write.throughput.kibs=Írás: %.2f kiB/s
+stats.write.throughput.mibs=Írás: %.2f MiB/s
+stats.write.total.data.none=Írott adat: -
+stats.write.total.data.kib=Írott adat: %.1f kiB
+stats.write.total.data.mib=Írott adat: %.1f MiB
+stats.write.total.data.gib=Írott adat: %.1f GiB
+stats.encr.total.data.none=Titkosított adat: -
+stats.encr.total.data.kib=Titkosított adat: %.1f kiB
+stats.encr.total.data.mib=Titkosított adat: %.1f MiB
+stats.encr.total.data.gib=Titkosított adat: %.1f GiB
+stats.write.accessCount=Összes írás: %d
+
+# Main Window
+main.closeBtn.tooltip=Bezárás
+main.minimizeBtn.tooltip=Minimalizálás
+main.preferencesBtn.tooltip=Beállítások
+main.debugModeEnabled.tooltip=A hibakeresési mód aktiválva van
+main.donationKeyMissing.tooltip=Kérjük, fontolja meg az adományozást
+## Drag 'n' Drop
+main.dropZone.dropVault=Adja hozzá ezt a széfet
+main.dropZone.unknownDragboardContent=Ha egy széfet szeretne hozzáadni, akkor húzza át erre az ablakra.
+## Vault List
+main.vaultlist.emptyList.onboardingInstruction=Kattintson ide egy széf hozzáadásához
+main.vaultlist.contextMenu.remove=Széf eltávolítása…
+main.vaultlist.addVaultBtn=Széf hozzáadása
+## Vault Detail
+### Welcome
+main.vaultDetail.welcomeOnboarding=Köszönjük, hogy a Cryptomator programot választotta a fájlai védelmére. Ha segítségre van szüksége, akkor olvassa el a kezdő útmutatónk lépéseit:
+### Locked
+main.vaultDetail.lockedStatus=ZÁROLVA
+main.vaultDetail.unlockBtn=Feloldás…
+main.vaultDetail.unlockNowBtn=Azonnali feloldás
+main.vaultDetail.optionsBtn=Széf beállítások
+main.vaultDetail.passwordSavedInKeychain=Jelszó mentve
+### Unlocked
+main.vaultDetail.unlockedStatus=FELOLDVA
+main.vaultDetail.accessLocation=A széf tartalma itt érhető el:
+main.vaultDetail.revealBtn=Széf megjelenítése
+main.vaultDetail.lockBtn=Zárolás
+main.vaultDetail.bytesPerSecondRead=Olvasás:
+main.vaultDetail.bytesPerSecondWritten=Írás:
+main.vaultDetail.throughput.idle=tétlen
+main.vaultDetail.throughput.kbps=%.1f kiB/s
+main.vaultDetail.throughput.mbps=%.1f MiB/s
+main.vaultDetail.stats=Széf statisztika
+### Missing
+main.vaultDetail.missing.info=A Cryptomator nem talált széfet ezen az útvonalon.
+main.vaultDetail.missing.recheck=Ellenőrizze újra
+main.vaultDetail.missing.remove=A széf eltávolítása a listából…
+main.vaultDetail.missing.changeLocation=A széf helyének megváltoztatása…
+### Needs Migration
+main.vaultDetail.migrateButton=Széf frissítése
+main.vaultDetail.migratePrompt=A széfet új formátumra kell frissíteni, mielőtt hozzáférhet
+
+# Wrong File Alert
+wrongFileAlert.title=Hogyan lehet fájlokat titkosítani
+wrongFileAlert.header.title=Próbálta ezeket a fájlokat titkosítani?
+wrongFileAlert.header.lead=Erre a célra a Cryptomator egy kötetet biztosít a rendszer fájlkezelőjében.
+wrongFileAlert.instruction.0=Hogy titkosítsa a fájlokat kövesse a következő lépéseket:
+wrongFileAlert.instruction.1=1. Oldja fel a széfet.
+wrongFileAlert.instruction.2=2. Kattintson a "Megjelenítés" gombra, hogy megnyissa a kötetet a fájlkezelőjében.
+wrongFileAlert.instruction.3=3. Adjon hozzá fájlokat a kötethez.
+wrongFileAlert.link=További segítségért látogasson el ide
+
+# Vault Options
+## General
+vaultOptions.general=Általános
+vaultOptions.general.vaultName=A széf neve
+vaultOptions.general.unlockAfterStartup=A széf feloldása a Cryptomator indításakor
+vaultOptions.general.actionAfterUnlock=Sikeres feloldás után
+vaultOptions.general.actionAfterUnlock.ignore=Ne tegyen semmit
+vaultOptions.general.actionAfterUnlock.reveal=Jelenítse meg a kötetet
+vaultOptions.general.actionAfterUnlock.ask=Kérdezzen
+## Mount
+vaultOptions.mount=Csatolás
+vaultOptions.mount.readonly=Csak olvasható
+vaultOptions.mount.customMountFlags=Egyedi csatolási paraméterek
+vaultOptions.mount.winDriveLetterOccupied=foglalt
+vaultOptions.mount.mountPoint=Csatolási pont
+vaultOptions.mount.mountPoint.auto=Válasszon egy megfelelő helyet autómatikusan
+vaultOptions.mount.mountPoint.driveLetter=Használja a kiválasztott meghajtó betűjelét
+vaultOptions.mount.mountPoint.custom=Egyedi útvonal
+vaultOptions.mount.mountPoint.directoryPickerButton=Kiválasztás…
+vaultOptions.mount.mountPoint.directoryPickerTitle=Válasszon egy üres könyvtárat
+## Master Key
+vaultOptions.masterkey=Jelszó
+vaultOptions.masterkey.changePasswordBtn=Jelszó megváltoztatása
+vaultOptions.masterkey.forgetSavedPasswordBtn=Elmentett jelszó elfelejtése
+vaultOptions.masterkey.recoveryKeyExpanation=A helyreállítási kulcs az egyetlen módja annak, hogy visszaállítsa a széfhez való hozzáférést, ha elveíti a jelszavát.
+vaultOptions.masterkey.showRecoveryKeyBtn=Visszaállítási kulcs megjelenítése
+vaultOptions.masterkey.recoverPasswordBtn=Jelszó visszaállítása
+
+# Recovery Key
+recoveryKey.title=Visszaállítási kulcs
+recoveryKey.enterPassword.prompt=Írja be a jelszavát a "%s" visszaállítási kulcsának megjelenítéséhez:
+recoveryKey.display.message=A következő helyreállítási kulcs használható a "%s" hozzáférésének visszaállítására:
+recoveryKey.display.StorageHints=Tartsa nagyon biztonságos helyen. pl.:\n •Tárolja egy jelszókezelővel\n •Mentse el egy USB meghajtóra\n •Nyomtassa egy papírra
+recoveryKey.recover.prompt=Írja be a visszaállítási kulcsát a következőhöz "%s":
+recoveryKey.recover.validKey=Ez egy érvényes visszaállítási kulcs
+recoveryKey.printout.heading=Cryptomator visszaállítási kulcs\n"%s"\n
+
+# New Password
+newPassword.promptText=Írja be az új jelszavát
+newPassword.reenterPassword=Erősítse meg az új jelszavát
+newPassword.passwordsMatch=A jelszavak megegyeznek!
+newPassword.passwordsDoNotMatch=A jelszavak nem egyeznek meg
+passwordStrength.messageLabel.tooShort=Használjon legalább %d karaktert
+passwordStrength.messageLabel.0=Nagyon gyenge
+passwordStrength.messageLabel.1=Gyenge
+passwordStrength.messageLabel.2=Átlagos
+passwordStrength.messageLabel.3=Erős
+passwordStrength.messageLabel.4=Nagyon erős
+
+# Quit
+quit.prompt=Kilép az alkalmazásból? Vannak még lezáratlan széfek.
+quit.lockAndQuit=Zárolás és kilépés
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Armin Schrenk	19ebc7e562	preparing 1.5.12	2021-01-27 15:30:56 +01:00
Armin SchrenkandGitHub	0fa052d2d1	Merge pull request #1518 from cryptomator/fix/1515-suppressed-messages Fixed suppressed "invalid mountpoint" messages	2021-01-27 15:22:47 +01:00
Armin Schrenk	402861b9c0	Update third party licenses	2021-01-27 12:37:50 +01:00
Armin Schrenk	aca1666dea	closes #1479	2021-01-27 12:36:22 +01:00
Sebastian Stenzel	70f6a4877c	Make sure not to catch Errors	2021-01-25 21:38:46 +01:00
Sebastian Stenzel	85c5dc8dfb	removed tmp workaround	2021-01-25 21:32:33 +01:00
JaniruTEC	23c113948f	Replaced catch with wildcard catch and added additional logger call See #1509 for further information and reasoning	2021-01-25 16:21:35 +01:00
JaniruTEC	d86ea20c31	Fixed suppressed "invalid mountpoint" messages Fixed #1515	2021-01-23 22:13:07 +01:00
Armin SchrenkandGitHub	c1f44f76b9	Merge pull request #1512 from cryptomator/feature/refactor-reveal	2021-01-22 11:42:20 +01:00
Sebastian Stenzel	b2f27c0a3d	removed dead code [ci skip]	2021-01-22 09:34:18 +01:00
Sebastian Stenzel	b1d7cfc81b	change scope of HostServiceRevealer to @FxApplicationScoped because unlock always happens after application start anyway	2021-01-22 09:31:43 +01:00
Armin Schrenk	7cd5c66836	Refactor reveal() methods: * new class HostServiceRevealer implemeting the Volume.Revealer-Interface * this class is injected in vault service and always used for revealing * removed Revealer parameter from several reveal methods	2021-01-21 17:25:23 +01:00
Armin Schrenk	95cef34234	remove unnecessary awtReavealer and trayModule	2021-01-21 16:09:16 +01:00
Armin Schrenk	8977440697	Rename RevealerFacade to Revealer	2021-01-21 15:29:04 +01:00
Armin Schrenk	d5eb84a000	change reveal method in vault service: * revealer is no member anymore * reveal() takes as second argument revealer object * several other classes hand over a revealer object * added awt-revealer if application is not yet started	2021-01-21 15:26:35 +01:00
Sebastian Stenzel	81fb6b8794	get rid of RevealException	2021-01-21 15:06:37 +01:00
Armin Schrenk	92b390d5bb	update third-party licenses	2021-01-21 12:44:32 +01:00
Armin Schrenk	8867532210	add javadoc	2021-01-21 12:44:11 +01:00
Armin Schrenk	77db435b4f	Refactor reveal call stack to apply facade pattern.	2021-01-21 12:41:52 +01:00
Tobias HagemannandGitHub	aaa93239d0	Merge pull request #1516 from stacksnack/feature/translations New translations strings.properties (Hungarian)	2021-01-21 11:03:27 +01:00
Sebastian Stenzel	93445e22d4	update library versions	2021-01-21 06:37:41 +01:00
stacksnackandGitHub	64897cfa21	New translations strings.properties (Hungarian) Add hungarian translation	2021-01-20 21:37:41 +01:00
Armin Schrenk	7349a29831	Ensure that on windows systems always the gui chooses the mountpoint for webdav	2021-01-19 15:52:52 +01:00
Armin Schrenk	73554b4759	split WebDAV Volume mount method into servlet start and servlet mount	2021-01-19 15:52:20 +01:00
Armin Schrenk	0312f045aa	add a logger to WebDAV-Volume	2021-01-19 15:28:50 +01:00
Armin Schrenk	1134c1b2ff	closes #1471 hand the javafx hostservice showDocument() method from ui package to the underlying nio-adapter-libraries through	2021-01-19 15:27:46 +01:00
Armin Schrenk	8bb925fd93	fixes #1509	2021-01-18 18:41:21 +01:00
Sebastian Stenzel	ca5d9eba36	New translations strings.properties (Norwegian Bokmal) [ci skip]	2021-01-16 04:07:35 +01:00
Sebastian Stenzel	1a49e24d8a	New translations strings.properties (Norwegian Bokmal) [ci skip]	2021-01-16 03:37:26 +01:00
Sebastian Stenzel	24b0ed2502	New translations strings.properties (German) [ci skip]	2021-01-14 18:18:01 +01:00
Sebastian Stenzel	a226d5403a	New translations strings.properties (Japanese) [ci skip]	2021-01-14 14:02:17 +01:00
Sebastian Stenzel	0f3085cc73	fixes #1476	2021-01-14 09:56:57 +01:00
Sebastian Stenzel	f0a040cf29	cleanup [ci skip]	2021-01-14 09:56:36 +01:00
Sebastian StenzelandGitHub	0676748dde	New Crowdin updates (#1466 ) [ci skip]	2021-01-14 09:24:42 +01:00
Armin Schrenk	589b8384eb	Only determine filenamelength limit if the the vault is mounted not read-only.	2021-01-11 14:15:37 +01:00
Julian RaufelderandGitHub	9e3947f337	Happy 2021 🎉	2021-01-11 10:08:35 +01:00
Tobias Hagemann	790cc4e772	simplified issue template [ci skip]	2021-01-06 12:01:07 +01:00
Tobias Hagemann	72f4988632	fixes #1452	2021-01-05 14:14:14 +01:00
Sebastian StenzelandGitHub	b3fa6bbf32	Merge pull request #1472 from cryptomator/feature/minimize Add Minimize Button	2020-12-18 15:58:02 +01:00
Sebastian Stenzel	c2dc487c79	make field volatile that might be modified concurrently	2020-12-18 13:37:23 +01:00
Sebastian Stenzel	e74dd3be9e	remove unused param	2020-12-18 13:36:16 +01:00
Sebastian Stenzel	1eeee61572	Add option to show minimize button despite tray icon being present fixes #1179	2020-12-17 14:50:33 +01:00
Sebastian Stenzel	984b7a2d0e	Removed @Named("trayMenuSupported") from FxApplication component	2020-12-17 14:46:52 +01:00
Sebastian Stenzel	45c714a123	Added checkbox in settings to start without a tray icon references #1113, #1078, #1079, #1344	2020-12-16 16:53:49 +01:00
Sebastian Stenzel	96bb97d50a	Added new setting `showTrayIcon` defaulting to new environment property `cryptomator.showTrayIcon`	2020-12-16 13:48:33 +01:00
Sebastian Stenzel	046acb9bbf	mark fuse.experimental deprecated [ci skip]	2020-12-16 13:33:50 +01:00
Armin SchrenkandGitHub	ce4ec16c62	Update bug.md Add info to also specify desktop environment on Linux systems in section system setup	2020-12-16 12:16:32 +01:00
Tobias HagemannandGitHub	96c8c9a9a9	Update bug.md	2020-12-16 09:07:39 +01:00
Tobias HagemannandGitHub	44db97327d	Update feature.md	2020-12-16 09:06:11 +01:00
Sebastian Stenzel	f441700c25	Merge branch 'master' into develop	2020-12-15 13:23:21 +01:00
Sebastian Stenzel	76b023bdbd	Merge branch 'release/1.5.11'	2020-12-15 12:42:13 +01:00
Sebastian Stenzel	241d9781bb	bump integrations-win version	2020-12-15 12:41:39 +01:00
Sebastian Stenzel	ff94532560	Merge branch 'release/1.5.11'	2020-12-15 10:53:40 +01:00
Tobias Hagemann	e949023321	updated third-party list [ci skip]	2020-12-15 10:37:27 +01:00
Sebastian Stenzel	da31407d63	Preparing 1.5.11	2020-12-15 08:57:35 +01:00
Sebastian Stenzel	8c7c5da89a	not sure what makes this "real" [ci skip]	2020-12-15 08:04:16 +01:00
Sebastian StenzelandGitHub	e3a0e1ec5a	New Crowdin updates (#1413 ) [ci skip]	2020-12-14 17:38:49 +01:00
Sebastian Stenzel	4cee27d8dd	bump webdav dependencies	2020-12-14 17:30:29 +01:00
Armin Schrenk	b0fce66d77	Add OWASP Dependency-Check Maven Plugin * only active if profile dependency check is active * added suppresion.xml for false positives * added tmp fix for jwt lib	2020-12-14 17:02:35 +01:00
Armin SchrenkandGitHub	bf47ba0145	Merge pull request #1440 from cryptomator/feature/#1439-finish-migration closes #1439	2020-12-14 15:41:52 +01:00
Armin Schrenk	fc7b484c9a	unwrap the Platform.runLater() statement because it is always executed on JavaFX thread	2020-12-14 15:34:03 +01:00
Armin Schrenk	4402c19d90	Simplifications and clean up	2020-12-14 11:47:02 +01:00
Armin Schrenk	4e89de9e47	activate force locking for dokany	2020-12-14 10:23:27 +01:00
Armin Schrenk	a27c9d63d9	Bump dokany-nio-adapter version	2020-12-14 10:09:13 +01:00
Armin Schrenk	da6aa0f002	bump integrations-win version	2020-12-11 16:23:57 +01:00
Armin Schrenk	0bf3533f45	Workaround for #1421	2020-12-11 13:25:02 +01:00
Sebastian Stenzel	295cb0ef6d	fixes #1446 , fixes #1415	2020-12-09 17:17:51 +01:00
Armin SchrenkandGitHub	6fac84e9c2	Replace "may" by "can" ... the end of a great and fierce war.	2020-12-09 15:39:49 +01:00
Sebastian Stenzel	77b2e67c49	updated labels	2020-12-09 15:16:45 +01:00
Armin SchrenkandGitHub	c48c9b1568	Merge pull request #1416 from cryptomator/feature/#1228-forcedUnmountDialog Feature/#1228 forced unmount dialog	2020-12-09 15:04:30 +01:00
Armin Schrenk	6da7eae2f8	Minor changes in lettering	2020-12-09 14:55:22 +01:00
Armin Schrenk	aec56c48c5	Merge branch 'develop' into feature/#1228-forcedUnmountDialog # Conflicts: # main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java	2020-12-09 14:51:00 +01:00
Sebastian Stenzel	3b73544766	Simplified observation of visible stages	2020-12-08 12:56:44 +01:00
Sebastian Stenzel	fbc471635a	fixed test	2020-12-08 12:51:34 +01:00
Sebastian Stenzel	3c5b9ed3a6	remove rarely used, complex class	2020-12-08 12:51:11 +01:00
Sebastian Stenzel	8479122561	temp fix for vulnerability in upstream lib [ci skip]	2020-12-08 08:30:16 +01:00
Tobias HagemannandGitHub	91c883d5cc	Create config.yml	2020-12-07 18:11:25 +01:00
Sebastian StenzelandGitHub	1cd4da0796	Merge branch 'develop' into feature/#1228-forcedUnmountDialog	2020-12-07 17:55:29 +01:00
Armin SchrenkandGitHub	935aaccdae	Update bug template * Make introduction section more visible * emphasize task to complete for successful bug ticket	2020-12-02 15:05:59 +01:00
Tobias Hagemann	ab3dd779d2	partially reverted `900fdd7f`, fixing "stutter" startup on macos	2020-12-02 14:59:17 +01:00
Armin Schrenk	1fbcf6d517	closes #1439	2020-11-27 15:53:33 +01:00
Armin SchrenkandGitHub	82538091c9	Merge pull request #1427 from cryptomator/feature/#1323-singleQuitWindow Show only one quit dialogue at a time	2020-11-24 15:31:31 +01:00
Sebastian Stenzel	62ade6113b	cleanup [ci skip]	2020-11-24 15:07:23 +01:00
Sebastian Stenzel	4779bbf415	Don't bother FxApplication with stuff that is meant to be dealt with internally within QuitComponent	2020-11-24 15:04:09 +01:00
Armin Schrenk	c6b786a771	Reworked implemenation by using dagger now: * create and inject QuitResponse container * QuitComponent manges now if quit window needs to be created * controller only handles the most recent QuitResponse	2020-11-24 13:34:12 +01:00
Armin Schrenk	6381227897	Stylin: * change css styleclass of dialogue headings to `label-large` * remove newly introduced style class `label-medium`	2020-11-23 16:14:31 +01:00
Armin Schrenk	e82167b5e6	correct wrong method name	2020-11-20 17:29:56 +01:00
Armin Schrenk	dc4fd482b5	Filter any whitespaces when entering text in donationkey form.	2020-11-20 17:17:16 +01:00
Armin Schrenk	a71f8b350e	Show only one quit dialogue at a time	2020-11-20 16:12:49 +01:00
Armin Schrenk	c9ec8fecef	fix wrong method name	2020-11-20 16:09:31 +01:00
Armin Schrenk GitHub Sebastian Stenzel	e72d32f2d1	Remove empty line Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>	2020-11-20 14:34:34 +01:00
Armin Schrenk GitHub Sebastian Stenzel	2545aa2a7e	Removed default clause from switch expression on enums Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>	2020-11-20 14:33:57 +01:00
Armin Schrenk	51aac15622	Changed forced lock description and clean up	2020-11-20 12:23:44 +01:00
Armin Schrenk	afa0cfeafb	Replace lock failed dialogue stub and integrate it into workflow	2020-11-20 12:23:18 +01:00
Armin Schrenk	19e24ba12c	refactor structure of LockWorkflow class	2020-11-20 12:22:26 +01:00
Armin Schrenk	c47ce2c730	clean up	2020-11-20 11:25:39 +01:00
Armin Schrenk	5d00b3dd76	activate ability to abort vault locking if it is mounted with dokany and still busy references #1228	2020-11-19 17:20:08 +01:00
Armin Schrenk	4db57cc0dc	Further improvements: * adding Log messages * change lock workflow to type of Task<Void> * set vault state based solely on task state * replaced dialogue stubs with real text	2020-11-19 16:31:16 +01:00
Armin Schrenk	432a9a27f1	Add forceLock Dialogue: * integrate it in workflow if normal lock throws exception * add stubs if also forced lock fails	2020-11-19 12:52:16 +01:00
Armin Schrenk	57bfa3276d	Integrate new lockWorkflow into application (gui and tray)	2020-11-19 11:42:00 +01:00
Sebastian Stenzel	02fc9b263a	re-added applicable choosers to exception text	2020-11-18 18:12:41 +01:00
Sebastian Stenzel	4c66f81736	simplified line	2020-11-18 18:09:30 +01:00
Sebastian Stenzel	2de151aebe	use less generic name	2020-11-18 18:08:00 +01:00
Armin Schrenk	c44911dcac	Prepare strucutre and classes for lock workflow	2020-11-18 17:16:58 +01:00
Armin Schrenk	bcf2a3d20c	Setting default onFailed handler in lock tasks	2020-11-18 17:16:43 +01:00
JaniruTEC	422ce4a387	Moved actual choosing of MPCs to MountPointHelper	2020-11-18 16:27:43 +01:00
JaniruTEC	21387bd76c	Renamed IrregularUnmountCleaner to MountPointHelper	2020-11-18 16:18:31 +01:00
JaniruTEC	52cd560cb2	Generifyed #chooseMountPoint()	2020-11-18 16:09:09 +01:00
JaniruTEC	6c440dfbbb	Re-Added check for non-emtpy dirs	2020-11-18 15:53:33 +01:00
Sebastian Stenzel	a074450452	Merge branch 'master' into develop	2020-11-18 15:03:37 +01:00
Sebastian Stenzel	b781cf6f25	Merge branch 'hotfix/1.5.10'	2020-11-18 15:03:11 +01:00
Sebastian Stenzel	9b653f488b	Merge branch 'develop' into hotfix/1.5.10	2020-11-18 15:02:33 +01:00
Armin Schrenk	17c580267f	prevent race conditions	2020-11-18 14:35:16 +01:00
Sebastian Stenzel	490d1b8f87	cancel unlock workflow, if closing window with shortcut	2020-11-18 14:21:18 +01:00
Armin Schrenk	b0ad86f16b	Perform cleanup of tmp mount points dir only once.	2020-11-18 14:07:34 +01:00
Sebastian Stenzel	df2b4ac086	cleanup	2020-11-18 13:17:35 +01:00
Sebastian Stenzel	aee4ececba	Merge branch 'fix/1409' into hotfix/1.5.10 fixes #1409	2020-11-18 13:16:36 +01:00
Sebastian Stenzel	b2992aa6ae	Merge branch 'fix/1408' into hotfix/1.5.10 fixes #1408 # Conflicts: # main/buildkit/pom.xml # main/commons/pom.xml # main/launcher/pom.xml # main/pom.xml # main/ui/pom.xml	2020-11-18 13:16:19 +01:00
Sebastian Stenzel	4c546d281a	Bumped version	2020-11-18 13:15:33 +01:00
Sebastian Stenzel	c90e445a67	Removed -Dcryptomator.mountPointsDir="/Volumes/" from macOS run profiles [ci skip]	2020-11-18 13:10:01 +01:00
Sebastian Stenzel	d3c2b0509e	Lazily call IrregularUnmountCleaner from (and only from!) TemporaryMountPointChooser	2020-11-18 13:08:48 +01:00
Sebastian Stenzel	c6d1c2ca6b	added MacVolumeMountChooser and refactored "priority" of mount point choosers: now all priorities are set in MountPointChooserModule (as a map key)	2020-11-18 13:07:12 +01:00
Sebastian Stenzel	86dec80726	avoid weird iteration counter manipulation	2020-11-18 10:33:04 +01:00
JaniruTEC	9083976989	Fixed #1409 by addig an additonal check	2020-11-18 00:46:24 +01:00
JaniruTEC	d9c5d76417	Fixed irregular quoting	2020-11-17 22:41:41 +01:00
JaniruTEC	c19c3754c6	Fixed high-spirited concatenation	2020-11-17 22:27:41 +01:00
JaniruTEC	947e0e2369	Fixed #1408	2020-11-17 22:00:41 +01:00
JaniruTEC	6eca8f2e0c	Added support for quote escaped values for mount arguments	2020-11-17 21:56:43 +01:00
Sebastian Stenzel	9f61ad1941	Merge branch 'master' into develop [ci skip]	2020-11-17 17:03:40 +01:00
Sebastian Stenzel	41492a951a	Merge branch 'release/1.5.9'	2020-11-17 17:02:14 +01:00
Sebastian Stenzel	cbbfec5531	Merge branch 'develop' into release/1.5.9	2020-11-16 17:16:54 +01:00
Sebastian StenzelandGitHub	d7a4dff080	New Crowdin updates (#1401 ) New translations strings.properties [ci skip]	2020-11-16 17:15:37 +01:00
Armin SchrenkandGitHub	8e56218fbb	Update launcher-linux.sh drastically reducing the allowed stacksize to 2m	2020-11-11 17:13:11 +01:00
Tobias Hagemann	8ad20c27da	Merge branch 'hotfix/1.5.8'	2020-08-28 15:57:54 +02:00