From 4476558e9cde1c43ff6962e52a1b89cb4dfab134 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 16 Aug 2016 12:33:15 +0200
Subject: [PATCH 01/45] fixes #321

---
 main/filesystem-crypto/pom.xml                               | 2 +-
 .../cryptomator/crypto/engine/impl/FilenameCryptorImpl.java  | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/main/filesystem-crypto/pom.xml b/main/filesystem-crypto/pom.xml
index 35f308aeb..bbc582be6 100644
--- a/main/filesystem-crypto/pom.xml
+++ b/main/filesystem-crypto/pom.xml
@@ -19,7 +19,7 @@
 	
 	<properties>
 		<bouncycastle.version>1.51</bouncycastle.version>
-		<sivmode.version>1.0.7</sivmode.version>
+		<sivmode.version>1.0.8</sivmode.version>
 	</properties>
 
 	<dependencies>
diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java
index 75408f609..e19cb0e25 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java
@@ -15,6 +15,7 @@ import java.security.NoSuchAlgorithmException;
 import java.util.regex.Pattern;
 
 import javax.crypto.AEADBadTagException;
+import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.SecretKey;
 
 import org.apache.commons.codec.binary.Base32;
@@ -70,8 +71,8 @@ class FilenameCryptorImpl implements FilenameCryptor {
 		try {
 			final byte[] cleartextBytes = AES_SIV.get().decrypt(encryptionKey, macKey, encryptedBytes, associatedData);
 			return new String(cleartextBytes, UTF_8);
-		} catch (AEADBadTagException e) {
-			throw new AuthenticationFailedException("Authentication failed.", e);
+		} catch (AEADBadTagException | IllegalBlockSizeException e) {
+			throw new AuthenticationFailedException("Invalid ciphertext.", e);
 		}
 	}
 

From 24bfbb59a404c0b0546a29a56aa243b635e2f064 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 16 Aug 2016 19:07:05 +0200
Subject: [PATCH 02/45] fixes #310

---
 .../ui/logging/ConfigurableFileAppender.java  | 83 ++++++++++---------
 main/ui/src/main/resources/log4j2.xml         | 20 +++--
 2 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/logging/ConfigurableFileAppender.java b/main/ui/src/main/java/org/cryptomator/ui/logging/ConfigurableFileAppender.java
index 7354fb544..375c51352 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/logging/ConfigurableFileAppender.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/logging/ConfigurableFileAppender.java
@@ -19,6 +19,7 @@ import java.util.regex.Pattern;
 import org.apache.commons.lang3.SystemUtils;
 import org.apache.logging.log4j.core.Filter;
 import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.appender.AbstractAppender;
 import org.apache.logging.log4j.core.appender.AbstractOutputStreamAppender;
 import org.apache.logging.log4j.core.appender.FileManager;
 import org.apache.logging.log4j.core.config.plugins.Plugin;
@@ -26,10 +27,11 @@ import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
 import org.apache.logging.log4j.core.config.plugins.PluginElement;
 import org.apache.logging.log4j.core.config.plugins.PluginFactory;
 import org.apache.logging.log4j.core.layout.PatternLayout;
+import org.apache.logging.log4j.core.util.Booleans;
 import org.apache.logging.log4j.util.Strings;
 
 /**
- * A preconfigured FileAppender only relying on a configurable system property, e.g. <code>-DlogPath=/var/log/cryptomator.log</code>.<br/>
+ * A preconfigured FileAppender only relying on a configurable system property, e.g. <code>-Dcryptomator.logPath=/var/log/cryptomator.log</code>.<br/>
  * Other than the normal {@link org.apache.logging.log4j.core.appender.FileAppender} paths can be resolved relative to the users home directory.
  */
 @Plugin(name = "ConfigurableFile", category = "Core", elementType = "appender", printObject = true)
@@ -37,7 +39,6 @@ public class ConfigurableFileAppender extends AbstractOutputStreamAppender<FileM
 
 	private static final long serialVersionUID = -6548221568069606389L;
 	private static final int DEFAULT_BUFFER_SIZE = 8192;
-	private static final String DEFAULT_FILE_NAME = "cryptomator.log";
 	private static final Pattern DRIVE_LETTER_WITH_PRECEEDING_SLASH = Pattern.compile("^/[A-Z]:", Pattern.CASE_INSENSITIVE);
 
 	protected ConfigurableFileAppender(String name, Layout<? extends Serializable> layout, Filter filter, FileManager manager) {
@@ -46,9 +47,8 @@ public class ConfigurableFileAppender extends AbstractOutputStreamAppender<FileM
 	}
 
 	@PluginFactory
-	public static ConfigurableFileAppender createAppender(@PluginAttribute("name") final String name, @PluginAttribute("pathPropertyName") final String pathPropertyName,
+	public static AbstractAppender createAppender(@PluginAttribute("name") final String name, @PluginAttribute("pathPropertyName") final String pathPropertyName, @PluginAttribute("append") final String append,
 			@PluginElement("Layout") Layout<? extends Serializable> layout) {
-
 		if (name == null) {
 			LOGGER.error("No name provided for HomeDirectoryAwareFileAppender");
 			return null;
@@ -59,41 +59,16 @@ public class ConfigurableFileAppender extends AbstractOutputStreamAppender<FileM
 			return null;
 		}
 
-		String fileName = System.getProperty(pathPropertyName);
+		final String fileName = System.getProperty(pathPropertyName);
 		if (Strings.isEmpty(fileName)) {
-			fileName = DEFAULT_FILE_NAME;
+			LOGGER.warn("No log file location provided in system property \"" + pathPropertyName + "\"");
+			return null;
 		}
 
-		final Path filePath;
-		if (fileName.startsWith("~/")) {
-			// home-dir-relative Path:
-			final Path userHome = FileSystems.getDefault().getPath(SystemUtils.USER_HOME);
-			filePath = userHome.resolve(fileName.substring(2));
-		} else if (fileName.startsWith("/")) {
-			// absolute Path:
-			filePath = FileSystems.getDefault().getPath(fileName);
-		} else if (SystemUtils.IS_OS_WINDOWS && fileName.startsWith("%appdata%/")) {
-			final String appdata = System.getenv("APPDATA");
-			final Path appdataPath = appdata != null ? FileSystems.getDefault().getPath(appdata) : FileSystems.getDefault().getPath(SystemUtils.USER_HOME);
-			filePath = appdataPath.resolve(fileName.substring(10));
-		} else {
-			// relative Path:
-			try {
-				String jarFileLocation = ConfigurableFileAppender.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath();
-				if (SystemUtils.IS_OS_WINDOWS && DRIVE_LETTER_WITH_PRECEEDING_SLASH.matcher(jarFileLocation).find()) {
-					// on windows we need to remove a preceeding slash from "/C:/foo/bar":
-					jarFileLocation = jarFileLocation.substring(1);
-				}
-				final Path workingDir = FileSystems.getDefault().getPath(jarFileLocation).getParent();
-				filePath = workingDir.resolve(fileName);
-			} catch (URISyntaxException e) {
-				LOGGER.error("Unable to resolve working directory ", e);
-				return null;
-			}
-		}
-
-		if (layout == null) {
-			layout = PatternLayout.createDefaultLayout();
+		final Path filePath = parsePath(fileName);
+		if (filePath == null) {
+			LOGGER.warn("Invalid path \"" + fileName + "\"");
+			return null;
 		}
 
 		if (!Files.exists(filePath.getParent())) {
@@ -105,8 +80,42 @@ public class ConfigurableFileAppender extends AbstractOutputStreamAppender<FileM
 			}
 		}
 
-		final FileManager manager = FileManager.getFileManager(filePath.toString(), false, false, true, null, layout, DEFAULT_BUFFER_SIZE);
+		final boolean shouldAppend = Booleans.parseBoolean(append, true);
+		if (layout == null) {
+			layout = PatternLayout.createDefaultLayout();
+		}
+
+		final FileManager manager = FileManager.getFileManager(filePath.toString(), shouldAppend, false, true, null, layout, DEFAULT_BUFFER_SIZE);
 		return new ConfigurableFileAppender(name, layout, null, manager);
 	}
 
+	private static Path parsePath(String path) {
+		if (path.startsWith("~/")) {
+			// home-dir-relative Path:
+			final Path userHome = FileSystems.getDefault().getPath(SystemUtils.USER_HOME);
+			return userHome.resolve(path.substring(2));
+		} else if (path.startsWith("/")) {
+			// absolute Path:
+			return FileSystems.getDefault().getPath(path);
+		} else if (SystemUtils.IS_OS_WINDOWS && path.startsWith("%appdata%/")) {
+			final String appdata = System.getenv("APPDATA");
+			final Path appdataPath = appdata != null ? FileSystems.getDefault().getPath(appdata) : FileSystems.getDefault().getPath(SystemUtils.USER_HOME);
+			return appdataPath.resolve(path.substring(10));
+		} else {
+			// relative Path:
+			try {
+				String jarFileLocation = ConfigurableFileAppender.class.getProtectionDomain().getCodeSource().getLocation().toURI().getPath();
+				if (SystemUtils.IS_OS_WINDOWS && DRIVE_LETTER_WITH_PRECEEDING_SLASH.matcher(jarFileLocation).find()) {
+					// on windows we need to remove a preceeding slash from "/C:/foo/bar":
+					jarFileLocation = jarFileLocation.substring(1);
+				}
+				final Path workingDir = FileSystems.getDefault().getPath(jarFileLocation).getParent();
+				return workingDir.resolve(path);
+			} catch (URISyntaxException e) {
+				LOGGER.error("Unable to resolve working directory ", e);
+				return null;
+			}
+		}
+	}
+
 }
diff --git a/main/ui/src/main/resources/log4j2.xml b/main/ui/src/main/resources/log4j2.xml
index 025f97279..c6476f356 100644
--- a/main/ui/src/main/resources/log4j2.xml
+++ b/main/ui/src/main/resources/log4j2.xml
@@ -10,7 +10,7 @@
 <Configuration status="WARN" packages="org.cryptomator.ui.logging">
 
 	<Appenders>
-		<Console name="Console" target="SYSTEM_OUT">
+		<Console name="StdOut" target="SYSTEM_OUT">
 			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
 			<ThresholdFilter level="WARN" onMatch="DENY" onMismatch="ACCEPT" />
 		</Console>
@@ -18,21 +18,27 @@
 			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
 			<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY" />
 		</Console>
-		<!-- <File fileName="${sys:logPath}" ...> not feasible for paths like ~/foo/bar -->
-		<ConfigurableFile name="File" pathPropertyName="cryptomator.logPath">
+		<ConfigurableFile name="DefaultLog" pathPropertyName="cryptomator.logPath" append="false">
+			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
+		</ConfigurableFile>
+		<ConfigurableFile name="UpgradeLog" pathPropertyName="cryptomator.upgradeLogPath" append="true">
 			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
 		</ConfigurableFile>
 	</Appenders>
 
 	<Loggers>
-		<!-- show our own debug messages: -->
+		<!-- package-specific config: -->
 		<Logger name="org.cryptomator" level="DEBUG" />
 		<Logger name="org.eclipse.jetty.server.Server" level="DEBUG" />
-		<!-- mute dependencies: -->
+		<Logger name="org.cryptomator.ui.model" level="INFO">
+			<AppenderRef ref="UpgradeLog" />
+		</Logger>
+		
+		<!-- defaults: -->
 		<Root level="INFO">
-			<AppenderRef ref="Console" />
+			<AppenderRef ref="StdOut" />
 			<AppenderRef ref="StdErr" />
-			<AppenderRef ref="File" />
+			<AppenderRef ref="DefaultLog" />
 		</Root>
 	</Loggers>
 

From 461b11700f38d71433e34dc5aee8ccd5cec57864 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 16 Aug 2016 19:15:23 +0200
Subject: [PATCH 03/45] added new upgrade log path setting to build script [ci
 skip]

---
 main/ant-kit/src/main/resources/build.xml | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/main/ant-kit/src/main/resources/build.xml b/main/ant-kit/src/main/resources/build.xml
index 06dcfc257..018df82f4 100644
--- a/main/ant-kit/src/main/resources/build.xml
+++ b/main/ant-kit/src/main/resources/build.xml
@@ -21,21 +21,6 @@
 		</fx:jar>
 	</target>
 	
-	<!-- Create native image -->
-	<target name="create-linux-image-with-jvm" depends="create-jar">
-		<fx:deploy nativeBundles="image" outdir="antbuild" outfile="Cryptomator-${project.version}" verbose="true">
-			<fx:application refid="Cryptomator" />
-			<fx:platform j2se="8.0">
-				<fx:property name="cryptomator.logPath" value="~/.Cryptomator/cryptomator.log" />
-				<fx:jvmarg value="-Xmx512m"/>
-			</fx:platform>
-			<fx:resources>
-				<fx:fileset dir="antbuild" type="jar" includes="Cryptomator-${project.version}.jar" />
-				<fx:fileset dir="libs" type="jar" includes="*.jar" excludes="ui-${project.version}.jar"/>
-			</fx:resources>
-		</fx:deploy>
-	</target>
-	
 	<!-- Create Debian package -->
 	<target name="deb" depends="create-jar">
 		<fx:deploy nativeBundles="deb" outdir="antbuild" outfile="Cryptomator-${project.version}" verbose="true">
@@ -45,7 +30,8 @@
 			</fx:info>
 			<fx:platform j2se="8.0">
 				<fx:property name="cryptomator.logPath" value="~/.Cryptomator/cryptomator.log" />
-				<fx:jvmarg value="-Xmx1048m"/>
+				<fx:property name="cryptomator.upgradeLogPath" value="~/.Cryptomator/upgrade.log" />
+				<fx:jvmarg value="-Xmx512m"/>
 			</fx:platform>
 			<fx:resources>
 				<fx:fileset dir="antbuild" type="jar" includes="Cryptomator-${project.version}.jar" />
@@ -66,7 +52,8 @@
 			</fx:info>
 			<fx:platform j2se="8.0">
 				<fx:property name="cryptomator.logPath" value="~/.Cryptomator/cryptomator.log" />
-				<fx:jvmarg value="-Xmx1048m"/>
+				<fx:property name="cryptomator.upgradeLogPath" value="~/.Cryptomator/upgrade.log" />
+				<fx:jvmarg value="-Xmx512m"/>
 			</fx:platform>
 			<fx:resources>
 				<fx:fileset dir="antbuild" type="jar" includes="Cryptomator-${project.version}.jar" />

From fe0a34907fa16039b4b6f269eb3bd4e45adbdde5 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 17 Aug 2016 15:59:36 +0200
Subject: [PATCH 04/45] Simplified settings/log file path handling. Removed
 support for %appdata%. Use ~/AppData/Roaming instead!

---
 main/ant-kit/src/main/resources/build.xml     |  2 ++
 .../ui/logging/ConfigurableFileAppender.java  |  4 ---
 .../cryptomator/ui/settings/Localization.java |  2 +-
 .../ui/settings/SettingsProvider.java         | 28 +++++++------------
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/main/ant-kit/src/main/resources/build.xml b/main/ant-kit/src/main/resources/build.xml
index 018df82f4..89dd5c4bb 100644
--- a/main/ant-kit/src/main/resources/build.xml
+++ b/main/ant-kit/src/main/resources/build.xml
@@ -31,6 +31,7 @@
 			<fx:platform j2se="8.0">
 				<fx:property name="cryptomator.logPath" value="~/.Cryptomator/cryptomator.log" />
 				<fx:property name="cryptomator.upgradeLogPath" value="~/.Cryptomator/upgrade.log" />
+				<fx:property name="cryptomator.settingsPath" value="~/.Cryptomator/settings.json" />
 				<fx:jvmarg value="-Xmx512m"/>
 			</fx:platform>
 			<fx:resources>
@@ -53,6 +54,7 @@
 			<fx:platform j2se="8.0">
 				<fx:property name="cryptomator.logPath" value="~/.Cryptomator/cryptomator.log" />
 				<fx:property name="cryptomator.upgradeLogPath" value="~/.Cryptomator/upgrade.log" />
+				<fx:property name="cryptomator.settingsPath" value="~/.Cryptomator/settings.json" />
 				<fx:jvmarg value="-Xmx512m"/>
 			</fx:platform>
 			<fx:resources>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/logging/ConfigurableFileAppender.java b/main/ui/src/main/java/org/cryptomator/ui/logging/ConfigurableFileAppender.java
index 375c51352..9074f9a87 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/logging/ConfigurableFileAppender.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/logging/ConfigurableFileAppender.java
@@ -97,10 +97,6 @@ public class ConfigurableFileAppender extends AbstractOutputStreamAppender<FileM
 		} else if (path.startsWith("/")) {
 			// absolute Path:
 			return FileSystems.getDefault().getPath(path);
-		} else if (SystemUtils.IS_OS_WINDOWS && path.startsWith("%appdata%/")) {
-			final String appdata = System.getenv("APPDATA");
-			final Path appdataPath = appdata != null ? FileSystems.getDefault().getPath(appdata) : FileSystems.getDefault().getPath(SystemUtils.USER_HOME);
-			return appdataPath.resolve(path.substring(10));
 		} else {
 			// relative Path:
 			try {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/settings/Localization.java b/main/ui/src/main/java/org/cryptomator/ui/settings/Localization.java
index 1c2fbf8d5..c13000625 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/settings/Localization.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/settings/Localization.java
@@ -39,7 +39,7 @@ public class Localization extends ResourceBundle {
 			Objects.requireNonNull(in);
 			Reader reader = new InputStreamReader(in, StandardCharsets.UTF_8);
 			this.fallback = new PropertyResourceBundle(reader);
-			LOG.info("Loaded localization from {}", LOCALIZATION_FILE);
+			LOG.info("Loaded localization from bundle:{}", LOCALIZATION_FILE);
 		} catch (IOException e) {
 			throw new UncheckedIOException(e);
 		}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java b/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java
index 417b6c369..6f752512d 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java
@@ -17,6 +17,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -28,6 +29,7 @@ import javax.inject.Named;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.SystemUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,23 +40,17 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 public class SettingsProvider implements Provider<Settings> {
 
 	private static final Logger LOG = LoggerFactory.getLogger(SettingsProvider.class);
-	private static final Path SETTINGS_DIR;
-	private static final String SETTINGS_FILE = "settings.json";
+	private static final Path DEFAULT_SETTINGS_PATH;
 	private static final long SAVE_DELAY_MS = 1000;
 
 	static {
-		final String appdata = System.getenv("APPDATA");
 		final FileSystem fs = FileSystems.getDefault();
-
-		if (SystemUtils.IS_OS_WINDOWS && appdata != null) {
-			SETTINGS_DIR = fs.getPath(appdata, "Cryptomator");
-		} else if (SystemUtils.IS_OS_WINDOWS && appdata == null) {
-			SETTINGS_DIR = fs.getPath(SystemUtils.USER_HOME, ".Cryptomator");
+		if (SystemUtils.IS_OS_WINDOWS) {
+			DEFAULT_SETTINGS_PATH = fs.getPath(SystemUtils.USER_HOME, "AppData/Roaming/Cryptomator/settings.json");
 		} else if (SystemUtils.IS_OS_MAC_OSX) {
-			SETTINGS_DIR = fs.getPath(SystemUtils.USER_HOME, "Library/Application Support/Cryptomator");
+			DEFAULT_SETTINGS_PATH = fs.getPath(SystemUtils.USER_HOME, "Library/Application Support/Cryptomator/settings.json");
 		} else {
-			// (os.contains("solaris") || os.contains("sunos") || os.contains("linux") || os.contains("unix"))
-			SETTINGS_DIR = fs.getPath(SystemUtils.USER_HOME, ".Cryptomator");
+			DEFAULT_SETTINGS_PATH = fs.getPath(SystemUtils.USER_HOME, ".Cryptomator/settings.json");
 		}
 	}
 
@@ -68,12 +64,8 @@ public class SettingsProvider implements Provider<Settings> {
 	}
 
 	private Path getSettingsPath() throws IOException {
-		String settingsPathProperty = System.getProperty("cryptomator.settingsPath");
-		if (settingsPathProperty == null) {
-			return SETTINGS_DIR.resolve(SETTINGS_FILE);
-		} else {
-			return FileSystems.getDefault().getPath(settingsPathProperty);
-		}
+		final String settingsPathProperty = System.getProperty("cryptomator.settingsPath");
+		return Optional.ofNullable(settingsPathProperty).filter(StringUtils::isNotBlank).map(FileSystems.getDefault()::getPath).orElse(DEFAULT_SETTINGS_PATH);
 	}
 
 	@Override
@@ -96,7 +88,7 @@ public class SettingsProvider implements Provider<Settings> {
 		}
 		ScheduledFuture<?> saveCmd = saveScheduler.schedule(() -> {
 			this.save(settings);
-		} , SAVE_DELAY_MS, TimeUnit.MILLISECONDS);
+		}, SAVE_DELAY_MS, TimeUnit.MILLISECONDS);
 		ScheduledFuture<?> previousSaveCmd = scheduledSaveCmd.getAndSet(saveCmd);
 		if (previousSaveCmd != null) {
 			previousSaveCmd.cancel(false);

From 1f73a08e09c3bd4e5d69e010b7da94d935c029f2 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Wed, 17 Aug 2016 18:11:27 +0200
Subject: [PATCH 05/45] added confirmation checkbox to upgrade screen [ci skip]

---
 .../ui/controllers/UpgradeController.java          |  9 ++++++++-
 main/ui/src/main/resources/css/linux_theme.css     |  6 +++---
 main/ui/src/main/resources/css/mac_theme.css       |  2 +-
 main/ui/src/main/resources/css/win_theme.css       |  2 +-
 main/ui/src/main/resources/fxml/upgrade.fxml       | 14 +++++++++-----
 main/ui/src/main/resources/localization/en.txt     |  1 +
 6 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java
index 729f3fdf9..a34e2aeb6 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java
@@ -15,11 +15,13 @@ import org.cryptomator.ui.settings.Localization;
 import org.cryptomator.ui.util.AsyncTaskService;
 import org.fxmisc.easybind.EasyBind;
 
+import javafx.beans.binding.BooleanExpression;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.ProgressIndicator;
 
@@ -44,6 +46,9 @@ public class UpgradeController extends LocalizedFXMLViewController {
 	@FXML
 	private SecPasswordField passwordField;
 
+	@FXML
+	private CheckBox confirmationCheckbox;
+
 	@FXML
 	private Button upgradeButton;
 
@@ -59,7 +64,9 @@ public class UpgradeController extends LocalizedFXMLViewController {
 			return instruction.map(this::upgradeNotification).orElse("");
 		}).orElse(""));
 
-		upgradeButton.disableProperty().bind(passwordField.textProperty().isEmpty().or(passwordField.disabledProperty()));
+		BooleanExpression passwordProvided = passwordField.textProperty().isNotEmpty().and(passwordField.disabledProperty().not());
+		BooleanExpression syncFinished = confirmationCheckbox.selectedProperty();
+		upgradeButton.disableProperty().bind(passwordProvided.not().or(syncFinished.not()));
 
 		EasyBind.subscribe(vault, this::vaultDidChange);
 	}
diff --git a/main/ui/src/main/resources/css/linux_theme.css b/main/ui/src/main/resources/css/linux_theme.css
index 38f453feb..f3b2f3576 100644
--- a/main/ui/src/main/resources/css/linux_theme.css
+++ b/main/ui/src/main/resources/css/linux_theme.css
@@ -305,17 +305,17 @@
  ****************************************************************************/
 
 .check-box {
-	-fx-label-padding: 0 0 0 3;
+	-fx-label-padding: 0 0 0 6px;
 	-fx-text-fill: COLOR_TEXT;
 }
 .check-box > .box {
-	-fx-padding: 3;
+	-fx-padding: 3px;
 	-fx-background-color: COLOR_BORDER_DARK, #FFF;
 	-fx-background-insets: 0, 1;
 }
 .check-box > .box > .mark {
 	-fx-background-color: transparent;
-	-fx-padding: 4;
+	-fx-padding: 4px;
 	-fx-shape: "M-1,4, L-1,5.5 L3.5,8.5 L9,0 L9,-1 L7,-1 L3,6 L1,4 Z";
 }
 .check-box:selected > .box {
diff --git a/main/ui/src/main/resources/css/mac_theme.css b/main/ui/src/main/resources/css/mac_theme.css
index bb5fa2053..ffd4b637e 100644
--- a/main/ui/src/main/resources/css/mac_theme.css
+++ b/main/ui/src/main/resources/css/mac_theme.css
@@ -386,7 +386,7 @@
  ******************************************************************************/
 
 .check-box {
-    -fx-label-padding: 0 0 0 3px;
+    -fx-label-padding: 0 0 0 6px;
     -fx-text-fill: COLOR_TEXT;
 }
 .check-box > .box {
diff --git a/main/ui/src/main/resources/css/win_theme.css b/main/ui/src/main/resources/css/win_theme.css
index 72fa8cb53..0c0c29c84 100644
--- a/main/ui/src/main/resources/css/win_theme.css
+++ b/main/ui/src/main/resources/css/win_theme.css
@@ -354,7 +354,7 @@
  ******************************************************************************/
 
 .check-box {
-    -fx-label-padding: 0 0 0 3px;
+    -fx-label-padding: 0 0 0 6px;
     -fx-text-fill: COLOR_TEXT;
 }
 .check-box > .box {
diff --git a/main/ui/src/main/resources/fxml/upgrade.fxml b/main/ui/src/main/resources/fxml/upgrade.fxml
index 5d54014a3..24fc99d0a 100644
--- a/main/ui/src/main/resources/fxml/upgrade.fxml
+++ b/main/ui/src/main/resources/fxml/upgrade.fxml
@@ -17,6 +17,8 @@
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.control.CheckBox?>
 
 <GridPane vgap="12.0" hgap="12.0" prefWidth="400.0" xmlns:fx="http://javafx.com/fxml" cacheShape="true" cache="true">
 	<padding>
@@ -34,15 +36,17 @@
 		<Pane prefHeight="12.0" GridPane.rowIndex="1" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true">
 		</Pane>
 
-		<Label text="%unlock.label.password" cacheShape="true" cache="true" GridPane.rowIndex="2" GridPane.columnIndex="0" />
-		<SecPasswordField fx:id="passwordField" cacheShape="true" cache="true" GridPane.rowIndex="2" GridPane.columnIndex="1" />
+		<Label text="%unlock.label.password" GridPane.rowIndex="2" GridPane.columnIndex="0" cacheShape="true" cache="true" />
+		<SecPasswordField fx:id="passwordField" GridPane.rowIndex="2" GridPane.columnIndex="1" cacheShape="true" cache="true" />
+		
+		<CheckBox fx:id="confirmationCheckbox" text="%upgrade.confirmation.label" wrapText="true" GridPane.rowIndex="3" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true" />
 
-		<HBox alignment="CENTER_RIGHT" GridPane.hgrow="ALWAYS" GridPane.rowIndex="3" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true">
+		<HBox alignment="CENTER_RIGHT" GridPane.hgrow="ALWAYS" GridPane.rowIndex="4" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true">
 			<Button fx:id="upgradeButton" text="%upgrade.button" prefWidth="150.0" onAction="#didClickUpgradeButton" cacheShape="true" cache="true" />
 		</HBox>
 
-		<ProgressIndicator progress="-1" fx:id="progressIndicator" visible="false" cacheShape="true" cache="true" cacheHint="SPEED" GridPane.rowIndex="4" GridPane.columnIndex="0" GridPane.columnSpan="2" />
+		<ProgressIndicator progress="-1" fx:id="progressIndicator" visible="false" GridPane.rowIndex="5" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true" cacheHint="SPEED" />
 
-		<Label fx:id="errorLabel" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true" />
+		<Label fx:id="errorLabel" wrapText="true" GridPane.rowIndex="6" GridPane.columnIndex="0" GridPane.columnSpan="2" cacheShape="true" cache="true" />
 	</children>
 </GridPane>
diff --git a/main/ui/src/main/resources/localization/en.txt b/main/ui/src/main/resources/localization/en.txt
index 3fe3d213c..ec6c8f6bf 100644
--- a/main/ui/src/main/resources/localization/en.txt
+++ b/main/ui/src/main/resources/localization/en.txt
@@ -38,6 +38,7 @@ initialize.label.doNotForget=IMPORTANT: If you forget your password, there is no
 notfound.label=Vault couldn't be found. Has it been moved?
 
 # upgrade.fxml
+upgrade.confirmation.label=Yes, I've made sure that synchronization has finished
 upgrade.button=Upgrade vault
 
 upgrade.version3dropBundleExtension.msg=This vault needs to be migrated to a newer format.\n"%1$s" will be renamed to "%2$s".\nPlease make sure synchronization has finished before proceeding.

From 363ed4ac4b632ba59ce45abcc0064569137fb0cd Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 17 Aug 2016 18:52:08 +0200
Subject: [PATCH 06/45] Accept paths beginning with "~" in
 cryptomator.settingsPath JVM arg. [ci skip]

---
 .../org/cryptomator/ui/settings/SettingsProvider.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java b/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java
index 6f752512d..5617815d3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java
@@ -65,7 +65,15 @@ public class SettingsProvider implements Provider<Settings> {
 
 	private Path getSettingsPath() throws IOException {
 		final String settingsPathProperty = System.getProperty("cryptomator.settingsPath");
-		return Optional.ofNullable(settingsPathProperty).filter(StringUtils::isNotBlank).map(FileSystems.getDefault()::getPath).orElse(DEFAULT_SETTINGS_PATH);
+		return Optional.ofNullable(settingsPathProperty).filter(StringUtils::isNotBlank).map(this::replaceHomeDir).map(FileSystems.getDefault()::getPath).orElse(DEFAULT_SETTINGS_PATH);
+	}
+
+	private String replaceHomeDir(String path) {
+		if (path.startsWith("~/")) {
+			return SystemUtils.USER_HOME + path.substring(1);
+		} else {
+			return path;
+		}
 	}
 
 	@Override

From fcfcffe9cb6217a57fb8595e56cfd5d4607cf3e3 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Fri, 19 Aug 2016 16:56:04 +0200
Subject: [PATCH 07/45] updated tray icons for OS X [ci skip]

---
 .../src/main/resources/tray_icon_mac_black.png  | Bin 369 -> 350 bytes
 .../main/resources/tray_icon_mac_black@2x.png   | Bin 783 -> 692 bytes
 .../src/main/resources/tray_icon_mac_white.png  | Bin 362 -> 359 bytes
 .../main/resources/tray_icon_mac_white@2x.png   | Bin 792 -> 707 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/main/ui/src/main/resources/tray_icon_mac_black.png b/main/ui/src/main/resources/tray_icon_mac_black.png
index 68fce050da60520d9f9caab3ac4b54d2c115b971..945626429a67a1ebf01cf4f9cccd445d8a720b6f 100644
GIT binary patch
delta 323
zcmV-J0lfb40^S0UB!4AIL_t(|0nN`dW1V3f1@K?(>DIQ*r8cK(s%?d9Y};Al>kk;b
zVL4UjJop>_H|$m*EG)-vzr<cK$x({i=NG6{Zmx70<|<d~r&uQW4VVACeVuGYI<+g5
zt;Rk80C*&9nzi=ZVX=@M_FHS3utxyELNWc0Nq)m)`ot^*fPc9n8XX=DkS~8!azvwu
zxd8A&*kUI}11z?9RB}Q{*mD5pNhrqY(E!gp8<m_wv4nZROncpM1&bwufVbWTf5Kv1
zal>9S;gC+*7Fpqz=C77&a?1*f<mz+??z?ZFO`Zqt$VA|%^xQ`K-1h)3O0mZlnStw$
zO!ewzx*O=3wmjG)#aWo{ifQ;1xE{&?86F1uCroq2bO5*{A*tJQ@Km>?giHP~h5&#V
VW>t2o;N1WK002ovPDHLkV1nL$o7eyV

delta 342
zcmV-c0jd7p0`UTnB!4(bL_t(|0nO0^2v|WJfbrjK+h$s}$J}f)%(lWDhcJhkakg#S
zw%)p3^=72$ySqQXc>XtXo941NuEw0#FUV|{#4{njB-WYzl$L_VvRNNr6S4MF<_htg
zbK3>6GQ$taFRSHt+hVng*2cWcd|4In4YLFzqI$*^2ds+kYJaSk>o1t&3vzfWi28SD
zp5TS-zTmF==B4Y4nz@nIbKUd67xWf%G$37{P}#+_9;CHkh)>+|UI}rSo&le#4hl=$
zmjN=WXO;0N;Dr#+TV+%6WfU1@wFc2s-5tj?S3-Y#QsrHmkLWGGMozk=7CnqtGHR2A
zAD-^|Dr<yZv`;lt1??>s;<;<6$AVV|r|LxQRg6w2G8rb<r%!!jkeq5NV^pe+M=nF6
o_ldR=A)bYRtwKDn)$vF90C*y#f3IU!kN^Mx07*qoM6N<$f;pM0e*gdg

diff --git a/main/ui/src/main/resources/tray_icon_mac_black@2x.png b/main/ui/src/main/resources/tray_icon_mac_black@2x.png
index 2e6f43e8d23e3194fef176ab800809f594aca5b9..f02eb7b6d2f72bb4529bfda14d3d42eff6e706d7 100644
GIT binary patch
delta 668
zcmV;N0%QG;2DAl`B!7EJL_t(|0qxX-vn)p(#qrPL*|u%lHcPQ>C;M(}TZI^l=l%VG
zVF%lnwJAj3o@typ)9&^^|I-62-S1-!q2VKUSmG}-%(Eg7Du!vBvNuJS;Z0?2a$Iy9
z4r`MSgm9&S`a2*T)Zai?3*jSeF+BBYb}C&m9L!GoXl<}i^nVzZYJ+t`XlQm*={ow(
zKobqbL~9H}(HI-u=W7qxV!ZweMp$PelDB7usAvi=DA}swb4^X3tJr6hea`qoQfyW7
ztk6_3L=QZehW510qSvt5nUs4_x0IYurbp}$y@nkgNxAdN-Opx6GIiM6r%KOA{+?#`
z>STJ}s;q)f-GA)UOk3sol)G9FJRpP@yl7=s!8A<Ew3S})f)F0iE!VmzoHxNbyR!<$
zVr-`Ew$=pag^RA$B`cEk18_R4;1#@@X{W&lQorS(l0M!I_GJ}(gKsizAGjx#DsmLn
zh0rt`jL(ke+jzT0X&MjaBxg-gM!_*v;V~euLI*nXW`6*W3021ww6NSwZn42GLjjy<
zsp59r-lCiYFw`y^+~Ow70pQa#ggX=f3{e-|hPojD3hqb~@+kmwg`?KEPtytP^_{BA
zqSsKj3nw()XN{x6T!2%;6cp6-!@Hu-;a!x~6fjvh1#rDE6ufJuvJ0Zm;ewKx-T^~}
z>j4f5vwy*h78&01(@m;bHB~pYl!sg7MKD`93@}{HotWlkjBEL2wMoABd)fCUWtYu3
z+-w@|R5JpArM@*A$a=cL3gH${`QB4*5ms2A^%R)xTT69KHmCc%rKUfiznZu0%jUFq
zvekbnJJl88<!tr)#IBZYf6)d2Y;ZB(r~mVh<rPPA4yi-Q3~8PK0000<MNUMnLSTZS
CJ4rbJ

delta 759
zcmV<T0to%I1&;=hB!AXPL_t(|0qxWSkR(YMK;f^a`)u2`ZQHhO+qP}nw(YfT+q?fM
z50w`^I|!WK3;fC~m;d><P_c{0wKc#%?LBD^6^&#mO+;pM%V;>3FhKlO11+h6)c8&a
z!~I~S5JqTXgb=<~(jayfLThtkF73577v|Dd2wP|nF9_jkGk^TzO>Rul^+I?=1E?4*
zYO$9Fuz-;Cs`ve%iBG&DBu%g0tR*D9<~>a`@v&Ehq$SjusVr>~Y_6F{T<%O4y51{#
z>gg3Xy2u$W_n_}BiG?g<8nxqmBZdBItl><Ldc)T~_ljE_Xg@c3#pk~EmPeg!9c5jF
z(XLQZm0iRyc7L|JsDlS-nWFtv<r!&HM~FIjye27nT~%&PBVFt(>fn)DrRV`wIWCP1
zvTe3}yvMvCGI!NAMQ5nWc|vHat(~&vSAd7J>Ry`pN(k4e!b%1SVO@JVK3jeqxFV~b
zW_K&4pU!HKQ%OIHuHc4jd2bup$&jpi6KIp3!=&VFl79vt0oRJm^W7(}-3#tX+4kgI
zmRkFOgGJ_cPL$V<13RbedU6glQs`?+Fssp`;5;_UDr3zJCe>9K?MMYya+jA}WN&K#
zWEVTwq~;d|9|N$my<Ff$_gWL6?7cMhi75fhZ>0E>!;C59qb&+xQt9vIQx#xxef4sL
z$AsOmntzrC7+|cZ#c{vPd}KCkD?IHeUGz6Ku$6Ev$_82<&kJ?;bS!4L$#99V6L6An
z7<k4$=pxkJr?Iowz`nwHz+vfl+~7PV6NIEOPB0?7mk$>5&vCjtz%jxJz+8s=R@tK7
zHl67TO9tUU-x?}}QMy~lVugt&n93WLRq~0^7H|aE-6$8BK@DmOOUB?m%bD5^b~3HQ
zU1Isd#227sdZ!v=e*l=ztN?lx7OkW+0Ory$`z<~PU}g)b$}5FMuXq9gboWxBe~vn_
pp?-yBM*)C`3cZ%*^*{eqegx9QgV{=H>plPg002ovPDHLkV1ig7Z=e7G

diff --git a/main/ui/src/main/resources/tray_icon_mac_white.png b/main/ui/src/main/resources/tray_icon_mac_white.png
index 6d39c154e309e3fc2f4d6fb75781297b2ecdf358..363e435c335e8ed71a3b0590a8bb2a8e809de06b 100644
GIT binary patch
delta 332
zcmV-S0ki(<0_OsdB!4bRL_t(|0nN<=%usO{h4Gv1F>7pyL$)#I8nWi)dD%5KWj8Ck
zA=}27jk{m(XMa;V=i=Pw|7<t;&!Vf7zC;h}R=U{J4*);)DowrQyz2JYt9q>KC5z1z
zPV<s~f72mnyzta12VK*vIBmHv%4(&zP8w<u&))G>Ht6z#Vt*Y!d@xL*1bOd=I{DRV
zzPf85;6xM{6!fd=`PB_RYiI<ZQ4|De5GU*N#2Qj(<2?qjHVTXmdRD4NmRL~_vrLWE
zC?IT%LaI^Fsb+;yF;oM*bVxld&GA6~+z-++PL6nCK&Tc+dueMO_zHO|XdAu4SQ4s<
zw(G9FePDt8Zbe1+TL|&)pnDkOLsiaHW#hdWEVDO>*c%Hr$1WR2xg;+pN%7jcBw|f0
eK_(@CIKKe%5OD&D4%`#~0000<MNUMnLSTaDiJJHT

delta 335
zcmV-V0kHn(0_p;gB!4kUL_t(|0nO0^3|CPU$MKhK+nk#1I4|2AvaKPHVaP+~m~Gp(
zt$+J;vYXQH@ZR%%xbG$ZnPfM~c`sayn)6p+dfTKtA|e%i`k$jsQC}vjBN~YQ=jcpu
z%5`VJlpkZcWwh9K8!UI$%Bb7Sj=enJg3~Z0&=W4$V_C$-=zkaMjTv8pSv(~0?==fg
zWd0Jq>9*JgXEkyKFw-q}z686Ytv-Mw$_Ebg(;Ndnqu0DvL~H_|E~1V6Qf^BVn6zqH
zW^{CUJOMA21U!{L_J>)nj<ku&ZaAc|B6`~acm+71yWHwI>Y8eaE=DUF*f>8{XFZiP
zM7KmsQ<c%$d`NK9K=<)Xf52F+l?|p{BAr39efp^{^pjOpB@6?^DP%K1y3b#sr4*R^
hVZ9MNS0nkOdIJG#lb+E-Rd)aY002ovPDHLkV1fWLp7Q_z

diff --git a/main/ui/src/main/resources/tray_icon_mac_white@2x.png b/main/ui/src/main/resources/tray_icon_mac_white@2x.png
index b789114bc389acdf83092957a880b02296e73f11..c6553906c71fec57ecd9c099e6652797611d645b 100644
GIT binary patch
delta 683
zcmV;c0#yB&2EzrAB!7xYL_t(|0qxZTjAd6C0N{UZ+qQRu+O}=mjZ@pUjX`bOW>~wU
zVEw+n^k!b~>5dyzUv!OMC;r#C|5?usK30c1AGyrx@z?0@Q7bCfKiWzsuWHz9Iz`(!
zQsWMZw($WtQBPg%j{|ho(<$JiXbS@Y^Rhil4U8gl0mGv8tbeR&YeehW6x1nb*rw5P
zdK#~1gz+}kD?$e&Y~_02yU}*W>Z+YVHZ#6-ZPWBoW;veF(GJRdsbIM;mD$Ho`>ODD
z>B#mvdKAl*=@X4}GvGnnYTmXg05?ZtbhHp~yInMI7q<fz>eP5ND*=^uXwgF}O4m0Y
zStkP?w}I5>&VTp0)CL|0oE(jFBY4tN){~kRVVcx>p7bQRF&g7^i?Pr+o7zKaWQ37Y
zd)UM{3$fVg(GcqbK8Pa6OFbXq1*zk66N2?(MaltJN0EJ`eu(gc)IL$<8bEpcnGR|}
zAsZmZD9C#=!kh96#zc|%3ZO=ZNNMMARk$lM=_9C&P=87KnvA<p<#6pH&)Uv)fi3K&
zUu443@-B^Vsk~z%6Z+ZBmM(Cvwc`&yR{)nOy-i=W8ds}t?k_I`1)oPf3vif?U2nOg
zBJAyFRhDU9t=%FVWx4BZ>@X~djAJo5LOV6OM0i`vy&a*m8to!X!m*KYCRr@KZI(_J
zX}Lu@nt$c3EVei+G7c=QL{C}OKzZk?lB#m9yn$BrR1}$)TV)MY?eYlIoF8GdybVq8
zs}jGOU;}xhBb;wqgv(VM6!om(NApUr$lJoYxX=TB^?(bpuFd5QjNh5(M{7pIq%qys
z>#B9l&grVg8}?0O8ZD4!{~44;i84H!X1_)3rX-e<#kPzRTUsow)BpW*{RVAGWcSeW
R<aGc5002ovPDHLkV1gzuQU3q{

delta 768
zcmV+b1ONQP1(*hqB!AyYL_t(|0qxZTlp|Rf2GG{pwr$(CZQHhO+qP}nW81c8?$-Ht
zPVy@4?t|4$DtY|MRb~GY|5Ifj&+BN2p*nlf0jioCxsn!2wYExgB3Cd(O@>;rsgV_a
z1Ec+6EEuDOG2mzAO$*%@w6|bZUPxyhEfl4WV27rKz5#AFM}K_oa;GS{9X!*tvp!s1
z`ZXnV2}SSv+#g!_#yg5;Z+z%Rir({?7Fzh)yNXt5c-Tx<woLZFy;h!ay$fCGcJJt$
zeco}Wt6boEPx@VUSy{>|W~ndoa$_-Ag$-QjSs(b>_ug@jBOT^0@A%%&KJu)KZK6^S
zjCVsF7npqn-GA+`A&$~ka9Hi3uM|R0&=99<A$Y&`(0c_v9I7Es)K2h3?V+a$hS^o#
zWY2j+seSbnTu^)HWuT>w_L6r)^gk`{Ag%laZmBJDEyKX34s^P_(_+L8^3JorwZLfW
z)qGoa1U;j6hrIr_vX>F^?uxM;Ko8Sa58a01gTk#!U4QN|r5=s3j}UgR9(o<&kf<H4
z)NanC#)Gmq;r8mGM;eQPW{ldr#>-p8R`MoVIL1z^C&oLm^b|ehEmt|%28FiAq=uW;
z;_{v=j9uG7uJEQuZ8)__rOyc8#C8UY8!I)+1gY_sEsUMkyM%95MU&|b)Xxc?!+u$P
zJ#7s!#D7F}nG|EbGG8`hSG?>bJq$K;gxU$W#ug8?diMXi#yCHlv7FJS%l@yyUJ>dn
z92ccmWanNFjq!4v|Mz14p|~tU9f$L$Uh<bIH$~9|XBZ<j-jh<_XY<bYK+Hb{XGExl
zjP|Qa%lg=C*(WtDF1BBd1mpC!iRGkP#M|Nnt9dH-jq#Q&`-}aJbA>rnWaSE}30cc$
zRx`6b>}6KRyT<BLKSV;g*_~^G!^?^+X5K=%kJMVaC*u~<)vi*n75e73L|JXTBlV6K
ya=pF1C3Q(zL)g+FsgrWOPf4}4XxTs2|NaC=v9{2eb$BuW0000<MNUMnLSTZQe~aY+


From 6a3ccf2b48baab281d41a842a2bc868e078f02c8 Mon Sep 17 00:00:00 2001
From: Olivier Paroz <oparoz@users.noreply.github.com>
Date: Fri, 19 Aug 2016 19:07:39 +0200
Subject: [PATCH 08/45] Add that the solution works with WebDAV clouds

I think it would be nice to promote other Open Source solutions which use standards such as WebDAV and work well with Cryptomator.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1b79ec1bf..b587298b5 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Download native binaries of Cryptomator on [cryptomator.org](https://cryptomator
 
 ## Features
 
-- Works with Dropbox, Google Drive, OneDrive, and any other cloud storage service that synchronizes with a local directory
+- Works with Dropbox, Google Drive, OneDrive, Nextcloud and any other cloud storage service which synchronizes with a local directory
 - Open Source means: No backdoors, control is better than trust
 - Client-side: No accounts, no data shared with any online service
 - Totally transparent: Just work on the virtual drive as if it were a USB flash drive

From 8c8db84a4ae09868e61add287d59526cbda962ef Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 23 Aug 2016 21:15:40 +0200
Subject: [PATCH 09/45] refactored migration (using cryptolib)

---
 main/pom.xml                                  |  8 ++++
 main/ui/pom.xml                               |  6 +++
 .../cryptomator/ui/model/UpgradeStrategy.java | 48 +++++++++++++------
 .../UpgradeVersion3DropBundleExtension.java   | 47 +++---------------
 .../ui/model/UpgradeVersion3to4.java          | 36 +++-----------
 5 files changed, 62 insertions(+), 83 deletions(-)

diff --git a/main/pom.xml b/main/pom.xml
index cfb5ace1a..757794d7d 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -28,6 +28,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- dependency versions -->
+		<cryptolib.version>1.0.0-SNAPSHOT</cryptolib.version>
 		<log4j.version>2.1</log4j.version>
 		<slf4j.version>1.7.7</slf4j.version>
 		<junit.version>4.12</junit.version>
@@ -123,6 +124,13 @@
 				<artifactId>ui</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			
+			<!-- Libs -->
+			<dependency>
+				<groupId>org.cryptomator</groupId>
+				<artifactId>cryptolib</artifactId>
+				<version>${cryptolib.version}</version>
+			</dependency>
 
 			<!-- Logging -->
 			<dependency>
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index 2c261d3ad..5515e6d26 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -55,6 +55,12 @@
 			<artifactId>frontend-webdav</artifactId>
 		</dependency>
 		
+		<!-- CryptoLib -->
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>cryptolib</artifactId>
+		</dependency>
+		
 		<!-- EasyBind -->
 		<dependency>
 			<groupId>org.fxmisc.easybind</groupId>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java
index 6f7f147ce..9d77b93d4 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java
@@ -6,11 +6,11 @@ import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardOpenOption;
 
-import javax.inject.Provider;
-
-import org.cryptomator.crypto.engine.Cryptor;
-import org.cryptomator.crypto.engine.InvalidPassphraseException;
-import org.cryptomator.crypto.engine.UnsupportedVaultFormatException;
+import org.cryptomator.cryptolib.api.Cryptor;
+import org.cryptomator.cryptolib.api.CryptorProvider;
+import org.cryptomator.cryptolib.api.InvalidPassphraseException;
+import org.cryptomator.cryptolib.api.KeyFile;
+import org.cryptomator.cryptolib.api.UnsupportedVaultFormatException;
 import org.cryptomator.filesystem.crypto.Constants;
 import org.cryptomator.ui.settings.Localization;
 import org.slf4j.Logger;
@@ -20,12 +20,16 @@ public abstract class UpgradeStrategy {
 
 	private static final Logger LOG = LoggerFactory.getLogger(UpgradeStrategy.class);
 
-	protected final Provider<Cryptor> cryptorProvider;
+	protected final CryptorProvider cryptorProvider;
 	protected final Localization localization;
+	protected final int vaultVersionBeforeUpgrade;
+	protected final int vaultVersionAfterUpgrade;
 
-	UpgradeStrategy(Provider<Cryptor> cryptorProvider, Localization localization) {
+	UpgradeStrategy(CryptorProvider cryptorProvider, Localization localization, int vaultVersionBeforeUpgrade, int vaultVersionAfterUpgrade) {
 		this.cryptorProvider = cryptorProvider;
 		this.localization = localization;
+		this.vaultVersionBeforeUpgrade = vaultVersionBeforeUpgrade;
+		this.vaultVersionAfterUpgrade = vaultVersionAfterUpgrade;
 	}
 
 	/**
@@ -37,27 +41,29 @@ public abstract class UpgradeStrategy {
 	 * Upgrades a vault. Might take a moment, should be run in a background thread.
 	 */
 	public void upgrade(Vault vault, CharSequence passphrase) throws UpgradeFailedException {
-		final Cryptor cryptor = cryptorProvider.get();
+		Cryptor cryptor = null;
 		try {
 			final Path masterkeyFile = vault.path().getValue().resolve(Constants.MASTERKEY_FILENAME);
 			final byte[] masterkeyFileContents = Files.readAllBytes(masterkeyFile);
-			cryptor.readKeysFromMasterkeyFile(masterkeyFileContents, passphrase);
+			cryptor = cryptorProvider.createFromKeyFile(KeyFile.parse(masterkeyFileContents), passphrase, vaultVersionBeforeUpgrade);
 			// create backup, as soon as we know the password was correct:
 			final Path masterkeyBackupFile = vault.path().getValue().resolve(Constants.MASTERKEY_BACKUP_FILENAME);
 			Files.copy(masterkeyFile, masterkeyBackupFile, StandardCopyOption.REPLACE_EXISTING);
 			// do stuff:
 			upgrade(vault, cryptor);
 			// write updated masterkey file:
-			final byte[] upgradedMasterkeyFileContents = cryptor.writeKeysToMasterkeyFile(passphrase);
-			final Path masterkeyFileAfterUpgrading = vault.path().getValue().resolve(Constants.MASTERKEY_FILENAME); // path may have changed
-			Files.write(masterkeyFileAfterUpgrading, upgradedMasterkeyFileContents, StandardOpenOption.TRUNCATE_EXISTING);
+			final byte[] upgradedMasterkeyFileContents = cryptor.writeKeysToMasterkeyFile(passphrase, vaultVersionAfterUpgrade).serialize();
+			final Path masterkeyFileAfterUpgrade = vault.path().getValue().resolve(Constants.MASTERKEY_FILENAME); // path may have changed
+			Files.write(masterkeyFileAfterUpgrade, upgradedMasterkeyFileContents, StandardOpenOption.TRUNCATE_EXISTING);
 		} catch (InvalidPassphraseException e) {
 			throw new UpgradeFailedException(localization.getString("unlock.errorMessage.wrongPassword"));
 		} catch (IOException | UnsupportedVaultFormatException e) {
 			LOG.warn("Upgrade failed.", e);
 			throw new UpgradeFailedException("Upgrade failed. Details in log message.");
 		} finally {
-			cryptor.destroy();
+			if (cryptor != null) {
+				cryptor.destroy();
+			}
 		}
 	}
 
@@ -68,7 +74,21 @@ public abstract class UpgradeStrategy {
 	 * 
 	 * @return <code>true</code> if and only if the vault can be migrated to a newer version without the risk of data losses.
 	 */
-	public abstract boolean isApplicable(Vault vault);
+	public boolean isApplicable(Vault vault) {
+		final Path masterkeyFile = vault.path().getValue().resolve(Constants.MASTERKEY_FILENAME);
+		try {
+			if (Files.isRegularFile(masterkeyFile)) {
+				byte[] masterkeyFileContents = Files.readAllBytes(masterkeyFile);
+				return KeyFile.parse(masterkeyFileContents).getVersion() == vaultVersionBeforeUpgrade;
+			} else {
+				LOG.warn("Not a file: {}", masterkeyFile);
+				return false;
+			}
+		} catch (IOException e) {
+			LOG.warn("Could not determine, whether upgrade is applicable.", e);
+			return false;
+		}
+	}
 
 	/**
 	 * Thrown when data migration failed.
diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3DropBundleExtension.java b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3DropBundleExtension.java
index 04fa63f30..a0462cd65 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3DropBundleExtension.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3DropBundleExtension.java
@@ -1,19 +1,16 @@
 package org.cryptomator.ui.model;
 
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.security.SecureRandom;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.inject.Singleton;
 
 import org.apache.commons.lang3.StringUtils;
-import org.cryptomator.crypto.engine.Cryptor;
-import org.cryptomator.crypto.engine.InvalidPassphraseException;
-import org.cryptomator.crypto.engine.UnsupportedVaultFormatException;
-import org.cryptomator.filesystem.crypto.Constants;
+import org.cryptomator.cryptolib.Cryptors;
+import org.cryptomator.cryptolib.api.Cryptor;
 import org.cryptomator.ui.settings.Localization;
 import org.cryptomator.ui.settings.Settings;
 import org.slf4j.Logger;
@@ -28,8 +25,8 @@ class UpgradeVersion3DropBundleExtension extends UpgradeStrategy {
 	private final Settings settings;
 
 	@Inject
-	public UpgradeVersion3DropBundleExtension(Provider<Cryptor> cryptorProvider, Localization localization, Settings settings) {
-		super(cryptorProvider, localization);
+	public UpgradeVersion3DropBundleExtension(SecureRandom secureRandom, Localization localization, Settings settings) {
+		super(Cryptors.version1(secureRandom), localization, 3, 3);
 		this.settings = settings;
 	}
 
@@ -42,25 +39,6 @@ class UpgradeVersion3DropBundleExtension extends UpgradeStrategy {
 		return String.format(fmt, oldVaultName, newVaultName);
 	}
 
-	@Override
-	public void upgrade(Vault vault, CharSequence passphrase) throws UpgradeFailedException {
-		final Cryptor cryptor = cryptorProvider.get();
-		try {
-			final Path masterkeyFile = vault.path().getValue().resolve(Constants.MASTERKEY_FILENAME);
-			final byte[] masterkeyFileContents = Files.readAllBytes(masterkeyFile);
-			cryptor.readKeysFromMasterkeyFile(masterkeyFileContents, passphrase);
-			upgrade(vault, cryptor);
-			// don't write new masterkey. this is a special case, as we were stupid and didn't increase the vault version with this upgrade...
-		} catch (InvalidPassphraseException e) {
-			throw new UpgradeFailedException(localization.getString("unlock.errorMessage.wrongPassword"));
-		} catch (IOException | UnsupportedVaultFormatException e) {
-			LOG.warn("Upgrade failed.", e);
-			throw new UpgradeFailedException("Upgrade failed. Details in log message.");
-		} finally {
-			cryptor.destroy();
-		}
-	}
-
 	@Override
 	protected void upgrade(Vault vault, Cryptor cryptor) throws UpgradeFailedException {
 		Path path = vault.path().getValue();
@@ -73,6 +51,7 @@ class UpgradeVersion3DropBundleExtension extends UpgradeStrategy {
 			throw new UpgradeFailedException(msg);
 		} else {
 			try {
+				LOG.info("Renaming {} to {}", path, newPath.getFileName());
 				Files.move(path, path.resolveSibling(newVaultName));
 				Platform.runLater(() -> {
 					vault.setPath(newPath);
@@ -89,19 +68,7 @@ class UpgradeVersion3DropBundleExtension extends UpgradeStrategy {
 	public boolean isApplicable(Vault vault) {
 		Path vaultPath = vault.path().getValue();
 		if (vaultPath.toString().endsWith(Vault.VAULT_FILE_EXTENSION)) {
-			final Path masterkeyFile = vaultPath.resolve(Constants.MASTERKEY_FILENAME);
-			try {
-				if (Files.isRegularFile(masterkeyFile)) {
-					final String keyContents = new String(Files.readAllBytes(masterkeyFile), StandardCharsets.UTF_8);
-					return keyContents.contains("\"version\":3") || keyContents.contains("\"version\": 3");
-				} else {
-					LOG.warn("Not a file: {}", masterkeyFile);
-					return false;
-				}
-			} catch (IOException e) {
-				LOG.warn("Could not determine, whether upgrade is applicable.", e);
-				return false;
-			}
+			return super.isApplicable(vault);
 		} else {
 			return false;
 		}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3to4.java b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3to4.java
index 51a75b263..17bbcaac1 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3to4.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3to4.java
@@ -9,19 +9,19 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.inject.Singleton;
 
 import org.apache.commons.codec.binary.Base32;
 import org.apache.commons.codec.binary.BaseNCodec;
 import org.apache.commons.lang3.StringUtils;
-import org.cryptomator.crypto.engine.Cryptor;
-import org.cryptomator.filesystem.crypto.Constants;
+import org.cryptomator.cryptolib.Cryptors;
+import org.cryptomator.cryptolib.api.Cryptor;
+import org.cryptomator.cryptolib.common.MessageDigestSupplier;
 import org.cryptomator.ui.settings.Localization;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,17 +40,12 @@ class UpgradeVersion3to4 extends UpgradeStrategy {
 	private static final String OLD_FOLDER_SUFFIX = "_";
 	private static final String NEW_FOLDER_PREFIX = "0";
 
-	private final MessageDigest sha1;
+	private final MessageDigest sha1 = MessageDigestSupplier.SHA1.get();
 	private final BaseNCodec base32 = new Base32();
 
 	@Inject
-	public UpgradeVersion3to4(Provider<Cryptor> cryptorProvider, Localization localization) {
-		super(cryptorProvider, localization);
-		try {
-			sha1 = MessageDigest.getInstance("SHA-1");
-		} catch (NoSuchAlgorithmException e) {
-			throw new AssertionError("SHA-1 exists in every JVM");
-		}
+	public UpgradeVersion3to4(SecureRandom secureRandom, Localization localization) {
+		super(Cryptors.version1(secureRandom), localization, 3, 4);
 	}
 
 	@Override
@@ -144,21 +139,4 @@ class UpgradeVersion3to4 extends UpgradeStrategy {
 		}
 	}
 
-	@Override
-	public boolean isApplicable(Vault vault) {
-		final Path masterkeyFile = vault.path().getValue().resolve(Constants.MASTERKEY_FILENAME);
-		try {
-			if (Files.isRegularFile(masterkeyFile)) {
-				final String keyContents = new String(Files.readAllBytes(masterkeyFile), UTF_8);
-				return keyContents.contains("\"version\":3") || keyContents.contains("\"version\": 3");
-			} else {
-				LOG.warn("Not a file: {}", masterkeyFile);
-				return false;
-			}
-		} catch (IOException e) {
-			LOG.warn("Could not determine, whether upgrade is applicable.", e);
-			return false;
-		}
-	}
-
 }

From 8a4a29b4d1f3517e61454462257549b316ab858d Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 23 Aug 2016 21:15:52 +0200
Subject: [PATCH 10/45] added version 4 to 5 migrator

---
 .../ui/model/UpgradeStrategies.java           |   4 +-
 .../ui/model/UpgradeVersion4to5.java          | 128 ++++++++++++++++++
 2 files changed, 130 insertions(+), 2 deletions(-)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion4to5.java

diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategies.java b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategies.java
index ba4407c39..d29b45ff2 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategies.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategies.java
@@ -14,8 +14,8 @@ public class UpgradeStrategies {
 	private final Collection<UpgradeStrategy> strategies;
 
 	@Inject
-	public UpgradeStrategies(UpgradeVersion3DropBundleExtension upgrader1, UpgradeVersion3to4 upgrader2) {
-		strategies = Collections.unmodifiableList(Arrays.asList(upgrader1, upgrader2));
+	public UpgradeStrategies(UpgradeVersion3DropBundleExtension upgrader1, UpgradeVersion3to4 upgrader2, UpgradeVersion4to5 upgrader3) {
+		strategies = Collections.unmodifiableList(Arrays.asList(upgrader1, upgrader2, upgrader3));
 	}
 
 	public Optional<UpgradeStrategy> getUpgradeStrategy(Vault vault) {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion4to5.java b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion4to5.java
new file mode 100644
index 000000000..0d8389250
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion4to5.java
@@ -0,0 +1,128 @@
+package org.cryptomator.ui.model;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.StandardOpenOption;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.security.SecureRandom;
+import java.util.regex.Pattern;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.cryptomator.cryptolib.Cryptors;
+import org.cryptomator.cryptolib.api.Cryptor;
+import org.cryptomator.cryptolib.api.FileHeader;
+import org.cryptomator.ui.settings.Localization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Contains the collective knowledge of all creatures who were alive during the development of vault format 3.
+ * This class uses no external classes from the crypto or shortening layer by purpose, so we don't need legacy code inside these.
+ */
+@Singleton
+class UpgradeVersion4to5 extends UpgradeStrategy {
+
+	private static final Logger LOG = LoggerFactory.getLogger(UpgradeVersion4to5.class);
+	private static final Pattern BASE32_PATTERN = Pattern.compile("^([A-Z2-7]{8})*[A-Z2-7=]{8}");
+
+	@Inject
+	public UpgradeVersion4to5(SecureRandom secureRandom, Localization localization) {
+		super(Cryptors.version1(secureRandom), localization, 4, 5);
+	}
+
+	@Override
+	public String getNotification(Vault vault) {
+		return localization.getString("upgrade.version3to4.msg");
+	}
+
+	@Override
+	protected void upgrade(Vault vault, Cryptor cryptor) throws UpgradeFailedException {
+		Path dataDir = vault.path().get().resolve("d");
+		if (!Files.isDirectory(dataDir)) {
+			return; // empty vault. no migration needed.
+		}
+		try {
+			Files.walkFileTree(dataDir, new SimpleFileVisitor<Path>() {
+
+				@Override
+				public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+					if (BASE32_PATTERN.matcher(file.getFileName().toString()).find() && attrs.size() > cryptor.fileHeaderCryptor().headerSize()) {
+						migrate(file, attrs, cryptor);
+					}
+					return FileVisitResult.CONTINUE;
+				}
+
+			});
+		} catch (IOException e) {
+			LOG.error("Migration failed.", e);
+			throw new UpgradeFailedException(localization.getString("upgrade.version3to4.err.io"));
+		}
+		LOG.info("Migration finished.");
+	}
+
+	private void migrate(Path file, BasicFileAttributes attrs, Cryptor cryptor) throws IOException {
+		try (FileChannel ch = FileChannel.open(file, StandardOpenOption.READ, StandardOpenOption.WRITE)) {
+			// read header:
+			ByteBuffer headerBuf = ByteBuffer.allocate(cryptor.fileHeaderCryptor().headerSize());
+			ch.read(headerBuf);
+			headerBuf.flip();
+			FileHeader header = cryptor.fileHeaderCryptor().decryptHeader(headerBuf);
+			long cleartextSize = header.getFilesize();
+			if (cleartextSize < 0) {
+				LOG.info("Skipping already migrated file {}.", file);
+				return;
+			} else if (cleartextSize > attrs.size()) {
+				LOG.warn("Skipping file {} with invalid file size {}/{}", file, cleartextSize, attrs.size());
+				return;
+			}
+			int headerSize = cryptor.fileHeaderCryptor().headerSize();
+			int ciphertextChunkSize = cryptor.fileContentCryptor().ciphertextChunkSize();
+			int cleartextChunkSize = cryptor.fileContentCryptor().cleartextChunkSize();
+			long newCiphertextSize = Cryptors.ciphertextSize(cleartextSize, cryptor);
+			long newEOF = headerSize + newCiphertextSize;
+			long newFullChunks = newCiphertextSize / ciphertextChunkSize; // int-truncation
+			long newAdditionalCiphertextBytes = newCiphertextSize % ciphertextChunkSize;
+			if (newAdditionalCiphertextBytes == 0) {
+				// (new) last block is already correct. just truncate:
+				LOG.info("Migrating {} of cleartext size {}: Truncating to new ciphertext size: {}", file, cleartextSize, newEOF);
+				ch.truncate(newEOF);
+			} else {
+				// last block may contain padding and needs to be re-encrypted:
+				long lastChunkIdx = newFullChunks;
+				LOG.info("Migrating {} of cleartext size {}: Re-encrypting chunk {}. New ciphertext size: {}", file, cleartextSize, lastChunkIdx, newEOF);
+				long beginOfLastChunk = headerSize + lastChunkIdx * ciphertextChunkSize;
+				assert beginOfLastChunk < newEOF;
+				int lastCleartextChunkLength = (int) (cleartextSize % cleartextChunkSize);
+				assert lastCleartextChunkLength < cleartextChunkSize;
+				assert lastCleartextChunkLength > 0;
+				ch.position(beginOfLastChunk);
+				ByteBuffer lastCiphertextChunk = ByteBuffer.allocate(ciphertextChunkSize);
+				int read = ch.read(lastCiphertextChunk);
+				if (read != -1) {
+					lastCiphertextChunk.flip();
+					ByteBuffer lastCleartextChunk = cryptor.fileContentCryptor().decryptChunk(lastCiphertextChunk, lastChunkIdx, header, true);
+					lastCleartextChunk.position(0).limit(lastCleartextChunkLength);
+					assert lastCleartextChunk.remaining() == lastCleartextChunkLength;
+					ByteBuffer newLastChunkCiphertext = cryptor.fileContentCryptor().encryptChunk(lastCleartextChunk, lastChunkIdx, header);
+					ch.truncate(beginOfLastChunk);
+					ch.write(newLastChunkCiphertext);
+				} else {
+					LOG.error("Reached EOF at position {}/{}", beginOfLastChunk, newEOF);
+					return; // must exit method before changing header!
+				}
+			}
+			header.setFilesize(-1l);
+			ByteBuffer newHeaderBuf = cryptor.fileHeaderCryptor().encryptHeader(header);
+			ch.position(0);
+			ch.write(newHeaderBuf);
+		}
+	}
+
+}

From 66faa13f404ad29821ce013fc46f0aaeadf3b976 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 23 Aug 2016 21:35:13 +0200
Subject: [PATCH 11/45] unlock version 5 vaults

---
 .../crypto/engine/FileContentDecryptor.java   |  5 ---
 .../crypto/engine/impl/Constants.java         |  7 +---
 .../crypto/engine/impl/CryptorImpl.java       |  3 +-
 .../engine/impl/FileContentDecryptorImpl.java | 17 +-------
 .../engine/impl/FileContentEncryptorImpl.java | 18 +--------
 .../filesystem/crypto/CryptoReadableFile.java | 15 ++++++-
 .../crypto/engine/NoFileContentCryptor.java   |  7 ----
 .../crypto/engine/impl/CryptorImplTest.java   | 13 +++----
 .../impl/FileContentCryptorImplTest.java      | 39 -------------------
 .../impl/FileContentEncryptorImplTest.java    | 20 ----------
 10 files changed, 23 insertions(+), 121 deletions(-)

diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/FileContentDecryptor.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/FileContentDecryptor.java
index 016e9871e..be7c468a9 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/FileContentDecryptor.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/FileContentDecryptor.java
@@ -19,11 +19,6 @@ import javax.security.auth.Destroyable;
  */
 public interface FileContentDecryptor extends Destroyable, Closeable {
 
-	/**
-	 * @return Number of bytes of the decrypted file.
-	 */
-	long contentLength();
-
 	/**
 	 * Appends further ciphertext to this decryptor. This method might block until space becomes available. If so, it is interruptable.
 	 * 
diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/Constants.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/Constants.java
index efbe84bfc..218f4c3aa 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/Constants.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/Constants.java
@@ -1,16 +1,11 @@
 package org.cryptomator.crypto.engine.impl;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-
 public final class Constants {
 
 	private Constants() {
 	}
 
-	static final Collection<Integer> SUPPORTED_VAULT_VERSIONS = Collections.unmodifiableCollection(Arrays.asList(3, 4));
-	static final Integer CURRENT_VAULT_VERSION = 4;
+	static final Integer CURRENT_VAULT_VERSION = 5;
 
 	public static final int PAYLOAD_SIZE = 32 * 1024;
 	public static final int NONCE_SIZE = 16;
diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java
index 836e6c134..166a34b12 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java
@@ -9,7 +9,6 @@
 package org.cryptomator.crypto.engine.impl;
 
 import static org.cryptomator.crypto.engine.impl.Constants.CURRENT_VAULT_VERSION;
-import static org.cryptomator.crypto.engine.impl.Constants.SUPPORTED_VAULT_VERSIONS;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -110,7 +109,7 @@ class CryptorImpl implements Cryptor {
 		assert keyFile != null;
 
 		// check version
-		if (!SUPPORTED_VAULT_VERSIONS.contains(keyFile.getVersion())) {
+		if (CURRENT_VAULT_VERSION != keyFile.getVersion()) {
 			throw new UnsupportedVaultFormatException(keyFile.getVersion(), CURRENT_VAULT_VERSION);
 		}
 
diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FileContentDecryptorImpl.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FileContentDecryptorImpl.java
index e619cddc5..0088f6a51 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FileContentDecryptorImpl.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FileContentDecryptorImpl.java
@@ -22,7 +22,6 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.LongAdder;
 import java.util.function.Supplier;
 
 import javax.crypto.Cipher;
@@ -47,7 +46,6 @@ class FileContentDecryptorImpl implements FileContentDecryptor {
 	private final Supplier<Mac> hmacSha256;
 	private final FileHeader header;
 	private final boolean authenticate;
-	private final LongAdder cleartextBytesDecrypted = new LongAdder();
 	private ByteBuffer ciphertextBuffer = ByteBuffer.allocate(CHUNK_SIZE);
 	private long chunkNumber = 0;
 
@@ -58,11 +56,6 @@ class FileContentDecryptorImpl implements FileContentDecryptor {
 		this.chunkNumber = firstCiphertextByte / CHUNK_SIZE; // floor() by int-truncation
 	}
 
-	@Override
-	public long contentLength() {
-		return header.getPayload().getFilesize();
-	}
-
 	@Override
 	public void append(ByteBuffer ciphertext) throws InterruptedException {
 		if (ciphertext == FileContentCryptor.EOF) {
@@ -105,15 +98,7 @@ class FileContentDecryptorImpl implements FileContentDecryptor {
 	@Override
 	public ByteBuffer cleartext() throws InterruptedException {
 		try {
-			final ByteBuffer cleartext = dataProcessor.processedData();
-			long bytesUntilLogicalEof = contentLength() - cleartextBytesDecrypted.sum();
-			if (bytesUntilLogicalEof <= 0) {
-				return FileContentCryptor.EOF;
-			} else if (bytesUntilLogicalEof < cleartext.remaining()) {
-				cleartext.limit((int) bytesUntilLogicalEof);
-			}
-			cleartextBytesDecrypted.add(cleartext.remaining());
-			return cleartext;
+			return dataProcessor.processedData();
 		} catch (ExecutionException e) {
 			if (e.getCause() instanceof AuthenticationFailedException) {
 				throw new AuthenticationFailedException(e);
diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FileContentEncryptorImpl.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FileContentEncryptorImpl.java
index 20b2eeea7..71c0b121b 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FileContentEncryptorImpl.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FileContentEncryptorImpl.java
@@ -36,8 +36,6 @@ import org.cryptomator.io.ByteBuffers;
 class FileContentEncryptorImpl implements FileContentEncryptor {
 
 	private static final String HMAC_SHA256 = "HmacSHA256";
-	private static final int PADDING_LOWER_BOUND = 4 * 1024; // 4k
-	private static final int PADDING_UPPER_BOUND = 16 * 1024 * 1024; // 16M
 	private static final int NUM_THREADS = Runtime.getRuntime().availableProcessors();
 	private static final int READ_AHEAD = 2;
 	private static final ExecutorService SHARED_DECRYPTION_EXECUTOR = Executors.newFixedThreadPool(NUM_THREADS);
@@ -63,7 +61,7 @@ class FileContentEncryptorImpl implements FileContentEncryptor {
 
 	@Override
 	public ByteBuffer getHeader() {
-		header.getPayload().setFilesize(cleartextBytesScheduledForEncryption.sum());
+		header.getPayload().setFilesize(-1l);
 		return header.toByteBuffer(headerKey, hmacSha256);
 	}
 
@@ -76,7 +74,6 @@ class FileContentEncryptorImpl implements FileContentEncryptor {
 	public void append(ByteBuffer cleartext) throws InterruptedException {
 		cleartextBytesScheduledForEncryption.add(cleartext.remaining());
 		if (cleartext == FileContentCryptor.EOF) {
-			appendSizeObfuscationPadding(cleartextBytesScheduledForEncryption.sum());
 			submitCleartextBuffer();
 			submitEof();
 		} else {
@@ -84,19 +81,6 @@ class FileContentEncryptorImpl implements FileContentEncryptor {
 		}
 	}
 
-	private void appendSizeObfuscationPadding(long actualSize) throws InterruptedException {
-		final int maxPaddingLength = (int) Math.min(Math.max(actualSize / 10, PADDING_LOWER_BOUND), PADDING_UPPER_BOUND); // preferably 10%, but at least lower bound and no more than upper bound
-		final int randomPaddingLength = randomSource.nextInt(maxPaddingLength);
-		final ByteBuffer buf = ByteBuffer.allocate(PAYLOAD_SIZE);
-		int remainingPadding = randomPaddingLength;
-		while (remainingPadding > 0) {
-			int bytesInCurrentIteration = Math.min(remainingPadding, PAYLOAD_SIZE);
-			buf.clear().limit(bytesInCurrentIteration);
-			appendAllAndSubmitIfFull(buf);
-			remainingPadding -= bytesInCurrentIteration;
-		}
-	}
-
 	private void appendAllAndSubmitIfFull(ByteBuffer cleartext) throws InterruptedException {
 		while (cleartext.hasRemaining()) {
 			ByteBuffers.copy(cleartext, cleartextBuffer);
diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoReadableFile.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoReadableFile.java
index c915750f0..ad0dd3e08 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoReadableFile.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoReadableFile.java
@@ -8,6 +8,9 @@
  *******************************************************************************/
 package org.cryptomator.filesystem.crypto;
 
+import static org.cryptomator.crypto.engine.impl.Constants.CHUNK_SIZE;
+import static org.cryptomator.crypto.engine.impl.Constants.PAYLOAD_SIZE;
+
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.io.UncheckedIOException;
@@ -72,8 +75,16 @@ class CryptoReadableFile implements ReadableFile {
 
 	@Override
 	public long size() throws UncheckedIOException {
-		assert decryptor != null : "decryptor is always being set during position(long)";
-		return decryptor.contentLength();
+		long ciphertextSize = file.size() - cryptor.getHeaderSize();
+		long overheadPerChunk = CHUNK_SIZE - PAYLOAD_SIZE;
+		long numFullChunks = ciphertextSize / CHUNK_SIZE; // floor by int-truncation
+		long additionalCiphertextBytes = ciphertextSize % CHUNK_SIZE;
+		if (additionalCiphertextBytes > 0 && additionalCiphertextBytes <= overheadPerChunk) {
+			throw new IllegalArgumentException("Method not defined for input value " + ciphertextSize);
+		}
+		long additionalCleartextBytes = (additionalCiphertextBytes == 0) ? 0 : additionalCiphertextBytes - overheadPerChunk;
+		assert additionalCleartextBytes >= 0;
+		return PAYLOAD_SIZE * numFullChunks + additionalCleartextBytes;
 	}
 
 	@Override
diff --git a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/NoFileContentCryptor.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/NoFileContentCryptor.java
index d7a061583..5a342d6e4 100644
--- a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/NoFileContentCryptor.java
+++ b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/NoFileContentCryptor.java
@@ -44,16 +44,9 @@ class NoFileContentCryptor implements FileContentCryptor {
 	private class Decryptor implements FileContentDecryptor {
 
 		private final BlockingQueue<Supplier<ByteBuffer>> cleartextQueue = new LinkedBlockingQueue<>();
-		private final long contentLength;
 
 		private Decryptor(ByteBuffer header) {
 			assert header.remaining() == Long.BYTES;
-			this.contentLength = header.getLong();
-		}
-
-		@Override
-		public long contentLength() {
-			return contentLength;
 		}
 
 		@Override
diff --git a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/CryptorImplTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/CryptorImplTest.java
index 8bd890a76..cb30b9bd5 100644
--- a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/CryptorImplTest.java
+++ b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/CryptorImplTest.java
@@ -21,7 +21,7 @@ public class CryptorImplTest {
 
 	@Test
 	public void testMasterkeyDecryptionWithCorrectPassphrase() throws IOException {
-		final String testMasterKey = "{\"version\":4,\"scryptSalt\":\"AAAAAAAAAAA=\",\"scryptCostParam\":2,\"scryptBlockSize\":8," //
+		final String testMasterKey = "{\"version\":5,\"scryptSalt\":\"AAAAAAAAAAA=\",\"scryptCostParam\":2,\"scryptBlockSize\":8," //
 				+ "\"primaryMasterKey\":\"mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==\"," //
 				+ "\"hmacMasterKey\":\"mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==\"," //
 				+ "\"versionMac\":\"Z9J8Uc5K1f7YKckLUFpXG39NHK1qUjzadw5nvOqvfok=\"}";
@@ -31,7 +31,7 @@ public class CryptorImplTest {
 
 	@Test(expected = InvalidPassphraseException.class)
 	public void testMasterkeyDecryptionWithWrongPassphrase() throws IOException {
-		final String testMasterKey = "{\"version\":4,\"scryptSalt\":\"AAAAAAAAAAA=\",\"scryptCostParam\":2,\"scryptBlockSize\":8," //
+		final String testMasterKey = "{\"version\":5,\"scryptSalt\":\"AAAAAAAAAAA=\",\"scryptCostParam\":2,\"scryptBlockSize\":8," //
 				+ "\"primaryMasterKey\":\"mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==\"," //
 				+ "\"hmacMasterKey\":\"mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==\"," //
 				+ "\"versionMac\":\"Z9J8Uc5K1f7YKckLUFpXG39NHK1qUjzadw5nvOqvfok=\"}";
@@ -52,7 +52,7 @@ public class CryptorImplTest {
 	@Ignore
 	@Test(expected = UnsupportedVaultFormatException.class)
 	public void testMasterkeyDecryptionWithMissingVersionMac() throws IOException {
-		final String testMasterKey = "{\"version\":3,\"scryptSalt\":\"AAAAAAAAAAA=\",\"scryptCostParam\":2,\"scryptBlockSize\":8," //
+		final String testMasterKey = "{\"version\":5,\"scryptSalt\":\"AAAAAAAAAAA=\",\"scryptCostParam\":2,\"scryptBlockSize\":8," //
 				+ "\"primaryMasterKey\":\"mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==\"," //
 				+ "\"hmacMasterKey\":\"mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==\"}";
 		final Cryptor cryptor = TestCryptorImplFactory.insecureCryptorImpl();
@@ -62,7 +62,7 @@ public class CryptorImplTest {
 	@Ignore
 	@Test(expected = UnsupportedVaultFormatException.class)
 	public void testMasterkeyDecryptionWithWrongVersionMac() throws IOException {
-		final String testMasterKey = "{\"version\":4,\"scryptSalt\":\"AAAAAAAAAAA=\",\"scryptCostParam\":2,\"scryptBlockSize\":8," //
+		final String testMasterKey = "{\"version\":5,\"scryptSalt\":\"AAAAAAAAAAA=\",\"scryptCostParam\":2,\"scryptBlockSize\":8," //
 				+ "\"primaryMasterKey\":\"mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==\"," //
 				+ "\"hmacMasterKey\":\"mM+qoQ+o0qvPTiDAZYt+flaC3WbpNAx1sTXaUzxwpy0M9Ctj6Tih/Q==\"," //
 				+ "\"versionMac\":\"z9J8Uc5K1f7YKckLUFpXG39NHK1qUjzadw5nvOqvfoK=\"}";
@@ -72,14 +72,13 @@ public class CryptorImplTest {
 
 	@Test
 	public void testMasterkeyEncryption() throws IOException {
-		final String expectedMasterKey = "{\"version\":4,\"scryptSalt\":\"AAAAAAAAAAA=\",\"scryptCostParam\":16384,\"scryptBlockSize\":8," //
+		final String expectedMasterKey = "{\"version\":5,\"scryptSalt\":\"AAAAAAAAAAA=\",\"scryptCostParam\":16384,\"scryptBlockSize\":8," //
 				+ "\"primaryMasterKey\":\"BJPIq5pvhN24iDtPJLMFPLaVJWdGog9k4n0P03j4ru+ivbWY9OaRGQ==\"," //
 				+ "\"hmacMasterKey\":\"BJPIq5pvhN24iDtPJLMFPLaVJWdGog9k4n0P03j4ru+ivbWY9OaRGQ==\"," //
-				+ "\"versionMac\":\"Z9J8Uc5K1f7YKckLUFpXG39NHK1qUjzadw5nvOqvfok=\"}";
+				+ "\"versionMac\":\"yuwoRE9GSdgQ2b//qRpTCj3W0qsVLxYVa7/KB3PkfA4=\"}";
 		final Cryptor cryptor = TestCryptorImplFactory.insecureCryptorImpl();
 		cryptor.randomizeMasterkey();
 		final byte[] masterkeyFile = cryptor.writeKeysToMasterkeyFile("asd");
-		System.out.println(new String(masterkeyFile));
 		Assert.assertArrayEquals(expectedMasterKey.getBytes(), masterkeyFile);
 	}
 
diff --git a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentCryptorImplTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentCryptorImplTest.java
index 71ed1b825..e1cdee671 100644
--- a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentCryptorImplTest.java
+++ b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentCryptorImplTest.java
@@ -137,45 +137,6 @@ public class FileContentCryptorImplTest {
 		Assert.assertArrayEquals("cleartext message".getBytes(), result);
 	}
 
-	@Test
-	public void testEncryptionAndDecryptionWithSizeObfuscationPadding() throws InterruptedException {
-		final byte[] keyBytes = new byte[32];
-		final SecretKey encryptionKey = new SecretKeySpec(keyBytes, "AES");
-		final SecretKey macKey = new SecretKeySpec(keyBytes, "HmacSHA256");
-		FileContentCryptor cryptor = new FileContentCryptorImpl(encryptionKey, macKey, RANDOM_MOCK_2);
-
-		ByteBuffer header = ByteBuffer.allocate(cryptor.getHeaderSize());
-		ByteBuffer ciphertext = ByteBuffer.allocate(16 + 11 + 500 + 32 + 1); // 16 bytes iv + 11 bytes ciphertext + 500 bytes padding + 32 bytes mac + 1.
-		try (FileContentEncryptor encryptor = cryptor.createFileContentEncryptor(Optional.empty(), 0)) {
-			encryptor.append(ByteBuffer.wrap("hello world".getBytes()));
-			encryptor.append(FileContentCryptor.EOF);
-			ByteBuffer buf;
-			while ((buf = encryptor.ciphertext()) != FileContentCryptor.EOF) {
-				ByteBuffers.copy(buf, ciphertext);
-			}
-			ByteBuffers.copy(encryptor.getHeader(), header);
-		}
-		header.flip();
-		ciphertext.flip();
-
-		Assert.assertEquals(16 + 11 + 500 + 32, ciphertext.remaining());
-
-		ByteBuffer plaintext = ByteBuffer.allocate(12); // 11 bytes plaintext + 1
-		try (FileContentDecryptor decryptor = cryptor.createFileContentDecryptor(header, 0, true)) {
-			decryptor.append(ciphertext);
-			decryptor.append(FileContentCryptor.EOF);
-			ByteBuffer buf;
-			while ((buf = decryptor.cleartext()) != FileContentCryptor.EOF) {
-				ByteBuffers.copy(buf, plaintext);
-			}
-		}
-		plaintext.flip();
-
-		byte[] result = new byte[plaintext.remaining()];
-		plaintext.get(result);
-		Assert.assertArrayEquals("hello world".getBytes(), result);
-	}
-
 	@Test(timeout = 20000) // assuming a minimum speed of 10mb/s during encryption and decryption 20s should be enough
 	public void testEncryptionAndDecryptionSpeed() throws InterruptedException, IOException {
 		final byte[] keyBytes = new byte[32];
diff --git a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentEncryptorImplTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentEncryptorImplTest.java
index b99964a77..f9503d6d8 100644
--- a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentEncryptorImplTest.java
+++ b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentEncryptorImplTest.java
@@ -95,24 +95,4 @@ public class FileContentEncryptorImplTest {
 		}
 	}
 
-	@Test
-	public void testSizeObfuscation() throws InterruptedException {
-		final byte[] keyBytes = new byte[32];
-		final SecretKey headerKey = new SecretKeySpec(keyBytes, "AES");
-		final SecretKey macKey = new SecretKeySpec(keyBytes, "AES");
-
-		try (FileContentEncryptor encryptor = new FileContentEncryptorImpl(headerKey, macKey, RANDOM_MOCK_2, 0)) {
-			encryptor.append(FileContentCryptor.EOF);
-
-			ByteBuffer result = ByteBuffer.allocate(91); // 16 bytes iv + 42 bytes size obfuscation + 32 bytes mac + 1
-			ByteBuffer buf;
-			while ((buf = encryptor.ciphertext()) != FileContentCryptor.EOF) {
-				ByteBuffers.copy(buf, result);
-			}
-			result.flip();
-
-			Assert.assertEquals(90, result.remaining());
-		}
-	}
-
 }

From e90880ac9a6dff376146e53b85b35885c4fdb24b Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 24 Aug 2016 17:27:36 +0200
Subject: [PATCH 12/45] speedboost 3000

---
 .../java/org/cryptomator/filesystem/File.java |  8 ++++++-
 .../cryptomator/filesystem/ReadableFile.java  |  7 ------
 .../filesystem/delegating/DelegatingFile.java |  7 +++++-
 .../delegating/DelegatingReadableFile.java    |  5 -----
 .../delegating/DelegatingFileTest.java        | 10 +++++++++
 .../DelegatingReadableFileTest.java           | 11 ----------
 .../CryptoFileSystemIntegrationTest.java      |  2 +-
 .../crypto/BlockAlignedReadableFile.java      |  5 -----
 .../filesystem/crypto/ConflictResolver.java   |  8 +++----
 .../filesystem/crypto/CryptoFile.java         | 22 +++++++++++++++++++
 .../filesystem/crypto/CryptoReadableFile.java | 17 --------------
 .../impl/FileContentCryptorImplTest.java      | 14 ------------
 .../impl/FileContentEncryptorImplTest.java    | 14 ------------
 .../filesystem/inmem/InMemoryFile.java        |  9 ++++++--
 .../inmem/InMemoryReadableFile.java           |  5 -----
 .../inmem/InMemoryFileSystemTest.java         |  4 +---
 .../filesystem/nio/DefaultNioAccess.java      |  8 ++++++-
 .../cryptomator/filesystem/nio/NioAccess.java |  2 ++
 .../cryptomator/filesystem/nio/NioFile.java   |  9 ++++++++
 .../filesystem/nio/ReadableNioFile.java       |  5 -----
 .../filesystem/nio/NioFileTest.java           | 22 +++++++++++++++++++
 .../filesystem/nio/ReadableNioFileTest.java   | 10 ---------
 .../webdav/jackrabbitservlet/DavFile.java     | 12 ++--------
 .../jackrabbitservlet/DavFileWithRange.java   |  2 +-
 .../DavFileWithUnsatisfiableRange.java        |  6 ++---
 25 files changed, 104 insertions(+), 120 deletions(-)

diff --git a/main/filesystem-api/src/main/java/org/cryptomator/filesystem/File.java b/main/filesystem-api/src/main/java/org/cryptomator/filesystem/File.java
index ddcefd11a..e973c7255 100644
--- a/main/filesystem-api/src/main/java/org/cryptomator/filesystem/File.java
+++ b/main/filesystem-api/src/main/java/org/cryptomator/filesystem/File.java
@@ -17,6 +17,13 @@ public interface File extends Node, Comparable<File> {
 
 	static final int EOF = -1;
 
+	/**
+	 * @return The current size of the file. This value is a snapshot and might have been changed by concurrent modifications.
+	 * @throws UncheckedIOException
+	 *             if an {@link IOException} occurs
+	 */
+	long size() throws UncheckedIOException;
+
 	/**
 	 * <p>
 	 * Opens this file for reading.
@@ -39,7 +46,6 @@ public interface File extends Node, Comparable<File> {
 	 *             if an {@link IOException} occurs while opening the file, the
 	 *             file does not exist or is a directory
 	 */
-
 	ReadableFile openReadable() throws UncheckedIOException;
 
 	/**
diff --git a/main/filesystem-api/src/main/java/org/cryptomator/filesystem/ReadableFile.java b/main/filesystem-api/src/main/java/org/cryptomator/filesystem/ReadableFile.java
index 398d87e72..300ad32ec 100644
--- a/main/filesystem-api/src/main/java/org/cryptomator/filesystem/ReadableFile.java
+++ b/main/filesystem-api/src/main/java/org/cryptomator/filesystem/ReadableFile.java
@@ -30,13 +30,6 @@ public interface ReadableFile extends ReadableByteChannel {
 	@Override
 	int read(ByteBuffer target) throws UncheckedIOException;
 
-	/**
-	 * @return The current size of the file. This value is a snapshot and might have been changed by concurrent modifications.
-	 * @throws UncheckedIOException
-	 *             if an {@link IOException} occurs
-	 */
-	long size() throws UncheckedIOException;
-
 	/**
 	 * <p>
 	 * Fast-forwards or rewinds the file to the specified position.
diff --git a/main/filesystem-api/src/main/java/org/cryptomator/filesystem/delegating/DelegatingFile.java b/main/filesystem-api/src/main/java/org/cryptomator/filesystem/delegating/DelegatingFile.java
index 49bc9eb6d..af119c90c 100644
--- a/main/filesystem-api/src/main/java/org/cryptomator/filesystem/delegating/DelegatingFile.java
+++ b/main/filesystem-api/src/main/java/org/cryptomator/filesystem/delegating/DelegatingFile.java
@@ -15,7 +15,7 @@ import org.cryptomator.filesystem.File;
 import org.cryptomator.filesystem.ReadableFile;
 import org.cryptomator.filesystem.WritableFile;
 
-public abstract class DelegatingFile<D extends DelegatingFolder<D, ?>> extends DelegatingNode<File>implements File {
+public abstract class DelegatingFile<D extends DelegatingFolder<D, ?>> extends DelegatingNode<File> implements File {
 
 	private final D parent;
 
@@ -29,6 +29,11 @@ public abstract class DelegatingFile<D extends DelegatingFolder<D, ?>> extends D
 		return Optional.of(parent);
 	}
 
+	@Override
+	public long size() throws UncheckedIOException {
+		return delegate.size();
+	}
+
 	@Override
 	public ReadableFile openReadable() throws UncheckedIOException {
 		return delegate.openReadable();
diff --git a/main/filesystem-api/src/main/java/org/cryptomator/filesystem/delegating/DelegatingReadableFile.java b/main/filesystem-api/src/main/java/org/cryptomator/filesystem/delegating/DelegatingReadableFile.java
index 435601782..d9a022d06 100644
--- a/main/filesystem-api/src/main/java/org/cryptomator/filesystem/delegating/DelegatingReadableFile.java
+++ b/main/filesystem-api/src/main/java/org/cryptomator/filesystem/delegating/DelegatingReadableFile.java
@@ -31,11 +31,6 @@ public class DelegatingReadableFile implements ReadableFile {
 		return delegate.read(target);
 	}
 
-	@Override
-	public long size() throws UncheckedIOException {
-		return delegate.size();
-	}
-
 	@Override
 	public void position(long position) throws UncheckedIOException {
 		delegate.position(position);
diff --git a/main/filesystem-api/src/test/java/org/cryptomator/filesystem/delegating/DelegatingFileTest.java b/main/filesystem-api/src/test/java/org/cryptomator/filesystem/delegating/DelegatingFileTest.java
index 2e20b1de4..36365d3e2 100644
--- a/main/filesystem-api/src/test/java/org/cryptomator/filesystem/delegating/DelegatingFileTest.java
+++ b/main/filesystem-api/src/test/java/org/cryptomator/filesystem/delegating/DelegatingFileTest.java
@@ -30,6 +30,16 @@ public class DelegatingFileTest {
 		Assert.assertEquals(mockFile.name(), delegatingFile.name());
 	}
 
+	@Test
+	public void testSize() {
+		File mockFile = Mockito.mock(File.class);
+		DelegatingFile<?> delegatingFile = new TestDelegatingFile(null, mockFile);
+
+		Mockito.when(mockFile.size()).thenReturn(42l);
+		Assert.assertEquals(42l, delegatingFile.size());
+		Mockito.verify(mockFile).size();
+	}
+
 	@Test
 	public void testParent() {
 		Folder mockFolder = Mockito.mock(Folder.class);
diff --git a/main/filesystem-api/src/test/java/org/cryptomator/filesystem/delegating/DelegatingReadableFileTest.java b/main/filesystem-api/src/test/java/org/cryptomator/filesystem/delegating/DelegatingReadableFileTest.java
index 0777bd5da..cd3fb106a 100644
--- a/main/filesystem-api/src/test/java/org/cryptomator/filesystem/delegating/DelegatingReadableFileTest.java
+++ b/main/filesystem-api/src/test/java/org/cryptomator/filesystem/delegating/DelegatingReadableFileTest.java
@@ -42,17 +42,6 @@ public class DelegatingReadableFileTest {
 		Mockito.verify(mockReadableFile).read(buf);
 	}
 
-	@Test
-	public void testSize() {
-		ReadableFile mockReadableFile = Mockito.mock(ReadableFile.class);
-		@SuppressWarnings("resource")
-		DelegatingReadableFile delegatingReadableFile = new DelegatingReadableFile(mockReadableFile);
-
-		Mockito.when(mockReadableFile.size()).thenReturn(42l);
-		Assert.assertEquals(42l, delegatingReadableFile.size());
-		Mockito.verify(mockReadableFile).size();
-	}
-
 	@Test
 	public void testPosition() {
 		ReadableFile mockReadableFile = Mockito.mock(ReadableFile.class);
diff --git a/main/filesystem-crypto-integration-tests/src/test/java/org/cryptomator/filesystem/crypto/CryptoFileSystemIntegrationTest.java b/main/filesystem-crypto-integration-tests/src/test/java/org/cryptomator/filesystem/crypto/CryptoFileSystemIntegrationTest.java
index de1f2a6d1..9d8b26869 100644
--- a/main/filesystem-crypto-integration-tests/src/test/java/org/cryptomator/filesystem/crypto/CryptoFileSystemIntegrationTest.java
+++ b/main/filesystem-crypto-integration-tests/src/test/java/org/cryptomator/filesystem/crypto/CryptoFileSystemIntegrationTest.java
@@ -130,7 +130,7 @@ public class CryptoFileSystemIntegrationTest {
 
 		// toggle last bit
 		try (WritableFile writable = physicalFile.openWritable(); ReadableFile readable = physicalFile.openReadable()) {
-			ByteBuffer buf = ByteBuffer.allocate((int) readable.size());
+			ByteBuffer buf = ByteBuffer.allocate((int) physicalFile.size());
 			readable.read(buf);
 			buf.array()[buf.limit() - 1] ^= 0x01;
 			buf.flip();
diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedReadableFile.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedReadableFile.java
index 34e37e925..4ae1c0a10 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedReadableFile.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/BlockAlignedReadableFile.java
@@ -100,11 +100,6 @@ class BlockAlignedReadableFile implements ReadableFile {
 		return delegate.isOpen();
 	}
 
-	@Override
-	public long size() throws UncheckedIOException {
-		return delegate.size();
-	}
-
 	@Override
 	public void close() throws UncheckedIOException {
 		delegate.close();
diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/ConflictResolver.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/ConflictResolver.java
index 138ec226f..a15c0a6fe 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/ConflictResolver.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/ConflictResolver.java
@@ -79,10 +79,10 @@ final class ConflictResolver {
 	}
 
 	private boolean isSameFileBasedOnSample(File file1, File file2, int sampleSize) {
-		try (ReadableFile r1 = file1.openReadable(); ReadableFile r2 = file2.openReadable()) {
-			if (r1.size() != r2.size()) {
-				return false;
-			} else {
+		if (file1.size() != file2.size()) {
+			return false;
+		} else {
+			try (ReadableFile r1 = file1.openReadable(); ReadableFile r2 = file2.openReadable()) {
 				ByteBuffer beginOfFile1 = ByteBuffer.allocate(sampleSize);
 				ByteBuffer beginOfFile2 = ByteBuffer.allocate(sampleSize);
 				int bytesRead1 = r1.read(beginOfFile1);
diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFile.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFile.java
index ff0df04e7..9d2afa238 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFile.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoFile.java
@@ -8,6 +8,9 @@
  *******************************************************************************/
 package org.cryptomator.filesystem.crypto;
 
+import static org.cryptomator.crypto.engine.impl.Constants.CHUNK_SIZE;
+import static org.cryptomator.crypto.engine.impl.Constants.PAYLOAD_SIZE;
+
 import java.io.UncheckedIOException;
 import java.nio.file.FileAlreadyExistsException;
 import java.util.Optional;
@@ -28,6 +31,25 @@ class CryptoFile extends CryptoNode implements File {
 		return parent().get().encryptChildName(name());
 	}
 
+	@Override
+	public long size() throws UncheckedIOException {
+		if (!physicalFile().isPresent()) {
+			return -1l;
+		} else {
+			File file = physicalFile().get();
+			long ciphertextSize = file.size() - cryptor.getFileContentCryptor().getHeaderSize();
+			long overheadPerChunk = CHUNK_SIZE - PAYLOAD_SIZE;
+			long numFullChunks = ciphertextSize / CHUNK_SIZE; // floor by int-truncation
+			long additionalCiphertextBytes = ciphertextSize % CHUNK_SIZE;
+			if (additionalCiphertextBytes > 0 && additionalCiphertextBytes <= overheadPerChunk) {
+				throw new IllegalArgumentException("Method not defined for input value " + ciphertextSize);
+			}
+			long additionalCleartextBytes = (additionalCiphertextBytes == 0) ? 0 : additionalCiphertextBytes - overheadPerChunk;
+			assert additionalCleartextBytes >= 0;
+			return PAYLOAD_SIZE * numFullChunks + additionalCleartextBytes;
+		}
+	}
+
 	@Override
 	public ReadableFile openReadable() {
 		boolean authenticate = !fileSystem().delegate().shouldSkipAuthentication(toString());
diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoReadableFile.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoReadableFile.java
index ad0dd3e08..9792643f2 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoReadableFile.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/CryptoReadableFile.java
@@ -8,9 +8,6 @@
  *******************************************************************************/
 package org.cryptomator.filesystem.crypto;
 
-import static org.cryptomator.crypto.engine.impl.Constants.CHUNK_SIZE;
-import static org.cryptomator.crypto.engine.impl.Constants.PAYLOAD_SIZE;
-
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.io.UncheckedIOException;
@@ -73,20 +70,6 @@ class CryptoReadableFile implements ReadableFile {
 		}
 	}
 
-	@Override
-	public long size() throws UncheckedIOException {
-		long ciphertextSize = file.size() - cryptor.getHeaderSize();
-		long overheadPerChunk = CHUNK_SIZE - PAYLOAD_SIZE;
-		long numFullChunks = ciphertextSize / CHUNK_SIZE; // floor by int-truncation
-		long additionalCiphertextBytes = ciphertextSize % CHUNK_SIZE;
-		if (additionalCiphertextBytes > 0 && additionalCiphertextBytes <= overheadPerChunk) {
-			throw new IllegalArgumentException("Method not defined for input value " + ciphertextSize);
-		}
-		long additionalCleartextBytes = (additionalCiphertextBytes == 0) ? 0 : additionalCiphertextBytes - overheadPerChunk;
-		assert additionalCleartextBytes >= 0;
-		return PAYLOAD_SIZE * numFullChunks + additionalCleartextBytes;
-	}
-
 	@Override
 	public void position(long position) throws UncheckedIOException {
 		if (readAheadTask != null) {
diff --git a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentCryptorImplTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentCryptorImplTest.java
index e1cdee671..6fa92c74b 100644
--- a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentCryptorImplTest.java
+++ b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentCryptorImplTest.java
@@ -43,20 +43,6 @@ public class FileContentCryptorImplTest {
 
 	};
 
-	private static final SecureRandom RANDOM_MOCK_2 = new SecureRandom() {
-
-		@Override
-		public int nextInt(int bound) {
-			return 500;
-		}
-
-		@Override
-		public void nextBytes(byte[] bytes) {
-			Arrays.fill(bytes, (byte) 0x00);
-		}
-
-	};
-
 	@Test(expected = IllegalArgumentException.class)
 	public void testShortHeaderInDecryptor() throws InterruptedException {
 		final byte[] keyBytes = new byte[32];
diff --git a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentEncryptorImplTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentEncryptorImplTest.java
index f9503d6d8..7c36c28e4 100644
--- a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentEncryptorImplTest.java
+++ b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentEncryptorImplTest.java
@@ -35,20 +35,6 @@ public class FileContentEncryptorImplTest {
 
 	};
 
-	private static final SecureRandom RANDOM_MOCK_2 = new SecureRandom() {
-
-		@Override
-		public int nextInt(int bound) {
-			return 42;
-		}
-
-		@Override
-		public void nextBytes(byte[] bytes) {
-			Arrays.fill(bytes, (byte) 0x00);
-		}
-
-	};
-
 	@Test
 	public void testEncryption() throws InterruptedException {
 		final byte[] keyBytes = new byte[32];
diff --git a/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryFile.java b/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryFile.java
index 568f431d1..781b079b1 100644
--- a/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryFile.java
+++ b/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryFile.java
@@ -43,6 +43,11 @@ class InMemoryFile extends InMemoryNode implements File {
 		return buf;
 	}
 
+	@Override
+	public long size() throws UncheckedIOException {
+		return content.get().limit();
+	}
+
 	@Override
 	public void moveTo(File destination) throws UncheckedIOException {
 		if (destination instanceof InMemoryFile) {
@@ -103,7 +108,7 @@ class InMemoryFile extends InMemoryNode implements File {
 				throw new UncheckedIOException(new FileAlreadyExistsException(k));
 			} else {
 				if (v == null) {
-					assert!content.get().hasRemaining();
+					assert !content.get().hasRemaining();
 					this.creationTime = Instant.now();
 				}
 				this.lastModified = Instant.now();
@@ -120,7 +125,7 @@ class InMemoryFile extends InMemoryNode implements File {
 			// returning null removes the entry.
 			return null;
 		});
-		assert!this.exists();
+		assert !this.exists();
 	}
 
 	@Override
diff --git a/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryReadableFile.java b/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryReadableFile.java
index 90eab31f3..8d2212596 100644
--- a/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryReadableFile.java
+++ b/main/filesystem-inmemory/src/main/java/org/cryptomator/filesystem/inmem/InMemoryReadableFile.java
@@ -51,11 +51,6 @@ class InMemoryReadableFile implements ReadableFile {
 		}
 	}
 
-	@Override
-	public long size() throws UncheckedIOException {
-		return contentGetter.get().limit();
-	}
-
 	@Override
 	public void position(long position) throws UncheckedIOException {
 		assert position < Integer.MAX_VALUE : "Can not use that big in-memory files.";
diff --git a/main/filesystem-inmemory/src/test/java/org/cryptomator/filesystem/inmem/InMemoryFileSystemTest.java b/main/filesystem-inmemory/src/test/java/org/cryptomator/filesystem/inmem/InMemoryFileSystemTest.java
index 7b913b0ba..d262e2513 100644
--- a/main/filesystem-inmemory/src/test/java/org/cryptomator/filesystem/inmem/InMemoryFileSystemTest.java
+++ b/main/filesystem-inmemory/src/test/java/org/cryptomator/filesystem/inmem/InMemoryFileSystemTest.java
@@ -104,9 +104,7 @@ public class InMemoryFileSystemTest {
 		Assert.assertTrue(fooFile.exists());
 
 		// check if size = 11 bytes
-		try (ReadableFile readable = fooFile.openReadable()) {
-			Assert.assertEquals(11, readable.size());
-		}
+		Assert.assertEquals(11, fooFile.size());
 
 		// copy foo to bar
 		File barFile = fs.file("bar.txt");
diff --git a/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/DefaultNioAccess.java b/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/DefaultNioAccess.java
index 2196b7a3e..5def2b008 100644
--- a/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/DefaultNioAccess.java
+++ b/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/DefaultNioAccess.java
@@ -17,6 +17,11 @@ import java.util.stream.Stream;
 
 class DefaultNioAccess implements NioAccess {
 
+	@Override
+	public long size(Path path) throws IOException {
+		return Files.size(path);
+	}
+
 	@Override
 	public AsynchronousFileChannel open(Path path, OpenOption... options) throws IOException {
 		return AsynchronousFileChannel.open(path, options);
@@ -59,7 +64,8 @@ class DefaultNioAccess implements NioAccess {
 		} catch (AccessDeniedException e) {
 			// workaround for https://github.com/cryptomator/cryptomator/issues/317
 			try {
-				if (path.toFile().delete()) return;
+				if (path.toFile().delete())
+					return;
 			} catch (UnsupportedOperationException e2) {
 				// ignore
 			}
diff --git a/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/NioAccess.java b/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/NioAccess.java
index cb75026f4..f19c46a18 100644
--- a/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/NioAccess.java
+++ b/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/NioAccess.java
@@ -16,6 +16,8 @@ interface NioAccess {
 
 	public static final Holder<NioAccess> DEFAULT = new Holder<>(new DefaultNioAccess());
 
+	long size(Path path) throws IOException;
+
 	AsynchronousFileChannel open(Path path, OpenOption... options) throws IOException;
 
 	boolean isRegularFile(Path path, LinkOption... options);
diff --git a/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/NioFile.java b/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/NioFile.java
index e1afc2718..a82e0d289 100644
--- a/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/NioFile.java
+++ b/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/NioFile.java
@@ -27,6 +27,15 @@ class NioFile extends NioNode implements File {
 		sharedChannel = instanceFactory.sharedFileChannel(path, nioAccess);
 	}
 
+	@Override
+	public long size() throws UncheckedIOException {
+		try {
+			return nioAccess.size(path);
+		} catch (IOException e) {
+			throw new UncheckedIOException(e);
+		}
+	}
+
 	@Override
 	public ReadableFile openReadable() throws UncheckedIOException {
 		if (lock.getWriteHoldCount() > 0) {
diff --git a/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/ReadableNioFile.java b/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/ReadableNioFile.java
index ef6621eb1..b7bff19e9 100644
--- a/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/ReadableNioFile.java
+++ b/main/filesystem-nio/src/main/java/org/cryptomator/filesystem/nio/ReadableNioFile.java
@@ -41,11 +41,6 @@ class ReadableNioFile implements ReadableFile {
 		return open;
 	}
 
-	@Override
-	public long size() throws UncheckedIOException {
-		return channel.size();
-	}
-
 	@Override
 	public void position(long position) throws UncheckedIOException {
 		assertOpen();
diff --git a/main/filesystem-nio/src/test/java/org/cryptomator/filesystem/nio/NioFileTest.java b/main/filesystem-nio/src/test/java/org/cryptomator/filesystem/nio/NioFileTest.java
index ec4269fc9..05dbe75e7 100644
--- a/main/filesystem-nio/src/test/java/org/cryptomator/filesystem/nio/NioFileTest.java
+++ b/main/filesystem-nio/src/test/java/org/cryptomator/filesystem/nio/NioFileTest.java
@@ -16,6 +16,7 @@ import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.attribute.FileTime;
 import java.time.Instant;
@@ -85,6 +86,27 @@ public class NioFileTest {
 
 	}
 
+	public class Size {
+
+		@Test
+		public void testSizeReturnsSizeOfRegularFile() throws IOException {
+			when(nioAccess.size(path)).thenReturn(42l);
+
+			assertThat(inTest.size(), is(42l));
+		}
+
+		@Test
+		public void testSizeThrowsExceptionIfRegularFileThrowsException() throws IOException {
+			Throwable t = new NoSuchFileException("foo");
+			when(nioAccess.size(path)).thenThrow(t);
+
+			thrown.expect(UncheckedIOException.class);
+			thrown.expectCause(org.hamcrest.Matchers.sameInstance(t));
+			inTest.size();
+		}
+
+	}
+
 	public class Open {
 
 		@Test
diff --git a/main/filesystem-nio/src/test/java/org/cryptomator/filesystem/nio/ReadableNioFileTest.java b/main/filesystem-nio/src/test/java/org/cryptomator/filesystem/nio/ReadableNioFileTest.java
index 4ff589f43..f398aa2c5 100644
--- a/main/filesystem-nio/src/test/java/org/cryptomator/filesystem/nio/ReadableNioFileTest.java
+++ b/main/filesystem-nio/src/test/java/org/cryptomator/filesystem/nio/ReadableNioFileTest.java
@@ -83,16 +83,6 @@ public class ReadableNioFileTest {
 		inTest.position(-1);
 	}
 
-	@Test
-	public void testSizeReturnsSizeOfChannel() {
-		long expectedSize = 85472;
-		when(channel.size()).thenReturn(expectedSize);
-
-		long actualSize = inTest.size();
-
-		assertThat(actualSize, is(expectedSize));
-	}
-
 	@Test
 	public void testReadDelegatesToChannelReadFullyWithZeroPositionIfNotSet() {
 		ByteBuffer buffer = mock(ByteBuffer.class);
diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFile.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFile.java
index bdde344b6..9c5d0ee8f 100644
--- a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFile.java
+++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFile.java
@@ -32,14 +32,11 @@ import org.cryptomator.filesystem.File;
 import org.cryptomator.filesystem.Folder;
 import org.cryptomator.filesystem.ReadableFile;
 import org.cryptomator.filesystem.jackrabbit.FileLocator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.google.common.io.ByteStreams;
 
 class DavFile extends DavNode<FileLocator> {
 
-	private static final Logger LOG = LoggerFactory.getLogger(DavFile.class);
 	protected static final String CONTENT_TYPE_VALUE = "application/octet-stream";
 	protected static final String CONTENT_DISPOSITION_HEADER = "Content-Disposition";
 	protected static final String CONTENT_DISPOSITION_VALUE = "attachment";
@@ -64,8 +61,8 @@ class DavFile extends DavNode<FileLocator> {
 		outputContext.setContentType(CONTENT_TYPE_VALUE);
 		outputContext.setProperty(CONTENT_DISPOSITION_HEADER, CONTENT_DISPOSITION_VALUE);
 		outputContext.setProperty(X_CONTENT_TYPE_OPTIONS_HEADER, X_CONTENT_TYPE_OPTIONS_VALUE);
+		outputContext.setContentLength(node.size());
 		try (ReadableFile src = node.openReadable(); WritableByteChannel dst = Channels.newChannel(outputContext.getOutputStream())) {
-			outputContext.setContentLength(src.size());
 			ByteStreams.copy(src, dst);
 		}
 	}
@@ -157,12 +154,7 @@ class DavFile extends DavNode<FileLocator> {
 
 	private Optional<DavProperty<?>> sizeProperty() {
 		if (node.exists()) {
-			try (ReadableFile src = node.openReadable()) {
-				return Optional.of(new DefaultDavProperty<Long>(DavPropertyName.GETCONTENTLENGTH, src.size()));
-			} catch (RuntimeException e) {
-				LOG.warn("Could not determine file size of " + getResourcePath(), e);
-				return Optional.empty();
-			}
+			return Optional.of(new DefaultDavProperty<Long>(DavPropertyName.GETCONTENTLENGTH, node.size()));
 		} else {
 			return Optional.empty();
 		}
diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithRange.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithRange.java
index 96a0bb547..8151b96c3 100644
--- a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithRange.java
+++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithRange.java
@@ -47,8 +47,8 @@ class DavFileWithRange extends DavFile {
 		if (!outputContext.hasStream()) {
 			return;
 		}
+		final long contentLength = node.size();
 		try (ReadableFile src = node.openReadable(); OutputStream out = outputContext.getOutputStream()) {
-			final long contentLength = src.size();
 			final Pair<Long, Long> range = getEffectiveRange(contentLength);
 			if (range.getLeft() < 0 || range.getLeft() > range.getRight() || range.getRight() > contentLength) {
 				outputContext.setProperty(HttpHeader.CONTENT_RANGE.asString(), "bytes */" + contentLength);
diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithUnsatisfiableRange.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithUnsatisfiableRange.java
index b612d1aac..1b820f90e 100644
--- a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithUnsatisfiableRange.java
+++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithUnsatisfiableRange.java
@@ -39,10 +39,10 @@ class DavFileWithUnsatisfiableRange extends DavFile {
 		if (!outputContext.hasStream()) {
 			return;
 		}
+		final long contentLength = node.size();
+		outputContext.setContentLength(contentLength);
+		outputContext.setProperty(HttpHeader.CONTENT_RANGE.asString(), "bytes */" + contentLength);
 		try (ReadableFile src = node.openReadable(); OutputStream out = outputContext.getOutputStream()) {
-			final long contentLength = src.size();
-			outputContext.setContentLength(contentLength);
-			outputContext.setProperty(HttpHeader.CONTENT_RANGE.asString(), "bytes */" + contentLength);
 			ByteStreams.copy(src, Channels.newChannel(out));
 		}
 	}

From 21d70b5ae465f696a322bacfe48e677e85928011 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 26 Aug 2016 12:49:55 +0200
Subject: [PATCH 13/45] moved from coveralls to codecov

---
 .travis.yml  | 20 ++++----------------
 main/pom.xml | 29 ++++++++---------------------
 2 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b2845a704..04803a603 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,15 @@
-sudo: required
-
-dist: trusty
-
 language: java
-
+sudo: required
+dist: trusty
 jdk:
 - oraclejdk8
-
 env:
   global:
-    - secure: "Lgj042RD0X3rB8VZVZLWP1GetLhjd3PqI5JbJMlzgHJpDI6RkFIBLN9SWAGmkLPCehIp2zA5tu9+UVy0NNMxm9xz6SyjMCaxS28/fnYEXaNmwwDSF6O6gLUbdxyzoYIFPYOPmFxpzhebqnNIsxaM29oZpgRgUGqosCczQxiB+Ng=" #coveralls
     - secure: "IfYURwZaDWuBDvyn47n0k1Zod/IQw1FF+CS5nnV08Q+NfC3vGGJMwV8m59XnbfwnWGxwvCaAbk4qP6s6+ijgZNKkvgfFMo3rfTok5zt43bIqgaFOANYV+OC/1c59gYD6ZUxhW5iNgMgU3qdsRtJuwSmfkVv/jKyLGfAbS4kN8BA=" #coverity
     - secure: "lV9OwUbHMrMpLUH1CY+Z4puLDdFXytudyPlG1eGRsesdpuG6KM3uQVz6uAtf6lrU8DRbMM/T7ML+PmvQ4UoPPYLdLxESLLBat2qUPOIVBOhTSlCc7I0DmGy04CSvkeMy8dPaQC0ukgNiR7zwoNzfcpGRN/U9S8tziDruuHoZSrg=" #bintray
-
 before_install: "curl -L --cookie 'oraclelicense=accept-securebackup-cookie;' http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip -o /tmp/policy.zip && sudo unzip -j -o /tmp/policy.zip *.jar -d `jdk_switcher home oraclejdk8`/jre/lib/security && rm /tmp/policy.zip"
-
 script: mvn -fmain/pom.xml clean test
-
-after_success: mvn -fmain/pom.xml -Ptest-coverage clean test jacoco:report-aggregate coveralls:report
-
+after_success: "mvn -fmain/pom.xml -Ptest-coverage clean test jacoco:report-aggregate && bash <(curl -s https://codecov.io/bash)"
 notifications:
   webhooks:
     urls:
@@ -31,9 +22,6 @@ notifications:
       secure: "lngJ/HEAFBbD5AdiO9avMqptKpZHdmEwOzS9FabZjkdFh7yAYueTk5RniPUvShjsKtThYm7cJ8AtDMDwc07NvPrzbMBRtUJGwuDT+7c7YFALGFJ1NYi+emkC9x1oafvmPgEYSE+tMKzNcwrHi3ytGgKdIotsKwaF35QNXYA9aMs="
     on_success: change
     on_failure: always
-
-before_deploy: mvn -fmain/pom.xml -Prelease clean package -DskipTests
-
 addons:
   coverity_scan:
     project:
@@ -41,7 +29,7 @@ addons:
     notification_email: sebastian.stenzel@cryptomator.org
     build_command: "mvn -fmain/pom.xml clean test -DskipTests"
     branch_pattern: release.*
-
+before_deploy: mvn -fmain/pom.xml -Prelease clean package -DskipTests
 deploy:
 - provider: releases
   prerelease: false
diff --git a/main/pom.xml b/main/pom.xml
index cfb5ace1a..6640becc7 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2014 Sebastian Stenzel This file is licensed under the 
-	terms of the MIT license. See the LICENSE.txt file for more info. Contributors: 
+<!-- Copyright (c) 2014 Sebastian Stenzel This file is licensed under the
+	terms of the MIT license. See the LICENSE.txt file for more info. Contributors:
 	Sebastian Stenzel - initial API and implementation -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
@@ -57,7 +56,7 @@
 				<version>${project.version}</version>
 				<scope>test</scope>
 			</dependency>
-			
+
 			<dependency>
 				<groupId>org.cryptomator</groupId>
 				<artifactId>filesystem-api</artifactId>
@@ -106,7 +105,7 @@
 				<artifactId>filesystem-stats</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			
+
 			<dependency>
 				<groupId>org.cryptomator</groupId>
 				<artifactId>frontend-api</artifactId>
@@ -168,19 +167,18 @@
 				<version>${commons-codec.version}</version>
 			</dependency>
 			<dependency>
-				<!-- org.apache.httpcomponents:httpclient is newer, but jackrabbit uses 
-					this version. We don't have a reason to upgrade -->
+				<!-- org.apache.httpcomponents:httpclient is newer, but jackrabbit uses this version. We don't have a reason to upgrade -->
 				<groupId>commons-httpclient</groupId>
 				<artifactId>commons-httpclient</artifactId>
 				<version>${commons-httpclient.version}</version>
 			</dependency>
-			
+
 			<!-- EasyBind -->
 			<dependency>
 				<groupId>org.fxmisc.easybind</groupId>
 				<artifactId>easybind</artifactId>
 				<version>1.0.3</version>
-			</dependency>	
+			</dependency>
 
 			<!-- Guava -->
 			<dependency>
@@ -343,17 +341,6 @@
 					<target>1.8</target>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.eluder.coveralls</groupId>
-				<artifactId>coveralls-maven-plugin</artifactId>
-				<version>4.0.0</version>
-				<configuration>
-					<jacocoReports>
-						<jacocoReport>jacoco-report/target/site/jacoco-aggregate/jacoco.xml</jacocoReport>
-					</jacocoReports>
-					<repoToken>${env.COVERALLS_REPO_TOKEN}</repoToken>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 

From 34af30630926a391af4fd8c7eb45c7e0b71bdf61 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 29 Aug 2016 17:16:56 +0200
Subject: [PATCH 14/45] defined keychain access interfaces

---
 main/keychain/pom.xml                         | 39 ++++++++++++++++
 .../cryptomator/keychain/KeychainAccess.java  | 19 ++++++++
 .../keychain/KeychainAccessStrategy.java      | 10 +++++
 .../keychain/KeychainComponent.java           | 15 +++++++
 .../cryptomator/keychain/KeychainModule.java  | 26 +++++++++++
 .../keychain/MacSystemKeychainAccess.java     | 45 +++++++++++++++++++
 .../keychain/WindowsSystemKeychainAccess.java | 45 +++++++++++++++++++
 .../keychain/KeychainModuleTest.java          | 17 +++++++
 .../keychain/KeychainTestModule.java          | 14 ++++++
 .../keychain/MapKeychainAccess.java           | 25 +++++++++++
 main/pom.xml                                  |  1 +
 11 files changed, 256 insertions(+)
 create mode 100644 main/keychain/pom.xml
 create mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccess.java
 create mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
 create mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/KeychainComponent.java
 create mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
 create mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
 create mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java
 create mode 100644 main/keychain/src/test/java/org/cryptomator/keychain/KeychainModuleTest.java
 create mode 100644 main/keychain/src/test/java/org/cryptomator/keychain/KeychainTestModule.java
 create mode 100644 main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java

diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml
new file mode 100644
index 000000000..4fab0ebc6
--- /dev/null
+++ b/main/keychain/pom.xml
@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.cryptomator</groupId>
+		<artifactId>main</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	<artifactId>keychain</artifactId>
+	<name>System Keychain Access</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcprov-jdk15on</artifactId>
+			<version>1.54</version>
+		</dependency>
+
+		<!-- DI -->
+		<dependency>
+			<groupId>com.google.dagger</groupId>
+			<artifactId>dagger</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.dagger</groupId>
+			<artifactId>dagger-compiler</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		
+		<!-- Test -->
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>commons-test</artifactId>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccess.java
new file mode 100644
index 000000000..af2152ce6
--- /dev/null
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccess.java
@@ -0,0 +1,19 @@
+package org.cryptomator.keychain;
+
+public interface KeychainAccess {
+
+	/**
+	 * Associates a passphrase with a given key.
+	 * 
+	 * @param key Key used to retrieve the passphrase via {@link #loadPassphrase(String)}.
+	 * @param passphrase The secret to store in this keychain.
+	 */
+	void storePassphrase(String key, CharSequence passphrase);
+
+	/**
+	 * @param key Unique key previously used while {@link #storePassphrase(String, CharSequence) storing a passphrase}.
+	 * @return The stored passphrase for the given key or <code>null</code> if no value for the given key could be found.
+	 */
+	CharSequence loadPassphrase(String key);
+
+}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
new file mode 100644
index 000000000..b304d6edf
--- /dev/null
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
@@ -0,0 +1,10 @@
+package org.cryptomator.keychain;
+
+interface KeychainAccessStrategy extends KeychainAccess {
+
+	/**
+	 * @return <code>true</code> if this KeychainAccessStrategy works on the current machine.
+	 */
+	boolean isSupported();
+
+}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainComponent.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainComponent.java
new file mode 100644
index 000000000..0264aa3fc
--- /dev/null
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainComponent.java
@@ -0,0 +1,15 @@
+package org.cryptomator.keychain;
+
+import java.util.Optional;
+
+import javax.inject.Singleton;
+
+import dagger.Component;
+
+@Singleton
+@Component(modules = KeychainModule.class)
+public interface KeychainComponent {
+
+	Optional<KeychainAccess> keychainAccess();
+
+}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
new file mode 100644
index 000000000..ab593f674
--- /dev/null
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
@@ -0,0 +1,26 @@
+package org.cryptomator.keychain;
+
+import java.util.Optional;
+import java.util.Set;
+
+import com.google.common.collect.Sets;
+
+import dagger.Module;
+import dagger.Provides;
+import dagger.multibindings.ElementsIntoSet;
+
+@Module
+public class KeychainModule {
+
+	@Provides
+	@ElementsIntoSet
+	Set<KeychainAccessStrategy> provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsSystemKeychainAccess winKeychain) {
+		return Sets.newHashSet(macKeychain, winKeychain);
+	}
+
+	@Provides
+	public Optional<KeychainAccess> provideSupportedKeychain(Set<KeychainAccessStrategy> keychainAccessStrategies) {
+		return keychainAccessStrategies.stream().filter(KeychainAccessStrategy::isSupported).map(KeychainAccess.class::cast).findFirst();
+	}
+
+}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
new file mode 100644
index 000000000..55a5e6ce9
--- /dev/null
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
@@ -0,0 +1,45 @@
+package org.cryptomator.keychain;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.commons.lang3.SystemUtils;
+
+@Singleton
+class MacSystemKeychainAccess implements KeychainAccessStrategy {
+
+	private final KeyStore keyStore;
+
+	@Inject
+	public MacSystemKeychainAccess() {
+		KeyStore ks;
+		try {
+			ks = KeyStore.getInstance("KeychainStore", "Apple");
+			ks.load(null);
+		} catch (GeneralSecurityException | IOException e) {
+			ks = null;
+		}
+		this.keyStore = ks;
+	}
+
+	@Override
+	public void storePassphrase(String key, CharSequence passphrase) {
+		// TODO Auto-generated method stub
+	}
+
+	@Override
+	public CharSequence loadPassphrase(String key) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean isSupported() {
+		return SystemUtils.IS_OS_MAC_OSX && keyStore != null;
+	}
+
+}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java
new file mode 100644
index 000000000..61aed5af9
--- /dev/null
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java
@@ -0,0 +1,45 @@
+package org.cryptomator.keychain;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.commons.lang3.SystemUtils;
+
+@Singleton
+class WindowsSystemKeychainAccess implements KeychainAccessStrategy {
+
+	private final KeyStore keyStore;
+
+	@Inject
+	public WindowsSystemKeychainAccess() {
+		KeyStore ks;
+		try {
+			ks = KeyStore.getInstance("Windows-MY", "SunMSCAPI");
+			ks.load(null);
+		} catch (GeneralSecurityException | IOException e) {
+			ks = null;
+		}
+		this.keyStore = ks;
+	}
+
+	@Override
+	public void storePassphrase(String key, CharSequence passphrase) {
+		// TODO Auto-generated method stub
+	}
+
+	@Override
+	public CharSequence loadPassphrase(String key) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean isSupported() {
+		return SystemUtils.IS_OS_WINDOWS && keyStore != null;
+	}
+
+}
diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/KeychainModuleTest.java b/main/keychain/src/test/java/org/cryptomator/keychain/KeychainModuleTest.java
new file mode 100644
index 000000000..c15c8c1f1
--- /dev/null
+++ b/main/keychain/src/test/java/org/cryptomator/keychain/KeychainModuleTest.java
@@ -0,0 +1,17 @@
+package org.cryptomator.keychain;
+
+import java.util.Optional;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class KeychainModuleTest {
+
+	@Test
+	public void testGetKeychain() {
+		Optional<KeychainAccess> keychainAccess = DaggerKeychainComponent.builder().keychainModule(new KeychainTestModule()).build().keychainAccess();
+		Assert.assertTrue(keychainAccess.isPresent());
+		Assert.assertTrue(keychainAccess.get() instanceof MapKeychainAccess);
+	}
+
+}
diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/KeychainTestModule.java b/main/keychain/src/test/java/org/cryptomator/keychain/KeychainTestModule.java
new file mode 100644
index 000000000..e2636981b
--- /dev/null
+++ b/main/keychain/src/test/java/org/cryptomator/keychain/KeychainTestModule.java
@@ -0,0 +1,14 @@
+package org.cryptomator.keychain;
+
+import java.util.Set;
+
+import com.google.common.collect.Sets;
+
+public class KeychainTestModule extends KeychainModule {
+
+	@Override
+	Set<KeychainAccessStrategy> provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsSystemKeychainAccess winKeychain) {
+		return Sets.newHashSet(new MapKeychainAccess());
+	}
+
+}
diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java b/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java
new file mode 100644
index 000000000..0af7f0a51
--- /dev/null
+++ b/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java
@@ -0,0 +1,25 @@
+package org.cryptomator.keychain;
+
+import java.util.HashMap;
+import java.util.Map;
+
+class MapKeychainAccess implements KeychainAccessStrategy {
+
+	private final Map<String, CharSequence> map = new HashMap<>();
+
+	@Override
+	public void storePassphrase(String key, CharSequence passphrase) {
+		map.put(key, passphrase);
+	}
+
+	@Override
+	public CharSequence loadPassphrase(String key) {
+		return map.get(key);
+	}
+
+	@Override
+	public boolean isSupported() {
+		return true;
+	}
+
+}
diff --git a/main/pom.xml b/main/pom.xml
index 6640becc7..ef7cf60fb 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -273,6 +273,7 @@
 		<module>frontend-webdav</module>
 		<module>ui</module>
 		<module>filesystem-charsets</module>
+		<module>keychain</module>
 	</modules>
 
 	<profiles>

From dc58ba434a061b0ac6a759edb31d6b6e8f6c5b3f Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 29 Aug 2016 20:14:48 +0200
Subject: [PATCH 15/45] Make Cryptomator a foreground app when restoring from
 status bar icon

---
 .../cryptomator/ui/CryptomatorComponent.java  |  4 ++
 .../org/cryptomator/ui/CryptomatorModule.java |  3 +-
 .../java/org/cryptomator/ui/ExitUtil.java     |  9 ++++-
 .../org/cryptomator/ui/MainApplication.java   |  3 ++
 .../org/cryptomator/ui/jni/JniException.java  | 24 ++++++++++++
 .../org/cryptomator/ui/jni/JniModule.java     | 33 +++++++++++++++++
 .../org/cryptomator/ui/jni/MacFunctions.java  | 37 +++++++++++++++++++
 7 files changed, 111 insertions(+), 2 deletions(-)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/jni/JniException.java
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/jni/JniModule.java
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/jni/MacFunctions.java

diff --git a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorComponent.java b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorComponent.java
index 095caeb89..7c047b213 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorComponent.java
@@ -8,11 +8,13 @@
  *******************************************************************************/
 package org.cryptomator.ui;
 
+import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
 import org.cryptomator.ui.controllers.MainController;
+import org.cryptomator.ui.jni.MacFunctions;
 import org.cryptomator.ui.settings.Localization;
 import org.cryptomator.ui.util.AsyncTaskService;
 import org.cryptomator.ui.util.DeferredCloser;
@@ -34,4 +36,6 @@ interface CryptomatorComponent {
 	Localization localization();
 
 	ExitUtil exitUtil();
+
+	Optional<MacFunctions> nativeMacFunctions();
 }
\ No newline at end of file
diff --git a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
index b62f631c4..7d8d86d0c 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
@@ -19,6 +19,7 @@ import org.cryptomator.crypto.engine.impl.CryptoEngineModule;
 import org.cryptomator.frontend.FrontendFactory;
 import org.cryptomator.frontend.webdav.WebDavModule;
 import org.cryptomator.frontend.webdav.WebDavServer;
+import org.cryptomator.ui.jni.JniModule;
 import org.cryptomator.ui.model.VaultObjectMapperProvider;
 import org.cryptomator.ui.settings.Settings;
 import org.cryptomator.ui.settings.SettingsProvider;
@@ -33,7 +34,7 @@ import dagger.Provides;
 import javafx.application.Application;
 import javafx.stage.Stage;
 
-@Module(includes = {CryptoEngineModule.class, CommonsModule.class, WebDavModule.class})
+@Module(includes = {CryptoEngineModule.class, CommonsModule.class, WebDavModule.class, JniModule.class})
 class CryptomatorModule {
 
 	private static final Logger LOG = LoggerFactory.getLogger(CryptomatorModule.class);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/ExitUtil.java b/main/ui/src/main/java/org/cryptomator/ui/ExitUtil.java
index ff0cbe0dd..8bbac3ea6 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/ExitUtil.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/ExitUtil.java
@@ -21,6 +21,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.IOException;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
@@ -32,6 +33,8 @@ import javax.script.ScriptException;
 import javax.swing.SwingUtilities;
 
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.ui.jni.JniException;
+import org.cryptomator.ui.jni.MacFunctions;
 import org.cryptomator.ui.settings.Localization;
 import org.cryptomator.ui.settings.Settings;
 import org.slf4j.Logger;
@@ -48,12 +51,14 @@ class ExitUtil {
 	private final Stage mainWindow;
 	private final Localization localization;
 	private final Settings settings;
+	private final Optional<MacFunctions> macFunctions;
 
 	@Inject
-	public ExitUtil(@Named("mainWindow") Stage mainWindow, Localization localization, Settings settings) {
+	public ExitUtil(@Named("mainWindow") Stage mainWindow, Localization localization, Settings settings, Optional<MacFunctions> macFunctions) {
 		this.mainWindow = mainWindow;
 		this.localization = localization;
 		this.settings = settings;
+		this.macFunctions = macFunctions;
 	}
 
 	public void initExitHandler(Runnable exitCommand) {
@@ -88,6 +93,7 @@ class ExitUtil {
 				if (Platform.isImplicitExit()) {
 					exitCommand.run();
 				} else {
+					macFunctions.ifPresent(JniException.ignore(MacFunctions::transformToAgentApplication));
 					mainWindow.close();
 					this.showTrayNotification(trayIcon);
 				}
@@ -189,6 +195,7 @@ class ExitUtil {
 
 	private void restoreFromTray(ActionEvent event) {
 		Platform.runLater(() -> {
+			macFunctions.ifPresent(JniException.ignore(MacFunctions::transformToForegroundApplication));
 			mainWindow.show();
 			mainWindow.requestFocus();
 		});
diff --git a/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java b/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
index d28721ffa..a6c4509de 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
@@ -16,6 +16,8 @@ import java.util.concurrent.ExecutionException;
 
 import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.ui.controllers.MainController;
+import org.cryptomator.ui.jni.JniException;
+import org.cryptomator.ui.jni.MacFunctions;
 import org.cryptomator.ui.util.ActiveWindowStyleSupport;
 import org.cryptomator.ui.util.DeferredCloser;
 import org.cryptomator.ui.util.SingleInstanceManager;
@@ -67,6 +69,7 @@ public class MainApplication extends Application {
 		}
 
 		// show window and start observing its focus:
+		comp.nativeMacFunctions().ifPresent(JniException.ignore(MacFunctions::transformToForegroundApplication));
 		primaryStage.show();
 		ActiveWindowStyleSupport.startObservingFocus(primaryStage);
 		comp.exitUtil().initExitHandler(this::quit);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/jni/JniException.java b/main/ui/src/main/java/org/cryptomator/ui/jni/JniException.java
new file mode 100644
index 000000000..2fd06eb07
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/jni/JniException.java
@@ -0,0 +1,24 @@
+package org.cryptomator.ui.jni;
+
+import java.util.function.Consumer;
+
+/**
+ * Thrown to indicate that a JNI call didn't succeed, i.e. returned an unexpected return value.
+ */
+public class JniException extends RuntimeException {
+
+	protected JniException(String message) {
+		super(message);
+	}
+
+	public static <T> Consumer<T> ignore(Consumer<T> consumer) {
+		return value -> {
+			try {
+				consumer.accept(value);
+			} catch (RuntimeException e) {
+				// no-op
+			}
+		};
+	}
+
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/jni/JniModule.java b/main/ui/src/main/java/org/cryptomator/ui/jni/JniModule.java
new file mode 100644
index 000000000..de72d0228
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/jni/JniModule.java
@@ -0,0 +1,33 @@
+package org.cryptomator.ui.jni;
+
+import java.util.Optional;
+
+import javax.inject.Singleton;
+
+import org.apache.commons.lang3.SystemUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module
+public class JniModule {
+
+	private static final Logger LOG = LoggerFactory.getLogger(JniModule.class);
+
+	@Provides
+	@Singleton
+	Optional<MacFunctions> provideMacFunctions(MacFunctions macFunctions) {
+		if (SystemUtils.IS_OS_MAC) {
+			try {
+				System.loadLibrary("MacFunctions");
+				return Optional.of(macFunctions);
+			} catch (UnsatisfiedLinkError e) {
+				LOG.error("Could not load JNI lib from path {}", System.getProperty("java.library.path"));
+			}
+		}
+		return Optional.empty();
+	}
+
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/jni/MacFunctions.java b/main/ui/src/main/java/org/cryptomator/ui/jni/MacFunctions.java
new file mode 100644
index 000000000..3cc58d7db
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/jni/MacFunctions.java
@@ -0,0 +1,37 @@
+package org.cryptomator.ui.jni;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+@Singleton
+public class MacFunctions {
+
+	@Inject
+	MacFunctions() {
+	}
+
+	/**
+	 * Makes the current application a foreground application, which appears in the Dock and the Application Switcher.
+	 */
+	public void transformToForegroundApplication() {
+		int errorCode = transformToForegroundApplication0();
+		if (errorCode != 0) {
+			throw new JniException("Failed to make app a foreground app. Error code " + errorCode);
+		}
+	}
+
+	private native int transformToForegroundApplication0();
+
+	/**
+	 * Makes the current application an agent app. Agent apps do not appear in the Dock or in the Force Quit window.
+	 */
+	public void transformToAgentApplication() {
+		int errorCode = transformToAgentApplication0();
+		if (errorCode != 0) {
+			throw new JniException("Failed to make app an agent app. Error code " + errorCode);
+		}
+	}
+
+	private native int transformToAgentApplication0();
+
+}

From a9c2b0fc5728a0ff0fdef3e959ef54d55907df72 Mon Sep 17 00:00:00 2001
From: Markus Kreusch <mail@markuskreusch.de>
Date: Mon, 29 Aug 2016 21:08:58 +0200
Subject: [PATCH 16/45] fixes #332

---
 .../cryptomator/frontend/webdav/Tarpit.java   |  17 +-
 .../frontend/webdav/WebDavFrontend.java       |  12 +-
 .../frontend/webdav/WebDavServer.java         |   8 +-
 .../org/cryptomator/ui/CryptomatorModule.java |  17 +-
 .../ui/controllers/MainController.java        |  14 +-
 .../java/org/cryptomator/ui/model/Vaults.java | 177 ++++++++++++++++++
 6 files changed, 215 insertions(+), 30 deletions(-)
 create mode 100644 main/ui/src/main/java/org/cryptomator/ui/model/Vaults.java

diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/Tarpit.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/Tarpit.java
index 011adddc6..14c528fef 100644
--- a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/Tarpit.java
+++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/Tarpit.java
@@ -7,8 +7,10 @@ package org.cryptomator.frontend.webdav;
 
 import static java.lang.Math.max;
 import static java.lang.System.currentTimeMillis;
+import static java.util.Collections.synchronizedSet;
 
 import java.io.Serializable;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
@@ -27,18 +29,15 @@ class Tarpit implements Serializable {
 	private static final Logger LOG = LoggerFactory.getLogger(Tarpit.class);
 	private static final long DELAY_MS = 10000;
 
-	private final Set<FrontendId> validFrontendIds = new HashSet<>();
+	private final Set<FrontendId> validFrontendIds = synchronizedSet(new HashSet<>());
 
 	@Inject
-	public Tarpit() {
-	}
+	public Tarpit() {}
 
-	public void register(FrontendId frontendId) {
-		validFrontendIds.add(frontendId);
-	}
-
-	public void unregister(FrontendId frontendId) {
-		validFrontendIds.remove(frontendId);
+	public void setValidFrontendIds(Collection<FrontendId> validFrontendIds) {
+		this.validFrontendIds.retainAll(validFrontendIds);
+		this.validFrontendIds.addAll(validFrontendIds);
+		validFrontendIds.forEach(System.out::println);
 	}
 
 	public void handle(HttpServletRequest req) {
diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavFrontend.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavFrontend.java
index f80e5543b..0bfd9515d 100644
--- a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavFrontend.java
+++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavFrontend.java
@@ -24,15 +24,13 @@ class WebDavFrontend implements Frontend {
 	private final WebDavMounterProvider webdavMounterProvider;
 	private final ServletContextHandler handler;
 	private final URI uri;
-	private final Runnable afterClose;
 
 	private WebDavMount mount;
 
-	public WebDavFrontend(WebDavMounterProvider webdavMounterProvider, ServletContextHandler handler, URI uri, Runnable afterUnmount) throws FrontendCreationFailedException {
+	public WebDavFrontend(WebDavMounterProvider webdavMounterProvider, ServletContextHandler handler, URI uri) throws FrontendCreationFailedException {
 		this.webdavMounterProvider = webdavMounterProvider;
 		this.handler = handler;
 		this.uri = uri;
-		this.afterClose = afterUnmount;
 		try {
 			handler.start();
 		} catch (Exception e) {
@@ -42,12 +40,8 @@ class WebDavFrontend implements Frontend {
 
 	@Override
 	public void close() throws Exception {
-		try {
-			unmount();
-			handler.stop();
-		} finally {
-			afterClose.run();
-		}
+		unmount();
+		handler.stop();
 	}
 
 	@Override
diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavServer.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavServer.java
index 0f18bbab5..cf40f1ce1 100644
--- a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavServer.java
+++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/WebDavServer.java
@@ -12,6 +12,7 @@ import static java.lang.String.format;
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Collection;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
@@ -117,9 +118,12 @@ public class WebDavServer implements FrontendFactory {
 			throw new IllegalStateException(e);
 		}
 		final ServletContextHandler handler = addServlet(root, uri);
-		tarpit.register(id);
 		LOG.info("Servlet available under " + uri);
-		return new WebDavFrontend(webdavMounterProvider, handler, uri, () -> tarpit.unregister(id));
+		return new WebDavFrontend(webdavMounterProvider, handler, uri);
+	}
+	
+	public void setValidFrontendIds(Collection<FrontendId> validFrontendIds) {
+		tarpit.setValidFrontendIds(validFrontendIds);
 	}
 
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
index b62f631c4..f460dc133 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
@@ -8,6 +8,8 @@
  *******************************************************************************/
 package org.cryptomator.ui;
 
+import static java.util.stream.Collectors.toList;
+
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -17,9 +19,12 @@ import javax.inject.Singleton;
 import org.cryptomator.common.CommonsModule;
 import org.cryptomator.crypto.engine.impl.CryptoEngineModule;
 import org.cryptomator.frontend.FrontendFactory;
+import org.cryptomator.frontend.FrontendId;
 import org.cryptomator.frontend.webdav.WebDavModule;
 import org.cryptomator.frontend.webdav.WebDavServer;
+import org.cryptomator.ui.model.Vault;
 import org.cryptomator.ui.model.VaultObjectMapperProvider;
+import org.cryptomator.ui.model.Vaults;
 import org.cryptomator.ui.settings.Settings;
 import org.cryptomator.ui.settings.SettingsProvider;
 import org.cryptomator.ui.util.DeferredCloser;
@@ -31,6 +36,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import dagger.Module;
 import dagger.Provides;
 import javafx.application.Application;
+import javafx.beans.Observable;
 import javafx.stage.Stage;
 
 @Module(includes = {CryptoEngineModule.class, CommonsModule.class, WebDavModule.class})
@@ -93,10 +99,19 @@ class CryptomatorModule {
 
 	@Provides
 	@Singleton
-	FrontendFactory provideFrontendFactory(DeferredCloser closer, WebDavServer webDavServer, Settings settings) {
+	FrontendFactory provideFrontendFactory(DeferredCloser closer, WebDavServer webDavServer, Vaults vaults, Settings settings) {
+		vaults.addListener((Observable o) -> setValidFrontendIds(webDavServer, vaults));
+		setValidFrontendIds(webDavServer, vaults);
 		webDavServer.setPort(settings.getPort());
 		webDavServer.start();
 		return closer.closeLater(webDavServer, WebDavServer::stop).get().orElseThrow(IllegalStateException::new);
 	}
 
+	private void setValidFrontendIds(WebDavServer webDavServer, Vaults vaults) {
+		webDavServer.setValidFrontendIds(vaults.stream() //
+				.map(Vault::getId)
+				.map(FrontendId::from)
+				.collect(toList()));
+	}
+
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
index c9dee3248..478c6be6b 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
@@ -29,6 +29,7 @@ import org.cryptomator.ui.controls.DirectoryListCell;
 import org.cryptomator.ui.model.UpgradeStrategies;
 import org.cryptomator.ui.model.Vault;
 import org.cryptomator.ui.model.VaultFactory;
+import org.cryptomator.ui.model.Vaults;
 import org.cryptomator.ui.settings.Localization;
 import org.cryptomator.ui.settings.Settings;
 import org.cryptomator.ui.util.DialogBuilderUtil;
@@ -44,9 +45,6 @@ import javafx.beans.binding.BooleanBinding;
 import javafx.beans.binding.BooleanExpression;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ListChangeListener.Change;
-import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.geometry.Side;
@@ -81,7 +79,7 @@ public class MainController extends LocalizedFXMLViewController {
 	private final Lazy<SettingsController> settingsController;
 	private final Lazy<UpgradeStrategies> upgradeStrategies;
 	private final ObjectProperty<AbstractFXMLViewController> activeController = new SimpleObjectProperty<>();
-	private final ObservableList<Vault> vaults;
+	private final Vaults vaults;
 	private final ObjectProperty<Vault> selectedVault = new SimpleObjectProperty<>();
 	private final BooleanExpression isSelectedVaultUnlocked = BooleanBinding.booleanExpression(EasyBind.select(selectedVault).selectObject(Vault::unlockedProperty).orElse(false));
 	private final BooleanExpression isSelectedVaultValid = BooleanBinding.booleanExpression(EasyBind.monadic(selectedVault).map(Vault::isValidVaultDirectory).orElse(false));
@@ -92,7 +90,8 @@ public class MainController extends LocalizedFXMLViewController {
 	@Inject
 	public MainController(@Named("mainWindow") Stage mainWindow, Localization localization, Settings settings, VaultFactory vaultFactoy, Lazy<WelcomeController> welcomeController,
 			Lazy<InitializeController> initializeController, Lazy<NotFoundController> notFoundController, Lazy<UpgradeController> upgradeController, Lazy<UnlockController> unlockController,
-			Provider<UnlockedController> unlockedControllerProvider, Lazy<ChangePasswordController> changePasswordController, Lazy<SettingsController> settingsController, Lazy<UpgradeStrategies> upgradeStrategies) {
+			Provider<UnlockedController> unlockedControllerProvider, Lazy<ChangePasswordController> changePasswordController, Lazy<SettingsController> settingsController, Lazy<UpgradeStrategies> upgradeStrategies,
+			Vaults vaults) {
 		super(localization);
 		this.mainWindow = mainWindow;
 		this.vaultFactoy = vaultFactoy;
@@ -105,10 +104,7 @@ public class MainController extends LocalizedFXMLViewController {
 		this.changePasswordController = changePasswordController;
 		this.settingsController = settingsController;
 		this.upgradeStrategies = upgradeStrategies;
-		this.vaults = FXCollections.observableList(settings.getDirectories());
-		this.vaults.addListener((Change<? extends Vault> c) -> {
-			settings.save();
-		});
+		this.vaults = vaults;
 
 		// derived bindings:
 		this.isShowingSettings = activeController.isEqualTo(settingsController.get());
diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/Vaults.java b/main/ui/src/main/java/org/cryptomator/ui/model/Vaults.java
new file mode 100644
index 000000000..9ac94d66e
--- /dev/null
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/Vaults.java
@@ -0,0 +1,177 @@
+package org.cryptomator.ui.model;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.cryptomator.ui.settings.Settings;
+
+import javafx.beans.InvalidationListener;
+import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
+import javafx.collections.ListChangeListener.Change;
+import javafx.collections.ObservableList;
+
+@Singleton
+public class Vaults implements ObservableList<Vault> {
+
+	private final ObservableList<Vault> delegate;
+	
+	@Inject
+	public Vaults(Settings settings) {
+		this.delegate = FXCollections.observableList(settings.getDirectories());
+		addListener((Change<? extends Vault> change) -> settings.save());
+	}
+	
+	public void addListener(ListChangeListener<? super Vault> listener) {
+		delegate.addListener(listener);
+	}
+
+	public void removeListener(ListChangeListener<? super Vault> listener) {
+		delegate.removeListener(listener);
+	}
+
+	public void addListener(InvalidationListener listener) {
+		delegate.addListener(listener);
+	}
+
+	public boolean addAll(Vault... elements) {
+		return delegate.addAll(elements);
+	}
+
+	public boolean setAll(Vault... elements) {
+		return delegate.setAll(elements);
+	}
+
+	public boolean setAll(Collection<? extends Vault> col) {
+		return delegate.setAll(col);
+	}
+
+	public boolean removeAll(Vault... elements) {
+		return delegate.removeAll(elements);
+	}
+
+	public void removeListener(InvalidationListener listener) {
+		delegate.removeListener(listener);
+	}
+
+	public boolean retainAll(Vault... elements) {
+		return delegate.retainAll(elements);
+	}
+
+	public void remove(int from, int to) {
+		delegate.remove(from, to);
+	}
+
+	public int size() {
+		return delegate.size();
+	}
+
+	public boolean isEmpty() {
+		return delegate.isEmpty();
+	}
+
+	public boolean contains(Object o) {
+		return delegate.contains(o);
+	}
+
+	public Iterator<Vault> iterator() {
+		return delegate.iterator();
+	}
+
+	public Object[] toArray() {
+		return delegate.toArray();
+	}
+
+	public <T> T[] toArray(T[] a) {
+		return delegate.toArray(a);
+	}
+
+	public boolean add(Vault e) {
+		return delegate.add(e);
+	}
+
+	public boolean remove(Object o) {
+		return delegate.remove(o);
+	}
+
+	public boolean containsAll(Collection<?> c) {
+		return delegate.containsAll(c);
+	}
+
+	public boolean addAll(Collection<? extends Vault> c) {
+		return delegate.addAll(c);
+	}
+
+	public boolean addAll(int index, Collection<? extends Vault> c) {
+		return delegate.addAll(index, c);
+	}
+
+	public boolean removeAll(Collection<?> c) {
+		return delegate.removeAll(c);
+	}
+
+	public boolean retainAll(Collection<?> c) {
+		return delegate.retainAll(c);
+	}
+
+	public void clear() {
+		delegate.clear();
+	}
+
+	public Vault get(int index) {
+		return delegate.get(index);
+	}
+
+	public Vault set(int index, Vault element) {
+		return delegate.set(index, element);
+	}
+
+	public void add(int index, Vault element) {
+		delegate.add(index, element);
+	}
+
+	public Vault remove(int index) {
+		return delegate.remove(index);
+	}
+
+	public int indexOf(Object o) {
+		return delegate.indexOf(o);
+	}
+
+	public int lastIndexOf(Object o) {
+		return delegate.lastIndexOf(o);
+	}
+
+	public ListIterator<Vault> listIterator() {
+		return delegate.listIterator();
+	}
+
+	public ListIterator<Vault> listIterator(int index) {
+		return delegate.listIterator(index);
+	}
+
+	public List<Vault> subList(int fromIndex, int toIndex) {
+		return delegate.subList(fromIndex, toIndex);
+	}
+	
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == this) return true;
+		if (obj == null || getClass() != obj.getClass()) return false;
+		return internalEquals((Vaults)obj);
+	}
+
+	private boolean internalEquals(Vaults other) {
+		return delegate.equals(other.delegate);
+	}
+
+	public int hashCode() {
+		return delegate.hashCode();
+	}
+	
+}

From e0ae50378fac717d2615bb64d7f127b800913bdd Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 30 Aug 2016 17:19:45 +0200
Subject: [PATCH 17/45] externalized JNI bindings

---
 .../cryptomator/common/LazyInitializer.java   | 19 +++++-----
 main/ui/pom.xml                               |  5 +++
 .../cryptomator/ui/CryptomatorComponent.java  |  5 ++-
 .../org/cryptomator/ui/CryptomatorModule.java | 12 +++++-
 .../java/org/cryptomator/ui/ExitUtil.java     |  9 +++--
 .../org/cryptomator/ui/MainApplication.java   |  7 ++--
 .../org/cryptomator/ui/jni/JniException.java  | 24 ------------
 .../org/cryptomator/ui/jni/JniModule.java     | 33 -----------------
 .../org/cryptomator/ui/jni/MacFunctions.java  | 37 -------------------
 9 files changed, 37 insertions(+), 114 deletions(-)
 delete mode 100644 main/ui/src/main/java/org/cryptomator/ui/jni/JniException.java
 delete mode 100644 main/ui/src/main/java/org/cryptomator/ui/jni/JniModule.java
 delete mode 100644 main/ui/src/main/java/org/cryptomator/ui/jni/MacFunctions.java

diff --git a/main/commons/src/main/java/org/cryptomator/common/LazyInitializer.java b/main/commons/src/main/java/org/cryptomator/common/LazyInitializer.java
index eb7a9400f..1316c50d1 100644
--- a/main/commons/src/main/java/org/cryptomator/common/LazyInitializer.java
+++ b/main/commons/src/main/java/org/cryptomator/common/LazyInitializer.java
@@ -17,16 +17,17 @@ public final class LazyInitializer {
 	 * @return The initialized value
 	 */
 	public static <T> T initializeLazily(AtomicReference<T> reference, Supplier<T> factory) {
-		final T existingInstance = reference.get();
-		if (existingInstance != null) {
-			return existingInstance;
+		final T existing = reference.get();
+		if (existing != null) {
+			return existing;
 		} else {
-			final T newInstance = factory.get();
-			if (reference.compareAndSet(null, newInstance)) {
-				return newInstance;
-			} else {
-				return reference.get();
-			}
+			return reference.updateAndGet(currentValue -> {
+				if (currentValue == null) {
+					return factory.get();
+				} else {
+					return currentValue;
+				}
+			});
 		}
 	}
 
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index 2c261d3ad..6ceb70390 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -54,6 +54,11 @@
 			<groupId>org.cryptomator</groupId>
 			<artifactId>frontend-webdav</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>jni</artifactId>
+			<version>1.0.0-SNAPSHOT</version>
+		</dependency>
 		
 		<!-- EasyBind -->
 		<dependency>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorComponent.java b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorComponent.java
index 7c047b213..e82e006e9 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorComponent.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorComponent.java
@@ -13,8 +13,8 @@ import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
+import org.cryptomator.jni.MacFunctions;
 import org.cryptomator.ui.controllers.MainController;
-import org.cryptomator.ui.jni.MacFunctions;
 import org.cryptomator.ui.settings.Localization;
 import org.cryptomator.ui.util.AsyncTaskService;
 import org.cryptomator.ui.util.DeferredCloser;
@@ -38,4 +38,5 @@ interface CryptomatorComponent {
 	ExitUtil exitUtil();
 
 	Optional<MacFunctions> nativeMacFunctions();
-}
\ No newline at end of file
+
+}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
index 7d8d86d0c..f4cc072ae 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
@@ -8,6 +8,7 @@
  *******************************************************************************/
 package org.cryptomator.ui;
 
+import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -19,7 +20,8 @@ import org.cryptomator.crypto.engine.impl.CryptoEngineModule;
 import org.cryptomator.frontend.FrontendFactory;
 import org.cryptomator.frontend.webdav.WebDavModule;
 import org.cryptomator.frontend.webdav.WebDavServer;
-import org.cryptomator.ui.jni.JniModule;
+import org.cryptomator.jni.JniModule;
+import org.cryptomator.jni.MacFunctions;
 import org.cryptomator.ui.model.VaultObjectMapperProvider;
 import org.cryptomator.ui.settings.Settings;
 import org.cryptomator.ui.settings.SettingsProvider;
@@ -34,7 +36,7 @@ import dagger.Provides;
 import javafx.application.Application;
 import javafx.stage.Stage;
 
-@Module(includes = {CryptoEngineModule.class, CommonsModule.class, WebDavModule.class, JniModule.class})
+@Module(includes = {CryptoEngineModule.class, CommonsModule.class, WebDavModule.class})
 class CryptomatorModule {
 
 	private static final Logger LOG = LoggerFactory.getLogger(CryptomatorModule.class);
@@ -100,4 +102,10 @@ class CryptomatorModule {
 		return closer.closeLater(webDavServer, WebDavServer::stop).get().orElseThrow(IllegalStateException::new);
 	}
 
+	@Provides
+	@Singleton
+	Optional<MacFunctions> provideMacFunctions() {
+		return JniModule.macFunctions();
+	}
+
 }
diff --git a/main/ui/src/main/java/org/cryptomator/ui/ExitUtil.java b/main/ui/src/main/java/org/cryptomator/ui/ExitUtil.java
index 8bbac3ea6..7352d149c 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/ExitUtil.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/ExitUtil.java
@@ -33,8 +33,9 @@ import javax.script.ScriptException;
 import javax.swing.SwingUtilities;
 
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.ui.jni.JniException;
-import org.cryptomator.ui.jni.MacFunctions;
+import org.cryptomator.jni.JniException;
+import org.cryptomator.jni.MacApplicationUiState;
+import org.cryptomator.jni.MacFunctions;
 import org.cryptomator.ui.settings.Localization;
 import org.cryptomator.ui.settings.Settings;
 import org.slf4j.Logger;
@@ -93,7 +94,7 @@ class ExitUtil {
 				if (Platform.isImplicitExit()) {
 					exitCommand.run();
 				} else {
-					macFunctions.ifPresent(JniException.ignore(MacFunctions::transformToAgentApplication));
+					macFunctions.map(MacFunctions::uiState).ifPresent(JniException.ignore(MacApplicationUiState::transformToAgentApplication));
 					mainWindow.close();
 					this.showTrayNotification(trayIcon);
 				}
@@ -195,7 +196,7 @@ class ExitUtil {
 
 	private void restoreFromTray(ActionEvent event) {
 		Platform.runLater(() -> {
-			macFunctions.ifPresent(JniException.ignore(MacFunctions::transformToForegroundApplication));
+			macFunctions.map(MacFunctions::uiState).ifPresent(JniException.ignore(MacApplicationUiState::transformToForegroundApplication));
 			mainWindow.show();
 			mainWindow.requestFocus();
 		});
diff --git a/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java b/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
index a6c4509de..8e5f60b06 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
@@ -15,9 +15,10 @@ import java.nio.file.Path;
 import java.util.concurrent.ExecutionException;
 
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.jni.JniException;
+import org.cryptomator.jni.MacApplicationUiState;
+import org.cryptomator.jni.MacFunctions;
 import org.cryptomator.ui.controllers.MainController;
-import org.cryptomator.ui.jni.JniException;
-import org.cryptomator.ui.jni.MacFunctions;
 import org.cryptomator.ui.util.ActiveWindowStyleSupport;
 import org.cryptomator.ui.util.DeferredCloser;
 import org.cryptomator.ui.util.SingleInstanceManager;
@@ -69,7 +70,7 @@ public class MainApplication extends Application {
 		}
 
 		// show window and start observing its focus:
-		comp.nativeMacFunctions().ifPresent(JniException.ignore(MacFunctions::transformToForegroundApplication));
+		comp.nativeMacFunctions().map(MacFunctions::uiState).ifPresent(JniException.ignore(MacApplicationUiState::transformToForegroundApplication));
 		primaryStage.show();
 		ActiveWindowStyleSupport.startObservingFocus(primaryStage);
 		comp.exitUtil().initExitHandler(this::quit);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/jni/JniException.java b/main/ui/src/main/java/org/cryptomator/ui/jni/JniException.java
deleted file mode 100644
index 2fd06eb07..000000000
--- a/main/ui/src/main/java/org/cryptomator/ui/jni/JniException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.cryptomator.ui.jni;
-
-import java.util.function.Consumer;
-
-/**
- * Thrown to indicate that a JNI call didn't succeed, i.e. returned an unexpected return value.
- */
-public class JniException extends RuntimeException {
-
-	protected JniException(String message) {
-		super(message);
-	}
-
-	public static <T> Consumer<T> ignore(Consumer<T> consumer) {
-		return value -> {
-			try {
-				consumer.accept(value);
-			} catch (RuntimeException e) {
-				// no-op
-			}
-		};
-	}
-
-}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/jni/JniModule.java b/main/ui/src/main/java/org/cryptomator/ui/jni/JniModule.java
deleted file mode 100644
index de72d0228..000000000
--- a/main/ui/src/main/java/org/cryptomator/ui/jni/JniModule.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.cryptomator.ui.jni;
-
-import java.util.Optional;
-
-import javax.inject.Singleton;
-
-import org.apache.commons.lang3.SystemUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import dagger.Module;
-import dagger.Provides;
-
-@Module
-public class JniModule {
-
-	private static final Logger LOG = LoggerFactory.getLogger(JniModule.class);
-
-	@Provides
-	@Singleton
-	Optional<MacFunctions> provideMacFunctions(MacFunctions macFunctions) {
-		if (SystemUtils.IS_OS_MAC) {
-			try {
-				System.loadLibrary("MacFunctions");
-				return Optional.of(macFunctions);
-			} catch (UnsatisfiedLinkError e) {
-				LOG.error("Could not load JNI lib from path {}", System.getProperty("java.library.path"));
-			}
-		}
-		return Optional.empty();
-	}
-
-}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/jni/MacFunctions.java b/main/ui/src/main/java/org/cryptomator/ui/jni/MacFunctions.java
deleted file mode 100644
index 3cc58d7db..000000000
--- a/main/ui/src/main/java/org/cryptomator/ui/jni/MacFunctions.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.cryptomator.ui.jni;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-@Singleton
-public class MacFunctions {
-
-	@Inject
-	MacFunctions() {
-	}
-
-	/**
-	 * Makes the current application a foreground application, which appears in the Dock and the Application Switcher.
-	 */
-	public void transformToForegroundApplication() {
-		int errorCode = transformToForegroundApplication0();
-		if (errorCode != 0) {
-			throw new JniException("Failed to make app a foreground app. Error code " + errorCode);
-		}
-	}
-
-	private native int transformToForegroundApplication0();
-
-	/**
-	 * Makes the current application an agent app. Agent apps do not appear in the Dock or in the Force Quit window.
-	 */
-	public void transformToAgentApplication() {
-		int errorCode = transformToAgentApplication0();
-		if (errorCode != 0) {
-			throw new JniException("Failed to make app an agent app. Error code " + errorCode);
-		}
-	}
-
-	private native int transformToAgentApplication0();
-
-}

From 72e52df4e0712582f4fcab34ae48c956da186b25 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 30 Aug 2016 19:12:20 +0200
Subject: [PATCH 18/45] implemented keychain access on OS X

---
 main/keychain/pom.xml                         |  4 +++
 .../keychain/MacSystemKeychainAccess.java     | 26 ++++++++-----------
 main/pom.xml                                  |  8 ++++++
 main/ui/pom.xml                               |  1 -
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml
index 4fab0ebc6..1983d5873 100644
--- a/main/keychain/pom.xml
+++ b/main/keychain/pom.xml
@@ -18,6 +18,10 @@
 			<artifactId>bcprov-jdk15on</artifactId>
 			<version>1.54</version>
 		</dependency>
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>jni</artifactId>
+		</dependency>
 
 		<!-- DI -->
 		<dependency>
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
index 55a5e6ce9..465a17ec1 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
@@ -1,45 +1,41 @@
 package org.cryptomator.keychain;
 
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
+import java.nio.CharBuffer;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.jni.JniModule;
+import org.cryptomator.jni.MacKeychainAccess;
 
 @Singleton
 class MacSystemKeychainAccess implements KeychainAccessStrategy {
 
-	private final KeyStore keyStore;
+	private final MacKeychainAccess keychain;
 
 	@Inject
 	public MacSystemKeychainAccess() {
-		KeyStore ks;
-		try {
-			ks = KeyStore.getInstance("KeychainStore", "Apple");
-			ks.load(null);
-		} catch (GeneralSecurityException | IOException e) {
-			ks = null;
+		if (JniModule.macFunctions().isPresent()) {
+			this.keychain = JniModule.macFunctions().get().getKeychainAccess();
+		} else {
+			this.keychain = null;
 		}
-		this.keyStore = ks;
 	}
 
 	@Override
 	public void storePassphrase(String key, CharSequence passphrase) {
-		// TODO Auto-generated method stub
+		keychain.storePassword(key, passphrase);
 	}
 
 	@Override
 	public CharSequence loadPassphrase(String key) {
-		// TODO Auto-generated method stub
-		return null;
+		return CharBuffer.wrap(keychain.loadPassword(key));
 	}
 
 	@Override
 	public boolean isSupported() {
-		return SystemUtils.IS_OS_MAC_OSX && keyStore != null;
+		return SystemUtils.IS_OS_MAC_OSX && keychain != null;
 	}
 
 }
diff --git a/main/pom.xml b/main/pom.xml
index ef7cf60fb..e4ddb32c9 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -27,6 +27,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- dependency versions -->
+		<cryptomator.jni.version>1.0.0-SNAPSHOT</cryptomator.jni.version>
 		<log4j.version>2.1</log4j.version>
 		<slf4j.version>1.7.7</slf4j.version>
 		<junit.version>4.12</junit.version>
@@ -122,6 +123,13 @@
 				<artifactId>ui</artifactId>
 				<version>${project.version}</version>
 			</dependency>
+			
+			<!-- Cryptomator libraries -->
+			<dependency>
+				<groupId>org.cryptomator</groupId>
+				<artifactId>jni</artifactId>
+				<version>${cryptomator.jni.version}</version>
+			</dependency>
 
 			<!-- Logging -->
 			<dependency>
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index 6ceb70390..885a875bc 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -57,7 +57,6 @@
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>jni</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
 		</dependency>
 		
 		<!-- EasyBind -->

From 995bba616f92c443f7878dffea8f9d09a8a9d8c8 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 30 Aug 2016 19:15:26 +0200
Subject: [PATCH 19/45] cache maven dir

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 04803a603..6744d39ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,9 @@ sudo: required
 dist: trusty
 jdk:
 - oraclejdk8
+cache:
+  directories:
+  - $HOME/.m2
 env:
   global:
     - secure: "IfYURwZaDWuBDvyn47n0k1Zod/IQw1FF+CS5nnV08Q+NfC3vGGJMwV8m59XnbfwnWGxwvCaAbk4qP6s6+ijgZNKkvgfFMo3rfTok5zt43bIqgaFOANYV+OC/1c59gYD6ZUxhW5iNgMgU3qdsRtJuwSmfkVv/jKyLGfAbS4kN8BA=" #coverity

From 6a15fa132a5c33cdd2d38c32b8ef3b2c1e5a60d9 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Tue, 30 Aug 2016 22:41:01 +0200
Subject: [PATCH 20/45] app launches as foreground app on mac

---
 main/ui/src/main/java/org/cryptomator/ui/MainApplication.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java b/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
index 8e5f60b06..d28721ffa 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
@@ -15,9 +15,6 @@ import java.nio.file.Path;
 import java.util.concurrent.ExecutionException;
 
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.jni.JniException;
-import org.cryptomator.jni.MacApplicationUiState;
-import org.cryptomator.jni.MacFunctions;
 import org.cryptomator.ui.controllers.MainController;
 import org.cryptomator.ui.util.ActiveWindowStyleSupport;
 import org.cryptomator.ui.util.DeferredCloser;
@@ -70,7 +67,6 @@ public class MainApplication extends Application {
 		}
 
 		// show window and start observing its focus:
-		comp.nativeMacFunctions().map(MacFunctions::uiState).ifPresent(JniException.ignore(MacApplicationUiState::transformToForegroundApplication));
 		primaryStage.show();
 		ActiveWindowStyleSupport.startObservingFocus(primaryStage);
 		comp.exitUtil().initExitHandler(this::quit);

From d61e5c5a0888c2a72e4aad6410f7621d979ef362 Mon Sep 17 00:00:00 2001
From: Tobias Hagemann <tobias@hagemann.org>
Date: Wed, 31 Aug 2016 01:08:58 +0200
Subject: [PATCH 21/45] added "delete passphrase" method to keychain access

---
 .../main/java/org/cryptomator/keychain/KeychainAccess.java | 7 +++++++
 .../org/cryptomator/keychain/MacSystemKeychainAccess.java  | 5 +++++
 .../cryptomator/keychain/WindowsSystemKeychainAccess.java  | 6 ++++++
 .../java/org/cryptomator/keychain/MapKeychainAccess.java   | 6 ++++++
 4 files changed, 24 insertions(+)

diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccess.java
index af2152ce6..35e406752 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccess.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccess.java
@@ -16,4 +16,11 @@ public interface KeychainAccess {
 	 */
 	CharSequence loadPassphrase(String key);
 
+	/**
+	 * Deletes a passphrase with a given key.
+	 * 
+	 * @param key Unique key previously used while {@link #storePassphrase(String, CharSequence) storing a passphrase}.
+	 */
+	void deletePassphrase(String key);
+
 }
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
index 465a17ec1..c8ab83c8c 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
@@ -38,4 +38,9 @@ class MacSystemKeychainAccess implements KeychainAccessStrategy {
 		return SystemUtils.IS_OS_MAC_OSX && keychain != null;
 	}
 
+	@Override
+	public void deletePassphrase(String key) {
+		keychain.deletePassword(key);
+	}
+
 }
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java
index 61aed5af9..cf8163141 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java
@@ -37,6 +37,12 @@ class WindowsSystemKeychainAccess implements KeychainAccessStrategy {
 		return null;
 	}
 
+	@Override
+	public void deletePassphrase(String key) {
+		// TODO Auto-generated method stub
+
+	}
+
 	@Override
 	public boolean isSupported() {
 		return SystemUtils.IS_OS_WINDOWS && keyStore != null;
diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java b/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java
index 0af7f0a51..dd06319cd 100644
--- a/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java
+++ b/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java
@@ -17,6 +17,12 @@ class MapKeychainAccess implements KeychainAccessStrategy {
 		return map.get(key);
 	}
 
+	@Override
+	public void deletePassphrase(String key) {
+		// TODO Auto-generated method stub
+
+	}
+
 	@Override
 	public boolean isSupported() {
 		return true;

From 2e343a951fac36e2afde0b9b325a09b601dddc9d Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
Date: Wed, 31 Aug 2016 19:39:55 +0200
Subject: [PATCH 22/45] Feature/travis container builds (#334)

improved build dependency caching + force updates of snapshots to bypass said cache
---
 .travis.yml                                   | 37 ++++++++++++-------
 .../common/WeakValuedCacheTest.java           |  3 +-
 main/pom.xml                                  |  2 +-
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6744d39ba..c7ca9832a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,16 +3,31 @@ sudo: required
 dist: trusty
 jdk:
 - oraclejdk8
-cache:
-  directories:
-  - $HOME/.m2
 env:
   global:
     - secure: "IfYURwZaDWuBDvyn47n0k1Zod/IQw1FF+CS5nnV08Q+NfC3vGGJMwV8m59XnbfwnWGxwvCaAbk4qP6s6+ijgZNKkvgfFMo3rfTok5zt43bIqgaFOANYV+OC/1c59gYD6ZUxhW5iNgMgU3qdsRtJuwSmfkVv/jKyLGfAbS4kN8BA=" #coverity
     - secure: "lV9OwUbHMrMpLUH1CY+Z4puLDdFXytudyPlG1eGRsesdpuG6KM3uQVz6uAtf6lrU8DRbMM/T7ML+PmvQ4UoPPYLdLxESLLBat2qUPOIVBOhTSlCc7I0DmGy04CSvkeMy8dPaQC0ukgNiR7zwoNzfcpGRN/U9S8tziDruuHoZSrg=" #bintray
-before_install: "curl -L --cookie 'oraclelicense=accept-securebackup-cookie;' http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip -o /tmp/policy.zip && sudo unzip -j -o /tmp/policy.zip *.jar -d `jdk_switcher home oraclejdk8`/jre/lib/security && rm /tmp/policy.zip"
-script: mvn -fmain/pom.xml clean test
-after_success: "mvn -fmain/pom.xml -Ptest-coverage clean test jacoco:report-aggregate && bash <(curl -s https://codecov.io/bash)"
+addons:
+  apt:
+    sources:
+    - sourceline: 'ppa:webupd8team/java'
+    packages:
+    - oracle-java8-unlimited-jce-policy
+  coverity_scan:
+    project:
+      name: "cryptomator/cryptomator"
+    notification_email: sebastian.stenzel@cryptomator.org
+    build_command: "mvn -fmain/pom.xml clean test -DskipTests"
+    branch_pattern: release.*
+script:
+- mvn --update-snapshots -fmain/pom.xml -Ptest-coverage clean test jacoco:report-aggregate
+before_cache:
+- mvn -fmain/pom.xml -Prelease clean test -DskipTests
+cache:
+  directories:
+  - $HOME/.m2
+after_success:
+- "bash <(curl -s https://codecov.io/bash)"
 notifications:
   webhooks:
     urls:
@@ -25,14 +40,8 @@ notifications:
       secure: "lngJ/HEAFBbD5AdiO9avMqptKpZHdmEwOzS9FabZjkdFh7yAYueTk5RniPUvShjsKtThYm7cJ8AtDMDwc07NvPrzbMBRtUJGwuDT+7c7YFALGFJ1NYi+emkC9x1oafvmPgEYSE+tMKzNcwrHi3ytGgKdIotsKwaF35QNXYA9aMs="
     on_success: change
     on_failure: always
-addons:
-  coverity_scan:
-    project:
-      name: "cryptomator/cryptomator"
-    notification_email: sebastian.stenzel@cryptomator.org
-    build_command: "mvn -fmain/pom.xml clean test -DskipTests"
-    branch_pattern: release.*
-before_deploy: mvn -fmain/pom.xml -Prelease clean package -DskipTests
+before_deploy:
+- mvn -fmain/pom.xml -Prelease clean package -DskipTests
 deploy:
 - provider: releases
   prerelease: false
diff --git a/main/commons/src/test/java/org/cryptomator/common/WeakValuedCacheTest.java b/main/commons/src/test/java/org/cryptomator/common/WeakValuedCacheTest.java
index 58830356c..d9d1b009d 100644
--- a/main/commons/src/test/java/org/cryptomator/common/WeakValuedCacheTest.java
+++ b/main/commons/src/test/java/org/cryptomator/common/WeakValuedCacheTest.java
@@ -9,8 +9,8 @@ import static org.mockito.Mockito.when;
 
 import java.util.function.Function;
 
-import org.cryptomator.common.WeakValuedCache;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
@@ -83,6 +83,7 @@ public class WeakValuedCacheTest {
 		assertThat(result, is(sameInstance(theValue)));
 	}
 
+	@Ignore
 	@Test
 	public void testCacheDoesNotPreventGarbageCollectionOfValues() {
 		when(loader.apply(A_KEY)).thenAnswer(this::createValueUsingMoreThanHalfTheJvmMemory);
diff --git a/main/pom.xml b/main/pom.xml
index 2ed5ca8b7..8707743d7 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -273,6 +273,7 @@
 		<module>filesystem-inmemory</module>
 		<module>filesystem-nio</module>
 		<module>filesystem-nameshortening</module>
+		<module>filesystem-charsets</module>
 		<module>filesystem-crypto</module>
 		<module>filesystem-crypto-integration-tests</module>
 		<module>filesystem-stats</module>
@@ -280,7 +281,6 @@
 		<module>frontend-api</module>
 		<module>frontend-webdav</module>
 		<module>ui</module>
-		<module>filesystem-charsets</module>
 	</modules>
 
 	<profiles>

From dc117c8415b71d3543471dfd937c9b671c9852c3 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 31 Aug 2016 20:12:49 +0200
Subject: [PATCH 23/45] oracle-java8-unlimited-jce-policy apparently no longer
 needed (already installed)

---
 .travis.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c7ca9832a..dd1e35467 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,11 +8,6 @@ env:
     - secure: "IfYURwZaDWuBDvyn47n0k1Zod/IQw1FF+CS5nnV08Q+NfC3vGGJMwV8m59XnbfwnWGxwvCaAbk4qP6s6+ijgZNKkvgfFMo3rfTok5zt43bIqgaFOANYV+OC/1c59gYD6ZUxhW5iNgMgU3qdsRtJuwSmfkVv/jKyLGfAbS4kN8BA=" #coverity
     - secure: "lV9OwUbHMrMpLUH1CY+Z4puLDdFXytudyPlG1eGRsesdpuG6KM3uQVz6uAtf6lrU8DRbMM/T7ML+PmvQ4UoPPYLdLxESLLBat2qUPOIVBOhTSlCc7I0DmGy04CSvkeMy8dPaQC0ukgNiR7zwoNzfcpGRN/U9S8tziDruuHoZSrg=" #bintray
 addons:
-  apt:
-    sources:
-    - sourceline: 'ppa:webupd8team/java'
-    packages:
-    - oracle-java8-unlimited-jce-policy
   coverity_scan:
     project:
       name: "cryptomator/cryptomator"

From ce12af84955073597fe8639c6f19df9820c22e06 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Fri, 2 Sep 2016 15:49:09 +0200
Subject: [PATCH 24/45] Added save password functionality to UI

---
 .../cryptomator/keychain/KeychainAccess.java  |  2 +-
 .../keychain/MacSystemKeychainAccess.java     |  6 +-
 .../keychain/WindowsSystemKeychainAccess.java |  2 +-
 .../keychain/KeychainComponent.java           |  2 +-
 .../keychain/MapKeychainAccess.java           | 10 ++-
 main/pom.xml                                  |  8 +-
 main/ui/pom.xml                               |  4 +
 .../org/cryptomator/ui/CryptomatorModule.java |  3 +-
 .../controllers/ChangePasswordController.java | 19 ++--
 .../ui/controllers/InitializeController.java  | 17 ++--
 .../ui/controllers/MainController.java        | 13 ++-
 .../ui/controllers/UnlockController.java      | 89 +++++++++++--------
 .../ui/controllers/UpgradeController.java     | 22 +++--
 main/ui/src/main/resources/fxml/unlock.fxml   | 12 ++-
 .../ui/src/main/resources/localization/en.txt |  1 +
 15 files changed, 121 insertions(+), 89 deletions(-)
 rename main/keychain/src/{main => test}/java/org/cryptomator/keychain/KeychainComponent.java (85%)

diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccess.java
index 35e406752..abd7a3ee8 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccess.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccess.java
@@ -14,7 +14,7 @@ public interface KeychainAccess {
 	 * @param key Unique key previously used while {@link #storePassphrase(String, CharSequence) storing a passphrase}.
 	 * @return The stored passphrase for the given key or <code>null</code> if no value for the given key could be found.
 	 */
-	CharSequence loadPassphrase(String key);
+	char[] loadPassphrase(String key);
 
 	/**
 	 * Deletes a passphrase with a given key.
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
index c8ab83c8c..a80d084ef 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
@@ -1,7 +1,5 @@
 package org.cryptomator.keychain;
 
-import java.nio.CharBuffer;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -29,8 +27,8 @@ class MacSystemKeychainAccess implements KeychainAccessStrategy {
 	}
 
 	@Override
-	public CharSequence loadPassphrase(String key) {
-		return CharBuffer.wrap(keychain.loadPassword(key));
+	public char[] loadPassphrase(String key) {
+		return keychain.loadPassword(key);
 	}
 
 	@Override
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java
index cf8163141..47d56953c 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java
@@ -32,7 +32,7 @@ class WindowsSystemKeychainAccess implements KeychainAccessStrategy {
 	}
 
 	@Override
-	public CharSequence loadPassphrase(String key) {
+	public char[] loadPassphrase(String key) {
 		// TODO Auto-generated method stub
 		return null;
 	}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainComponent.java b/main/keychain/src/test/java/org/cryptomator/keychain/KeychainComponent.java
similarity index 85%
rename from main/keychain/src/main/java/org/cryptomator/keychain/KeychainComponent.java
rename to main/keychain/src/test/java/org/cryptomator/keychain/KeychainComponent.java
index 0264aa3fc..44301ed7f 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainComponent.java
+++ b/main/keychain/src/test/java/org/cryptomator/keychain/KeychainComponent.java
@@ -8,7 +8,7 @@ import dagger.Component;
 
 @Singleton
 @Component(modules = KeychainModule.class)
-public interface KeychainComponent {
+interface KeychainComponent {
 
 	Optional<KeychainAccess> keychainAccess();
 
diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java b/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java
index dd06319cd..081a0b0e6 100644
--- a/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java
+++ b/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java
@@ -5,15 +5,19 @@ import java.util.Map;
 
 class MapKeychainAccess implements KeychainAccessStrategy {
 
-	private final Map<String, CharSequence> map = new HashMap<>();
+	private final Map<String, char[]> map = new HashMap<>();
 
 	@Override
 	public void storePassphrase(String key, CharSequence passphrase) {
-		map.put(key, passphrase);
+		char[] pw = new char[passphrase.length()];
+		for (int i = 0; i < passphrase.length(); i++) {
+			pw[i] = passphrase.charAt(i);
+		}
+		map.put(key, pw);
 	}
 
 	@Override
-	public CharSequence loadPassphrase(String key) {
+	public char[] loadPassphrase(String key) {
 		return map.get(key);
 	}
 
diff --git a/main/pom.xml b/main/pom.xml
index bb9d47a8b..1a412a88a 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -58,7 +58,6 @@
 				<version>${project.version}</version>
 				<scope>test</scope>
 			</dependency>
-
 			<dependency>
 				<groupId>org.cryptomator</groupId>
 				<artifactId>filesystem-api</artifactId>
@@ -107,7 +106,6 @@
 				<artifactId>filesystem-stats</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-
 			<dependency>
 				<groupId>org.cryptomator</groupId>
 				<artifactId>frontend-api</artifactId>
@@ -118,7 +116,11 @@
 				<artifactId>frontend-webdav</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-
+			<dependency>
+				<groupId>org.cryptomator</groupId>
+				<artifactId>keychain</artifactId>
+				<version>${project.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.cryptomator</groupId>
 				<artifactId>ui</artifactId>
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index bf6ab3fec..a0e7a0749 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -58,6 +58,10 @@
 			<groupId>org.cryptomator</groupId>
 			<artifactId>jni</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>keychain</artifactId>
+		</dependency>
 		
 		<!-- CryptoLib -->
 		<dependency>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
index 473e213d0..3de672b47 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
@@ -25,6 +25,7 @@ import org.cryptomator.frontend.webdav.WebDavModule;
 import org.cryptomator.frontend.webdav.WebDavServer;
 import org.cryptomator.jni.JniModule;
 import org.cryptomator.jni.MacFunctions;
+import org.cryptomator.keychain.KeychainModule;
 import org.cryptomator.ui.model.Vault;
 import org.cryptomator.ui.model.VaultObjectMapperProvider;
 import org.cryptomator.ui.model.Vaults;
@@ -42,7 +43,7 @@ import javafx.application.Application;
 import javafx.beans.Observable;
 import javafx.stage.Stage;
 
-@Module(includes = {CryptoEngineModule.class, CommonsModule.class, WebDavModule.class})
+@Module(includes = {CryptoEngineModule.class, CommonsModule.class, WebDavModule.class, KeychainModule.class})
 class CryptomatorModule {
 
 	private static final Logger LOG = LoggerFactory.getLogger(CryptomatorModule.class);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java
index b1a76529b..c78ac51f0 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java
@@ -12,6 +12,7 @@ package org.cryptomator.ui.controllers;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URL;
+import java.util.Objects;
 import java.util.Optional;
 
 import javax.inject.Inject;
@@ -31,9 +32,7 @@ import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -49,9 +48,9 @@ public class ChangePasswordController extends LocalizedFXMLViewController {
 
 	private final Application app;
 	private final PasswordStrengthUtil strengthRater;
-	final ObjectProperty<Vault> vault = new SimpleObjectProperty<>();
-	private Optional<ChangePasswordListener> listener = Optional.empty();
 	private final IntegerProperty passwordStrength = new SimpleIntegerProperty(); // 0-4
+	private Optional<ChangePasswordListener> listener = Optional.empty();
+	private Vault vault;
 
 	@Inject
 	public ChangePasswordController(Application app, PasswordStrengthUtil strengthRater, Localization localization) {
@@ -101,7 +100,6 @@ public class ChangePasswordController extends LocalizedFXMLViewController {
 		BooleanBinding oldPasswordIsEmpty = oldPasswordField.textProperty().isEmpty();
 		BooleanBinding newPasswordIsEmpty = newPasswordField.textProperty().isEmpty();
 		BooleanBinding passwordsDiffer = newPasswordField.textProperty().isNotEqualTo(retypePasswordField.textProperty());
-		EasyBind.subscribe(vault, this::vaultDidChange);
 		changePasswordButton.disableProperty().bind(oldPasswordIsEmpty.or(newPasswordIsEmpty.or(passwordsDiffer)));
 		passwordStrength.bind(EasyBind.map(newPasswordField.textProperty(), strengthRater::computeRate));
 
@@ -118,10 +116,11 @@ public class ChangePasswordController extends LocalizedFXMLViewController {
 		return getClass().getResource("/fxml/change_password.fxml");
 	}
 
-	private void vaultDidChange(Vault newVault) {
-		oldPasswordField.clear();
-		newPasswordField.clear();
-		retypePasswordField.clear();
+	void setVault(Vault vault) {
+		this.vault = Objects.requireNonNull(vault);
+		oldPasswordField.swipe();
+		newPasswordField.swipe();
+		retypePasswordField.swipe();
 		// trigger "default" change to refresh key bindings:
 		changePasswordButton.setDefaultButton(false);
 		changePasswordButton.setDefaultButton(true);
@@ -144,7 +143,7 @@ public class ChangePasswordController extends LocalizedFXMLViewController {
 	private void didClickChangePasswordButton(ActionEvent event) {
 		downloadsPageLink.setVisible(false);
 		try {
-			vault.get().changePassphrase(oldPasswordField.getCharacters(), newPasswordField.getCharacters());
+			vault.changePassphrase(oldPasswordField.getCharacters(), newPasswordField.getCharacters());
 			messageText.setText(localization.getString("changePassword.infoMessage.success"));
 			listener.ifPresent(this::invokeListenerLater);
 		} catch (InvalidPassphraseException e) {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java
index 2989e9eaf..9a61f28c9 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java
@@ -13,6 +13,7 @@ import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.net.URL;
 import java.nio.file.FileAlreadyExistsException;
+import java.util.Objects;
 import java.util.Optional;
 
 import javax.inject.Inject;
@@ -29,9 +30,7 @@ import org.slf4j.LoggerFactory;
 import javafx.application.Platform;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -44,9 +43,9 @@ public class InitializeController extends LocalizedFXMLViewController {
 	private static final Logger LOG = LoggerFactory.getLogger(InitializeController.class);
 
 	private final PasswordStrengthUtil strengthRater;
-	final ObjectProperty<Vault> vault = new SimpleObjectProperty<>();
-	private Optional<InitializationListener> listener = Optional.empty();
 	private final IntegerProperty passwordStrength = new SimpleIntegerProperty(); // 0-4
+	private Optional<InitializationListener> listener = Optional.empty();
+	private Vault vault;
 
 	@Inject
 	public InitializeController(Localization localization, PasswordStrengthUtil strengthRater) {
@@ -88,7 +87,6 @@ public class InitializeController extends LocalizedFXMLViewController {
 	public void initialize() {
 		BooleanBinding passwordIsEmpty = passwordField.textProperty().isEmpty();
 		BooleanBinding passwordsDiffer = passwordField.textProperty().isNotEqualTo(retypePasswordField.textProperty());
-		EasyBind.subscribe(vault, this::vaultDidChange);
 		okButton.disableProperty().bind(passwordIsEmpty.or(passwordsDiffer));
 		passwordStrength.bind(EasyBind.map(passwordField.textProperty(), strengthRater::computeRate));
 
@@ -105,9 +103,10 @@ public class InitializeController extends LocalizedFXMLViewController {
 		return getClass().getResource("/fxml/initialize.fxml");
 	}
 
-	private void vaultDidChange(Vault newVault) {
-		passwordField.clear();
-		retypePasswordField.clear();
+	void setVault(Vault vault) {
+		this.vault = Objects.requireNonNull(vault);
+		passwordField.swipe();
+		retypePasswordField.swipe();
 		// trigger "default" change to refresh key bindings:
 		okButton.setDefaultButton(false);
 		okButton.setDefaultButton(true);
@@ -121,7 +120,7 @@ public class InitializeController extends LocalizedFXMLViewController {
 	protected void initializeVault(ActionEvent event) {
 		final CharSequence passphrase = passwordField.getCharacters();
 		try {
-			vault.get().create(passphrase);
+			vault.create(passphrase);
 			listener.ifPresent(this::invokeListenerLater);
 		} catch (FileAlreadyExistsException ex) {
 			messageLabel.setText(localization.getString("initialize.messageLabel.alreadyInitialized"));
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
index 478c6be6b..9c9c194ba 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java
@@ -315,7 +315,8 @@ public class MainController extends LocalizedFXMLViewController {
 
 	private void showInitializeView() {
 		final InitializeController ctrl = initializeController.get();
-		ctrl.vault.bind(selectedVault);
+		ctrl.loadFxml();
+		ctrl.setVault(selectedVault.get());
 		ctrl.setListener(this::didInitialize);
 		activeController.set(ctrl);
 	}
@@ -326,7 +327,8 @@ public class MainController extends LocalizedFXMLViewController {
 
 	private void showUpgradeView() {
 		final UpgradeController ctrl = upgradeController.get();
-		ctrl.vault.bind(selectedVault);
+		ctrl.loadFxml();
+		ctrl.setVault(selectedVault.get());
 		ctrl.setListener(this::didUpgrade);
 		activeController.set(ctrl);
 	}
@@ -337,7 +339,8 @@ public class MainController extends LocalizedFXMLViewController {
 
 	private void showUnlockView() {
 		final UnlockController ctrl = unlockController.get();
-		ctrl.vault.bind(selectedVault);
+		ctrl.loadFxml();
+		ctrl.setVault(selectedVault.get());
 		ctrl.setListener(this::didUnlock);
 		activeController.set(ctrl);
 	}
@@ -353,6 +356,7 @@ public class MainController extends LocalizedFXMLViewController {
 		final UnlockedController ctrl = unlockedVaults.computeIfAbsent(vault, k -> {
 			return unlockedControllerProvider.get();
 		});
+		ctrl.loadFxml();
 		ctrl.setVault(vault);
 		ctrl.setListener(this::didLock);
 		activeController.set(ctrl);
@@ -368,7 +372,8 @@ public class MainController extends LocalizedFXMLViewController {
 
 	private void showChangePasswordView() {
 		final ChangePasswordController ctrl = changePasswordController.get();
-		ctrl.vault.bind(selectedVault);
+		ctrl.loadFxml();
+		ctrl.setVault(selectedVault.get());
 		ctrl.setListener(this::didChangePassword);
 		activeController.set(ctrl);
 	}
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
index d17175dc7..e5fe09fe4 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
@@ -9,7 +9,9 @@
 package org.cryptomator.ui.controllers;
 
 import java.net.URL;
+import java.util.Arrays;
 import java.util.Comparator;
+import java.util.Objects;
 import java.util.Optional;
 
 import javax.inject.Inject;
@@ -22,25 +24,24 @@ import org.cryptomator.frontend.CommandFailedException;
 import org.cryptomator.frontend.FrontendCreationFailedException;
 import org.cryptomator.frontend.FrontendFactory;
 import org.cryptomator.frontend.webdav.mount.WindowsDriveLetters;
+import org.cryptomator.keychain.KeychainAccess;
 import org.cryptomator.ui.controls.SecPasswordField;
 import org.cryptomator.ui.model.Vault;
 import org.cryptomator.ui.settings.Localization;
 import org.cryptomator.ui.settings.Settings;
 import org.cryptomator.ui.util.AsyncTaskService;
-import org.fxmisc.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import dagger.Lazy;
 import javafx.application.Application;
 import javafx.application.Platform;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
+import javafx.scene.control.CheckBox;
 import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
@@ -61,22 +62,34 @@ public class UnlockController extends LocalizedFXMLViewController {
 	private final Settings settings;
 	private final WindowsDriveLetters driveLetters;
 	private final ChangeListener<Character> driveLetterChangeListener = this::winDriveLetterDidChange;
-	final ObjectProperty<Vault> vault = new SimpleObjectProperty<>();
+	private final Optional<KeychainAccess> keychainAccess;
+	private Vault vault;
 	private Optional<UnlockListener> listener = Optional.empty();
 
 	@Inject
-	public UnlockController(Application app, Localization localization, AsyncTaskService asyncTaskService, Lazy<FrontendFactory> frontendFactory, Settings settings, WindowsDriveLetters driveLetters) {
+	public UnlockController(Application app, Localization localization, AsyncTaskService asyncTaskService, Lazy<FrontendFactory> frontendFactory, Settings settings, WindowsDriveLetters driveLetters,
+			Optional<KeychainAccess> keychainAccess) {
 		super(localization);
 		this.app = app;
 		this.asyncTaskService = asyncTaskService;
 		this.frontendFactory = frontendFactory;
 		this.settings = settings;
 		this.driveLetters = driveLetters;
+		this.keychainAccess = keychainAccess;
 	}
 
 	@FXML
 	private SecPasswordField passwordField;
 
+	@FXML
+	private Button advancedOptionsButton;
+
+	@FXML
+	private Button unlockButton;
+
+	@FXML
+	private CheckBox savePassword;
+
 	@FXML
 	private TextField mountName;
 
@@ -86,12 +99,6 @@ public class UnlockController extends LocalizedFXMLViewController {
 	@FXML
 	private ChoiceBox<Character> winDriveLetter;
 
-	@FXML
-	private Button advancedOptionsButton;
-
-	@FXML
-	private Button unlockButton;
-
 	@FXML
 	private ProgressIndicator progressIndicator;
 
@@ -107,8 +114,10 @@ public class UnlockController extends LocalizedFXMLViewController {
 	@Override
 	public void initialize() {
 		advancedOptions.managedProperty().bind(advancedOptions.visibleProperty());
+		unlockButton.disableProperty().bind(passwordField.textProperty().isEmpty());
 		mountName.addEventFilter(KeyEvent.KEY_TYPED, this::filterAlphanumericKeyEvents);
 		mountName.textProperty().addListener(this::mountNameDidChange);
+		savePassword.setDisable(!keychainAccess.isPresent());
 		if (SystemUtils.IS_OS_WINDOWS) {
 			winDriveLetter.setConverter(new WinDriveLetterLabelConverter());
 		} else {
@@ -117,9 +126,6 @@ public class UnlockController extends LocalizedFXMLViewController {
 			winDriveLetter.setVisible(false);
 			winDriveLetter.setManaged(false);
 		}
-		unlockButton.disableProperty().bind(passwordField.textProperty().isEmpty());
-
-		EasyBind.subscribe(vault, this::vaultDidChange);
 	}
 
 	@Override
@@ -127,11 +133,15 @@ public class UnlockController extends LocalizedFXMLViewController {
 		return getClass().getResource("/fxml/unlock.fxml");
 	}
 
-	private void vaultDidChange(Vault newVault) {
-		if (newVault == null) {
+	void setVault(Vault vault) {
+		// trigger "default" change to refresh key bindings:
+		unlockButton.setDefaultButton(false);
+		unlockButton.setDefaultButton(true);
+		if (vault.equals(this.vault)) {
 			return;
 		}
-		passwordField.clear();
+		this.vault = Objects.requireNonNull(vault);
+		passwordField.swipe();
 		advancedOptions.setVisible(false);
 		advancedOptionsButton.setText(localization.getString("unlock.button.advancedOptions.show"));
 		progressIndicator.setVisible(false);
@@ -145,13 +155,21 @@ public class UnlockController extends LocalizedFXMLViewController {
 		}
 		downloadsPageLink.setVisible(false);
 		messageText.setText(null);
-		mountName.setText(newVault.getMountName());
+		mountName.setText(vault.getMountName());
 		if (SystemUtils.IS_OS_WINDOWS) {
 			chooseSelectedDriveLetter();
 		}
-		// trigger "default" change to refresh key bindings:
-		unlockButton.setDefaultButton(false);
-		unlockButton.setDefaultButton(true);
+		savePassword.setSelected(false);
+		// auto-fill pw from keychain:
+		if (keychainAccess.isPresent()) {
+			char[] storedPw = keychainAccess.get().loadPassphrase(vault.getId());
+			if (storedPw != null) {
+				savePassword.setSelected(true);
+				passwordField.setText(new String(storedPw));
+				passwordField.selectRange(storedPw.length, storedPw.length);
+				Arrays.fill(storedPw, ' ');
+			}
+		}
 	}
 
 	// ****************************************
@@ -188,14 +206,11 @@ public class UnlockController extends LocalizedFXMLViewController {
 	}
 
 	private void mountNameDidChange(ObservableValue<? extends String> property, String oldValue, String newValue) {
-		if (vault.get() == null) {
-			return;
-		}
 		// newValue is guaranteed to be a-z0-9_, see #filterAlphanumericKeyEvents
 		if (newValue.isEmpty()) {
-			mountName.setText(vault.get().getMountName());
+			mountName.setText(vault.getMountName());
 		} else {
-			vault.get().setMountName(newValue);
+			vault.setMountName(newValue);
 		}
 	}
 
@@ -242,20 +257,17 @@ public class UnlockController extends LocalizedFXMLViewController {
 	}
 
 	private void winDriveLetterDidChange(ObservableValue<? extends Character> property, Character oldValue, Character newValue) {
-		if (vault.get() == null) {
-			return;
-		}
-		vault.get().setWinDriveLetter(newValue);
+		vault.setWinDriveLetter(newValue);
 		settings.save();
 	}
 
 	private void chooseSelectedDriveLetter() {
 		assert SystemUtils.IS_OS_WINDOWS;
 		// if the vault prefers a drive letter, that is currently occupied, this is our last chance to reset this:
-		if (driveLetters.getOccupiedDriveLetters().contains(vault.get().getWinDriveLetter())) {
-			vault.get().setWinDriveLetter(null);
+		if (driveLetters.getOccupiedDriveLetters().contains(vault.getWinDriveLetter())) {
+			vault.setWinDriveLetter(null);
 		}
-		final Character letter = vault.get().getWinDriveLetter();
+		final Character letter = vault.getWinDriveLetter();
 		if (letter == null) {
 			// first option is known to be 'auto-assign' due to #WinDriveLetterComparator.
 			this.winDriveLetter.getSelectionModel().selectFirst();
@@ -275,10 +287,10 @@ public class UnlockController extends LocalizedFXMLViewController {
 		progressIndicator.setVisible(true);
 		downloadsPageLink.setVisible(false);
 		CharSequence password = passwordField.getCharacters();
-		asyncTaskService.asyncTaskOf(() -> this.unlock(vault.get(), password)).run();
+		asyncTaskService.asyncTaskOf(() -> this.unlock(password)).run();
 	}
 
-	private void unlock(Vault vault, CharSequence password) {
+	private void unlock(CharSequence password) {
 		try {
 			vault.activateFrontend(frontendFactory.get(), settings, password);
 			vault.reveal();
@@ -286,9 +298,15 @@ public class UnlockController extends LocalizedFXMLViewController {
 				messageText.setText(null);
 				listener.ifPresent(lstnr -> lstnr.didUnlock(vault));
 			});
+			if (keychainAccess.isPresent() && savePassword.isSelected()) {
+				keychainAccess.get().storePassphrase(vault.getId(), password);
+			} else {
+				passwordField.swipe();
+			}
 		} catch (InvalidPassphraseException e) {
 			Platform.runLater(() -> {
 				messageText.setText(localization.getString("unlock.errorMessage.wrongPassword"));
+				passwordField.selectAll();
 				passwordField.requestFocus();
 			});
 		} catch (UnsupportedVaultFormatException e) {
@@ -307,7 +325,6 @@ public class UnlockController extends LocalizedFXMLViewController {
 			});
 		} finally {
 			Platform.runLater(() -> {
-				passwordField.swipe();
 				mountName.setDisable(false);
 				advancedOptionsButton.setDisable(false);
 				progressIndicator.setVisible(false);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java
index a34e2aeb6..8e6a4e97f 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java
@@ -27,11 +27,11 @@ import javafx.scene.control.ProgressIndicator;
 
 public class UpgradeController extends LocalizedFXMLViewController {
 
-	final ObjectProperty<Vault> vault = new SimpleObjectProperty<>();
-	final ObjectProperty<Optional<UpgradeStrategy>> strategy = new SimpleObjectProperty<>();
+	private final ObjectProperty<Optional<UpgradeStrategy>> strategy = new SimpleObjectProperty<>();
 	private final UpgradeStrategies strategies;
 	private final AsyncTaskService asyncTaskService;
 	private Optional<UpgradeListener> listener = Optional.empty();
+	private Vault vault;
 
 	@Inject
 	public UpgradeController(Localization localization, UpgradeStrategies strategies, AsyncTaskService asyncTaskService) {
@@ -67,8 +67,6 @@ public class UpgradeController extends LocalizedFXMLViewController {
 		BooleanExpression passwordProvided = passwordField.textProperty().isNotEmpty().and(passwordField.disabledProperty().not());
 		BooleanExpression syncFinished = confirmationCheckbox.selectedProperty();
 		upgradeButton.disableProperty().bind(passwordProvided.not().or(syncFinished.not()));
-
-		EasyBind.subscribe(vault, this::vaultDidChange);
 	}
 
 	@Override
@@ -76,9 +74,10 @@ public class UpgradeController extends LocalizedFXMLViewController {
 		return getClass().getResource("/fxml/upgrade.fxml");
 	}
 
-	private void vaultDidChange(Vault newVault) {
+	void setVault(Vault vault) {
+		this.vault = Objects.requireNonNull(vault);
 		errorLabel.setText(null);
-		strategy.set(strategies.getUpgradeStrategy(newVault));
+		strategy.set(strategies.getUpgradeStrategy(vault));
 		// trigger "default" change to refresh key bindings:
 		upgradeButton.setDefaultButton(false);
 		upgradeButton.setDefaultButton(true);
@@ -89,7 +88,7 @@ public class UpgradeController extends LocalizedFXMLViewController {
 	// ****************************************
 
 	private String upgradeNotification(UpgradeStrategy instruction) {
-		return instruction.getNotification(vault.get());
+		return instruction.getNotification(vault);
 	}
 
 	// ****************************************
@@ -102,15 +101,14 @@ public class UpgradeController extends LocalizedFXMLViewController {
 	}
 
 	private void upgrade(UpgradeStrategy instruction) {
-		Vault v = Objects.requireNonNull(vault.getValue());
 		passwordField.setDisable(true);
 		progressIndicator.setVisible(true);
 		asyncTaskService //
 				.asyncTaskOf(() -> {
-					if (!instruction.isApplicable(v)) {
-						throw new IllegalStateException("No ugprade needed for " + v.path().getValue());
+					if (!instruction.isApplicable(vault)) {
+						throw new IllegalStateException("No ugprade needed for " + vault.path().getValue());
 					}
-					instruction.upgrade(v, passwordField.getCharacters());
+					instruction.upgrade(vault, passwordField.getCharacters());
 				}) //
 				.onSuccess(this::showNextUpgrade) //
 				.onError(UpgradeFailedException.class, e -> {
@@ -125,7 +123,7 @@ public class UpgradeController extends LocalizedFXMLViewController {
 
 	private void showNextUpgrade() {
 		errorLabel.setText(null);
-		Optional<UpgradeStrategy> nextStrategy = strategies.getUpgradeStrategy(vault.getValue());
+		Optional<UpgradeStrategy> nextStrategy = strategies.getUpgradeStrategy(vault);
 		if (nextStrategy.isPresent()) {
 			strategy.set(nextStrategy);
 		} else {
diff --git a/main/ui/src/main/resources/fxml/unlock.fxml b/main/ui/src/main/resources/fxml/unlock.fxml
index 851d33fc9..0a8ea2fb8 100644
--- a/main/ui/src/main/resources/fxml/unlock.fxml
+++ b/main/ui/src/main/resources/fxml/unlock.fxml
@@ -68,12 +68,16 @@
 			</HBox>
 			
 			<!-- Row 3.1 -->
-			<Label text="%unlock.label.mountName" GridPane.rowIndex="1" GridPane.columnIndex="0" cacheShape="true" cache="true" />
-			<TextField fx:id="mountName" GridPane.rowIndex="1" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
+			<Label GridPane.rowIndex="1" GridPane.columnIndex="0" text="%unlock.label.savePassword" cacheShape="true" cache="true" />
+			<CheckBox GridPane.rowIndex="1" GridPane.columnIndex="1" fx:id="savePassword" cacheShape="true" cache="true" />
 			
 			<!-- Row 3.2 -->
-			<Label fx:id="winDriveLetterLabel" text="%unlock.label.winDriveLetter" GridPane.rowIndex="2" GridPane.columnIndex="0" cacheShape="true" cache="true" />
-			<ChoiceBox fx:id="winDriveLetter" GridPane.rowIndex="2" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
+			<Label GridPane.rowIndex="2" GridPane.columnIndex="0" text="%unlock.label.mountName"  cacheShape="true" cache="true" />
+			<TextField GridPane.rowIndex="2" GridPane.columnIndex="1" fx:id="mountName"  GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
+			
+			<!-- Row 3.3 -->
+			<Label GridPane.rowIndex="3" GridPane.columnIndex="0" fx:id="winDriveLetterLabel" text="%unlock.label.winDriveLetter" cacheShape="true" cache="true" />
+			<ChoiceBox GridPane.rowIndex="3" GridPane.columnIndex="1" fx:id="winDriveLetter" GridPane.hgrow="ALWAYS" maxWidth="Infinity" cacheShape="true" cache="true" />
 		</GridPane>
 		
 		<!-- Row 4 -->
diff --git a/main/ui/src/main/resources/localization/en.txt b/main/ui/src/main/resources/localization/en.txt
index ec6c8f6bf..1e72c083e 100644
--- a/main/ui/src/main/resources/localization/en.txt
+++ b/main/ui/src/main/resources/localization/en.txt
@@ -49,6 +49,7 @@ upgrade.version3to4.err.io=Migration failed due to an I/O Exception. See log fil
 
 # unlock.fxml
 unlock.label.password=Password
+unlock.label.savePassword=Save password
 unlock.label.mountName=Drive name
 unlock.label.winDriveLetter=Drive letter
 unlock.label.downloadsPageLink=All Cryptomator versions

From 0983120712ab20878f863ebad3843360053e8fab Mon Sep 17 00:00:00 2001
From: Markus Kreusch <mail@markuskreusch.de>
Date: Fri, 2 Sep 2016 19:21:54 +0200
Subject: [PATCH 25/45] Removed Syso logging

---
 .../src/main/java/org/cryptomator/frontend/webdav/Tarpit.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/Tarpit.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/Tarpit.java
index 14c528fef..0c40d7e0f 100644
--- a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/Tarpit.java
+++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/Tarpit.java
@@ -32,12 +32,12 @@ class Tarpit implements Serializable {
 	private final Set<FrontendId> validFrontendIds = synchronizedSet(new HashSet<>());
 
 	@Inject
-	public Tarpit() {}
+	public Tarpit() {
+	}
 
 	public void setValidFrontendIds(Collection<FrontendId> validFrontendIds) {
 		this.validFrontendIds.retainAll(validFrontendIds);
 		this.validFrontendIds.addAll(validFrontendIds);
-		validFrontendIds.forEach(System.out::println);
 	}
 
 	public void handle(HttpServletRequest req) {

From c1611a12ed1e3ed0fb028b1719a7c3486bc011b2 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Sat, 3 Sep 2016 23:04:53 +0200
Subject: [PATCH 26/45] implemented Windows keychain

---
 main/keychain/pom.xml                         |   9 +
 .../cryptomator/keychain/KeychainModule.java  |   6 +-
 .../keychain/MacSystemKeychainAccess.java     |  12 +-
 .../WindowsProtectedKeychainAccess.java       | 188 ++++++++++++++++++
 .../keychain/WindowsSystemKeychainAccess.java |  51 -----
 .../keychain/KeychainModuleTest.java          |   2 +-
 .../keychain/MapKeychainAccess.java           |   3 +-
 .../cryptomator/keychain/TestJniModule.java   |  23 +++
 ...ponent.java => TestKeychainComponent.java} |   2 +-
 ...estModule.java => TestKeychainModule.java} |   4 +-
 .../WindowsProtectedKeychainAccessTest.java   |  60 ++++++
 main/keychain/src/test/resources/log4j2.xml   |  33 +++
 main/pom.xml                                  |   2 +-
 .../org/cryptomator/ui/CryptomatorModule.java |  10 +-
 14 files changed, 330 insertions(+), 75 deletions(-)
 create mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java
 delete mode 100644 main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java
 create mode 100644 main/keychain/src/test/java/org/cryptomator/keychain/TestJniModule.java
 rename main/keychain/src/test/java/org/cryptomator/keychain/{KeychainComponent.java => TestKeychainComponent.java} (86%)
 rename main/keychain/src/test/java/org/cryptomator/keychain/{KeychainTestModule.java => TestKeychainModule.java} (62%)
 create mode 100644 main/keychain/src/test/java/org/cryptomator/keychain/WindowsProtectedKeychainAccessTest.java
 create mode 100644 main/keychain/src/test/resources/log4j2.xml

diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml
index 1983d5873..5c96a8aad 100644
--- a/main/keychain/pom.xml
+++ b/main/keychain/pom.xml
@@ -13,6 +13,15 @@
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>com.google.code.gson</groupId>
+			<artifactId>gson</artifactId>
+			<version>2.7</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk15on</artifactId>
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
index ab593f674..3f2cf6abc 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainModule.java
@@ -3,18 +3,20 @@ package org.cryptomator.keychain;
 import java.util.Optional;
 import java.util.Set;
 
+import org.cryptomator.jni.JniModule;
+
 import com.google.common.collect.Sets;
 
 import dagger.Module;
 import dagger.Provides;
 import dagger.multibindings.ElementsIntoSet;
 
-@Module
+@Module(includes = {JniModule.class})
 public class KeychainModule {
 
 	@Provides
 	@ElementsIntoSet
-	Set<KeychainAccessStrategy> provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsSystemKeychainAccess winKeychain) {
+	Set<KeychainAccessStrategy> provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsProtectedKeychainAccess winKeychain) {
 		return Sets.newHashSet(macKeychain, winKeychain);
 	}
 
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
index a80d084ef..5e8b27b6c 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/MacSystemKeychainAccess.java
@@ -1,21 +1,21 @@
 package org.cryptomator.keychain;
 
+import java.util.Optional;
+
 import javax.inject.Inject;
-import javax.inject.Singleton;
 
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.jni.JniModule;
+import org.cryptomator.jni.MacFunctions;
 import org.cryptomator.jni.MacKeychainAccess;
 
-@Singleton
 class MacSystemKeychainAccess implements KeychainAccessStrategy {
 
 	private final MacKeychainAccess keychain;
 
 	@Inject
-	public MacSystemKeychainAccess() {
-		if (JniModule.macFunctions().isPresent()) {
-			this.keychain = JniModule.macFunctions().get().getKeychainAccess();
+	public MacSystemKeychainAccess(Optional<MacFunctions> macFunctions) {
+		if (macFunctions.isPresent()) {
+			this.keychain = macFunctions.get().keychainAccess();
 		} else {
 			this.keychain = null;
 		}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java
new file mode 100644
index 000000000..205772d15
--- /dev/null
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java
@@ -0,0 +1,188 @@
+package org.cryptomator.keychain;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.UncheckedIOException;
+import java.io.Writer;
+import java.lang.reflect.Type;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+import javax.inject.Inject;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.jni.WinDataProtection;
+import org.cryptomator.jni.WinFunctions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.reflect.TypeToken;
+
+class WindowsProtectedKeychainAccess implements KeychainAccessStrategy {
+
+	private static final Logger LOG = LoggerFactory.getLogger(WindowsProtectedKeychainAccess.class);
+	private static final Gson GSON = new GsonBuilder().setPrettyPrinting() //
+			.registerTypeHierarchyAdapter(byte[].class, new ByteArrayJsonAdapter()) //
+			.disableHtmlEscaping().create();
+
+	private final WinDataProtection dataProtection;
+	private final Path keychainPath;
+	private Map<String, KeychainEntry> keychainEntries;
+
+	@Inject
+	public WindowsProtectedKeychainAccess(Optional<WinFunctions> winFunctions) {
+		if (winFunctions.isPresent()) {
+			this.dataProtection = winFunctions.get().dataProtection();
+		} else {
+			this.dataProtection = null;
+		}
+		final String keychainPathProperty = System.getProperty("cryptomator.keychainPath");
+		if (dataProtection != null && keychainPathProperty == null) {
+			LOG.warn("Windows DataProtection module loaded, but no keychainPath configured.");
+		}
+		if (keychainPathProperty != null) {
+			this.keychainPath = FileSystems.getDefault().getPath(keychainPathProperty);
+		} else {
+			this.keychainPath = null;
+		}
+	}
+
+	@Override
+	public void storePassphrase(String key, CharSequence passphrase) {
+		loadKeychainEntriesIfNeeded();
+		ByteBuffer buf = UTF_8.encode(CharBuffer.wrap(passphrase));
+		byte[] cleartext = new byte[buf.remaining()];
+		buf.get(cleartext);
+		KeychainEntry entry = new KeychainEntry();
+		entry.salt = generateSalt();
+		entry.ciphertext = dataProtection.protect(cleartext, entry.salt);
+		Arrays.fill(buf.array(), (byte) 0x00);
+		Arrays.fill(cleartext, (byte) 0x00);
+		keychainEntries.put(key, entry);
+		saveKeychainEntries();
+	}
+
+	@Override
+	public char[] loadPassphrase(String key) {
+		loadKeychainEntriesIfNeeded();
+		KeychainEntry entry = keychainEntries.get(key);
+		if (entry == null) {
+			return null;
+		}
+		byte[] cleartext = dataProtection.unprotect(entry.ciphertext, entry.salt);
+		if (cleartext == null) {
+			return null;
+		}
+		CharBuffer buf = UTF_8.decode(ByteBuffer.wrap(cleartext));
+		char[] passphrase = new char[buf.remaining()];
+		buf.get(passphrase);
+		Arrays.fill(cleartext, (byte) 0x00);
+		Arrays.fill(buf.array(), (char) 0x00);
+		return passphrase;
+	}
+
+	@Override
+	public void deletePassphrase(String key) {
+		loadKeychainEntriesIfNeeded();
+		keychainEntries.remove(key);
+		saveKeychainEntries();
+	}
+
+	@Override
+	public boolean isSupported() {
+		return SystemUtils.IS_OS_WINDOWS && dataProtection != null && keychainPath != null;
+	}
+
+	private byte[] generateSalt() {
+		byte[] result = new byte[2 * Long.BYTES];
+		UUID uuid = UUID.randomUUID();
+		ByteBuffer buf = ByteBuffer.wrap(result);
+		buf.putLong(uuid.getMostSignificantBits());
+		buf.putLong(uuid.getLeastSignificantBits());
+		return result;
+	}
+
+	private void loadKeychainEntriesIfNeeded() {
+		if (keychainEntries == null) {
+			loadKeychainEntries();
+		}
+		assert keychainEntries != null;
+	}
+
+	private void loadKeychainEntries() {
+		Type type = new TypeToken<Map<String, KeychainEntry>>() {
+		}.getType();
+		try (InputStream in = Files.newInputStream(keychainPath, StandardOpenOption.READ); //
+				Reader reader = new InputStreamReader(in, UTF_8)) {
+			keychainEntries = GSON.fromJson(reader, type);
+		} catch (JsonParseException | NoSuchFileException e) {
+			LOG.info("Creating new keychain at path {}", keychainPath);
+		} catch (IOException e) {
+			throw new UncheckedIOException("Could not read keychain from path " + keychainPath, e);
+		}
+		if (keychainEntries == null) {
+			keychainEntries = new HashMap<>();
+		}
+	}
+
+	private void saveKeychainEntries() {
+		try (OutputStream out = Files.newOutputStream(keychainPath, StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); //
+				Writer writer = new OutputStreamWriter(out, UTF_8)) {
+			GSON.toJson(keychainEntries, writer);
+		} catch (IOException e) {
+			throw new UncheckedIOException("Could not read keychain from path " + keychainPath, e);
+		}
+	}
+
+	private static class KeychainEntry {
+		@SerializedName("ciphertext")
+		byte[] ciphertext;
+		@SerializedName("salt")
+		byte[] salt;
+	}
+
+	private static class ByteArrayJsonAdapter implements JsonSerializer<byte[]>, JsonDeserializer<byte[]> {
+
+		private static final Base64 BASE64 = new Base64();
+
+		@Override
+		public byte[] deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+			return BASE64.decode(json.getAsString().getBytes(StandardCharsets.UTF_8));
+		}
+
+		@Override
+		public JsonElement serialize(byte[] src, Type typeOfSrc, JsonSerializationContext context) {
+			return new JsonPrimitive(new String(BASE64.encode(src), StandardCharsets.UTF_8));
+		}
+
+	}
+
+}
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java
deleted file mode 100644
index 47d56953c..000000000
--- a/main/keychain/src/main/java/org/cryptomator/keychain/WindowsSystemKeychainAccess.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.cryptomator.keychain;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.commons.lang3.SystemUtils;
-
-@Singleton
-class WindowsSystemKeychainAccess implements KeychainAccessStrategy {
-
-	private final KeyStore keyStore;
-
-	@Inject
-	public WindowsSystemKeychainAccess() {
-		KeyStore ks;
-		try {
-			ks = KeyStore.getInstance("Windows-MY", "SunMSCAPI");
-			ks.load(null);
-		} catch (GeneralSecurityException | IOException e) {
-			ks = null;
-		}
-		this.keyStore = ks;
-	}
-
-	@Override
-	public void storePassphrase(String key, CharSequence passphrase) {
-		// TODO Auto-generated method stub
-	}
-
-	@Override
-	public char[] loadPassphrase(String key) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public void deletePassphrase(String key) {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public boolean isSupported() {
-		return SystemUtils.IS_OS_WINDOWS && keyStore != null;
-	}
-
-}
diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/KeychainModuleTest.java b/main/keychain/src/test/java/org/cryptomator/keychain/KeychainModuleTest.java
index c15c8c1f1..2d8fe4e9e 100644
--- a/main/keychain/src/test/java/org/cryptomator/keychain/KeychainModuleTest.java
+++ b/main/keychain/src/test/java/org/cryptomator/keychain/KeychainModuleTest.java
@@ -9,7 +9,7 @@ public class KeychainModuleTest {
 
 	@Test
 	public void testGetKeychain() {
-		Optional<KeychainAccess> keychainAccess = DaggerKeychainComponent.builder().keychainModule(new KeychainTestModule()).build().keychainAccess();
+		Optional<KeychainAccess> keychainAccess = DaggerTestKeychainComponent.builder().jniModule(new TestJniModule()).keychainModule(new TestKeychainModule()).build().keychainAccess();
 		Assert.assertTrue(keychainAccess.isPresent());
 		Assert.assertTrue(keychainAccess.get() instanceof MapKeychainAccess);
 	}
diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java b/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java
index 081a0b0e6..8b3bb3e07 100644
--- a/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java
+++ b/main/keychain/src/test/java/org/cryptomator/keychain/MapKeychainAccess.java
@@ -23,8 +23,7 @@ class MapKeychainAccess implements KeychainAccessStrategy {
 
 	@Override
 	public void deletePassphrase(String key) {
-		// TODO Auto-generated method stub
-
+		map.remove(key);
 	}
 
 	@Override
diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/TestJniModule.java b/main/keychain/src/test/java/org/cryptomator/keychain/TestJniModule.java
new file mode 100644
index 000000000..79d770b57
--- /dev/null
+++ b/main/keychain/src/test/java/org/cryptomator/keychain/TestJniModule.java
@@ -0,0 +1,23 @@
+package org.cryptomator.keychain;
+
+import java.util.Optional;
+
+import org.cryptomator.jni.JniModule;
+import org.cryptomator.jni.MacFunctions;
+import org.cryptomator.jni.WinFunctions;
+
+import dagger.Lazy;
+
+public class TestJniModule extends JniModule {
+
+	@Override
+	public Optional<WinFunctions> winFunctions(Lazy<WinFunctions> winFunction) {
+		return Optional.empty();
+	}
+
+	@Override
+	public Optional<MacFunctions> macFunctions(Lazy<MacFunctions> winFunction) {
+		return Optional.empty();
+	}
+
+}
diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/KeychainComponent.java b/main/keychain/src/test/java/org/cryptomator/keychain/TestKeychainComponent.java
similarity index 86%
rename from main/keychain/src/test/java/org/cryptomator/keychain/KeychainComponent.java
rename to main/keychain/src/test/java/org/cryptomator/keychain/TestKeychainComponent.java
index 44301ed7f..30e42ee52 100644
--- a/main/keychain/src/test/java/org/cryptomator/keychain/KeychainComponent.java
+++ b/main/keychain/src/test/java/org/cryptomator/keychain/TestKeychainComponent.java
@@ -8,7 +8,7 @@ import dagger.Component;
 
 @Singleton
 @Component(modules = KeychainModule.class)
-interface KeychainComponent {
+interface TestKeychainComponent {
 
 	Optional<KeychainAccess> keychainAccess();
 
diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/KeychainTestModule.java b/main/keychain/src/test/java/org/cryptomator/keychain/TestKeychainModule.java
similarity index 62%
rename from main/keychain/src/test/java/org/cryptomator/keychain/KeychainTestModule.java
rename to main/keychain/src/test/java/org/cryptomator/keychain/TestKeychainModule.java
index e2636981b..4bb403906 100644
--- a/main/keychain/src/test/java/org/cryptomator/keychain/KeychainTestModule.java
+++ b/main/keychain/src/test/java/org/cryptomator/keychain/TestKeychainModule.java
@@ -4,10 +4,10 @@ import java.util.Set;
 
 import com.google.common.collect.Sets;
 
-public class KeychainTestModule extends KeychainModule {
+public class TestKeychainModule extends KeychainModule {
 
 	@Override
-	Set<KeychainAccessStrategy> provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsSystemKeychainAccess winKeychain) {
+	Set<KeychainAccessStrategy> provideKeychainAccessStrategies(MacSystemKeychainAccess macKeychain, WindowsProtectedKeychainAccess winKeychain) {
 		return Sets.newHashSet(new MapKeychainAccess());
 	}
 
diff --git a/main/keychain/src/test/java/org/cryptomator/keychain/WindowsProtectedKeychainAccessTest.java b/main/keychain/src/test/java/org/cryptomator/keychain/WindowsProtectedKeychainAccessTest.java
new file mode 100644
index 000000000..9b3fd94e8
--- /dev/null
+++ b/main/keychain/src/test/java/org/cryptomator/keychain/WindowsProtectedKeychainAccessTest.java
@@ -0,0 +1,60 @@
+package org.cryptomator.keychain;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Optional;
+
+import org.cryptomator.jni.WinDataProtection;
+import org.cryptomator.jni.WinFunctions;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Mockito;
+import org.mockito.stubbing.Answer;
+
+public class WindowsProtectedKeychainAccessTest {
+
+	@Rule
+	public final ExpectedException thrown = ExpectedException.none();
+
+	private Path tmpFile;
+	private WindowsProtectedKeychainAccess keychain;
+
+	@Before
+	public void setup() throws IOException, ReflectiveOperationException {
+		tmpFile = Files.createTempFile("unit-tests", ".tmp");
+		System.setProperty("cryptomator.keychainPath", tmpFile.toAbsolutePath().normalize().toString());
+		WinFunctions winFunctions = Mockito.mock(WinFunctions.class);
+		WinDataProtection winDataProtection = Mockito.mock(WinDataProtection.class);
+		Mockito.when(winFunctions.dataProtection()).thenReturn(winDataProtection);
+		Answer<byte[]> answerReturningFirstArg = invocation -> invocation.getArgumentAt(0, byte[].class).clone();
+		Mockito.when(winDataProtection.protect(Mockito.any(), Mockito.any())).thenAnswer(answerReturningFirstArg);
+		Mockito.when(winDataProtection.unprotect(Mockito.any(), Mockito.any())).thenAnswer(answerReturningFirstArg);
+		keychain = new WindowsProtectedKeychainAccess(Optional.of(winFunctions));
+	}
+
+	@After
+	public void teardown() throws IOException {
+		Files.deleteIfExists(tmpFile);
+	}
+
+	@Test
+	public void testStoreAndLoad() {
+		String storedPw1 = "topSecret";
+		String storedPw2 = "bottomSecret";
+		keychain.storePassphrase("myPassword", storedPw1);
+		keychain.storePassphrase("myOtherPassword", storedPw2);
+		String loadedPw1 = new String(keychain.loadPassphrase("myPassword"));
+		String loadedPw2 = new String(keychain.loadPassphrase("myOtherPassword"));
+		Assert.assertEquals(storedPw1, loadedPw1);
+		Assert.assertEquals(storedPw2, loadedPw2);
+		keychain.deletePassphrase("myPassword");
+		Assert.assertNull(keychain.loadPassphrase("myPassword"));
+		Assert.assertNull(keychain.loadPassphrase("nonExistingPassword"));
+	}
+
+}
diff --git a/main/keychain/src/test/resources/log4j2.xml b/main/keychain/src/test/resources/log4j2.xml
new file mode 100644
index 000000000..39c2f8545
--- /dev/null
+++ b/main/keychain/src/test/resources/log4j2.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  Copyright (c) 2014 Markus Kreusch
+  This file is licensed under the terms of the MIT license.
+  See the LICENSE.txt file for more info.
+  
+  Contributors:
+      Sebastian Stenzel - log4j config for WebDAV unit tests
+-->
+<Configuration status="WARN">
+
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
+			<ThresholdFilter level="WARN" onMatch="DENY" onMismatch="ACCEPT" />
+		</Console>
+		<Console name="StdErr" target="SYSTEM_ERR">
+			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
+			<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY" />
+		</Console>
+	</Appenders>
+
+	<Loggers>
+		<!-- show our own debug messages: -->
+		<Logger name="org.cryptomator" level="DEBUG" />
+		<!-- mute dependencies: -->
+		<Root level="INFO">
+			<AppenderRef ref="Console" />
+			<AppenderRef ref="StdErr" />
+		</Root>
+	</Loggers>
+
+</Configuration>
diff --git a/main/pom.xml b/main/pom.xml
index 1a412a88a..4716aed5b 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -41,7 +41,7 @@
 		<commons-httpclient.version>3.1</commons-httpclient.version>
 		<jackson-databind.version>2.4.4</jackson-databind.version>
 		<mockito.version>1.10.19</mockito.version>
-		<dagger.version>2.4</dagger.version>
+		<dagger.version>2.6.1</dagger.version>
 	</properties>
 
 	<dependencyManagement>
diff --git a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
index 3de672b47..d4f5f7b38 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
@@ -10,7 +10,6 @@ package org.cryptomator.ui;
 
 import static java.util.stream.Collectors.toList;
 
-import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
@@ -24,7 +23,6 @@ import org.cryptomator.frontend.FrontendId;
 import org.cryptomator.frontend.webdav.WebDavModule;
 import org.cryptomator.frontend.webdav.WebDavServer;
 import org.cryptomator.jni.JniModule;
-import org.cryptomator.jni.MacFunctions;
 import org.cryptomator.keychain.KeychainModule;
 import org.cryptomator.ui.model.Vault;
 import org.cryptomator.ui.model.VaultObjectMapperProvider;
@@ -43,7 +41,7 @@ import javafx.application.Application;
 import javafx.beans.Observable;
 import javafx.stage.Stage;
 
-@Module(includes = {CryptoEngineModule.class, CommonsModule.class, WebDavModule.class, KeychainModule.class})
+@Module(includes = {CryptoEngineModule.class, CommonsModule.class, WebDavModule.class, KeychainModule.class, JniModule.class})
 class CryptomatorModule {
 
 	private static final Logger LOG = LoggerFactory.getLogger(CryptomatorModule.class);
@@ -111,12 +109,6 @@ class CryptomatorModule {
 		return closer.closeLater(webDavServer, WebDavServer::stop).get().orElseThrow(IllegalStateException::new);
 	}
 
-	@Provides
-	@Singleton
-	Optional<MacFunctions> provideMacFunctions() {
-		return JniModule.macFunctions();
-	}
-
 	private void setValidFrontendIds(WebDavServer webDavServer, Vaults vaults) {
 		webDavServer.setValidFrontendIds(vaults.stream() //
 				.map(Vault::getId).map(FrontendId::from).collect(toList()));

From 5c4bf2a207add4aeb9ccc94f2287dc69c1c5dd76 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastianstenzel@gmail.com>
Date: Sun, 4 Sep 2016 12:27:23 +0200
Subject: [PATCH 27/45] support home-relative paths for
 cryptomator.keychainPath

---
 .../keychain/WindowsProtectedKeychainAccess.java           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java b/main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java
index 205772d15..a0ced12eb 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java
@@ -64,11 +64,14 @@ class WindowsProtectedKeychainAccess implements KeychainAccessStrategy {
 		} else {
 			this.dataProtection = null;
 		}
-		final String keychainPathProperty = System.getProperty("cryptomator.keychainPath");
+		String keychainPathProperty = System.getProperty("cryptomator.keychainPath");
 		if (dataProtection != null && keychainPathProperty == null) {
-			LOG.warn("Windows DataProtection module loaded, but no keychainPath configured.");
+			LOG.warn("Windows DataProtection module loaded, but no cryptomator.keychainPath property found.");
 		}
 		if (keychainPathProperty != null) {
+			if (keychainPathProperty.startsWith("~/")) {
+				keychainPathProperty = SystemUtils.USER_HOME + keychainPathProperty.substring(1);
+			}
 			this.keychainPath = FileSystems.getDefault().getPath(keychainPathProperty);
 		} else {
 			this.keychainPath = null;

From a63bcfbaa269627887c553a8ddc1b77b033db7ae Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Sun, 4 Sep 2016 16:04:16 +0200
Subject: [PATCH 28/45] relaxed "vault not empty" check

---
 .../cryptomator/ui/controllers/InitializeController.java  | 6 ++++--
 main/ui/src/main/java/org/cryptomator/ui/model/Vault.java | 8 ++++++--
 main/ui/src/main/resources/localization/en.txt            | 1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java
index 9a61f28c9..d45cce37a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java
@@ -10,8 +10,8 @@
 package org.cryptomator.ui.controllers;
 
 import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.net.URL;
+import java.nio.file.DirectoryNotEmptyException;
 import java.nio.file.FileAlreadyExistsException;
 import java.util.Objects;
 import java.util.Optional;
@@ -124,7 +124,9 @@ public class InitializeController extends LocalizedFXMLViewController {
 			listener.ifPresent(this::invokeListenerLater);
 		} catch (FileAlreadyExistsException ex) {
 			messageLabel.setText(localization.getString("initialize.messageLabel.alreadyInitialized"));
-		} catch (UncheckedIOException | IOException ex) {
+		} catch (DirectoryNotEmptyException ex) {
+			messageLabel.setText(localization.getString("initialize.messageLabel.notEmpty"));
+		} catch (IOException ex) {
 			LOG.error("I/O Exception", ex);
 			messageLabel.setText(localization.getString("initialize.messageLabel.initializationFailed"));
 		} finally {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java b/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java
index 07c83530d..8c0c00fc3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java
@@ -12,6 +12,7 @@ import static org.apache.commons.lang3.StringUtils.stripStart;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
+import java.nio.file.DirectoryNotEmptyException;
 import java.nio.file.FileAlreadyExistsException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -30,6 +31,7 @@ import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.LazyInitializer;
 import org.cryptomator.common.Optionals;
 import org.cryptomator.crypto.engine.InvalidPassphraseException;
+import org.cryptomator.filesystem.File;
 import org.cryptomator.filesystem.FileSystem;
 import org.cryptomator.filesystem.charsets.NormalizedNameFileSystem;
 import org.cryptomator.filesystem.crypto.CryptoFileSystemDelegate;
@@ -109,8 +111,10 @@ public class Vault implements CryptoFileSystemDelegate {
 	public void create(CharSequence passphrase) throws IOException {
 		try {
 			FileSystem fs = getNioFileSystem();
-			if (fs.children().count() > 0) {
-				throw new FileAlreadyExistsException(null, null, "Vault location not empty.");
+			if (fs.files().map(File::name).filter(s -> s.endsWith(VAULT_FILE_EXTENSION)).count() > 0) {
+				throw new FileAlreadyExistsException("masterkey.cryptomator", null, "Vault location not empty.");
+			} else if (fs.folders().count() > 0) {
+				throw new DirectoryNotEmptyException(fs.toString());
 			}
 			cryptoFileSystemFactory.initializeNew(fs, passphrase);
 		} catch (UncheckedIOException e) {
diff --git a/main/ui/src/main/resources/localization/en.txt b/main/ui/src/main/resources/localization/en.txt
index 1e72c083e..984884574 100644
--- a/main/ui/src/main/resources/localization/en.txt
+++ b/main/ui/src/main/resources/localization/en.txt
@@ -26,6 +26,7 @@ initialize.label.password=Password
 initialize.label.retypePassword=Retype password
 initialize.button.ok=Create vault
 initialize.messageLabel.alreadyInitialized=Vault already initialized
+initialize.messageLabel.notEmpty=Vault not empty
 initialize.messageLabel.initializationFailed=Could not initialize vault. See log file for details.
 initialize.messageLabel.passwordStrength.0=Very weak
 initialize.messageLabel.passwordStrength.1=Weak

From 3535e83d7ded36fbd3e843f53341d5dcd4e11ba1 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 8 Sep 2016 18:20:57 +0200
Subject: [PATCH 29/45] updated travis config

---
 .travis.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dd1e35467..9472198aa 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,9 @@ sudo: required
 dist: trusty
 jdk:
 - oraclejdk8
+cache:
+  directories:
+  - $HOME/.m2
 env:
   global:
     - secure: "IfYURwZaDWuBDvyn47n0k1Zod/IQw1FF+CS5nnV08Q+NfC3vGGJMwV8m59XnbfwnWGxwvCaAbk4qP6s6+ijgZNKkvgfFMo3rfTok5zt43bIqgaFOANYV+OC/1c59gYD6ZUxhW5iNgMgU3qdsRtJuwSmfkVv/jKyLGfAbS4kN8BA=" #coverity
@@ -14,13 +17,11 @@ addons:
     notification_email: sebastian.stenzel@cryptomator.org
     build_command: "mvn -fmain/pom.xml clean test -DskipTests"
     branch_pattern: release.*
+install:
+- mvn -fmain/pom.xml dependency:go-offline -Ptest-coverage
+- mvn -fmain/pom.xml dependency:go-offline -Prelease
 script:
 - mvn --update-snapshots -fmain/pom.xml -Ptest-coverage clean test jacoco:report-aggregate
-before_cache:
-- mvn -fmain/pom.xml -Prelease clean test -DskipTests
-cache:
-  directories:
-  - $HOME/.m2
 after_success:
 - "bash <(curl -s https://codecov.io/bash)"
 notifications:

From 7462a887b34d5ff5fe07a66a2769e5366115519f Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 8 Sep 2016 18:30:11 +0200
Subject: [PATCH 30/45] updated travis config

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9472198aa..cc367981e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,8 @@ addons:
     build_command: "mvn -fmain/pom.xml clean test -DskipTests"
     branch_pattern: release.*
 install:
-- mvn -fmain/pom.xml dependency:go-offline -Ptest-coverage
-- mvn -fmain/pom.xml dependency:go-offline -Prelease
+- mvn -fmain/pom.xml package -DskipTests dependency:go-offline -Ptest-coverage
+- mvn -fmain/pom.xml package -DskipTests dependency:go-offline -Prelease
 script:
 - mvn --update-snapshots -fmain/pom.xml -Ptest-coverage clean test jacoco:report-aggregate
 after_success:

From 697a7915931763c8bd9ffcfc38a0a6946cd6c5e5 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 8 Sep 2016 18:34:28 +0200
Subject: [PATCH 31/45] updated travis config

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cc367981e..5b7fb94d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,8 @@ addons:
     build_command: "mvn -fmain/pom.xml clean test -DskipTests"
     branch_pattern: release.*
 install:
-- mvn -fmain/pom.xml package -DskipTests dependency:go-offline -Ptest-coverage
-- mvn -fmain/pom.xml package -DskipTests dependency:go-offline -Prelease
+- mvn -fmain/pom.xml clean package -DskipTests dependency:go-offline -Ptest-coverage
+- mvn -fmain/pom.xml clean package -DskipTests dependency:go-offline -Prelease
 script:
 - mvn --update-snapshots -fmain/pom.xml -Ptest-coverage clean test jacoco:report-aggregate
 after_success:

From 824bd9ea6422cbbdd395481d3ed02a33eb0f95c8 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 8 Sep 2016 18:41:36 +0200
Subject: [PATCH 32/45] just added a comment [ci skip]

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 5b7fb94d9..83a72d52d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ addons:
     build_command: "mvn -fmain/pom.xml clean test -DskipTests"
     branch_pattern: release.*
 install:
+# "clean" needed until https://bugs.openjdk.java.net/browse/JDK-8067747 is resolved.
 - mvn -fmain/pom.xml clean package -DskipTests dependency:go-offline -Ptest-coverage
 - mvn -fmain/pom.xml clean package -DskipTests dependency:go-offline -Prelease
 script:

From 091e62057dba7d8d6291003acf9e9fdbb315d521 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 12 Sep 2016 13:56:47 +0200
Subject: [PATCH 33/45] Injecting CryptorProvider into UpgradeStrategies

---
 .../java/org/cryptomator/ui/CryptomatorModule.java  |  3 ++-
 .../java/org/cryptomator/ui/MainApplication.java    | 13 ++++++++++++-
 .../model/UpgradeVersion3DropBundleExtension.java   |  9 +++++----
 .../cryptomator/ui/model/UpgradeVersion3to4.java    |  9 +++++----
 .../cryptomator/ui/model/UpgradeVersion4to5.java    |  8 +++++---
 5 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
index d4f5f7b38..17fcb7ef6 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
@@ -18,6 +18,7 @@ import javax.inject.Singleton;
 
 import org.cryptomator.common.CommonsModule;
 import org.cryptomator.crypto.engine.impl.CryptoEngineModule;
+import org.cryptomator.cryptolib.CryptoLibModule;
 import org.cryptomator.frontend.FrontendFactory;
 import org.cryptomator.frontend.FrontendId;
 import org.cryptomator.frontend.webdav.WebDavModule;
@@ -41,7 +42,7 @@ import javafx.application.Application;
 import javafx.beans.Observable;
 import javafx.stage.Stage;
 
-@Module(includes = {CryptoEngineModule.class, CommonsModule.class, WebDavModule.class, KeychainModule.class, JniModule.class})
+@Module(includes = {CryptoEngineModule.class, CommonsModule.class, WebDavModule.class, KeychainModule.class, JniModule.class, CryptoLibModule.class})
 class CryptomatorModule {
 
 	private static final Logger LOG = LoggerFactory.getLogger(CryptomatorModule.class);
diff --git a/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java b/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
index d28721ffa..11628a65c 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
@@ -12,9 +12,12 @@ import java.io.IOException;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.util.concurrent.ExecutionException;
 
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.cryptolib.common.SecureRandomModule;
 import org.cryptomator.ui.controllers.MainController;
 import org.cryptomator.ui.util.ActiveWindowStyleSupport;
 import org.cryptomator.ui.util.DeferredCloser;
@@ -40,7 +43,15 @@ public class MainApplication extends Application {
 	@Override
 	public void start(Stage primaryStage) throws IOException {
 		LOG.info("JavaFX application started");
-		final CryptomatorComponent comp = DaggerCryptomatorComponent.builder().cryptomatorModule(new CryptomatorModule(this, primaryStage)).build();
+		final CryptomatorComponent comp;
+		try {
+			comp = DaggerCryptomatorComponent.builder() //
+					.cryptomatorModule(new CryptomatorModule(this, primaryStage)) //
+					.secureRandomModule(new SecureRandomModule(SecureRandom.getInstanceStrong())) //
+					.build();
+		} catch (NoSuchAlgorithmException e) {
+			throw new IllegalStateException("Every implementation of the Java platform is required to support at least one strong SecureRandom implementation.", e);
+		}
 		final MainController mainCtrl = comp.mainController();
 		closer = comp.deferredCloser();
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3DropBundleExtension.java b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3DropBundleExtension.java
index a0462cd65..873c69716 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3DropBundleExtension.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3DropBundleExtension.java
@@ -3,14 +3,15 @@ package org.cryptomator.ui.model;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.security.SecureRandom;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import org.apache.commons.lang3.StringUtils;
-import org.cryptomator.cryptolib.Cryptors;
+import org.cryptomator.cryptolib.api.CryptoLibVersion;
+import org.cryptomator.cryptolib.api.CryptoLibVersion.Version;
 import org.cryptomator.cryptolib.api.Cryptor;
+import org.cryptomator.cryptolib.api.CryptorProvider;
 import org.cryptomator.ui.settings.Localization;
 import org.cryptomator.ui.settings.Settings;
 import org.slf4j.Logger;
@@ -25,8 +26,8 @@ class UpgradeVersion3DropBundleExtension extends UpgradeStrategy {
 	private final Settings settings;
 
 	@Inject
-	public UpgradeVersion3DropBundleExtension(SecureRandom secureRandom, Localization localization, Settings settings) {
-		super(Cryptors.version1(secureRandom), localization, 3, 3);
+	public UpgradeVersion3DropBundleExtension(@CryptoLibVersion(Version.ONE) CryptorProvider version1CryptorProvider, Localization localization, Settings settings) {
+		super(version1CryptorProvider, localization, 3, 3);
 		this.settings = settings;
 	}
 
diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3to4.java b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3to4.java
index 17bbcaac1..49b5c13a3 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3to4.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion3to4.java
@@ -9,7 +9,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.security.MessageDigest;
-import java.security.SecureRandom;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -19,8 +18,10 @@ import javax.inject.Singleton;
 import org.apache.commons.codec.binary.Base32;
 import org.apache.commons.codec.binary.BaseNCodec;
 import org.apache.commons.lang3.StringUtils;
-import org.cryptomator.cryptolib.Cryptors;
+import org.cryptomator.cryptolib.api.CryptoLibVersion;
+import org.cryptomator.cryptolib.api.CryptoLibVersion.Version;
 import org.cryptomator.cryptolib.api.Cryptor;
+import org.cryptomator.cryptolib.api.CryptorProvider;
 import org.cryptomator.cryptolib.common.MessageDigestSupplier;
 import org.cryptomator.ui.settings.Localization;
 import org.slf4j.Logger;
@@ -44,8 +45,8 @@ class UpgradeVersion3to4 extends UpgradeStrategy {
 	private final BaseNCodec base32 = new Base32();
 
 	@Inject
-	public UpgradeVersion3to4(SecureRandom secureRandom, Localization localization) {
-		super(Cryptors.version1(secureRandom), localization, 3, 4);
+	public UpgradeVersion3to4(@CryptoLibVersion(Version.ONE) CryptorProvider version1CryptorProvider, Localization localization) {
+		super(version1CryptorProvider, localization, 3, 4);
 	}
 
 	@Override
diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion4to5.java b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion4to5.java
index 0d8389250..487f98b85 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion4to5.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeVersion4to5.java
@@ -9,14 +9,16 @@ import java.nio.file.Path;
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.StandardOpenOption;
 import java.nio.file.attribute.BasicFileAttributes;
-import java.security.SecureRandom;
 import java.util.regex.Pattern;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
 import org.cryptomator.cryptolib.Cryptors;
+import org.cryptomator.cryptolib.api.CryptoLibVersion;
+import org.cryptomator.cryptolib.api.CryptoLibVersion.Version;
 import org.cryptomator.cryptolib.api.Cryptor;
+import org.cryptomator.cryptolib.api.CryptorProvider;
 import org.cryptomator.cryptolib.api.FileHeader;
 import org.cryptomator.ui.settings.Localization;
 import org.slf4j.Logger;
@@ -33,8 +35,8 @@ class UpgradeVersion4to5 extends UpgradeStrategy {
 	private static final Pattern BASE32_PATTERN = Pattern.compile("^([A-Z2-7]{8})*[A-Z2-7=]{8}");
 
 	@Inject
-	public UpgradeVersion4to5(SecureRandom secureRandom, Localization localization) {
-		super(Cryptors.version1(secureRandom), localization, 4, 5);
+	public UpgradeVersion4to5(@CryptoLibVersion(Version.ONE) CryptorProvider version1CryptorProvider, Localization localization) {
+		super(version1CryptorProvider, localization, 4, 5);
 	}
 
 	@Override

From 56b71ef7d9c26f94b54e75c986c6ff6abd1117cd Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 12 Sep 2016 21:28:21 +0200
Subject: [PATCH 34/45] depends on relase version of cryptolib 1.0.0

---
 main/pom.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/main/pom.xml b/main/pom.xml
index 4716aed5b..0dc9ead14 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -27,7 +27,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- dependency versions -->
-		<cryptomator.cryptolib.version>1.0.0-SNAPSHOT</cryptomator.cryptolib.version>
+		<cryptomator.cryptolib.version>1.0.0</cryptomator.cryptolib.version>
 		<cryptomator.jni.version>1.0.0-SNAPSHOT</cryptomator.jni.version>
 		<log4j.version>2.1</log4j.version>
 		<slf4j.version>1.7.7</slf4j.version>
@@ -44,6 +44,19 @@
 		<dagger.version>2.6.1</dagger.version>
 	</properties>
 
+	<repositories>
+		<repository>
+			<id>ossrh-snapshots</id>
+			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
 	<dependencyManagement>
 		<dependencies>
 			<!-- modules -->

From 20d4047bed4ce484f9d948ed8b9d623be1b2292f Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Mon, 12 Sep 2016 23:16:17 +0200
Subject: [PATCH 35/45] changed to cryptolib version 1.0.1 (which includes
 sources) [ci skip]

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

diff --git a/main/pom.xml b/main/pom.xml
index 0dc9ead14..75b8e462c 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -27,7 +27,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- dependency versions -->
-		<cryptomator.cryptolib.version>1.0.0</cryptomator.cryptolib.version>
+		<cryptomator.cryptolib.version>1.0.1</cryptomator.cryptolib.version>
 		<cryptomator.jni.version>1.0.0-SNAPSHOT</cryptomator.jni.version>
 		<log4j.version>2.1</log4j.version>
 		<slf4j.version>1.7.7</slf4j.version>

From 09ba4f512991d9606044f9b9244bbb681a402b0e Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 13 Sep 2016 20:17:30 +0200
Subject: [PATCH 36/45] changed to jni lib version 1.0.0

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

diff --git a/main/pom.xml b/main/pom.xml
index 75b8e462c..24a1b0fb2 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -28,7 +28,7 @@
 
 		<!-- dependency versions -->
 		<cryptomator.cryptolib.version>1.0.1</cryptomator.cryptolib.version>
-		<cryptomator.jni.version>1.0.0-SNAPSHOT</cryptomator.jni.version>
+		<cryptomator.jni.version>1.0.0</cryptomator.jni.version>
 		<log4j.version>2.1</log4j.version>
 		<slf4j.version>1.7.7</slf4j.version>
 		<junit.version>4.12</junit.version>

From 47133c6f3131f8007340b72dc48d637997e800f4 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 14 Sep 2016 17:22:26 +0200
Subject: [PATCH 37/45] fixed change pw function leaving invalid JSON file if
 length gets shorter due to different encoding or pretty printing etc

---
 .../main/java/org/cryptomator/filesystem/crypto/Masterkeys.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/Masterkeys.java b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/Masterkeys.java
index 9e8578dc2..98b488836 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/Masterkeys.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/filesystem/crypto/Masterkeys.java
@@ -103,6 +103,7 @@ class Masterkeys {
 
 	private static void writeMasterKey(File file, Cryptor cryptor, CharSequence passphrase) throws UncheckedIOException {
 		try (WritableFile writable = file.openWritable()) {
+			writable.truncate();
 			final byte[] fileContents = cryptor.writeKeysToMasterkeyFile(passphrase);
 			writable.write(ByteBuffer.wrap(fileContents));
 		}

From 5b18eff01a72b0721605b1bb4f7ed8a78eac3080 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 15 Sep 2016 13:28:20 +0200
Subject: [PATCH 38/45] increased cryptolib version to 1.0.2 [ci skip]

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

diff --git a/main/pom.xml b/main/pom.xml
index 24a1b0fb2..c63c2c449 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -27,7 +27,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- dependency versions -->
-		<cryptomator.cryptolib.version>1.0.1</cryptomator.cryptolib.version>
+		<cryptomator.cryptolib.version>1.0.2</cryptomator.cryptolib.version>
 		<cryptomator.jni.version>1.0.0</cryptomator.jni.version>
 		<log4j.version>2.1</log4j.version>
 		<slf4j.version>1.7.7</slf4j.version>

From a15acd64c868028322b42e294d12323c65be8f6c Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 15 Sep 2016 13:33:37 +0200
Subject: [PATCH 39/45] set version to 1.2.0

---
 main/ant-kit/pom.xml                             | 2 +-
 main/commons-test/pom.xml                        | 2 +-
 main/commons/pom.xml                             | 2 +-
 main/filesystem-api/pom.xml                      | 2 +-
 main/filesystem-charsets/pom.xml                 | 2 +-
 main/filesystem-crypto-integration-tests/pom.xml | 2 +-
 main/filesystem-crypto/pom.xml                   | 2 +-
 main/filesystem-inmemory/pom.xml                 | 2 +-
 main/filesystem-invariants-tests/pom.xml         | 2 +-
 main/filesystem-nameshortening/pom.xml           | 2 +-
 main/filesystem-nio/pom.xml                      | 2 +-
 main/filesystem-stats/pom.xml                    | 2 +-
 main/frontend-api/pom.xml                        | 2 +-
 main/frontend-webdav/pom.xml                     | 2 +-
 main/jacoco-report/pom.xml                       | 2 +-
 main/keychain/pom.xml                            | 2 +-
 main/pom.xml                                     | 2 +-
 main/uber-jar/pom.xml                            | 2 +-
 main/ui/pom.xml                                  | 2 +-
 19 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/main/ant-kit/pom.xml b/main/ant-kit/pom.xml
index 9d43788c7..601346301 100644
--- a/main/ant-kit/pom.xml
+++ b/main/ant-kit/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>ant-kit</artifactId>
 	<packaging>pom</packaging>
diff --git a/main/commons-test/pom.xml b/main/commons-test/pom.xml
index 53f68521f..21158bbaa 100644
--- a/main/commons-test/pom.xml
+++ b/main/commons-test/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>commons-test</artifactId>
 	<name>Cryptomator common test dependencies</name>
diff --git a/main/commons/pom.xml b/main/commons/pom.xml
index afeb35fa1..152fa7313 100644
--- a/main/commons/pom.xml
+++ b/main/commons/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>commons</artifactId>
 	<name>Cryptomator common</name>
diff --git a/main/filesystem-api/pom.xml b/main/filesystem-api/pom.xml
index b4b4cfc4d..3f7342a3b 100644
--- a/main/filesystem-api/pom.xml
+++ b/main/filesystem-api/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>filesystem-api</artifactId>
 	<name>Cryptomator filesystem: API</name>
diff --git a/main/filesystem-charsets/pom.xml b/main/filesystem-charsets/pom.xml
index e156412e5..e8aa48799 100644
--- a/main/filesystem-charsets/pom.xml
+++ b/main/filesystem-charsets/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>filesystem-charsets</artifactId>
 	<name>Cryptomator filesystem: Charset compatibility layer</name>
diff --git a/main/filesystem-crypto-integration-tests/pom.xml b/main/filesystem-crypto-integration-tests/pom.xml
index 48b51a55b..af67a1480 100644
--- a/main/filesystem-crypto-integration-tests/pom.xml
+++ b/main/filesystem-crypto-integration-tests/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>filesystem-crypto-integration-tests</artifactId>
 	<name>Cryptomator filesystem: Encryption layer tests</name>
diff --git a/main/filesystem-crypto/pom.xml b/main/filesystem-crypto/pom.xml
index bbc582be6..517566bbe 100644
--- a/main/filesystem-crypto/pom.xml
+++ b/main/filesystem-crypto/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>filesystem-crypto</artifactId>
 	<name>Cryptomator filesystem: Encryption layer</name>
diff --git a/main/filesystem-inmemory/pom.xml b/main/filesystem-inmemory/pom.xml
index d1db21e24..d40ac9f35 100644
--- a/main/filesystem-inmemory/pom.xml
+++ b/main/filesystem-inmemory/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>filesystem-inmemory</artifactId>
 	<name>Cryptomator filesystem: In-memory mock</name>
diff --git a/main/filesystem-invariants-tests/pom.xml b/main/filesystem-invariants-tests/pom.xml
index 83ec41625..9ba7f6433 100644
--- a/main/filesystem-invariants-tests/pom.xml
+++ b/main/filesystem-invariants-tests/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>filesystem-invariants-tests</artifactId>
 	<name>Cryptomator filesystem: Invariants tests</name>
diff --git a/main/filesystem-nameshortening/pom.xml b/main/filesystem-nameshortening/pom.xml
index f325b84c3..362163018 100644
--- a/main/filesystem-nameshortening/pom.xml
+++ b/main/filesystem-nameshortening/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>filesystem-nameshortening</artifactId>
 	<name>Cryptomator filesystem: Name shortening layer</name>
diff --git a/main/filesystem-nio/pom.xml b/main/filesystem-nio/pom.xml
index 4f535b1b0..7df577334 100644
--- a/main/filesystem-nio/pom.xml
+++ b/main/filesystem-nio/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>filesystem-nio</artifactId>
 	<name>Cryptomator filesystem: NIO-based physical layer</name>
diff --git a/main/filesystem-stats/pom.xml b/main/filesystem-stats/pom.xml
index 4912e2a72..3a7937188 100644
--- a/main/filesystem-stats/pom.xml
+++ b/main/filesystem-stats/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>filesystem-stats</artifactId>
 	<name>Cryptomator filesystem: Throughput statistics</name>
diff --git a/main/frontend-api/pom.xml b/main/frontend-api/pom.xml
index 7952ce438..f06a270db 100644
--- a/main/frontend-api/pom.xml
+++ b/main/frontend-api/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>frontend-api</artifactId>
 	<name>Cryptomator frontend: API</name>
diff --git a/main/frontend-webdav/pom.xml b/main/frontend-webdav/pom.xml
index 1e6421508..083961c2a 100644
--- a/main/frontend-webdav/pom.xml
+++ b/main/frontend-webdav/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>frontend-webdav</artifactId>
 	<name>Cryptomator frontend: WebDAV frontend</name>
diff --git a/main/jacoco-report/pom.xml b/main/jacoco-report/pom.xml
index b57576813..3131db4ea 100644
--- a/main/jacoco-report/pom.xml
+++ b/main/jacoco-report/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>jacoco-report</artifactId>
 	<name>Cryptomator Code Coverage Report</name>
diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml
index 5c96a8aad..2d497f4d7 100644
--- a/main/keychain/pom.xml
+++ b/main/keychain/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>keychain</artifactId>
 	<name>System Keychain Access</name>
diff --git a/main/pom.xml b/main/pom.xml
index c63c2c449..313f85004 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
+	<version>1.2.0</version>
 	<packaging>pom</packaging>
 	<name>Cryptomator</name>
 
diff --git a/main/uber-jar/pom.xml b/main/uber-jar/pom.xml
index dc7a961fd..dadceab2a 100644
--- a/main/uber-jar/pom.xml
+++ b/main/uber-jar/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>uber-jar</artifactId>
 	<packaging>pom</packaging>
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index a0e7a0749..82b2df321 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>ui</artifactId>
 	<name>Cryptomator GUI</name>

From df1fd6d0b30282b64fe8f0ae65f42b536541749e Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 15 Sep 2016 14:07:08 +0200
Subject: [PATCH 40/45] fixed coverity issue 72979

---
 .../java/org/cryptomator/crypto/engine/impl/CryptorImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java
index 166a34b12..ef88c4a8d 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java
@@ -109,7 +109,7 @@ class CryptorImpl implements Cryptor {
 		assert keyFile != null;
 
 		// check version
-		if (CURRENT_VAULT_VERSION != keyFile.getVersion()) {
+		if (!CURRENT_VAULT_VERSION.equals(keyFile.getVersion())) {
 			throw new UnsupportedVaultFormatException(keyFile.getVersion(), CURRENT_VAULT_VERSION);
 		}
 

From ef0425e2b18fda8c44a73187946e251d6bbea45c Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 15 Sep 2016 14:14:50 +0200
Subject: [PATCH 41/45] fixes coverity issue 147409

---
 main/ui/src/main/java/org/cryptomator/ui/model/Vault.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java b/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java
index 8c0c00fc3..086fffa90 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/Vault.java
@@ -168,7 +168,7 @@ public class Vault implements CryptoFileSystemDelegate {
 		);
 	}
 
-	public void reveal() throws CommandFailedException {
+	public synchronized void reveal() throws CommandFailedException {
 		Optionals.ifPresent(filesystemFrontend.get(), Frontend::reveal);
 	}
 
@@ -190,7 +190,7 @@ public class Vault implements CryptoFileSystemDelegate {
 	// Getter/Setter
 	// *******************************************************************************/
 
-	public String getWebDavUrl() {
+	public synchronized String getWebDavUrl() {
 		return filesystemFrontend.get().map(Frontend::getWebDavUrl).orElseThrow(IllegalStateException::new);
 	}
 

From d7d8d21ba496ba31f82732896f61a4faab91a227 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastianstenzel@gmail.com>
Date: Thu, 15 Sep 2016 22:15:21 +0200
Subject: [PATCH 42/45] Show warning when trying to migrate a masterkey with
 invalid version mac

---
 .../ui/controllers/ChangePasswordController.java       |  3 ++-
 .../cryptomator/ui/controllers/UnlockController.java   |  8 ++++++--
 .../java/org/cryptomator/ui/model/UpgradeStrategy.java | 10 +++++++++-
 main/ui/src/main/resources/localization/en.txt         |  2 +-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java
index c78ac51f0..b254931fb 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java
@@ -124,6 +124,7 @@ public class ChangePasswordController extends LocalizedFXMLViewController {
 		// trigger "default" change to refresh key bindings:
 		changePasswordButton.setDefaultButton(false);
 		changePasswordButton.setDefaultButton(true);
+		messageText.setText(null);
 	}
 
 	// ****************************************
@@ -144,7 +145,7 @@ public class ChangePasswordController extends LocalizedFXMLViewController {
 		downloadsPageLink.setVisible(false);
 		try {
 			vault.changePassphrase(oldPasswordField.getCharacters(), newPasswordField.getCharacters());
-			messageText.setText(localization.getString("changePassword.infoMessage.success"));
+			messageText.setText(null);
 			listener.ifPresent(this::invokeListenerLater);
 		} catch (InvalidPassphraseException e) {
 			messageText.setText(localization.getString("changePassword.errorMessage.wrongPassword"));
diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
index e5fe09fe4..f6b19cb8a 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
@@ -178,7 +178,7 @@ public class UnlockController extends LocalizedFXMLViewController {
 
 	@FXML
 	public void didClickDownloadsLink(ActionEvent event) {
-		app.getHostServices().showDocument("https://cryptomator.org/downloads/");
+		app.getHostServices().showDocument("https://cryptomator.org/downloads/#allVersions");
 	}
 
 	// ****************************************
@@ -311,11 +311,15 @@ public class UnlockController extends LocalizedFXMLViewController {
 			});
 		} catch (UnsupportedVaultFormatException e) {
 			Platform.runLater(() -> {
-				downloadsPageLink.setVisible(true);
 				if (e.isVaultOlderThanSoftware()) {
+					// whitespace after localized text used as separator between text and hyperlink
 					messageText.setText(localization.getString("unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware") + " ");
+					downloadsPageLink.setVisible(true);
 				} else if (e.isSoftwareOlderThanVault()) {
 					messageText.setText(localization.getString("unlock.errorMessage.unsupportedVersion.softwareOlderThanVault") + " ");
+					downloadsPageLink.setVisible(true);
+				} else if (e.getDetectedVersion() == Integer.MAX_VALUE) {
+					messageText.setText(localization.getString("unlock.errorMessage.unauthenticVersionMac"));
 				}
 			});
 		} catch (FrontendCreationFailedException | CommandFailedException e) {
diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java
index 9d77b93d4..b235a794e 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/model/UpgradeStrategy.java
@@ -57,7 +57,15 @@ public abstract class UpgradeStrategy {
 			Files.write(masterkeyFileAfterUpgrade, upgradedMasterkeyFileContents, StandardOpenOption.TRUNCATE_EXISTING);
 		} catch (InvalidPassphraseException e) {
 			throw new UpgradeFailedException(localization.getString("unlock.errorMessage.wrongPassword"));
-		} catch (IOException | UnsupportedVaultFormatException e) {
+		} catch (UnsupportedVaultFormatException e) {
+			if (e.getDetectedVersion() == Integer.MAX_VALUE) {
+				LOG.warn("Version MAC authentication error in vault {}", vault.path().get());
+				throw new UpgradeFailedException(localization.getString("unlock.errorMessage.unauthenticVersionMac"));
+			} else {
+				LOG.warn("Upgrade failed.", e);
+				throw new UpgradeFailedException("Upgrade failed. Details in log message.");
+			}
+		} catch (IOException e) {
 			LOG.warn("Upgrade failed.", e);
 			throw new UpgradeFailedException("Upgrade failed. Details in log message.");
 		} finally {
diff --git a/main/ui/src/main/resources/localization/en.txt b/main/ui/src/main/resources/localization/en.txt
index 984884574..92cd4815a 100644
--- a/main/ui/src/main/resources/localization/en.txt
+++ b/main/ui/src/main/resources/localization/en.txt
@@ -63,6 +63,7 @@ unlock.errorMessage.wrongPassword=Wrong password
 unlock.errorMessage.mountingFailed=Mounting failed. See log file for details.
 unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware=Unsupported vault. This vault has been created with an older version of Cryptomator.
 unlock.errorMessage.unsupportedVersion.softwareOlderThanVault=Unsupported vault. This vault has been created with a newer version of Cryptomator.
+unlock.errorMessage.unauthenticVersionMac=Could not authenticate version MAC.
 unlock.messageLabel.startServerFailed=Starting WebDAV server failed.
 
 # change_password.fxml
@@ -73,7 +74,6 @@ changePassword.label.downloadsPageLink=All Cryptomator versions
 changePassword.button.change=Change password
 changePassword.errorMessage.wrongPassword=Wrong password
 changePassword.errorMessage.decryptionFailed=Decryption failed
-changePassword.infoMessage.success=Password changed
 
 # unlocked.fxml
 unlocked.button.lock=Lock vault

From a3cfcb11316ff28278fbe9382a156132b7b8b1fa Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastianstenzel@gmail.com>
Date: Thu, 15 Sep 2016 23:26:13 +0200
Subject: [PATCH 43/45] Reject opening files when former filesize header is !=
 -1

---
 .../engine/impl/FileContentDecryptorImpl.java     |  5 +++++
 .../engine/impl/FileContentDecryptorImplTest.java | 10 +++++-----
 .../crypto/engine/impl/FileHeaderTest.java        | 15 ++++++++++++++-
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FileContentDecryptorImpl.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FileContentDecryptorImpl.java
index 0088f6a51..fdc12bb2a 100644
--- a/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FileContentDecryptorImpl.java
+++ b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FileContentDecryptorImpl.java
@@ -54,6 +54,11 @@ class FileContentDecryptorImpl implements FileContentDecryptor {
 		this.header = FileHeader.decrypt(headerKey, hmacSha256, header);
 		this.authenticate = authenticate;
 		this.chunkNumber = firstCiphertextByte / CHUNK_SIZE; // floor() by int-truncation
+		
+		// vault version 5 and onwards should have filesize: -1
+		if (this.header.getPayload().getFilesize() != -1l) {
+			throw new UncheckedIOException(new IOException("Attempted to decrypt file with invalid header (probably from previous vault version)"));
+		}
 	}
 
 	@Override
diff --git a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentDecryptorImplTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentDecryptorImplTest.java
index 173d13348..631811da7 100644
--- a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentDecryptorImplTest.java
+++ b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileContentDecryptorImplTest.java
@@ -45,7 +45,7 @@ public class FileContentDecryptorImplTest {
 		final byte[] keyBytes = new byte[32];
 		final SecretKey headerKey = new SecretKeySpec(keyBytes, "AES");
 		final SecretKey macKey = new SecretKeySpec(keyBytes, "HmacSHA256");
-		final byte[] header = Base64.decode("AAAAAAAAAAAAAAAAAAAAANyVwHiiQImjrUiiFJKEIIdTD4r7x0U2ualjtPHEy3OLzqdAPU1ga26lJzstK9RUv1hj5zDC4wC9FgMfoVE1mD0HnuENuYXkJA==");
+		final byte[] header = Base64.decode("AAAAAAAAAAAAAAAAAAAAACNqP4ddv3Z2rUiiFJKEIIdTD4r7x0U2ualjtPHEy3OLzqdAPU1ga24VjC86+zlHN49BfMdzvHF3f9EE0LSnRLSsu6ps3IRcJg==");
 		final byte[] content = Base64.decode("AAAAAAAAAAAAAAAAAAAAALTwrBTNYP7m3yTGKlhka9WPvX1Lpn5EYfVxlyX1ISgRXtdRnivM7r6F3Og=");
 
 		try (FileContentDecryptor decryptor = new FileContentDecryptorImpl(headerKey, macKey, ByteBuffer.wrap(header), 0, true)) {
@@ -68,7 +68,7 @@ public class FileContentDecryptorImplTest {
 		final byte[] keyBytes = new byte[32];
 		final SecretKey headerKey = new SecretKeySpec(keyBytes, "AES");
 		final SecretKey macKey = new SecretKeySpec(keyBytes, "HmacSHA256");
-		final byte[] header = Base64.decode("AAAAAAAAAAAAAAAAAAAAANyVwHiiQImjrUiiFJKEIIdTD4r7x0U2ualjtPHEy3OLzqdAPU1ga26lJzstK9RUv1hj5zDC4wC9FgMfoVE1mD0HnuENuYXkJa==");
+		final byte[] header = Base64.decode("AAAAAAAAAAAAAAAAAAAAACNqP4ddv3Z2rUiiFJKEIIdTD4r7x0U2ualjtPHEy3OLzqdAPU1ga24VjC86+zlHN49BfMdzvHF3f9EE0LSnRLSsu6ps3IRcJG==");
 
 		try (FileContentDecryptor decryptor = new FileContentDecryptorImpl(headerKey, macKey, ByteBuffer.wrap(header), 0, true)) {
 
@@ -80,7 +80,7 @@ public class FileContentDecryptorImplTest {
 		final byte[] keyBytes = new byte[32];
 		final SecretKey headerKey = new SecretKeySpec(keyBytes, "AES");
 		final SecretKey macKey = new SecretKeySpec(keyBytes, "HmacSHA256");
-		final byte[] header = Base64.decode("AAAAAAAAAAAAAAAAAAAAANyVwHiiQImjrUiiFJKEIIdTD4r7x0U2ualjtPHEy3OLzqdAPU1ga26lJzstK9RUv1hj5zDC4wC9FgMfoVE1mD0HnuENuYXkJA==");
+		final byte[] header = Base64.decode("AAAAAAAAAAAAAAAAAAAAACNqP4ddv3Z2rUiiFJKEIIdTD4r7x0U2ualjtPHEy3OLzqdAPU1ga24VjC86+zlHN49BfMdzvHF3f9EE0LSnRLSsu6ps3IRcJg==");
 		final byte[] content = Base64.decode("aAAAAAAAAAAAAAAAAAAAALTwrBTNYP7m3yTGKlhka9WPvX1Lpn5EYfVxlyX1ISgRXtdRnivM7r6F3Og=");
 
 		try (FileContentDecryptor decryptor = new FileContentDecryptorImpl(headerKey, macKey, ByteBuffer.wrap(header), 0, true)) {
@@ -101,7 +101,7 @@ public class FileContentDecryptorImplTest {
 		final byte[] keyBytes = new byte[32];
 		final SecretKey headerKey = new SecretKeySpec(keyBytes, "AES");
 		final SecretKey macKey = new SecretKeySpec(keyBytes, "HmacSHA256");
-		final byte[] header = Base64.decode("AAAAAAAAAAAAAAAAAAAAANyVwHiiQImjrUiiFJKEIIdTD4r7x0U2ualjtPHEy3OLzqdAPU1ga26lJzstK9RUv1hj5zDC4wC9FgMfoVE1mD0HnuENuYXkJA==");
+		final byte[] header = Base64.decode("AAAAAAAAAAAAAAAAAAAAACNqP4ddv3Z2rUiiFJKEIIdTD4r7x0U2ualjtPHEy3OLzqdAPU1ga24VjC86+zlHN49BfMdzvHF3f9EE0LSnRLSsu6ps3IRcJg==");
 		final byte[] content = Base64.decode("AAAAAAAAAAAAAAAAAAAAALTwrBTNYP7m3yTGKlhka9WPvX1Lpn5EYfVxlyX1ISgRXtdRnivM7r6F3OG=");
 
 		try (FileContentDecryptor decryptor = new FileContentDecryptorImpl(headerKey, macKey, ByteBuffer.wrap(header), 0, false)) {
@@ -124,7 +124,7 @@ public class FileContentDecryptorImplTest {
 		final byte[] keyBytes = new byte[32];
 		final SecretKey headerKey = new SecretKeySpec(keyBytes, "AES");
 		final SecretKey macKey = new SecretKeySpec(keyBytes, "AES");
-		final byte[] header = Base64.decode("AAAAAAAAAAAAAAAAAAAAANyVwHiiQImjrUiiFJKEIIdTD4r7x0U2ualjtPHEy3OLzqdAPU1ga26lJzstK9RUv1hj5zDC4wC9FgMfoVE1mD0HnuENuYXkJA==");
+		final byte[] header = Base64.decode("AAAAAAAAAAAAAAAAAAAAACNqP4ddv3Z2rUiiFJKEIIdTD4r7x0U2ualjtPHEy3OLzqdAPU1ga24VjC86+zlHN49BfMdzvHF3f9EE0LSnRLSsu6ps3IRcJg==");
 
 		try (FileContentDecryptor decryptor = new FileContentDecryptorImpl(headerKey, macKey, ByteBuffer.wrap(header), 0, true)) {
 			decryptor.cancelWithException(new IOException("can not do"));
diff --git a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileHeaderTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileHeaderTest.java
index 391fa88b4..bbe61a522 100644
--- a/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileHeaderTest.java
+++ b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FileHeaderTest.java
@@ -53,13 +53,26 @@ public class FileHeaderTest {
 
 	@Test
 	public void testDecryption() {
+		final byte[] keyBytes = new byte[32];
+		final SecretKey headerKey = new SecretKeySpec(keyBytes, "AES");
+		final SecretKey macKey = new SecretKeySpec(keyBytes, "HmacSHA256");
+		final ByteBuffer headerBuf = ByteBuffer.wrap(Base64.decode("AAAAAAAAAAAAAAAAAAAAACNqP4ddv3Z2rUiiFJKEIIdTD4r7x0U2ualjtPHEy3OLzqdAPU1ga24VjC86+zlHN49BfMdzvHF3f9EE0LSnRLSsu6ps3IRcJg=="));
+		final FileHeader header = FileHeader.decrypt(headerKey, new ThreadLocalMac(macKey, "HmacSHA256"), headerBuf);
+
+		Assert.assertEquals(-1l, header.getPayload().getFilesize());
+		Assert.assertArrayEquals(new byte[16], header.getIv());
+		Assert.assertArrayEquals(new byte[32], header.getPayload().getContentKey().getEncoded());
+	}
+
+	@Test
+	public void testDecryptionOfOldHeader() {
 		final byte[] keyBytes = new byte[32];
 		final SecretKey headerKey = new SecretKeySpec(keyBytes, "AES");
 		final SecretKey macKey = new SecretKeySpec(keyBytes, "HmacSHA256");
 		final ByteBuffer headerBuf = ByteBuffer.wrap(Base64.decode("AAAAAAAAAAAAAAAAAAAAANyVwHiiQImjrUiiFJKEIIdTD4r7x0U2ualjtPHEy3OLzqdAPU1ga26lJzstK9RUv1hj5zDC4wC9FgMfoVE1mD0HnuENuYXkJA=="));
 		final FileHeader header = FileHeader.decrypt(headerKey, new ThreadLocalMac(macKey, "HmacSHA256"), headerBuf);
 
-		Assert.assertEquals(42, header.getPayload().getFilesize());
+		Assert.assertEquals(42l, header.getPayload().getFilesize());
 		Assert.assertArrayEquals(new byte[16], header.getIv());
 		Assert.assertArrayEquals(new byte[32], header.getPayload().getContentKey().getEncoded());
 	}

From 72f6ee647730c54576aea3648a0e9099976a4ccd Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 15 Sep 2016 23:52:23 +0200
Subject: [PATCH 44/45] updated localizations

---
 .../ui/src/main/resources/localization/de.txt |  8 +-
 .../ui/src/main/resources/localization/es.txt | 10 +-
 .../ui/src/main/resources/localization/fr.txt | 10 +-
 .../ui/src/main/resources/localization/hu.txt | 10 +-
 .../ui/src/main/resources/localization/it.txt | 20 ++--
 .../ui/src/main/resources/localization/kr.txt |  8 +-
 .../ui/src/main/resources/localization/lv.txt | 91 +++++++++++++++++++
 .../ui/src/main/resources/localization/nl.txt |  8 +-
 .../ui/src/main/resources/localization/pl.txt | 90 ++++++++++++++++++
 .../ui/src/main/resources/localization/pt.txt | 90 ++++++++++++++----
 .../ui/src/main/resources/localization/ru.txt |  8 +-
 .../ui/src/main/resources/localization/sk.txt | 21 ++++-
 .../ui/src/main/resources/localization/tr.txt |  8 +-
 .../ui/src/main/resources/localization/uk.txt | 90 ++++++++++++++++++
 14 files changed, 437 insertions(+), 35 deletions(-)
 create mode 100644 main/ui/src/main/resources/localization/lv.txt
 create mode 100644 main/ui/src/main/resources/localization/pl.txt
 create mode 100644 main/ui/src/main/resources/localization/uk.txt

diff --git a/main/ui/src/main/resources/localization/de.txt b/main/ui/src/main/resources/localization/de.txt
index aab0f325b..7761861c9 100644
--- a/main/ui/src/main/resources/localization/de.txt
+++ b/main/ui/src/main/resources/localization/de.txt
@@ -82,4 +82,10 @@ main.directoryList.remove.confirmation.title = Tresor entfernen
 main.directoryList.remove.confirmation.header = Möchten Sie diesen Tresor wirklich entfernen?
 main.directoryList.remove.confirmation.content = Dieser Tresor wird nur aus der Liste entfernt. Um den Tresor unwiderruflich zu löschen, entfernen Sie bitte die Dateien aus Ihrem Dateisystem.
 upgrade.version3to4.msg = Dieser Tresor muss auf ein neueres Format aktualisiert werden.\nVerschlüsselte Ordnernamen werden dabei aktualisiert.\nStellen Sie bitte sicher, dass derzeit keine Synchronisation stattfindet.
-upgrade.version3to4.err.io = Migration aufgrund eines I/O-Fehlers fehlgeschlagen.\nWeitere Informationen in der Log-Datei.
\ No newline at end of file
+upgrade.version3to4.err.io = Migration aufgrund eines I/O-Fehlers fehlgeschlagen.\nWeitere Informationen in der Log-Datei.
+settings.prefGvfsScheme.label = WebDAV Schema
+# upgrade.fxml
+upgrade.confirmation.label = Ja, die Synchronisation ist abgeschlossen
+initialize.messageLabel.notEmpty = Tresor ist nicht leer
+unlock.label.savePassword = Passwort speichern
+unlock.errorMessage.unauthenticVersionMac = Versions-MAC konnte nicht authentifiziert werden.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/es.txt b/main/ui/src/main/resources/localization/es.txt
index 8a7efa64b..13d356589 100644
--- a/main/ui/src/main/resources/localization/es.txt
+++ b/main/ui/src/main/resources/localization/es.txt
@@ -14,7 +14,7 @@ initialize.label.password = Contraseña
 initialize.label.retypePassword = Reintroduzca contraseña
 initialize.button.ok = Crear caja fuerte
 initialize.messageLabel.alreadyInitialized = Caja fuerte ya está inicializado
-initialize.messageLabel.initializationFailed = No se pudo inicializar la caja fuerte. Ver archivo de registro para detalles. 
+initialize.messageLabel.initializationFailed = No se pudo inicializar la caja fuerte. Ver archivo de registro para detalles.
 # notfound.fxml
 notfound.label = No se pudo encontrar la caja fuerte. Se movió a otro lugar?
 # upgrade.fxml
@@ -83,4 +83,10 @@ main.directoryList.remove.confirmation.title = Borrar caja fuerte
 main.directoryList.remove.confirmation.header = ¿Quieres de verdad borrar este caja fuerte?
 main.directoryList.remove.confirmation.content = La caja fuerte solo se borra de la lista. Para eliminarla permanente por favor elimina los datos de tú sistema de archivos.
 upgrade.version3to4.msg = Este caja fuerte se debe migrar a un formato más reciente.\nLos nombres de las carpetas cifradas se actualizan.\nPor favor asegurarse de que la sincronización ha terminado antes de seguir.
-upgrade.version3to4.err.io = Migración ha fallado por causa de una excepción I/O. Para detalles revisa el archivo de registro.
\ No newline at end of file
+upgrade.version3to4.err.io = Migración ha fallado por causa de una excepción I/O. Para detalles revisa el archivo de registro.
+settings.prefGvfsScheme.label = WebDAV scheme
+# upgrade.fxml
+upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
+initialize.messageLabel.notEmpty = Vault not empty
+unlock.label.savePassword = Save password
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/fr.txt b/main/ui/src/main/resources/localization/fr.txt
index 36ac3046a..605b00092 100644
--- a/main/ui/src/main/resources/localization/fr.txt
+++ b/main/ui/src/main/resources/localization/fr.txt
@@ -78,10 +78,16 @@ initialize.messageLabel.passwordStrength.0 = Très faible
 initialize.messageLabel.passwordStrength.1 = Faible
 initialize.messageLabel.passwordStrength.2 = Raisonnable
 initialize.messageLabel.passwordStrength.3 = Fort
-initialize.messageLabel.passwordStrength.4 = Très fort\n
+initialize.messageLabel.passwordStrength.4 = Très fort
 initialize.label.doNotForget = ATTENTION \: Si vous oubliez votre mot de passe, il n'y aura aucun moyen de récupérer vos données.
 main.directoryList.remove.confirmation.title = Retirer un coffre
 main.directoryList.remove.confirmation.header = Voulez-vous vraiment retirer ce coffre ?
 main.directoryList.remove.confirmation.content = Le coffre sera simplement retiré de la liste. Pour le supprimer complètement, supprimez les fichiers depuis votre système de fichiers.
 upgrade.version3to4.msg = Ce coffre doit être converti dans un nouveau format. Les noms de dossiers chiffrés seront mis à jour.\nMerci de vous assurer que la procédure de synchronisation est terminée avant de continuer.
-upgrade.version3to4.err.io = La migration a échoué à cause d'une erreur d'entrée/sortie. Référez-vous au fichier log pour plus de détails.
\ No newline at end of file
+upgrade.version3to4.err.io = La migration a échoué à cause d'une erreur d'entrée/sortie. Référez-vous au fichier log pour plus de détails.
+settings.prefGvfsScheme.label = Schéma d'URI WebDAV
+# upgrade.fxml
+upgrade.confirmation.label = Oui, je suis certain que la synchronisation est finie
+initialize.messageLabel.notEmpty = Vault not empty
+unlock.label.savePassword = Save password
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/hu.txt b/main/ui/src/main/resources/localization/hu.txt
index f332a172f..772dcb44e 100644
--- a/main/ui/src/main/resources/localization/hu.txt
+++ b/main/ui/src/main/resources/localization/hu.txt
@@ -79,4 +79,12 @@ initialize.messageLabel.passwordStrength.4 = Nagyon erős
 initialize.label.doNotForget = FONTOS\: Ha elfelejted a jelszavadat, akkor nincs lehetőség az adataid visszaállítására.
 main.directoryList.remove.confirmation.title = Széf eltávolítása
 main.directoryList.remove.confirmation.header = Tényleg törölni akarod ezt a széfet?
-main.directoryList.remove.confirmation.content = A széf csak a listából lesz eltávolítva. Végleges törléshez kérlek töröld a merevlemezen tárolt fájlokat.
\ No newline at end of file
+main.directoryList.remove.confirmation.content = A széf csak a listából lesz eltávolítva. Végleges törléshez kérlek töröld a merevlemezen tárolt fájlokat.
+upgrade.version3to4.msg = Ennek a széfnek egy újabb formátumra való migrációja szükséges. A titkosított könyvtárnevek frissítve lesznek. Kérlek, győződj meg a szinkronizáció befejeztéről mielőtt továbblépnél.
+upgrade.version3to4.err.io = Migráció meghíusúlt egy I/O kivétel miatt. Kérlek nézd meg a naplófájlt a további részletekért.
+settings.prefGvfsScheme.label = WebDAV séma
+# upgrade.fxml
+upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
+initialize.messageLabel.notEmpty = Vault not empty
+unlock.label.savePassword = Save password
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/it.txt b/main/ui/src/main/resources/localization/it.txt
index 12ddb3da6..dabf824aa 100644
--- a/main/ui/src/main/resources/localization/it.txt
+++ b/main/ui/src/main/resources/localization/it.txt
@@ -18,7 +18,7 @@ initialize.messageLabel.initializationFailed = Non è possibile inizializzare il
 notfound.label = Il vault non può essere trovato. E' stato rimosso?
 # upgrade.fxml
 upgrade.button = Aggiorna vault
-upgrade.version3dropBundleExtension.msg = Questo vault deve essere migrato ad un nuovo formato.\n"%1$s" verrà rinominato in "%2$s".\nPer favore verifica che la sincronizzazione sia finita prima di procedere\n
+upgrade.version3dropBundleExtension.msg = Questo vault deve essere migrato ad un nuovo formato.\n"%1$s" verrà rinominato in "%2$s".\nPer favore verifica che la sincronizzazione sia finita prima di procedere
 upgrade.version3dropBundleExtension.err.alreadyExists = Migrazione automatica fallita.\n"%s" esiste già.
 # unlock.fxml
 unlock.label.password = Password
@@ -45,14 +45,14 @@ changePassword.errorMessage.wrongPassword = Password errata
 changePassword.errorMessage.decryptionFailed = Decriptaggio fallito
 changePassword.infoMessage.success = Password cambiata
 # unlocked.fxml
-unlocked.button.lock = Blocca vault 
+unlocked.button.lock = Blocca vault
 unlocked.moreOptions.reveal = Apri il disco
 unlocked.moreOptions.copyUrl = Copia url WebDAV
 unlocked.label.revealFailed = Comando fallito
 unlocked.label.unmountFailed = Espulsione disco fallita
 unlocked.label.statsEncrypted = criptato
 unlocked.label.statsDecrypted = decriptato
-unlocked.ioGraph.yAxis.label = Volume dati (MiB/s) 
+unlocked.ioGraph.yAxis.label = Volume dati (MiB/s)
 # mac_warnings.fxml
 macWarnings.windowTitle = Pericolo - File corroto in %s
 macWarnings.message = Cryptomator ha individuato potenziali pericolose corruzioni nei seguenti file\:
@@ -69,8 +69,8 @@ settings.requiresRestartLabel = * Cryptomator deve essere riavviato
 tray.menu.open = Apri
 tray.menu.quit = Chiudi
 tray.infoMsg.title = Ancora in esecuzione
-tray.infoMsg.msg = Cryptomator è ancora in esecuzione. Chiudilo utilizzando l'icona nel menù di stato. 
-tray.infoMsg.msg.osx = Cryptomator è ancora in esecuzione. Chiudilo utilizzando l'icona nella barra del menù. 
+tray.infoMsg.msg = Cryptomator è ancora in esecuzione. Chiudilo utilizzando l'icona nel menù di stato.
+tray.infoMsg.msg.osx = Cryptomator è ancora in esecuzione. Chiudilo utilizzando l'icona nella barra del menù.
 initialize.messageLabel.passwordStrength.0 = Molto debole
 initialize.messageLabel.passwordStrength.1 = Debole
 initialize.messageLabel.passwordStrength.2 = Buona
@@ -79,4 +79,12 @@ initialize.messageLabel.passwordStrength.4 = Molto sicura
 initialize.label.doNotForget = IMPORTANTE\: Se dimentichi la password, non c'è modo di recuperare i tuoi dati.
 main.directoryList.remove.confirmation.title = Rimuovi vault
 main.directoryList.remove.confirmation.header = Vuoi davvero rimuovere questo vault?
-main.directoryList.remove.confirmation.content = Il vault sarà rimosso solo dalla lista. Per eliminarlo definitivamente, elimina per favore i file dal tuo hard disk.
\ No newline at end of file
+main.directoryList.remove.confirmation.content = Il vault sarà rimosso solo dalla lista. Per eliminarlo definitivamente, elimina per favore i file dal tuo hard disk.
+upgrade.version3to4.msg = This vault needs to be migrated to a newer format.\nEncrypted folder names will be updated.\nPlease make sure synchronization has finished before proceeding.
+upgrade.version3to4.err.io = Migration failed due to an I/O Exception. See log file for details.
+settings.prefGvfsScheme.label = WebDAV scheme
+# upgrade.fxml
+upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
+initialize.messageLabel.notEmpty = Vault not empty
+unlock.label.savePassword = Save password
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/kr.txt b/main/ui/src/main/resources/localization/kr.txt
index 5ae12cfc0..28de51ae3 100644
--- a/main/ui/src/main/resources/localization/kr.txt
+++ b/main/ui/src/main/resources/localization/kr.txt
@@ -81,4 +81,10 @@ main.directoryList.remove.confirmation.title = 보관함 삭제
 main.directoryList.remove.confirmation.header = 정말 이 보관함을 삭제하시겠습니까?
 main.directoryList.remove.confirmation.content = 보관함이 목록에서만 제거되었습니다. 데이터를 완전히 제거하시려면, 여러분의 파일시스템이서 제거해 주시기 바랍니다.
 upgrade.version3to4.msg = 이 보관함은 새로운 형식으로 바뀔 필요가 있습니다. 암호화된 폴더 이름이 업데이트 될 것입니다. 진행하기 전에 동기화가 완료되었는지 확인하기 바랍니다.
-upgrade.version3to4.err.io = 입출력 예외 문제로 마이그레이션이 실패하였습니다. 자세한 사항은 로그 파일을 확인하세요.
\ No newline at end of file
+upgrade.version3to4.err.io = 입출력 예외 문제로 마이그레이션이 실패하였습니다. 자세한 사항은 로그 파일을 확인하세요.
+settings.prefGvfsScheme.label = WebDAV sceme
+# upgrade.fxml
+upgrade.confirmation.label = 네. 동기화가 완료되었음을 확인하였습니다.
+initialize.messageLabel.notEmpty = Vault not empty
+unlock.label.savePassword = Save password
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/lv.txt b/main/ui/src/main/resources/localization/lv.txt
new file mode 100644
index 000000000..bb6d91f2a
--- /dev/null
+++ b/main/ui/src/main/resources/localization/lv.txt
@@ -0,0 +1,91 @@
+app.name = Cryptomator
+# main.fxml
+main.emptyListInstructions = Noklikšķiniet šeit, lai pievienotu glabātuvi
+main.directoryList.contextMenu.remove = Noņemt no saraksta
+main.directoryList.contextMenu.changePassword = Mainīt paroli
+main.addDirectory.contextMenu.new = Izveidot jaunu glabātuvi
+main.addDirectory.contextMenu.open = Atvērt esošu glabātuvi
+# welcome.fxml
+welcome.checkForUpdates.label.currentlyChecking = Pārbauda atjauninājumus...
+welcome.newVersionMessage = Lejupielādei pieejama versija %1$s.\nŠī ir %2$s. 
+# initialize.fxml
+initialize.label.password = Parole
+initialize.label.retypePassword = Atkārto paroli
+initialize.button.ok = Izveidot glabātuvi
+initialize.messageLabel.alreadyInitialized = Glabātuve jau ir inicializēta
+initialize.messageLabel.initializationFailed = Nevarēja inicializēt glabātuvi. Sīkākai informācijai skati žurnālu.
+# notfound.fxml
+notfound.label = Nevar atrast glabātuvi. Vai tā ir pārvietota?
+# upgrade.fxml
+upgrade.button = Atjaunināt glabātuvi
+upgrade.version3dropBundleExtension.msg = Šī glabātuve ir jāmigrē uz jaunākas versijas formātu.\n"%1$s" tiks pārsaukta par "%2$s".\nPirms palaišanas pārliecinies, ka ir beigusies sinhronizācija.
+upgrade.version3dropBundleExtension.err.alreadyExists = Automātiskā migrācija neizdevās.\n"%s" jau eksistē.
+# unlock.fxml
+unlock.label.password = Parole
+unlock.label.mountName = Diska nosaukums
+unlock.label.winDriveLetter = Diska burts
+unlock.label.downloadsPageLink = Visas Cryptomator versijas
+unlock.label.advancedHeading = Papildus opcijas
+unlock.button.unlock = Atslēgt glabātuvi
+unlock.button.advancedOptions.show = Vairāk opcijas
+unlock.button.advancedOptions.hide = Mazāk opcijas
+unlock.choicebox.winDriveLetter.auto = Piešķirt automātiski
+unlock.errorMessage.wrongPassword = Nepareiza parole
+unlock.errorMessage.mountingFailed = Montēšana neizdevās. Sīkākai informācijai skati žurnālu.
+unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Neatbastīta glabātuve. Šī glabātuve ir veidota ar vecāku Cryptomator versiju.
+unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Neatbastīta glabātuve. Šī glabātuve ir veidota ar jaunāku Cryptomator versiju.
+unlock.messageLabel.startServerFailed = WebDAV servera palaišana neizdevās.
+# change_password.fxml
+changePassword.label.oldPassword = Vecā parole
+changePassword.label.newPassword = Jaunā parole
+changePassword.label.retypePassword = Atkārto paroli
+changePassword.label.downloadsPageLink = Visas Cryptomator versijas
+changePassword.button.change = Mainīt paroli
+changePassword.errorMessage.wrongPassword = Nepareiza parole
+changePassword.errorMessage.decryptionFailed = Atšifrēšana neizdevās
+changePassword.infoMessage.success = Parole nomainīta
+# unlocked.fxml
+unlocked.button.lock = Aizslēgt glabātuvi
+unlocked.moreOptions.reveal = Atklāt disku
+unlocked.moreOptions.copyUrl = Kopēt WebDAV saiti
+unlocked.label.revealFailed = Komunikācija neizdevās
+unlocked.label.unmountFailed = Diska izgrūšana neizdevās
+unlocked.label.statsEncrypted = šifrēts
+unlocked.label.statsDecrypted = atšifrēts
+unlocked.ioGraph.yAxis.label = Caurlaidība (MiB/s)
+# mac_warnings.fxml
+macWarnings.windowTitle = Bīstami - %s satur bojātu datni
+macWarnings.message = Cryptomator konstatēja potenciāli ļaunprātīgu bojājumu sekojošām datnēm\:
+macWarnings.moreInformationButton = Skatīt vairāk
+macWarnings.whitelistButton = Atšifrēt iezīmēto tāpat
+# settings.fxml
+settings.version.label = Versija %s
+settings.checkForUpdates.label = Meklēt atjauninājumus
+settings.port.label = WebDAV Ports *
+settings.port.prompt = 0 \= automātiski
+settings.useipv6.label = Izmantot IPv6
+settings.requiresRestartLabel = * Cryptomator nepieciešams restarts
+# tray icon
+tray.menu.open = Atvērt
+tray.menu.quit = Iziet
+tray.infoMsg.title = Joprojām darbojās
+# Fuzzy
+tray.infoMsg.msg = Cryptomator joprojām darbojās. Iziet var no ikonas.
+tray.infoMsg.msg.osx = Cryptomator is still alive. joprojām darbojās. Iziet var no izvēlnes ikonas.
+initialize.messageLabel.passwordStrength.0 = Ļoti vāja
+initialize.messageLabel.passwordStrength.1 = Vāja
+initialize.messageLabel.passwordStrength.2 = Vidēja
+initialize.messageLabel.passwordStrength.3 = Stipra
+initialize.messageLabel.passwordStrength.4 = Ļoti stipra
+initialize.label.doNotForget = SVARĪGI\: Ja tu aizmirsti paroli, nav ceļa datu atjaunošanai
+main.directoryList.remove.confirmation.title = Noņemt glabātuvi
+main.directoryList.remove.confirmation.header = Vai tiešām vēlie noņemt šo glabātuvi?
+main.directoryList.remove.confirmation.content = Glabātuve tiks noņemta tikai no saraksta. Lai to dzēstu pilnībā, lūdzu nodzēs to no datņu sistēmas.
+upgrade.version3to4.msg = Šī glabātuve ir jāmigrē uz jaunāku formāta versiju. Sifrētie mapju nosaukumi tiks atjaunināti. Pirms palaišanas lūdzu pārliecinies, ka ir pabeigusies sinhronizācija.
+upgrade.version3to4.err.io = Migrācija neizdevās dēļ I/O izņēmuma. Sīkākai informācijai skati žurnālu.
+settings.prefGvfsScheme.label = WebDAV shēma
+# upgrade.fxml
+upgrade.confirmation.label = Jā, esmu pārliecinājies, ka sinhronizācija ir pabeigta.
+initialize.messageLabel.notEmpty = Vault not empty
+unlock.label.savePassword = Save password
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/nl.txt b/main/ui/src/main/resources/localization/nl.txt
index 473534744..f037ef101 100644
--- a/main/ui/src/main/resources/localization/nl.txt
+++ b/main/ui/src/main/resources/localization/nl.txt
@@ -81,4 +81,10 @@ main.directoryList.remove.confirmation.title = Verwijder Kluis
 main.directoryList.remove.confirmation.header = Weet je zeker dat je deze kluis wilt verwijderen?
 main.directoryList.remove.confirmation.content = De kluis zal alleen van de lijst worden verwijdert. Verwijder de bestanden van het bestandssysteem voor permanente verwijdering.
 upgrade.version3to4.msg = Deze kluis dient gemigreerd te worden naar een nieuwer type. \nVersleutelde mapnamen zullen worden geüpdatet. \nZorg ervoor dat de synchronisatie voltooid is alvorens door te gaan.
-upgrade.version3to4.err.io = Migratie mislukt door een I/O Exception. Zie logbestand voor details.
\ No newline at end of file
+upgrade.version3to4.err.io = Migratie mislukt door een I/O Exception. Zie logbestand voor details.
+settings.prefGvfsScheme.label = WebDAV scheme
+# upgrade.fxml
+upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
+initialize.messageLabel.notEmpty = Vault not empty
+unlock.label.savePassword = Save password
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/pl.txt b/main/ui/src/main/resources/localization/pl.txt
new file mode 100644
index 000000000..0ba42552b
--- /dev/null
+++ b/main/ui/src/main/resources/localization/pl.txt
@@ -0,0 +1,90 @@
+app.name = Cryptomator
+# main.fxml
+main.emptyListInstructions = Kliknij tutaj aby dodać kryptę
+main.directoryList.contextMenu.remove = Usuń z listy
+main.directoryList.contextMenu.changePassword = Zmień hasło
+main.addDirectory.contextMenu.new = Stwórz nową kryptę
+main.addDirectory.contextMenu.open = Otwórz istniejącą kryptę
+# welcome.fxml
+welcome.checkForUpdates.label.currentlyChecking = Sprawdź aktualizację
+welcome.newVersionMessage = Wersja %1$s może być pobrana.\nObecna %2$s.
+# initialize.fxml
+initialize.label.password = Hasło
+initialize.label.retypePassword = Ponów hasło
+initialize.button.ok = Stwórz kryptę
+initialize.messageLabel.alreadyInitialized = Krypta aktualnie załadowana
+initialize.messageLabel.initializationFailed = Nie można załadować krypty. Sprawdź logi
+# notfound.fxml
+notfound.label = Krypta nie znaleziona. Przeniesiona? 
+# upgrade.fxml
+upgrade.button = Aktualizuj kryptę
+upgrade.version3dropBundleExtension.msg = Ta krypta musi zostać przeniesiona do nowego formatu\n"%1$s" zamienione na "%2$s".\nProszę synchronizować przed skończeniem procesu
+upgrade.version3dropBundleExtension.err.alreadyExists = Błąd automatycznej migracji.\n"%s" już istnieje
+# unlock.fxml
+unlock.label.password = Hasło
+unlock.label.mountName = Nazwa dysku
+unlock.label.winDriveLetter = Litera dysku
+unlock.label.downloadsPageLink = Wszystkie wersje Cryptomatora
+unlock.label.advancedHeading = Zaawansowane opcje
+unlock.button.unlock = Odblokuj kryptę
+unlock.button.advancedOptions.show = Więcej opcji
+unlock.button.advancedOptions.hide = Mniej opcji
+unlock.choicebox.winDriveLetter.auto = Przydzielone automatycznie
+unlock.errorMessage.wrongPassword = Złe hasło
+unlock.errorMessage.mountingFailed = Błąd zamontowania. Sprawdź logi 
+unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Niewspierana krypta, utworzona przez starszą wersje Cryptomatora
+unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Niewspierana krypta, utworzona przez nowszą wersje Cryptomatora
+unlock.messageLabel.startServerFailed = Błąd startu serwera WebDAV 
+# change_password.fxml
+changePassword.label.oldPassword = Stare hasło
+changePassword.label.newPassword = Nowe hasło
+changePassword.label.retypePassword = Powtórz hasło
+changePassword.label.downloadsPageLink = Wszystkie wersje Cryptomatora
+changePassword.button.change = Zmień hasło
+changePassword.errorMessage.wrongPassword = Złe hasło
+changePassword.errorMessage.decryptionFailed = Błąd deszyfracji
+changePassword.infoMessage.success = Hasło zmienione
+# unlocked.fxml
+unlocked.button.lock = Zablokuj kryptę
+unlocked.moreOptions.reveal = Zwolnij napęd
+unlocked.moreOptions.copyUrl = Skopiuj url WebDAV
+unlocked.label.revealFailed = Zła komenda
+unlocked.label.unmountFailed = Błąd wysuwania napędu
+unlocked.label.statsEncrypted = Zaszyfrowany
+unlocked.label.statsDecrypted = Odszyfrowany
+unlocked.ioGraph.yAxis.label = Wydajność (MiB/s) 
+# mac_warnings.fxml
+macWarnings.windowTitle = Uwaga - Plik uszkodzony %s
+macWarnings.message = Wykryto zagrożenie w plikach
+macWarnings.moreInformationButton = Czytaj więcej
+macWarnings.whitelistButton = Odszyfruj wszystko
+# settings.fxml
+settings.version.label = Wersja %s 
+settings.checkForUpdates.label = Sprawdź aktualizacje 
+settings.port.label = WebDAV port *
+settings.port.prompt = 0 \= Automatycznie
+settings.useipv6.label = Użyj IPv6
+settings.requiresRestartLabel = * Cryptomator wymaga restartu
+# tray icon
+tray.menu.open = Otwórz
+tray.menu.quit = Wyjdź
+tray.infoMsg.title = Nadal działa
+tray.infoMsg.msg = Cryptomator działa nadal. Wyjdź z ikony tray
+tray.infoMsg.msg.osx = Cryptomator działa nadal. Wyjdź z menu programu
+initialize.messageLabel.passwordStrength.0 = Bardzo słabe
+initialize.messageLabel.passwordStrength.1 = Słabe
+initialize.messageLabel.passwordStrength.2 = W porządku
+initialize.messageLabel.passwordStrength.3 = Mocne
+initialize.messageLabel.passwordStrength.4 = Bardzo mocne
+initialize.label.doNotForget = Ważne\! Jeśli zapomnisz hasło stracisz dostęp do danych
+main.directoryList.remove.confirmation.title = Usuń kryptę
+main.directoryList.remove.confirmation.header = Czy na pewno chcesz osunąć kryptę? 
+main.directoryList.remove.confirmation.content = Ta krypta zostanie usunięta z listy. Ostatecznie usuń dane z dysku.
+upgrade.version3to4.msg = Krypta wymaga migracji do nowszej wersji. Nazwa folderu zaszyfrowanego zostanie zaktualizowana. Synchronizuj dane przed procesem.
+upgrade.version3to4.err.io = Błąd migracji  I/O Exception. Sprawdź logi
+settings.prefGvfsScheme.label = Schemat WebDAV
+# upgrade.fxml
+upgrade.confirmation.label = Tak, jestem pewien, że zakończyłem synchronizacje
+initialize.messageLabel.notEmpty = Vault not empty
+unlock.label.savePassword = Save password
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/pt.txt b/main/ui/src/main/resources/localization/pt.txt
index ef8cdfbe3..0cb657db4 100644
--- a/main/ui/src/main/resources/localization/pt.txt
+++ b/main/ui/src/main/resources/localization/pt.txt
@@ -1,34 +1,90 @@
-# Copyright (c) 2016 The Cryptomator Contributors
-# This file is licensed under the terms of the MIT license.
-# See the LICENSE.txt file for more info.
-#
-# Contributors:
-#     Will
-#     André Di Biasi
-
 app.name = Cryptomator
+# main.fxml
+main.emptyListInstructions = Clique aqui para adicionar uma caixa-forte
 main.directoryList.contextMenu.remove = Remover da lista
 main.directoryList.contextMenu.changePassword = Alterar senha
+main.addDirectory.contextMenu.new = Criar nova caixa-forte
+main.addDirectory.contextMenu.open = Abrir caixa-forte existente
 # welcome.fxml
-welcome.checkForUpdates.label.currentlyChecking = Procurando atualizações...
+welcome.checkForUpdates.label.currentlyChecking = Buscando por atualizações...
+welcome.newVersionMessage = Versão %1$s pode ser abaixada. Esta é a versão %2$s.
 # initialize.fxml
 initialize.label.password = Senha
-initialize.label.retypePassword = Digite a senha novamente
+initialize.label.retypePassword = Redigitar senha
+initialize.button.ok = Criar caixa-forte
+initialize.messageLabel.alreadyInitialized = Caixa-forte já inicializada
+initialize.messageLabel.initializationFailed = Não pôde inicializar a caixa-forte. Ver arquivo de log para mais detalhes.
+# notfound.fxml
+notfound.label = A caixa-forte não pode ser encontrada. Ela foi movida?
+# upgrade.fxml
+upgrade.button = Atualizar caixa-forte
+upgrade.version3dropBundleExtension.msg = Esta caixa-forte tem que ser a migrada a um novo formato. "%1$s" será renomeada para "%2$s". Por favor assegure-se de que a sincronização foi finalizada antes de proceder com a migração.
+upgrade.version3dropBundleExtension.err.alreadyExists = A migração automática falhou. "%s" já existe.
 # unlock.fxml
 unlock.label.password = Senha
+unlock.label.mountName = Nome do drive
+unlock.label.winDriveLetter = Letra do drive
+unlock.label.downloadsPageLink = Todas as versões do Cryptomator
 unlock.label.advancedHeading = Opções avançadas
+unlock.button.unlock = Abrir caixa-forte
+unlock.button.advancedOptions.show = Mais opções
 unlock.button.advancedOptions.hide = Menos opções
 unlock.choicebox.winDriveLetter.auto = Atribuir automaticamente
-unlock.errorMessage.wrongPassword = Senha incorreta
-unlock.errorMessage.mountingFailed = Montagem falhou. Veja o arquivo de log para detalhes
-unlock.messageLabel.startServerFailed = Inicialização do servidor WEBDAV falhou
+unlock.errorMessage.wrongPassword = Senha errada
+unlock.errorMessage.mountingFailed = Falha ao montar. Ver arquivo de log para mais detalhes.
+unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Caixa-forte não suportada. Esta caixa-forte foi criada por uma versão antiga do Cryptomator.
+unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Caixa-forte não suportada. Esta caixa-forte foi criada por uma versão mais nova do Cryptomator.
+unlock.messageLabel.startServerFailed = Falha ao iniciar servidor WebDAV.
 # change_password.fxml
-changePassword.label.oldPassword = Senha antiga
+changePassword.label.oldPassword = Senha anterior
 changePassword.label.newPassword = Nova senha
-changePassword.label.retypePassword = Digite a senha novamente
+changePassword.label.retypePassword = Re-digitar senha
+changePassword.label.downloadsPageLink = Todas as versões do Cryptomator
 changePassword.button.change = Alterar senha
+changePassword.errorMessage.wrongPassword = Senha incorreta
+changePassword.errorMessage.decryptionFailed = Falha ao desencriptar
 changePassword.infoMessage.success = Senha alterada
-unlocked.label.revealFailed = Falha no comando
-unlocked.label.unmountFailed = Falha ao ejetar o drive
+# unlocked.fxml
+unlocked.button.lock = Fechar caixa-forte
+unlocked.moreOptions.reveal = Mostrar drive
+unlocked.moreOptions.copyUrl = Copiar URL WebDAV
+unlocked.label.revealFailed = Falha ao mostrar drive
+unlocked.label.unmountFailed = Falha ao ejetar drive
 unlocked.label.statsEncrypted = encriptado
+unlocked.label.statsDecrypted = desencriptado
+unlocked.ioGraph.yAxis.label = Taxa de transferência (MiB/s)
+# mac_warnings.fxml
+macWarnings.windowTitle = Perigo - Arquivo corrompido na %s
+macWarnings.message = Cryptomator detectou potenciais corrupções maliciosas nos seguintes arquivos\:
 macWarnings.moreInformationButton = Saiba mais
+macWarnings.whitelistButton = Desencriptar selecionado de qualquer modo
+# settings.fxml
+settings.version.label = Versão %s
+settings.checkForUpdates.label = Verificar por atualizações
+settings.port.label = Port WebDAV *
+settings.port.prompt = 0 \= Escolher automaticamente
+settings.useipv6.label = Usar IPv6 literal
+settings.requiresRestartLabel = * Cryptomator necessita ser reiniciado
+# tray icon
+tray.menu.open = Abrir
+tray.menu.quit = Sair
+tray.infoMsg.title = Ainda em execução
+tray.infoMsg.msg = Cryptomator ainda está ativo. Finalize-o a partir do ícone da bandeja.
+tray.infoMsg.msg.osx = Cryptomator ainda está ativo. Finalize-o a partir do ícone da barra de menu.
+initialize.messageLabel.passwordStrength.0 = Muito fraca
+initialize.messageLabel.passwordStrength.1 = Fraca
+initialize.messageLabel.passwordStrength.2 = Razoável
+initialize.messageLabel.passwordStrength.3 = Forte
+initialize.messageLabel.passwordStrength.4 = Muito forte
+initialize.label.doNotForget = IMPORTANTE\: se você esquecer a sua senha, não haverá como recuperar os seus dados.
+main.directoryList.remove.confirmation.title = Remover caixa-forte
+main.directoryList.remove.confirmation.header = Você realmente quer remover esta caixa-forte?
+main.directoryList.remove.confirmation.content = A caixa-forte somente será removida da lista. Para apagá-la permanentemente, por favor apagar os arquivos do seu sistema de arquivos.
+upgrade.version3to4.msg = Esta caixa-forte tem que ser migrada a um novo formato. Os nomes das pastas encriptadas serão atualizados. Por favor assegure-se de que a sincronização foi finalizada antes de proceder com a migração.
+upgrade.version3to4.err.io = Falha na migração devido a um erro de E/S. Ver arquivo de log para mais detalhes.
+settings.prefGvfsScheme.label = WebDAV scheme
+# upgrade.fxml
+upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
+initialize.messageLabel.notEmpty = Vault not empty
+unlock.label.savePassword = Save password
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/ru.txt b/main/ui/src/main/resources/localization/ru.txt
index 64754cb8d..f3dec6089 100644
--- a/main/ui/src/main/resources/localization/ru.txt
+++ b/main/ui/src/main/resources/localization/ru.txt
@@ -83,4 +83,10 @@ main.directoryList.remove.confirmation.title = Удаление хранилищ
 main.directoryList.remove.confirmation.header = Вы действительно хотите удалить это хранилище?
 main.directoryList.remove.confirmation.content = Хранилище будет удалено только из списка. Чтобы стереть его окончательно, удалите файлы из файловой системы.
 upgrade.version3to4.msg = Это хранилище требуется преобразовать в новый формат. Зашифрованные имена папок будут обновлены. Прежде чем продолжить, выполните синхронизацию.
-upgrade.version3to4.err.io = Преобразование не выполнено из-за ошибки ввода-вывода. См. подробности в файле-отчёте.
\ No newline at end of file
+upgrade.version3to4.err.io = Преобразование не выполнено из-за ошибки ввода-вывода. См. подробности в файле-отчёте.
+settings.prefGvfsScheme.label = Схема WebDAV
+# upgrade.fxml
+upgrade.confirmation.label = Да, синхронизация точно завершена
+initialize.messageLabel.notEmpty = Vault not empty
+unlock.label.savePassword = Save password
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/sk.txt b/main/ui/src/main/resources/localization/sk.txt
index 9c05a37d7..f3924bb68 100644
--- a/main/ui/src/main/resources/localization/sk.txt
+++ b/main/ui/src/main/resources/localization/sk.txt
@@ -22,7 +22,7 @@ notfound.label = Trezor nemohol byť nenájdený. Bol presunutý?
 # upgrade.fxml
 upgrade.button = Upgradnúť trezor
 upgrade.version3dropBundleExtension.msg = Tento trezor musí byť premigrovaný na nový formát. "%1$s" bude premenovaný na "%2$s". Prosím, uistite sa že je dokončená synchronizácia skôr než budete pokračovať.
-upgrade.version3dropBundleExtension.err.alreadyExists = Automatická migrácia zlyhala. "%s" už existuje. 
+upgrade.version3dropBundleExtension.err.alreadyExists = Automatická migrácia zlyhala. "%s" už existuje.
 # unlock.fxml
 unlock.label.password = Heslo
 unlock.label.mountName = Názov jednotky
@@ -73,4 +73,21 @@ tray.menu.open = Otvoriť
 tray.menu.quit = Vypnúť
 tray.infoMsg.title = Stále beží
 tray.infoMsg.msg = Cryptomator je stále spustený. Vypnite ho pomocou ikony v systémovej lište.
-tray.infoMsg.msg.osx = Cryptomator je stále sputený. Ukončite ho pomocou ikony v menu.
\ No newline at end of file
+tray.infoMsg.msg.osx = Cryptomator je stále sputený. Ukončite ho pomocou ikony v menu.
+initialize.messageLabel.passwordStrength.0 = Very weak
+initialize.messageLabel.passwordStrength.1 = Weak
+initialize.messageLabel.passwordStrength.2 = Fair
+initialize.messageLabel.passwordStrength.3 = Strong
+initialize.messageLabel.passwordStrength.4 = Very strong
+initialize.label.doNotForget = IMPORTANT\: If you forget your password, there is no way to recover your data.
+main.directoryList.remove.confirmation.title = Remove Vault
+main.directoryList.remove.confirmation.header = Do you really want to remove this vault?
+main.directoryList.remove.confirmation.content = The vault will only be removed from the list. To permanently delete it, please delete the files from your filesystem.
+upgrade.version3to4.msg = This vault needs to be migrated to a newer format.\nEncrypted folder names will be updated.\nPlease make sure synchronization has finished before proceeding.
+upgrade.version3to4.err.io = Migration failed due to an I/O Exception. See log file for details.
+settings.prefGvfsScheme.label = WebDAV scheme
+# upgrade.fxml
+upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
+initialize.messageLabel.notEmpty = Vault not empty
+unlock.label.savePassword = Save password
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/tr.txt b/main/ui/src/main/resources/localization/tr.txt
index 44fcda4ff..acd84ccb0 100644
--- a/main/ui/src/main/resources/localization/tr.txt
+++ b/main/ui/src/main/resources/localization/tr.txt
@@ -81,4 +81,10 @@ main.directoryList.remove.confirmation.title = Kasayı Sil
 main.directoryList.remove.confirmation.header = Kasayı silmek istediğinize emin misiniz ?
 main.directoryList.remove.confirmation.content = Kasa yalnızca listeden silinecek. Tamamen silmek için dosya sisteminizden dosyaları elle siliniz.
 upgrade.version3to4.msg = Bu kasanın yeni formata geçirilmesi gerekmekte. Şifreli klasör isimleri güncellenecek. Devam etmeden önce senkronizasyonun bittiğine emin olun.
-upgrade.version3to4.err.io = Format değiştirme işlemi I/O Hatası dolayısı ile başarısız oldu. Detaylar için log dosyasına bakın
\ No newline at end of file
+upgrade.version3to4.err.io = Format değiştirme işlemi I/O Hatası dolayısı ile başarısız oldu. Detaylar için log dosyasına bakın
+settings.prefGvfsScheme.label = WebDAV scheme
+# upgrade.fxml
+upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
+initialize.messageLabel.notEmpty = Vault not empty
+unlock.label.savePassword = Save password
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
\ No newline at end of file
diff --git a/main/ui/src/main/resources/localization/uk.txt b/main/ui/src/main/resources/localization/uk.txt
new file mode 100644
index 000000000..babb3f8ce
--- /dev/null
+++ b/main/ui/src/main/resources/localization/uk.txt
@@ -0,0 +1,90 @@
+app.name = Cryptomator
+# main.fxml
+main.emptyListInstructions = Натисніть тут, щоб додати сховище
+main.directoryList.contextMenu.remove = Видалити зі списку
+main.directoryList.contextMenu.changePassword = Змінити пароль
+main.addDirectory.contextMenu.new = Створити нове сховище
+main.addDirectory.contextMenu.open = Відкрити існуюче сховище
+# welcome.fxml
+welcome.checkForUpdates.label.currentlyChecking = Перевірка оновлень...
+welcome.newVersionMessage = Доступна версія %1$s.\nВаша версія %2$s.
+# initialize.fxml
+initialize.label.password = Пароль
+initialize.label.retypePassword = Повторіть пароль
+initialize.button.ok = Створити сховище
+initialize.messageLabel.alreadyInitialized = Сховище вже ініціалізовано
+initialize.messageLabel.initializationFailed = Неможливо ініціалізувати сховище. Дивіться деталі в файлі-звіті.
+# notfound.fxml
+notfound.label = Сховище не знайдене. Воно було переміщене?
+# upgrade.fxml
+upgrade.button = Оновити сховище
+upgrade.version3dropBundleExtension.msg = Це сховище необхідно перетворити в новіший формат.\n"%1$s" буде перейменовано в "%2$s".\nПереконайтеся, що синхронізація завершена, перш ніж продовжити.
+upgrade.version3dropBundleExtension.err.alreadyExists = Автоматичне перетворення не виконане.\n"%s" вже існує.
+# unlock.fxml
+unlock.label.password = Пароль
+unlock.label.mountName = Ім'я диска
+unlock.label.winDriveLetter = Літера диска
+unlock.label.downloadsPageLink = Всі версії Cryptomator
+unlock.label.advancedHeading = Додаткові налаштування
+unlock.button.unlock = Розблокувати сховище
+unlock.button.advancedOptions.show = Більше налаштувань
+unlock.button.advancedOptions.hide = Менше налаштувань
+unlock.choicebox.winDriveLetter.auto = Призначити автоматично
+unlock.errorMessage.wrongPassword = Пароль невірний
+unlock.errorMessage.mountingFailed = Монтування невдале. Дивіться деталі в файлі-звіті.
+unlock.errorMessage.unsupportedVersion.vaultOlderThanSoftware = Сховище не підтримується. Воно було створене в старішій версії Cryptomator.
+unlock.errorMessage.unsupportedVersion.softwareOlderThanVault = Сховище не підтримується. Воно було створене в новішій версії Cryptomator.
+unlock.messageLabel.startServerFailed = Помилка запуску сервера WebDAV.
+# change_password.fxml
+changePassword.label.oldPassword = Старий пароль
+changePassword.label.newPassword = Новий пароль
+changePassword.label.retypePassword = Повторіть пароль
+changePassword.label.downloadsPageLink = Всі версії Cryptomator
+changePassword.button.change = Змінити пароль
+changePassword.errorMessage.wrongPassword = Пароль невірний
+changePassword.errorMessage.decryptionFailed = Розшифрування невдале
+changePassword.infoMessage.success = Пароль змінений
+# unlocked.fxml
+unlocked.button.lock = Заблокувати сховище
+unlocked.moreOptions.reveal = Відкрити накопичувач
+unlocked.moreOptions.copyUrl = Копіювати URL-адресу WebDAV
+unlocked.label.revealFailed = Команда невдала
+unlocked.label.unmountFailed = Вилучення диска невдале
+unlocked.label.statsEncrypted = зашифровано
+unlocked.label.statsDecrypted = розшифровано
+unlocked.ioGraph.yAxis.label = Пропускна спроможність (МіБ/с)
+# mac_warnings.fxml
+macWarnings.windowTitle = Небезпека - Пошкоджений файл в %s
+macWarnings.message = Cryptomator виявив потенційно небезпечні пошкодження в наступних файлах\:
+macWarnings.moreInformationButton = Докладніше
+macWarnings.whitelistButton = Розшифрувати обрані все одно
+# settings.fxml
+settings.version.label = Версія %s
+settings.checkForUpdates.label = Перевірити оновлення
+settings.port.label = Порт WebDAV *
+settings.port.prompt = 0 \= Обрати автоматично
+settings.useipv6.label = Використовувати IPv6
+settings.requiresRestartLabel = * Необхідне перезавантаження Cryptomator
+# tray icon
+tray.menu.open = Відкрити
+tray.menu.quit = Вихід
+tray.infoMsg.title = Ще працює
+tray.infoMsg.msg = Cryptomator все ще працює. Вийдіть за допомогою значка в області сповіщень.
+tray.infoMsg.msg.osx = Cryptomator все ще працює. Вийдіть за допомогою значка в рядку меню.
+initialize.messageLabel.passwordStrength.0 = Дуже слабкий
+initialize.messageLabel.passwordStrength.1 = Слабкий
+initialize.messageLabel.passwordStrength.2 = Прийнятний
+initialize.messageLabel.passwordStrength.3 = Сильний
+initialize.messageLabel.passwordStrength.4 = Дуже сильний
+initialize.label.doNotForget = ВАЖЛИВО\: Якщо ви забудете свій пароль, відновити дані буде неможливо.
+main.directoryList.remove.confirmation.title = Видалити сховище
+main.directoryList.remove.confirmation.header = Ви дійсно хочете видалити це сховище?
+main.directoryList.remove.confirmation.content = Сховище буде видалене тільки зі списку. Щоб стерти його остаточно, видаліть файли із файлової системи.
+upgrade.version3to4.msg = Це сховище необхідно перетворити в новий формат. Зашифровані імена папок будуть оновлені. Перш ніж продовжити, виконайте синхронізацію.
+upgrade.version3to4.err.io = Перетворення невдале через помилку введення-виведення. Дивіться деталі в файлі-звіті.
+settings.prefGvfsScheme.label = WebDAV scheme
+# upgrade.fxml
+upgrade.confirmation.label = Yes, I've made sure that synchronization has finished
+initialize.messageLabel.notEmpty = Vault not empty
+unlock.label.savePassword = Save password
+unlock.errorMessage.unauthenticVersionMac = Could not authenticate version MAC.
\ No newline at end of file

From 84ac6d88f573ba08b0bb96372e9aeb15b9c11b7e Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastianstenzel@gmail.com>
Date: Thu, 15 Sep 2016 23:55:37 +0200
Subject: [PATCH 45/45] added new localization files to unit test [ci skip]

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

diff --git a/main/ui/src/test/java/org/cryptomator/ui/LocalizationTest.java b/main/ui/src/test/java/org/cryptomator/ui/LocalizationTest.java
index 2b67a282e..6f086064c 100644
--- a/main/ui/src/test/java/org/cryptomator/ui/LocalizationTest.java
+++ b/main/ui/src/test/java/org/cryptomator/ui/LocalizationTest.java
@@ -31,7 +31,7 @@ public class LocalizationTest {
 	private static final Logger LOG = LoggerFactory.getLogger(LocalizationTest.class);
 	private static final String RESOURCE_FOLDER_PATH = "/localization/";
 	private static final String REF_FILE_NAME = "en.txt";
-	private static final String[] LANG_FILE_NAMES = {"de.txt", "es.txt", "fr.txt", "hu.txt", "it.txt", "kr.txt", "nl.txt", "pt.txt", "ru.txt", "sk.txt", "tr.txt"};
+	private static final String[] LANG_FILE_NAMES = {"de.txt", "es.txt", "fr.txt", "hu.txt", "it.txt", "kr.txt", "lv.txt", "nl.txt", "pl.txt", "pt.txt", "ru.txt", "sk.txt", "tr.txt", "uk.txt"};
 
 	/*
 	 * @see Formatter