preparing 1.4.10

fixes #862

.github/CONTRIBUTING.md

@@ -4,7 +4,7 @@
 
 - Ensure you're running the latest version of Cryptomator.
 - Ensure the bug is related to the desktop version of Cryptomator. Bugs concerning the Cryptomator iOS and Android app can be reported on the [Cryptomator for iOS issues list](https://github.com/cryptomator/cryptomator-ios/issues) and [Cryptomator for Android issues list](https://github.com/cryptomator/cryptomator-android/issues) respectively.
-- Ensure the bug was not [already reported](https://github.com/cryptomator/cryptomator/issues). You can also check out our [FAQ](https://community.cryptomator.org/c/faq).
+- Ensure the bug was not [already reported](https://github.com/cryptomator/cryptomator/issues). You can also check out our [FAQ](https://community.cryptomator.org/c/kb/faq).
 - If you're unable to find an open issue addressing the problem, [submit a new one](https://github.com/cryptomator/cryptomator/issues/new).
 
 ## Did you write a patch that fixes a bug?
@@ -18,7 +18,7 @@
 
 ## Code of Conduct
 
-Help us keep Cryptomator open and inclusive. Please read and follow our [Code of Conduct](https://github.com/cryptomator/cryptomator/blob/develop/CODE_OF_CONDUCT.md).
+Help us keep Cryptomator open and inclusive. Please read and follow our [Code of Conduct](https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md).
 
 ## Above all, thank you for your contributions
 

.github/ISSUE_TEMPLATE.md

@@ -4,8 +4,8 @@ Before creating a new issue make sure that you
 - searched existing (and closed) issues: https://github.com/cryptomator/cryptomator/issues
 - searched the knowledge base: https://community.cryptomator.org/c/kb
 - have read the support guide: https://github.com/cryptomator/cryptomator/blob/develop/SUPPORT.md
-- have read the contribution guide: https://github.com/cryptomator/cryptomator/blob/develop/CONTRIBUTING.md
-- have read the code of conduct: https://github.com/cryptomator/cryptomator/blob/develop/CODE_OF_CONDUCT.md
+- have read the contribution guide: https://github.com/cryptomator/cryptomator/blob/develop/.github/CONTRIBUTING.md
+- have read the code of conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md
 
 ## Basic Info
 

.github/ISSUE_TEMPLATE/1.4.0-beta-testing.md

@@ -0,0 +1,15 @@
+## 1.4.0 Beta Issue Checklist
+- Existing 1.4.0 Beta Issues: https://github.com/cryptomator/cryptomator/milestone/27
+- Contribution Guide: https://github.com/cryptomator/cryptomator/blob/develop/.github/CONTRIBUTING.md
+- Code of Conduct: https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md
+
+## Software Used During the Test
+- Cryptomator 1.4.0 Beta 1
+- Ubuntu 16.04 / macOS 10.11.6 / etc
+- Linux Kernel x.y.z
+- Gnome x.y.z
+- OpenOffice x.y.z
+- ...
+
+## Description
+What doesn't work? What did you do? How can the bug be reproduced?

.github/no-response.yml

@@ -0,0 +1,13 @@
+# Configuration for probot-no-response - https://github.com/probot/no-response
+
+# Number of days of inactivity before an Issue is closed for lack of response
+daysUntilClose: 14
+# Label requiring a response
+responseRequiredLabel: state:awaiting-response
+# Comment to post when closing an Issue for lack of response. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed because there has been no response
+  to our request for more information from the original author. With only the
+  information that is currently in the issue, we don't have enough information
+  to take action. Please reach out if you have or find the answers we need so
+  that we can investigate further.

.github/stale.yml

@@ -0,0 +1,19 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - type:security-issue # never close automatically
+  - state:awaiting-response # handled by different bot
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+# Label to use when marking an issue as stale
+staleLabel: state:stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false

.gitignore

@@ -9,15 +9,14 @@
 .settings
 .project
 .classpath
+
+# Maven #
 target/
-test-output/
+pom.xml.versionsBackup
 
-# IntelliJ Settings Files #
-.idea/
-out/
-.idea_modules/
-*.iws
-*.iml
-
-# Temporary file created by test launcher
-main/launcher/.ipcPort.tmp
+# IntelliJ Settings Files (https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems) #
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
+.idea/**/libraries/
+*.iml

.idea/.name

@@ -0,0 +1 @@
+Cryptomator

.idea/codeStyles/Project.xml

@@ -0,0 +1,51 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="OTHER_INDENT_OPTIONS">
+      <value>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </value>
+    </option>
+    <option name="LINE_SEPARATOR" value="&#10;" />
+    <option name="RIGHT_MARGIN" value="220" />
+    <option name="FORMATTER_TAGS_ENABLED" value="true" />
+    <JavaCodeStyleSettings>
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="30" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="10" />
+      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+        <value />
+      </option>
+      <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
+      <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
+    </JavaCodeStyleSettings>
+    <codeStyleSettings language="Groovy">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <option name="KEEP_LINE_BREAKS" value="false" />
+      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+      <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+      <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JSON">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="USE_TAB_CHARACTER" value="true" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/compiler.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Annotation profile for Cryptomator" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="false">
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-compiler/2.22.1/dagger-compiler-2.22.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger/2.22.1/dagger-2.22.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-producers/2.22.1/dagger-producers-2.22.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/25.0-jre/guava-25.0-jre.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/checkerframework/checker-compat-qual/2.5.3/checker-compat-qual-2.5.3.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-spi/2.22.1/dagger-spi-2.22.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/squareup/javapoet/1.11.1/javapoet-1.11.1.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/googlejavaformat/google-java-format/1.5/google-java-format-1.5.jar" />
+          <entry name="$MAVEN_REPOSITORY$/com/google/errorprone/javac-shaded/9-dev-r4023-3/javac-shaded-9-dev-r4023-3.jar" />
+          <entry name="$MAVEN_REPOSITORY$/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" />
+        </processorPath>
+        <module name="keychain" />
+        <module name="commons" />
+        <module name="ui" />
+        <module name="launcher" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="buildkit" target="11" />
+    </bytecodeTargetLevel>
+  </component>
+</project>

.idea/encodings.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM">
+    <file url="file://$PROJECT_DIR$/main" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/main/buildkit" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/main/commons" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/main/keychain" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/main/launcher" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/main/ui" charset="UTF-8" />
+  </component>
+</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,10 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
+      <option name="processCode" value="true" />
+      <option name="processLiterals" value="true" />
+      <option name="processComments" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

.idea/misc.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/main/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/Desktop.iml" filepath="$PROJECT_DIR$/.idea/Desktop.iml" />
+      <module fileurl="file://$PROJECT_DIR$/main/buildkit/buildkit.iml" filepath="$PROJECT_DIR$/main/buildkit/buildkit.iml" />
+    </modules>
+  </component>
+</project>

.idea/runConfigurations/Cryptomator_Linux.xml

@@ -0,0 +1,10 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Cryptomator Linux" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
+    <module name="launcher" />
+    <option name="VM_PARAMETERS" value="-Djdk.gtk.version=2 -Duser.language=en -Dcryptomator.settingsPath=&quot;~/.config/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/.config/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/.local/share/Cryptomator/logs&quot; -Dcryptomator.mountPointsDir=&quot;~/.local/share/Cryptomator/mnt&quot; -Xss20m -Xmx512m" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.idea/runConfigurations/Cryptomator_Windows.xml

@@ -0,0 +1,10 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Cryptomator Windows" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
+    <module name="launcher" />
+    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/AppData/Roaming/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/AppData/Roaming/Cryptomator&quot; -Dcryptomator.keychainPath=&quot;~/AppData/Roaming/Cryptomator/keychain.json&quot; -Xss2m -Xmx512m" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.idea/runConfigurations/Cryptomator_macOS.xml

@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Cryptomator macOS" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
+    <module name="launcher" />
+    <option name="VM_PARAMETERS" value="-Duser.language=en -Dcryptomator.settingsPath=&quot;~/Library/Application Support/Cryptomator/settings.json&quot; -Dcryptomator.ipcPortPath=&quot;~/Library/Application Support/Cryptomator/ipcPort.bin&quot; -Dcryptomator.logDir=&quot;~/Library/Logs/Cryptomator&quot; -Dcryptomator.mountPointsDir=&quot;/Volumes/&quot; -Xss2m -Xmx512m" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.travis-deploy-release.tmpl.json

@@ -0,0 +1,19 @@
+{
+  "package": {
+	"name": "buildkit",
+	"repo": "cryptomator",
+	"subject": "cryptomator"
+  },
+  "version": {
+	"name": "$TRAVIS_TAG",
+	"desc": "Cryptomator version $TRAVIS_TAG",
+	"released": "$TODAY",
+	"vcs_tag": "$TRAVIS_TAG",
+	"gpgSign": true
+  },
+  "files":
+  [
+	{"includePattern": "main/buildkit/target/(buildkit-[a-z]+\\.zip)", "uploadPattern": "/$TRAVIS_TAG/$1"}
+  ],
+  "publish": true
+}

.travis-deploy-snapshot.json

@@ -0,0 +1,15 @@
+{
+  "package": {
+	"name": "buildkit",
+	"repo": "cryptomator",
+	"subject": "cryptomator"
+  },
+  "version": {
+	"name": "snapshot"
+  },
+  "files":
+  [
+	{"includePattern": "main/buildkit/target/(buildkit-[a-z]+\\.zip)", "uploadPattern": "/snapshot/$1", "matrixParams": {"override": 1}}
+  ],
+  "publish": true
+}

.travis.yml

@@ -1,93 +1,55 @@
+dist: xenial
 language: java
 sudo: false
 jdk:
-- oraclejdk9
-branches:
-  except:
-  - continuous # To avoid infinite loops, as this tag is created by this Travis config
+- openjdk11
 cache:
   directories:
   - $HOME/.m2
 env:
   global:
-    - secure: "IfYURwZaDWuBDvyn47n0k1Zod/IQw1FF+CS5nnV08Q+NfC3vGGJMwV8m59XnbfwnWGxwvCaAbk4qP6s6+ijgZNKkvgfFMo3rfTok5zt43bIqgaFOANYV+OC/1c59gYD6ZUxhW5iNgMgU3qdsRtJuwSmfkVv/jKyLGfAbS4kN8BA=" # COVERITY_SCAN_TOKEN
-    - secure: "lV9OwUbHMrMpLUH1CY+Z4puLDdFXytudyPlG1eGRsesdpuG6KM3uQVz6uAtf6lrU8DRbMM/T7ML+PmvQ4UoPPYLdLxESLLBat2qUPOIVBOhTSlCc7I0DmGy04CSvkeMy8dPaQC0ukgNiR7zwoNzfcpGRN/U9S8tziDruuHoZSrg=" # BINTRAY_API_KEY
+    - secure: "HftEaabMmWn5GwKFKksUkOcelc3Mn7xazwAEy+4d4gL1+F8VhID/6DCK7nas+afUymWnxTano8Rv4Ci5MWryNkNkTH+FUPWmF3xWezc3hajSyS7RB92IZ8VPetl4Fo8UI1WwM5apDEaugalPxkIf8a7N+lpG5X/Gpumwzo3Be3w=" # BINTRAY_API_KEY
     - secure: "oWFgRTVP6lyTa7qVxlvkpm20MtVc3BtmsNXQJS6bfg2A0o/iCQMNx7OD59BaafCLGRKvCcJVESiC8FlSylVMS7CDSyYu0gg70NUiIuHp4NBM5inFWYCy/PdQsCTzr5uvNG+rMFQpMFRaCV0FrfM3tLondcVkhsHL68l93Xoexx4=" # CODACY_PROJECT_TOKEN
     - secure: "zJxgytA2Ks5Xzv+7kUaUq+EBFNQw9Qec63lcMJVuXVWczjL16nKW1EzzV515ag+OWL46z3lEPForDhufw0VtFnNmaX68jkO0mp01eLrHApc1llN2Y/U8GBXfNNazN4+Kom4H+z/AO+wJr8EsKMMUczCdQ3APgd9uVI0hzXw/Z3M=" # GITHUB_API_KEY
 addons:
   apt:
     packages:
     - haveged
-  coverity_scan:
-    project:
-      name: "cryptomator/cryptomator"
-    notification_email: sebastian.stenzel@cryptomator.org
-    build_command: "mvn -fmain/pom.xml clean test -DskipTests"
-    branch_pattern: release.*
 install:
 - curl -o $HOME/.m2/settings.xml https://gist.githubusercontent.com/cryptobot/cf5fbd909c4782aaeeeb7c7f4a1a43da/raw/e60ee486e34ee0c79f89f947abe2c83b4290c6bb/settings.xml
 - mvn -fmain/pom.xml clean install -DskipTests org.codehaus.mojo:versions-maven-plugin:help dependency:go-offline -Pcoverage,release # "clean install" needed until we can exclude artifacts currently in the reactor, see https://maven.apache.org/plugins/maven-dependency-plugin/go-offline-mojo.html#excludeReactor and https://issues.apache.org/jira/browse/MDEP-568
 script:
-- mvn --update-snapshots -fmain/pom.xml clean test jacoco:report verify -Pcoverage
+- mvn --update-snapshots -fmain/pom.xml clean test verify -Pcoverage
 after_success:
-- jdk_switcher use oraclejdk8
-- curl -o ~/codacy-coverage-reporter-assembly-latest.jar https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/2.0.1/codacy-coverage-reporter-2.0.1-assembly.jar
-- $JAVA_HOME/bin/java -cp ~/codacy-coverage-reporter-assembly-latest.jar com.codacy.CodacyCoverageReporter -l Java -r main/jacoco-report/target/site/jacoco-aggregate/jacoco.xml
+- curl -o ~/codacy-coverage-reporter.jar https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/4.0.2/codacy-coverage-reporter-4.0.2-assembly.jar
+- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/commons/target/site/jacoco/jacoco.xml --partial
+- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/keychain/target/site/jacoco/jacoco.xml --partial
+- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/ui/target/site/jacoco/jacoco.xml --partial
+- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/launcher/target/site/jacoco/jacoco.xml --partial
+- $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar final
 before_deploy:
-- jdk_switcher use oraclejdk9
-- |
-  if [[ $TRAVIS_BRANCH == "develop" ]] && [[ $TRAVIS_PULL_REQUEST == "false" ]]; then
-    CONTINUOUS_RELEASE_URL=`curl -s https://api.github.com/repos/cryptomator/cryptomator/releases/tags/continuous | jq -re '.url'`
-    echo "Existing continuous release: ${CONTINUOUS_RELEASE_URL}"
-    if [[ $CONTINUOUS_RELEASE_URL == http* ]]; then
-      curl -u cryptobot:$GITHUB_API_KEY -X DELETE $CONTINUOUS_RELEASE_URL
-    fi
-  fi
 - |
   if [[ -n "$TRAVIS_TAG" ]]; then
     mvn -fmain/pom.xml org.codehaus.mojo:versions-maven-plugin:set -DnewVersion=$TRAVIS_TAG
   elif [[ $TRAVIS_BRANCH == "develop" ]] && [[ $TRAVIS_PULL_REQUEST == "false" ]]; then
     mvn -fmain/pom.xml org.codehaus.mojo:versions-maven-plugin:set -DnewVersion=SNAPSHOT-$(echo $TRAVIS_COMMIT | head -c7)
-    git tag -f continuous
-    git remote add gh https://cryptobot:${GITHUB_API_KEY}@github.com/cryptomator/cryptomator.git
-    git push -f gh continuous
-    git remote remove gh
   fi
 - mvn -fmain/pom.xml clean package -Prelease -DskipTests
+- export TODAY=`date +'%Y-%m-%d'`; envsubst '$TRAVIS_TAG $TODAY' < .travis-deploy-release.tmpl.json > .travis-deploy-release.json
 deploy:
-- provider: releases # CONTINUOUS
-  prerelease: true
-  api-key: $GITHUB_API_KEY
-  tag_name: continuous
-  overwrite: true
-  file_glob: true
-  file:
-  - "main/uber-jar/target/Cryptomator-*.jar"
-  - "main/ant-kit/target/antkit.tar.gz"
+- provider: bintray # SNAPSHOTS
+  file: .travis-deploy-snapshot.json
+  user: cryptobot
+  key: $BINTRAY_API_KEY
   skip_cleanup: true
-  name: Cryptomator continuous build
-  body: Automatically built on $(date +'%F %T %Z').
   on:
     repo: cryptomator/cryptomator
     branch: develop
-    condition: $TRAVIS_TAG = ''
-- provider: releases # RELEASE
-  prerelease: false
-  api_key: $GITHUB_API_KEY
-  file:
-  - "main/uber-jar/target/Cryptomator-$TRAVIS_TAG.jar"
-  - "main/ant-kit/target/antkit.tar.gz"
+- provider: bintray # RELEASES
+  file: .travis-deploy-release.json
+  user: cryptobot
+  key: $BINTRAY_API_KEY
   skip_cleanup: true
   on:
     repo: cryptomator/cryptomator
-    tags: true
-- provider: script
-  script: "curl -X POST -u cryptobot:${BINTRAY_API_KEY} -H 'Content-Type: application/json' -d '{\"name\": \"${TRAVIS_TAG}\", \"vcs_tag\": \"${TRAVIS_TAG}\"}' https://api.bintray.com/packages/cryptomator/cryptomator/cryptomator-win/versions"
-  on:
-    repo: cryptomator/cryptomator
-    tags: true
-- provider: script
-  script: "curl -X POST -u cryptobot:${BINTRAY_API_KEY} -H 'Content-Type: application/json' -d '{\"name\": \"${TRAVIS_TAG}\", \"vcs_tag\": \"${TRAVIS_TAG}\"}' https://api.bintray.com/packages/cryptomator/cryptomator/cryptomator-osx/versions"
-  on:
-    repo: cryptomator/cryptomator
-    tags: true
+    tags: true

README.md

@@ -46,8 +46,7 @@ For more information on the security details visit [cryptomator.org](https://cry
 
 ### Dependencies
 
-* Java 8 (min. 8u51, we recommend to use the current version)
-* [JCE unlimited strength policy files](http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html) (needed for 256-bit keys)
+* JDK 11 (we recommend to use the latest version)
 * Maven 3
 * Optional: OS-dependent build tools for native packaging (see [Windows](https://github.com/cryptomator/cryptomator-win), [OS X](https://github.com/cryptomator/cryptomator-osx), [Linux](https://github.com/cryptomator/builder-containers))
 
@@ -58,7 +57,7 @@ cd main
 mvn clean install -Prelease
 ```
 
-An executable jar file will be created inside `main/uber-jar/target`.
+This will build all the jars and bundle them together with their OS-specific dependencies under `main/buildkit/target`. This can now be used to build native packages.
 
 ## License
 

main/ant-kit/.gitignore

@@ -1 +0,0 @@
-/target/

main/ant-kit/pom.xml

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.cryptomator</groupId>
-		<artifactId>main</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>ant-kit</artifactId>
-	<packaging>pom</packaging>
-	<name>Cryptomator Ant Build Kit</name>
-	<description>Builds a package that can be built with Ant locally</description>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>launcher</artifactId>
-		</dependency>
-	</dependencies>
-
-	<build>	
-		<plugins>
-			<!-- copy libraries to target/libs/: -->
-			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-libs</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy-dependencies</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}/libs</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<!-- copy resources to target/: -->
-			<plugin>
-				<artifactId>maven-resources-plugin</artifactId>
-				<version>3.0.2</version>
-				<executions>
-					<execution>
-						<id>copy-resources</id>
-						<phase>prepare-package</phase>
-						<goals>
-							<goal>copy-resources</goal>
-						</goals>
-						<configuration>
-							<outputDirectory>${project.build.directory}</outputDirectory>
-							<escapeString>\</escapeString>
-							<encoding>UTF-8</encoding>
-							<resources>
-								<resource>
-									<directory>src/main/resources</directory>
-									<filtering>true</filtering>
-									<includes>
-										<include>build.xml</include>
-									</includes>
-								</resource>
-								<resource>
-									<directory>src/main/resources</directory>
-									<filtering>false</filtering>
-									<includes>
-										<include>logback.xml</include>
-									</includes>
-								</resource>
-							</resources>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-			<!-- create antkit.tar.gz: -->
-			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.1.0</version>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<descriptors>
-						<descriptor>assembly.xml</descriptor>
-					</descriptors>
-					<appendAssemblyId>false</appendAssemblyId>
-					<finalName>antkit</finalName>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>

main/ant-kit/src/main/resources/build.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Cryptomator" default="create-jar" basedir="." xmlns:fx="javafx:com.sun.javafx.tools.ant">
-	<taskdef uri="javafx:com.sun.javafx.tools.ant" resource="com/sun/javafx/tools/ant/antlib.xml" classpath="\${java.class.path}:\${java.home}/lib/ant-javafx.jar:." />
-	
-	<!-- Define application to build -->
-	<fx:application id="Cryptomator" name="Cryptomator" version="${project.version}" mainClass="org.cryptomator.launcher.Cryptomator" />
-	
-	<!-- Create main application jar -->
-	<target name="create-jar">
-		<fx:jar destfile="antbuild/Cryptomator-${project.version}.jar">
-			<fx:application refid="Cryptomator" />
-			<fx:fileset dir="libs" includes="launcher-${project.version}.jar" />
-			<fx:resources>
-				<fx:fileset dir="libs" type="jar" includes="*.jar" excludes="launcher-${project.version}.jar" />
-			</fx:resources>
-			<fx:manifest>
-				<fx:attribute name="Implementation-Vendor" value="cryptomator.org" />
-				<fx:attribute name="Implementation-Title" value="Cryptomator"/>
-				<fx:attribute name="Implementation-Version" value="${project.version}" />
-			</fx:manifest>
-		</fx:jar>
-	</target>
-
-	<!-- Create Image package -->
-	<target name="image" depends="create-jar">
-		<fx:deploy nativeBundles="image" outdir="antbuild" verbose="true">
-			<fx:application refid="Cryptomator" />
-			<fx:info title="Cryptomator" vendor="cryptomator.org" copyright="cryptomator.org" license="GPL" category="Utility"/>
-			<fx:platform j2se="9.0">
-				<fx:property name="logback.configurationFile" value="logback.xml" />
-				<fx:property name="cryptomator.settingsPath" value="~/.Cryptomator/settings.json" />
-				<fx:property name="cryptomator.ipcPortPath" value="~/.Cryptomator/ipcPort.bin" />
-				<fx:jvmarg value="-Xss2m"/>
-				<fx:jvmarg value="-Xmx512m"/>
-				<fx:jvmarg value="--add-modules"/>
-				<fx:jvmarg value="jdk.incubator.httpclient"/>
-			</fx:platform>
-			<fx:resources>
-				<fx:fileset dir="." type="data" includes="logback.xml" />
-				<fx:fileset dir="antbuild" type="jar" includes="Cryptomator-${project.version}.jar" />
-				<fx:fileset dir="libs" type="jar" includes="*.jar" excludes="launcher-${project.version}.jar"/>
-			</fx:resources>
-			<fx:permissions elevated="false" />
-			<fx:preferences install="true" />
-		</fx:deploy>
-	</target>
-	
-</project>

main/ant-kit/src/main/resources/logback.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xml>
-<configuration scan="true" debug="true">
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-		</encoder>
-	</appender>
-	
-	<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${user.home}/.Cryptomator/cryptomator.log</file>
-		<append>false</append>
-		<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-			<fileNamePattern>${user.home}/.Cryptomator/cryptomator%i.log</fileNamePattern>
-			<minIndex>0</minIndex>
-			<maxIndex>9</maxIndex>
-		</rollingPolicy>
-		<triggeringPolicy class="org.cryptomator.logging.LaunchBasedTriggeringPolicy" />
-		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-		</encoder>
-	</appender>
-	
-	<appender name="UPGRADE_FILE" class="ch.qos.logback.core.FileAppender">
-		<file>${user.home}/.Cryptomator/upgrade.log</file>
-		<append>true</append>
-		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-		</encoder>
-	</appender>
-
-	<logger name="org.cryptomator" level="INFO" />
-	<logger name="org.eclipse.jetty.server.HttpChannel" level="INFO" />
-	<logger name="org.cryptomator.ui.model" level="INFO">
-		<appender-ref ref="UPGRADE_FILE" />
-	</logger>
-
-	<root level="INFO">
-		<appender-ref ref="STDOUT" />
-		<appender-ref ref="FILE" />
-	</root>
-
-</configuration>

main/buildkit/assembly-linux.xml

@@ -4,9 +4,16 @@
 	<id>tarball</id>
 	<includeBaseDirectory>false</includeBaseDirectory>
 	<formats>
-		<format>tar.gz</format>
+		<format>zip</format>
 	</formats>
 	<fileSets>
+		<fileSet>
+			<directory>target/</directory>
+			<includes>
+				<include>version.txt</include>
+			</includes>
+			<outputDirectory>libs</outputDirectory>
+		</fileSet>
 		<fileSet>
 			<directory>target/libs</directory>
 			<includes>
@@ -15,24 +22,11 @@
 			<outputDirectory>libs</outputDirectory>
 		</fileSet>
 		<fileSet>
-			<directory>target/fixed-binaries</directory>
-			<filtered>false</filtered>
-			<outputDirectory>fixed-binaries</outputDirectory>
-			<fileMode>755</fileMode>
-		</fileSet>
-		<fileSet>
-			<directory>target/package</directory>
-			<filtered>false</filtered>
-			<outputDirectory>package</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target</directory>
+			<directory>target/linux-libs</directory>
 			<includes>
-				<include>build.xml</include>
-				<include>logback.xml</include>
+				<include>*.jar</include>
 			</includes>
-			<filtered>false</filtered>
-			<outputDirectory>.</outputDirectory>
+			<outputDirectory>libs</outputDirectory>
 		</fileSet>
 	</fileSets>
 </assembly>

main/buildkit/assembly-mac.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+	<id>tarball</id>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<fileSets>
+		<fileSet>
+			<directory>target/</directory>
+			<includes>
+				<include>version.txt</include>
+			</includes>
+			<outputDirectory>libs</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>target/libs</directory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
+			<outputDirectory>libs</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>target/mac-libs</directory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
+			<outputDirectory>libs</outputDirectory>
+		</fileSet>
+	</fileSets>
+</assembly>

main/buildkit/assembly-win.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
+	<id>tarball</id>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<fileSets>
+		<fileSet>
+			<directory>target/</directory>
+			<includes>
+				<include>version.txt</include>
+			</includes>
+			<outputDirectory>libs</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>target/libs</directory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
+			<outputDirectory>libs</outputDirectory>
+		</fileSet>
+		<fileSet>
+			<directory>target/win-libs</directory>
+			<includes>
+				<include>*.jar</include>
+			</includes>
+			<outputDirectory>libs</outputDirectory>
+		</fileSet>
+	</fileSets>
+</assembly>

main/buildkit/pom.xml

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.cryptomator</groupId>
+		<artifactId>main</artifactId>
+		<version>1.4.10</version>
+	</parent>
+	<artifactId>buildkit</artifactId>
+	<packaging>pom</packaging>
+	<name>Cryptomator Build Kit</name>
+	<description>Builds a package that can be built with Ant locally</description>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>launcher</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<!-- generate version.txt -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.1.0</version>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}</outputDirectory>
+							<resources>
+								<resource>
+									<directory>${project.basedir}/src/main/resources</directory>
+									<includes>
+										<include>version.txt</include>
+									</includes>
+									<filtering>true</filtering>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- copy libraries to target/libs/: -->
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.1.1</version>
+				<executions>
+					<execution>
+						<id>copy-libs</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/libs</outputDirectory>
+							<excludeClassifiers>linux,mac,win</excludeClassifiers>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-linux-libs</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/linux-libs</outputDirectory>
+							<includeGroupIds>org.openjfx</includeGroupIds>
+							<classifier>linux</classifier>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-mac-libs</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/mac-libs</outputDirectory>
+							<includeGroupIds>org.openjfx</includeGroupIds>
+							<classifier>mac</classifier>
+						</configuration>
+					</execution>
+					<execution>
+						<id>copy-win-libs</id>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${project.build.directory}/win-libs</outputDirectory>
+							<includeGroupIds>org.openjfx</includeGroupIds>
+							<classifier>win</classifier>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<!-- create buildkit.zip: -->
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.1.1</version>
+				<executions>
+					<execution>
+						<id>assemble-linux</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>assembly-linux.xml</descriptor>
+							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
+							<finalName>buildkit-linux</finalName>
+						</configuration>
+					</execution>
+					<execution>
+						<id>assemble-mac</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>assembly-mac.xml</descriptor>
+							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
+							<finalName>buildkit-mac</finalName>
+						</configuration>
+					</execution>
+					<execution>
+						<id>assemble-win</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<descriptors>
+								<descriptor>assembly-win.xml</descriptor>
+							</descriptors>
+							<appendAssemblyId>false</appendAssemblyId>
+							<finalName>buildkit-win</finalName>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>

main/buildkit/src/main/resources/version.txt

@@ -0,0 +1 @@
+${project.version}

main/commons/pom.xml

@@ -4,13 +4,19 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.10</version>
 	</parent>
 	<artifactId>commons</artifactId>
 	<name>Cryptomator Commons</name>
 	<description>Shared utilities</description>
 
 	<dependencies>
+		<!-- JavaFx -->
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-base</artifactId>
+		</dependency>
+
 		<!-- Libs -->
 		<dependency>
 			<groupId>com.google.guava</groupId>

main/commons/src/main/java/org/cryptomator/common/Environment.java

@@ -0,0 +1,95 @@
+package org.cryptomator.common;
+
+import com.google.common.base.Splitter;
+import com.google.common.base.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Optional;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.function.Predicate;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+@Singleton
+public class Environment {
+
+	private static final Logger LOG = LoggerFactory.getLogger(Environment.class);
+	private static final String USER_HOME = System.getProperty("user.home");
+	private static final Path RELATIVE_HOME_DIR = Paths.get("~");
+	private static final Path ABSOLUTE_HOME_DIR = Paths.get(USER_HOME);
+	private static final char PATH_LIST_SEP = ':';
+
+	@Inject
+	public Environment() {
+		LOG.debug("user.language: {}", System.getProperty("user.language"));
+		LOG.debug("user.region: {}", System.getProperty("user.region"));
+		LOG.debug("logback.configurationFile: {}", System.getProperty("logback.configurationFile"));
+		LOG.debug("cryptomator.settingsPath: {}", System.getProperty("cryptomator.settingsPath"));
+		LOG.debug("cryptomator.ipcPortPath: {}", System.getProperty("cryptomator.ipcPortPath"));
+		LOG.debug("cryptomator.keychainPath: {}", System.getProperty("cryptomator.keychainPath"));
+		LOG.debug("cryptomator.logDir: {}", System.getProperty("cryptomator.logDir"));
+		LOG.debug("cryptomator.mountPointsDir: {}", System.getProperty("cryptomator.mountPointsDir"));
+	}
+
+	public boolean useCustomLogbackConfig() {
+		return getPath("logback.configurationFile").map(Files::exists).orElse(false);
+	}
+
+	public Stream<Path> getSettingsPath() {
+		return getPaths("cryptomator.settingsPath");
+	}
+
+	public Stream<Path> getIpcPortPath() {
+		return getPaths("cryptomator.ipcPortPath");
+	}
+
+	public Stream<Path> getKeychainPath() {
+		return getPaths("cryptomator.keychainPath");
+	}
+
+	public Optional<Path> getLogDir() {
+		return getPath("cryptomator.logDir").map(this::replaceHomeDir);
+	}
+
+	public Optional<Path> getMountPointsDir() {
+		return getPath("cryptomator.mountPointsDir").map(this::replaceHomeDir);
+	}
+
+	private Optional<Path> getPath(String propertyName) {
+		String value = System.getProperty(propertyName);
+		return Optional.ofNullable(value).map(Paths::get);
+	}
+
+	// visible for testing
+	Stream<Path> getPaths(String propertyName) {
+		Stream<String> rawSettingsPaths = getRawList(propertyName, PATH_LIST_SEP);
+		return rawSettingsPaths.filter(Predicate.not(Strings::isNullOrEmpty)).map(Paths::get).map(this::replaceHomeDir);
+	}
+
+	private Path replaceHomeDir(Path path) {
+		if (path.startsWith(RELATIVE_HOME_DIR)) {
+			return ABSOLUTE_HOME_DIR.resolve(RELATIVE_HOME_DIR.relativize(path));
+		} else {
+			return path;
+		}
+	}
+
+	private Stream<String> getRawList(String propertyName, char separator) {
+		String value = System.getProperty(propertyName);
+		if (value == null) {
+			return Stream.empty();
+		} else {
+			Iterable<String> iter = Splitter.on(separator).split(value);
+			Spliterator<String> spliter = Spliterators.spliteratorUnknownSize(iter.iterator(), Spliterator.ORDERED | Spliterator.IMMUTABLE);
+			return StreamSupport.stream(spliter, false);
+		}
+	}
+
+}

main/commons/src/main/java/org/cryptomator/common/FxApplicationScoped.java

@@ -0,0 +1,13 @@
+package org.cryptomator.common;
+
+import javax.inject.Scope;
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Scope
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FxApplicationScoped {
+
+}

main/commons/src/main/java/org/cryptomator/common/settings/Settings.java

@@ -8,39 +8,34 @@
  ******************************************************************************/
 package org.cryptomator.common.settings;
 
-import java.util.function.Consumer;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.IntegerProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
+import javafx.beans.property.*;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 
+import java.util.function.Consumer;
+
 public class Settings {
 
 	public static final int MIN_PORT = 1024;
 	public static final int MAX_PORT = 65535;
-	public static final boolean DEFAULT_CHECK_FOR_UDPATES = true;
+	public static final boolean DEFAULT_ASKED_FOR_UPDATE_CHECK = false;
+	public static final boolean DEFAULT_CHECK_FOR_UDPATES = false;
 	public static final int DEFAULT_PORT = 42427;
 	public static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3;
 	public static final String DEFAULT_GVFS_SCHEME = "dav";
 	public static final boolean DEFAULT_DEBUG_MODE = false;
-	public static final VolumeImpl DEFAULT_VOLUME_IMPL = VolumeImpl.FUSE;
+	public static final VolumeImpl DEFAULT_PREFERRED_VOLUME_IMPL = System.getProperty("os.name").toLowerCase().contains("windows") ? VolumeImpl.DOKANY : VolumeImpl.FUSE;
 
 	private final ObservableList<VaultSettings> directories = FXCollections.observableArrayList(VaultSettings::observables);
+	private final BooleanProperty askedForUpdateCheck = new SimpleBooleanProperty(DEFAULT_ASKED_FOR_UPDATE_CHECK);
 	private final BooleanProperty checkForUpdates = new SimpleBooleanProperty(DEFAULT_CHECK_FOR_UDPATES);
 	private final IntegerProperty port = new SimpleIntegerProperty(DEFAULT_PORT);
 	private final IntegerProperty numTrayNotifications = new SimpleIntegerProperty(DEFAULT_NUM_TRAY_NOTIFICATIONS);
 	private final StringProperty preferredGvfsScheme = new SimpleStringProperty(DEFAULT_GVFS_SCHEME);
 	private final BooleanProperty debugMode = new SimpleBooleanProperty(DEFAULT_DEBUG_MODE);
-	private final ObjectProperty<VolumeImpl> volumeImpl = new SimpleObjectProperty<>(DEFAULT_VOLUME_IMPL);
+	private final ObjectProperty<VolumeImpl> preferredVolumeImpl = new SimpleObjectProperty<>(DEFAULT_PREFERRED_VOLUME_IMPL);
 
 	private Consumer<Settings> saveCmd;
 
@@ -49,12 +44,13 @@ public class Settings {
 	 */
 	Settings() {
 		directories.addListener((ListChangeListener.Change<? extends VaultSettings> change) -> this.save());
+		askedForUpdateCheck.addListener(this::somethingChanged);
 		checkForUpdates.addListener(this::somethingChanged);
 		port.addListener(this::somethingChanged);
 		numTrayNotifications.addListener(this::somethingChanged);
 		preferredGvfsScheme.addListener(this::somethingChanged);
 		debugMode.addListener(this::somethingChanged);
-		volumeImpl.addListener(this::somethingChanged);
+		preferredVolumeImpl.addListener(this::somethingChanged);
 	}
 
 	void setSaveCmd(Consumer<Settings> saveCmd) {
@@ -77,6 +73,10 @@ public class Settings {
 		return directories;
 	}
 
+	public BooleanProperty askedForUpdateCheck() {
+		return askedForUpdateCheck;
+	}
+
 	public BooleanProperty checkForUpdates() {
 		return checkForUpdates;
 	}
@@ -97,8 +97,8 @@ public class Settings {
 		return debugMode;
 	}
 
-	public ObjectProperty<VolumeImpl> volumeImpl() {
-		return volumeImpl;
+	public ObjectProperty<VolumeImpl> preferredVolumeImpl() {
+		return preferredVolumeImpl;
 	}
 
 }

main/commons/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java

@@ -5,17 +5,16 @@
  *******************************************************************************/
 package org.cryptomator.common.settings;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.gson.TypeAdapter;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 
@@ -28,12 +27,13 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 		out.beginObject();
 		out.name("directories");
 		writeVaultSettingsArray(out, value.getDirectories());
+		out.name("askedForUpdateCheck").value(value.askedForUpdateCheck().get());
 		out.name("checkForUpdatesEnabled").value(value.checkForUpdates().get());
 		out.name("port").value(value.port().get());
 		out.name("numTrayNotifications").value(value.numTrayNotifications().get());
 		out.name("preferredGvfsScheme").value(value.preferredGvfsScheme().get());
 		out.name("debugMode").value(value.debugMode().get());
-		out.name("volumeImpl").value(value.volumeImpl().get().name());
+		out.name("preferredVolumeImpl").value(value.preferredVolumeImpl().get().name());
 		out.endObject();
 	}
 
@@ -56,6 +56,9 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 				case "directories":
 					settings.getDirectories().addAll(readVaultSettingsArray(in));
 					break;
+				case "askedForUpdateCheck":
+					settings.askedForUpdateCheck().set(in.nextBoolean());
+					break;
 				case "checkForUpdatesEnabled":
 					settings.checkForUpdates().set(in.nextBoolean());
 					break;
@@ -71,12 +74,13 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 				case "debugMode":
 					settings.debugMode().set(in.nextBoolean());
 					break;
-				case "volumeImpl":
-					settings.volumeImpl().set(parseNioAdapterName(in.nextString()));
+				case "preferredVolumeImpl":
+					settings.preferredVolumeImpl().set(parsePreferredVolumeImplName(in.nextString()));
 					break;
 				default:
 					LOG.warn("Unsupported vault setting found in JSON: " + name);
 					in.skipValue();
+					break;
 			}
 		}
 		in.endObject();
@@ -84,11 +88,11 @@ public class SettingsJsonAdapter extends TypeAdapter<Settings> {
 		return settings;
 	}
 
-	private VolumeImpl parseNioAdapterName(String nioAdapterName) {
+	private VolumeImpl parsePreferredVolumeImplName(String nioAdapterName) {
 		try {
 			return VolumeImpl.valueOf(nioAdapterName);
 		} catch (IllegalArgumentException e) {
-			return Settings.DEFAULT_VOLUME_IMPL;
+			return Settings.DEFAULT_PREFERRED_VOLUME_IMPL;
 		}
 	}
 

main/commons/src/main/java/org/cryptomator/common/settings/SettingsProvider.java

@@ -8,6 +8,16 @@
  *******************************************************************************/
 package org.cryptomator.common.settings;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.cryptomator.common.Environment;
+import org.cryptomator.common.LazyInitializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+import javax.inject.Singleton;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -16,9 +26,8 @@ import java.io.OutputStreamWriter;
 import java.io.Reader;
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.FileSystem;
-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.Optional;
@@ -27,110 +36,83 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
-
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.LazyInitializer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
+import java.util.stream.Stream;
 
 @Singleton
 public class SettingsProvider implements Provider<Settings> {
 
 	private static final Logger LOG = LoggerFactory.getLogger(SettingsProvider.class);
-	private static final Path DEFAULT_SETTINGS_PATH;
 	private static final long SAVE_DELAY_MS = 1000;
 
-	static {
-		final FileSystem fs = FileSystems.getDefault();
-		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) {
-			DEFAULT_SETTINGS_PATH = fs.getPath(SystemUtils.USER_HOME, "Library/Application Support/Cryptomator/settings.json");
-		} else {
-			DEFAULT_SETTINGS_PATH = fs.getPath(SystemUtils.USER_HOME, ".Cryptomator/settings.json");
-		}
-	}
-
 	private final ScheduledExecutorService saveScheduler = Executors.newSingleThreadScheduledExecutor();
 	private final AtomicReference<ScheduledFuture<?>> scheduledSaveCmd = new AtomicReference<>();
 	private final AtomicReference<Settings> settings = new AtomicReference<>();
 	private final SettingsJsonAdapter settingsJsonAdapter = new SettingsJsonAdapter();
+	private final Environment env;
 	private final Gson gson;
 
 	@Inject
-	public SettingsProvider() {
+	public SettingsProvider(Environment env) {
+		this.env = env;
 		this.gson = new GsonBuilder() //
 				.setPrettyPrinting().setLenient().disableHtmlEscaping() //
 				.registerTypeAdapter(Settings.class, settingsJsonAdapter) //
 				.create();
 	}
 
-	private Path getSettingsPath() {
-		final String settingsPathProperty = System.getProperty("cryptomator.settingsPath");
-		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
 	public Settings get() {
 		return LazyInitializer.initializeLazily(settings, this::load);
 	}
 
 	private Settings load() {
-		Settings settings;
-		final Path settingsPath = getSettingsPath();
-		try (InputStream in = Files.newInputStream(settingsPath, StandardOpenOption.READ); //
-				Reader reader = new InputStreamReader(in, StandardCharsets.UTF_8)) {
-			settings = gson.fromJson(reader, Settings.class);
+		Settings settings = env.getSettingsPath().flatMap(this::tryLoad).findFirst().orElse(new Settings());
+		settings.setSaveCmd(this::scheduleSave);
+		return settings;
+	}
+
+	private Stream<Settings> tryLoad(Path path) {
+		LOG.debug("Attempting to load settings from {}", path);
+		try (InputStream in = Files.newInputStream(path, StandardOpenOption.READ); //
+			 Reader reader = new InputStreamReader(in, StandardCharsets.UTF_8)) {
+			Settings settings = gson.fromJson(reader, Settings.class);
 			if (settings == null) {
 				throw new IOException("Unexpected EOF");
 			}
-			LOG.info("Settings loaded from " + settingsPath);
+			LOG.info("Settings loaded from {}", path);
+			return Stream.of(settings);
+		} catch (NoSuchFileException e) {
+			return Stream.empty();
 		} catch (IOException e) {
-			LOG.info("Failed to load settings, creating new one.");
-			settings = new Settings();
+			LOG.warn("Exception while loading settings from " + path, e);
+			return Stream.empty();
 		}
-		settings.setSaveCmd(this::scheduleSave);
-		return settings;
 	}
 
 	private void scheduleSave(Settings settings) {
 		if (settings == null) {
 			return;
 		}
-		ScheduledFuture<?> saveCmd = saveScheduler.schedule(() -> {
-			this.save(settings);
-		}, SAVE_DELAY_MS, TimeUnit.MILLISECONDS);
-		ScheduledFuture<?> previousSaveCmd = scheduledSaveCmd.getAndSet(saveCmd);
-		if (previousSaveCmd != null) {
-			previousSaveCmd.cancel(false);
-		}
+		final Optional<Path> settingsPath = env.getSettingsPath().findFirst(); // alway save to preferred (first) path
+		settingsPath.ifPresent(path -> {
+			Runnable saveCommand = () -> this.save(settings, path);
+			ScheduledFuture<?> scheduledTask = saveScheduler.schedule(saveCommand, SAVE_DELAY_MS, TimeUnit.MILLISECONDS);
+			ScheduledFuture<?> previouslyScheduledTask = scheduledSaveCmd.getAndSet(scheduledTask);
+			if (previouslyScheduledTask != null) {
+				previouslyScheduledTask.cancel(false);
+			}
+		});
 	}
 
-	private void save(Settings settings) {
+	private void save(Settings settings, Path settingsPath) {
 		assert settings != null : "method should only be invoked by #scheduleSave, which checks for null";
-		final Path settingsPath = getSettingsPath();
+		LOG.debug("Attempting to save settings to {}", settingsPath);
 		try {
 			Files.createDirectories(settingsPath.getParent());
 			try (OutputStream out = Files.newOutputStream(settingsPath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); //
 					Writer writer = new OutputStreamWriter(out, StandardCharsets.UTF_8)) {
 				gson.toJson(settings, writer);
-				LOG.info("Settings saved to " + settingsPath);
+				LOG.info("Settings saved to {}", settingsPath);
 			}
 		} catch (IOException e) {
 			LOG.error("Failed to save settings.", e);

main/commons/src/main/java/org/cryptomator/common/settings/VaultSettings.java

@@ -5,16 +5,7 @@
  *******************************************************************************/
 package org.cryptomator.common.settings;
 
-import java.nio.ByteBuffer;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.util.Base64;
-import java.util.Objects;
-import java.util.UUID;
-
-import org.apache.commons.lang3.StringUtils;
-import org.fxmisc.easybind.EasyBind;
-
+import com.google.common.base.Strings;
 import javafx.beans.Observable;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -22,23 +13,37 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import org.apache.commons.lang3.StringUtils;
+import org.fxmisc.easybind.EasyBind;
 
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.util.Base64;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+
+/**
+ * The settings specific to a single vault.
+ * TODO: Change the name of individualMountPath and its derivatives to customMountPath
+ */
 public class VaultSettings {
 
 	public static final boolean DEFAULT_UNLOCK_AFTER_STARTUP = false;
-	public static final boolean DEFAULT_MOUNT_AFTER_UNLOCK = true;
 	public static final boolean DEFAULT_REAVEAL_AFTER_MOUNT = true;
 	public static final boolean DEFAULT_USES_INDIVIDUAL_MOUNTPATH = false;
+	public static final boolean DEFAULT_USES_READONLY_MODE = false;
 
 	private final String id;
 	private final ObjectProperty<Path> path = new SimpleObjectProperty<>();
 	private final StringProperty mountName = new SimpleStringProperty();
 	private final StringProperty winDriveLetter = new SimpleStringProperty();
 	private final BooleanProperty unlockAfterStartup = new SimpleBooleanProperty(DEFAULT_UNLOCK_AFTER_STARTUP);
-	private final BooleanProperty mountAfterUnlock = new SimpleBooleanProperty(DEFAULT_MOUNT_AFTER_UNLOCK);
 	private final BooleanProperty revealAfterMount = new SimpleBooleanProperty(DEFAULT_REAVEAL_AFTER_MOUNT);
 	private final BooleanProperty usesIndividualMountPath = new SimpleBooleanProperty(DEFAULT_USES_INDIVIDUAL_MOUNTPATH);
 	private final StringProperty individualMountPath = new SimpleStringProperty();
+	private final BooleanProperty usesReadOnlyMode = new SimpleBooleanProperty(DEFAULT_USES_READONLY_MODE);
 
 	public VaultSettings(String id) {
 		this.id = Objects.requireNonNull(id);
@@ -47,7 +52,7 @@ public class VaultSettings {
 	}
 
 	Observable[] observables() {
-		return new Observable[]{path, mountName, winDriveLetter, unlockAfterStartup, mountAfterUnlock, revealAfterMount, usesIndividualMountPath, individualMountPath};
+		return new Observable[]{path, mountName, winDriveLetter, unlockAfterStartup, revealAfterMount, usesIndividualMountPath, individualMountPath, usesReadOnlyMode};
 	}
 
 	private void deriveMountNameFromPath(Path path) {
@@ -118,10 +123,6 @@ public class VaultSettings {
 		return unlockAfterStartup;
 	}
 
-	public BooleanProperty mountAfterUnlock() {
-		return mountAfterUnlock;
-	}
-
 	public BooleanProperty revealAfterMount() {
 		return revealAfterMount;
 	}
@@ -134,6 +135,18 @@ public class VaultSettings {
 		return individualMountPath;
 	}
 
+	public Optional<String> getIndividualMountPath() {
+		if (usesIndividualMountPath.get()) {
+			return Optional.ofNullable(Strings.emptyToNull(individualMountPath.get()));
+		} else {
+			return Optional.empty();
+		}
+	}
+
+	public BooleanProperty usesReadOnlyMode() {
+		return usesReadOnlyMode;
+	}
+
 	/* Hashcode/Equals */
 
 	@Override

main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java

@@ -5,14 +5,13 @@
  *******************************************************************************/
 package org.cryptomator.common.settings;
 
-import java.io.IOException;
-import java.nio.file.Paths;
-
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
+import java.nio.file.Paths;
 
 class VaultSettingsJsonAdapter {
 
@@ -25,11 +24,10 @@ class VaultSettingsJsonAdapter {
 		out.name("mountName").value(value.mountName().get());
 		out.name("winDriveLetter").value(value.winDriveLetter().get());
 		out.name("unlockAfterStartup").value(value.unlockAfterStartup().get());
-		out.name("mountAfterUnlock").value(value.mountAfterUnlock().get());
 		out.name("revealAfterMount").value(value.revealAfterMount().get());
 		out.name("usesIndividualMountPath").value(value.usesIndividualMountPath().get());
-		//TODO: should this always be written? ( because it could contain metadata, which the user does not want to save!)
-		out.name("individualMountPath").value(value.individualMountPath().get());
+		out.name("individualMountPath").value(value.individualMountPath().get());    //TODO: should this always be written? ( because it could contain metadata, which the user may not want to save!)
+		out.name("usesReadOnlyMode").value(value.usesReadOnlyMode().get());
 		out.endObject();
 	}
 
@@ -40,9 +38,9 @@ class VaultSettingsJsonAdapter {
 		String individualMountPath = null;
 		String winDriveLetter = null;
 		boolean unlockAfterStartup = VaultSettings.DEFAULT_UNLOCK_AFTER_STARTUP;
-		boolean mountAfterUnlock = VaultSettings.DEFAULT_MOUNT_AFTER_UNLOCK;
 		boolean revealAfterMount = VaultSettings.DEFAULT_REAVEAL_AFTER_MOUNT;
 		boolean usesIndividualMountPath = VaultSettings.DEFAULT_USES_INDIVIDUAL_MOUNTPATH;
+		boolean usesReadOnlyMode = VaultSettings.DEFAULT_USES_READONLY_MODE;
 
 		in.beginObject();
 		while (in.hasNext()) {
@@ -63,9 +61,6 @@ class VaultSettingsJsonAdapter {
 				case "unlockAfterStartup":
 					unlockAfterStartup = in.nextBoolean();
 					break;
-				case "mountAfterUnlock":
-					mountAfterUnlock = in.nextBoolean();
-					break;
 				case "revealAfterMount":
 					revealAfterMount = in.nextBoolean();
 					break;
@@ -75,9 +70,13 @@ class VaultSettingsJsonAdapter {
 				case "individualMountPath":
 					individualMountPath = in.nextString();
 					break;
+				case "usesReadOnlyMode":
+					usesReadOnlyMode = in.nextBoolean();
+					break;
 				default:
 					LOG.warn("Unsupported vault setting found in JSON: " + name);
 					in.skipValue();
+					break;
 			}
 		}
 		in.endObject();
@@ -87,10 +86,10 @@ class VaultSettingsJsonAdapter {
 		vaultSettings.path().set(Paths.get(path));
 		vaultSettings.winDriveLetter().set(winDriveLetter);
 		vaultSettings.unlockAfterStartup().set(unlockAfterStartup);
-		vaultSettings.mountAfterUnlock().set(mountAfterUnlock);
 		vaultSettings.revealAfterMount().set(revealAfterMount);
 		vaultSettings.usesIndividualMountPath().set(usesIndividualMountPath);
 		vaultSettings.individualMountPath().set(individualMountPath);
+		vaultSettings.usesReadOnlyMode().set(usesReadOnlyMode);
 		return vaultSettings;
 	}
 

main/commons/src/main/java/org/cryptomator/common/settings/VolumeImpl.java

@@ -4,7 +4,8 @@ import java.util.Arrays;
 
 public enum VolumeImpl {
 	WEBDAV("WebDAV"),
-	FUSE("FUSE");
+	FUSE("FUSE"),
+	DOKANY("Dokany");
 
 	private String displayName;
 

main/commons/src/test/java/org/cryptomator/common/EnvironmentTest.java

@@ -0,0 +1,133 @@
+package org.cryptomator.common;
+
+import org.hamcrest.MatcherAssert;
+import org.hamcrest.Matchers;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+@DisplayName("Environment Variables Test")
+class EnvironmentTest {
+
+	private Environment env;
+
+	@BeforeAll
+	static void init() {
+		System.setProperty("user.home", "/home/testuser");
+	}
+
+	@BeforeEach
+	void initEach() {
+		env = new Environment();
+	}
+
+	@Test
+	@DisplayName("cryptomator.settingsPath=~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json")
+	public void testSettingsPath() {
+		System.setProperty("cryptomator.settingsPath", "~/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json");
+
+		List<Path> result = env.getSettingsPath().collect(Collectors.toList());
+		MatcherAssert.assertThat(result, Matchers.hasSize(2));
+		MatcherAssert.assertThat(result, Matchers.contains(Paths.get("/home/testuser/.config/Cryptomator/settings.json"),
+				Paths.get("/home/testuser/.Cryptomator/settings.json")));
+	}
+
+	@Test
+	@DisplayName("cryptomator.ipcPortPath=~/.config/Cryptomator/ipcPort.bin:~/.Cryptomator/ipcPort.bin")
+	public void testIpcPortPath() {
+		System.setProperty("cryptomator.ipcPortPath", "~/.config/Cryptomator/ipcPort.bin:~/.Cryptomator/ipcPort.bin");
+
+		List<Path> result = env.getIpcPortPath().collect(Collectors.toList());
+		MatcherAssert.assertThat(result, Matchers.hasSize(2));
+		MatcherAssert.assertThat(result, Matchers.contains(Paths.get("/home/testuser/.config/Cryptomator/ipcPort.bin"),
+				Paths.get("/home/testuser/.Cryptomator/ipcPort.bin")));
+	}
+
+	@Test
+	@DisplayName("cryptomator.keychainPath=~/AppData/Roaming/Cryptomator/keychain.json")
+	public void testKeychainPath() {
+		System.setProperty("cryptomator.keychainPath", "~/AppData/Roaming/Cryptomator/keychain.json");
+
+		List<Path> result = env.getKeychainPath().collect(Collectors.toList());
+		MatcherAssert.assertThat(result, Matchers.hasSize(1));
+		MatcherAssert.assertThat(result, Matchers.contains(Paths.get("/home/testuser/AppData/Roaming/Cryptomator/keychain.json")));
+	}
+
+	@Test
+	@DisplayName("cryptomator.logDir=/foo/bar")
+	public void testAbsoluteLogDir() {
+		System.setProperty("cryptomator.logDir", "/foo/bar");
+
+		Optional<Path> logDir = env.getLogDir();
+
+		Assertions.assertTrue(logDir.isPresent());
+	}
+
+	@Test
+	@DisplayName("cryptomator.logDir=~/foo/bar")
+	public void testRelativeLogDir() {
+		System.setProperty("cryptomator.logDir", "~/foo/bar");
+
+		Optional<Path> logDir = env.getLogDir();
+
+		Assertions.assertTrue(logDir.isPresent());
+		Assertions.assertEquals(Paths.get("/home/testuser/foo/bar"), logDir.get());
+	}
+
+	@Nested
+	@DisplayName("Path Lists")
+	class SettingsPath {
+
+		@Test
+		@DisplayName("test.path.property=")
+		public void testEmptyList() {
+			System.setProperty("test.path.property", "");
+			List<Path> result = env.getPaths("test.path.property").collect(Collectors.toList());
+
+			MatcherAssert.assertThat(result, Matchers.hasSize(0));
+		}
+
+		@Test
+		@DisplayName("test.path.property=/foo/bar/test")
+		public void testSingleAbsolutePath() {
+			System.setProperty("test.path.property", "/foo/bar/test");
+			List<Path> result = env.getPaths("test.path.property").collect(Collectors.toList());
+
+			MatcherAssert.assertThat(result, Matchers.hasSize(1));
+			MatcherAssert.assertThat(result, Matchers.hasItem(Paths.get("/foo/bar/test")));
+		}
+
+		@Test
+		@DisplayName("test.path.property=~/test")
+		public void testSingleHomeRelativePath() {
+			System.setProperty("test.path.property", "~/test");
+			List<Path> result = env.getPaths("test.path.property").collect(Collectors.toList());
+
+			MatcherAssert.assertThat(result, Matchers.hasSize(1));
+			MatcherAssert.assertThat(result, Matchers.hasItem(Paths.get("/home/testuser/test")));
+		}
+
+		@Test
+		@DisplayName("test.path.property=~/test:~/test2:/foo/bar/test")
+		public void testMultiplePaths() {
+			System.setProperty("test.path.property", "~/test:~/test2:/foo/bar/test");
+			List<Path> result = env.getPaths("test.path.property").collect(Collectors.toList());
+
+			MatcherAssert.assertThat(result, Matchers.hasSize(3));
+			MatcherAssert.assertThat(result, Matchers.contains(Paths.get("/home/testuser/test"),
+					Paths.get("/home/testuser/test2"),
+					Paths.get("/foo/bar/test")));
+		}
+
+	}
+
+}

main/commons/src/test/java/org/cryptomator/common/SemVerComparatorTest.java

@@ -8,10 +8,10 @@
  *******************************************************************************/
 package org.cryptomator.common;
 
-import java.util.Comparator;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Assert;
-import org.junit.Test;
+import java.util.Comparator;
 
 public class SemVerComparatorTest {
 
@@ -21,38 +21,38 @@ public class SemVerComparatorTest {
 
 	@Test
 	public void compareEqualVersions() {
-		Assert.assertEquals(0, Integer.signum(semVerComparator.compare("1.23.4", "1.23.4")));
-		Assert.assertEquals(0, Integer.signum(semVerComparator.compare("1.23.4-alpha", "1.23.4-alpha")));
-		Assert.assertEquals(0, Integer.signum(semVerComparator.compare("1.23.4+20170101", "1.23.4+20171231")));
-		Assert.assertEquals(0, Integer.signum(semVerComparator.compare("1.23.4-alpha+20170101", "1.23.4-alpha+20171231")));
+		Assertions.assertEquals(0, Integer.signum(semVerComparator.compare("1.23.4", "1.23.4")));
+		Assertions.assertEquals(0, Integer.signum(semVerComparator.compare("1.23.4-alpha", "1.23.4-alpha")));
+		Assertions.assertEquals(0, Integer.signum(semVerComparator.compare("1.23.4+20170101", "1.23.4+20171231")));
+		Assertions.assertEquals(0, Integer.signum(semVerComparator.compare("1.23.4-alpha+20170101", "1.23.4-alpha+20171231")));
 	}
 
 	// newer versions in first argument
 
 	@Test
 	public void compareHigherToLowerVersions() {
-		Assert.assertEquals(1, Integer.signum(semVerComparator.compare("1.23.5", "1.23.4")));
-		Assert.assertEquals(1, Integer.signum(semVerComparator.compare("1.24.4", "1.23.4")));
-		Assert.assertEquals(1, Integer.signum(semVerComparator.compare("1.23.4", "1.23")));
-		Assert.assertEquals(1, Integer.signum(semVerComparator.compare("1.23.4", "1.23.4-SNAPSHOT")));
-		Assert.assertEquals(1, Integer.signum(semVerComparator.compare("1.23.4", "1.23.4-56.78")));
-		Assert.assertEquals(1, Integer.signum(semVerComparator.compare("1.23.4-beta", "1.23.4-alpha")));
-		Assert.assertEquals(1, Integer.signum(semVerComparator.compare("1.23.4-alpha.1", "1.23.4-alpha")));
-		Assert.assertEquals(1, Integer.signum(semVerComparator.compare("1.23.4-56.79", "1.23.4-56.78")));
+		Assertions.assertEquals(1, Integer.signum(semVerComparator.compare("1.23.5", "1.23.4")));
+		Assertions.assertEquals(1, Integer.signum(semVerComparator.compare("1.24.4", "1.23.4")));
+		Assertions.assertEquals(1, Integer.signum(semVerComparator.compare("1.23.4", "1.23")));
+		Assertions.assertEquals(1, Integer.signum(semVerComparator.compare("1.23.4", "1.23.4-SNAPSHOT")));
+		Assertions.assertEquals(1, Integer.signum(semVerComparator.compare("1.23.4", "1.23.4-56.78")));
+		Assertions.assertEquals(1, Integer.signum(semVerComparator.compare("1.23.4-beta", "1.23.4-alpha")));
+		Assertions.assertEquals(1, Integer.signum(semVerComparator.compare("1.23.4-alpha.1", "1.23.4-alpha")));
+		Assertions.assertEquals(1, Integer.signum(semVerComparator.compare("1.23.4-56.79", "1.23.4-56.78")));
 	}
 
 	// newer versions in second argument
 
 	@Test
 	public void compareLowerToHigherVersions() {
-		Assert.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23.4", "1.23.5")));
-		Assert.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23.4", "1.24.4")));
-		Assert.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23", "1.23.4")));
-		Assert.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23.4-SNAPSHOT", "1.23.4")));
-		Assert.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23.4-56.78", "1.23.4")));
-		Assert.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23.4-alpha", "1.23.4-beta")));
-		Assert.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23.4-alpha", "1.23.4-alpha.1")));
-		Assert.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23.4-56.78", "1.23.4-56.79")));
+		Assertions.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23.4", "1.23.5")));
+		Assertions.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23.4", "1.24.4")));
+		Assertions.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23", "1.23.4")));
+		Assertions.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23.4-SNAPSHOT", "1.23.4")));
+		Assertions.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23.4-56.78", "1.23.4")));
+		Assertions.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23.4-alpha", "1.23.4-beta")));
+		Assertions.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23.4-alpha", "1.23.4-alpha.1")));
+		Assertions.assertEquals(-1, Integer.signum(semVerComparator.compare("1.23.4-56.78", "1.23.4-56.79")));
 	}
 
 }

main/commons/src/test/java/org/cryptomator/common/settings/SettingsJsonAdapterTest.java

@@ -5,10 +5,10 @@
  *******************************************************************************/
 package org.cryptomator.common.settings;
 
-import java.io.IOException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Assert;
-import org.junit.Test;
+import java.io.IOException;
 
 public class SettingsJsonAdapterTest {
 
@@ -22,16 +22,16 @@ public class SettingsJsonAdapterTest {
 				+ "\"checkForUpdatesEnabled\": true,"//
 				+ "\"port\": 8080,"//
 				+ "\"numTrayNotifications\": 42,"//
-				+ "\"volumeImpl\": \"FUSE\"}";
+				+ "\"preferredVolumeImpl\": \"FUSE\"}";
 
 		Settings settings = adapter.fromJson(json);
 
-		Assert.assertTrue(settings.checkForUpdates().get());
-		Assert.assertEquals(2, settings.getDirectories().size());
-		Assert.assertEquals(8080, settings.port().get());
-		Assert.assertEquals(42, settings.numTrayNotifications().get());
-		Assert.assertEquals("dav", settings.preferredGvfsScheme().get());
-		Assert.assertEquals(VolumeImpl.FUSE, settings.volumeImpl().get());
+		Assertions.assertTrue(settings.checkForUpdates().get());
+		Assertions.assertEquals(2, settings.getDirectories().size());
+		Assertions.assertEquals(8080, settings.port().get());
+		Assertions.assertEquals(42, settings.numTrayNotifications().get());
+		Assertions.assertEquals("dav", settings.preferredGvfsScheme().get());
+		Assertions.assertEquals(VolumeImpl.FUSE, settings.preferredVolumeImpl().get());
 	}
 
 }

main/commons/src/test/java/org/cryptomator/common/settings/SettingsTest.java

@@ -5,12 +5,12 @@
  *******************************************************************************/
 package org.cryptomator.common.settings;
 
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
 import java.io.IOException;
 import java.util.function.Consumer;
 
-import org.junit.Test;
-import org.mockito.Mockito;
-
 public class SettingsTest {
 
 	@Test

main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsJsonAdapterTest.java

@@ -5,15 +5,14 @@
  *******************************************************************************/
 package org.cryptomator.common.settings;
 
+import com.google.gson.stream.JsonReader;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
 import java.io.IOException;
 import java.io.StringReader;
 import java.nio.file.Paths;
 
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.google.gson.stream.JsonReader;
-
 public class VaultSettingsJsonAdapterTest {
 
 	private final VaultSettingsJsonAdapter adapter = new VaultSettingsJsonAdapter();
@@ -24,11 +23,11 @@ public class VaultSettingsJsonAdapterTest {
 		JsonReader jsonReader = new JsonReader(new StringReader(json));
 
 		VaultSettings vaultSettings = adapter.read(jsonReader);
-		Assert.assertEquals("foo", vaultSettings.getId());
-		Assert.assertEquals(Paths.get("/foo/bar"), vaultSettings.path().get());
-		Assert.assertEquals("test", vaultSettings.mountName().get());
-		Assert.assertEquals("X", vaultSettings.winDriveLetter().get());
-		Assert.assertEquals("/home/test/crypto", vaultSettings.individualMountPath().get());
+		Assertions.assertEquals("foo", vaultSettings.getId());
+		Assertions.assertEquals(Paths.get("/foo/bar"), vaultSettings.path().get());
+		Assertions.assertEquals("test", vaultSettings.mountName().get());
+		Assertions.assertEquals("X", vaultSettings.winDriveLetter().get());
+		Assertions.assertEquals("/home/test/crypto", vaultSettings.individualMountPath().get());
 	}
 
 }

main/commons/src/test/java/org/cryptomator/common/settings/VaultSettingsTest.java

@@ -8,9 +8,9 @@
  *******************************************************************************/
 package org.cryptomator.common.settings;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class VaultSettingsTest {
 

main/jacoco-report/.gitignore

@@ -1 +0,0 @@
-/target/

main/jacoco-report/pom.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.cryptomator</groupId>
-		<artifactId>main</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>jacoco-report</artifactId>
-	<name>Cryptomator Code Coverage Report</name>
-	<packaging>pom</packaging>
-
-	<dependencies>
-		<!-- all modules containing unit tests: -->
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>commons</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>keychain</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>ui</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>launcher</artifactId>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>report-aggregate</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>report-aggregate</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-</project>

main/keychain/pom.xml

@@ -4,12 +4,17 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.10</version>
 	</parent>
 	<artifactId>keychain</artifactId>
 	<name>System Keychain Access</name>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>commons</artifactId>
+		</dependency>
+
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>

main/keychain/src/main/java/org/cryptomator/keychain/WindowsProtectedKeychainAccess.java

@@ -5,30 +5,6 @@
  *******************************************************************************/
 package org.cryptomator.keychain;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.io.UncheckedIOException;
-import java.io.Writer;
-import java.lang.reflect.Type;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.file.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 com.google.common.io.BaseEncoding;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -42,11 +18,36 @@ import com.google.gson.JsonSerializer;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.Environment;
 import org.cryptomator.jni.WinDataProtection;
 import org.cryptomator.jni.WinFunctions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.UncheckedIOException;
+import java.io.Writer;
+import java.lang.reflect.Type;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 class WindowsProtectedKeychainAccess implements KeychainAccessStrategy {
@@ -57,24 +58,13 @@ class WindowsProtectedKeychainAccess implements KeychainAccessStrategy {
 			.disableHtmlEscaping().create();
 
 	private final Optional<WinFunctions> winFunctions;
-	private final Path keychainPath;
+	private final List<Path> keychainPaths;
 	private Map<String, KeychainEntry> keychainEntries;
 
 	@Inject
-	public WindowsProtectedKeychainAccess(Optional<WinFunctions> winFunctions) {
+	public WindowsProtectedKeychainAccess(Optional<WinFunctions> winFunctions, Environment environment) {
 		this.winFunctions = winFunctions;
-		String keychainPathProperty = System.getProperty("cryptomator.keychainPath");
-		if (keychainPathProperty == null) {
-			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;
-		}
+		this.keychainPaths = environment.getKeychainPath().collect(Collectors.toList());
 	}
 
 	private WinDataProtection dataProtection() {
@@ -124,7 +114,7 @@ class WindowsProtectedKeychainAccess implements KeychainAccessStrategy {
 
 	@Override
 	public boolean isSupported() {
-		return SystemUtils.IS_OS_WINDOWS && winFunctions.isPresent() && keychainPath != null;
+		return SystemUtils.IS_OS_WINDOWS && winFunctions.isPresent() && !keychainPaths.isEmpty();
 	}
 
 	private byte[] generateSalt() {
@@ -138,30 +128,44 @@ class WindowsProtectedKeychainAccess implements KeychainAccessStrategy {
 
 	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);
+			for (Path keychainPath : keychainPaths) {
+				Optional<Map<String, KeychainEntry>> keychain = loadKeychainEntries(keychainPath);
+				if (keychain.isPresent()) {
+					keychainEntries = keychain.get();
+					break;
+				}
+			}
 		}
 		if (keychainEntries == null) {
+			LOG.info("Unable to load existing keychain file, creating new keychain.");
 			keychainEntries = new HashMap<>();
 		}
 	}
 
+	private Optional<Map<String, KeychainEntry>> loadKeychainEntries(Path keychainPath) {
+		LOG.debug("Attempting to load keychain from {}", keychainPath);
+		Type type = new TypeToken<Map<String, KeychainEntry>>() {
+		}.getType();
+		try (InputStream in = Files.newInputStream(keychainPath, StandardOpenOption.READ); //
+			 Reader reader = new InputStreamReader(in, UTF_8)) {
+			return Optional.of(GSON.fromJson(reader, type));
+		} catch (NoSuchFileException | JsonParseException e) {
+			return Optional.empty();
+		} catch (IOException e) {
+			throw new UncheckedIOException("Could not read keychain from path " + keychainPath, e);
+		}
+	}
+
 	private void saveKeychainEntries() {
+		if (keychainPaths.isEmpty()) {
+			throw new IllegalStateException("Can't save keychain if no keychain path is specified.");
+		}
+		saveKeychainEntries(keychainPaths.get(0));
+	}
+
+	private void saveKeychainEntries(Path keychainPath) {
 		try (OutputStream out = Files.newOutputStream(keychainPath, StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING); //
-				Writer writer = new OutputStreamWriter(out, UTF_8)) {
+			 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);
@@ -169,6 +173,7 @@ class WindowsProtectedKeychainAccess implements KeychainAccessStrategy {
 	}
 
 	private static class KeychainEntry {
+
 		@SerializedName("ciphertext")
 		byte[] ciphertext;
 		@SerializedName("salt")

main/keychain/src/test/java/org/cryptomator/keychain/KeychainModuleTest.java

@@ -5,20 +5,20 @@
  *******************************************************************************/
 package org.cryptomator.keychain;
 
-import java.util.Optional;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
-import org.junit.Assert;
-import org.junit.Test;
+import java.util.Optional;
 
 public class KeychainModuleTest {
 
 	@Test
 	public void testGetKeychain() {
 		Optional<KeychainAccess> keychainAccess = DaggerTestKeychainComponent.builder().keychainModule(new TestKeychainModule()).build().keychainAccess();
-		Assert.assertTrue(keychainAccess.isPresent());
-		Assert.assertTrue(keychainAccess.get() instanceof MapKeychainAccess);
+		Assertions.assertTrue(keychainAccess.isPresent());
+		Assertions.assertTrue(keychainAccess.get() instanceof MapKeychainAccess);
 		keychainAccess.get().storePassphrase("test", "asd");
-		Assert.assertArrayEquals("asd".toCharArray(), keychainAccess.get().loadPassphrase("test"));
+		Assertions.assertArrayEquals("asd".toCharArray(), keychainAccess.get().loadPassphrase("test"));
 	}
 
 }

main/keychain/src/test/java/org/cryptomator/keychain/TestKeychainComponent.java

@@ -5,11 +5,10 @@
  *******************************************************************************/
 package org.cryptomator.keychain;
 
-import java.util.Optional;
+import dagger.Component;
 
 import javax.inject.Singleton;
-
-import dagger.Component;
+import java.util.Optional;
 
 @Singleton
 @Component(modules = KeychainModule.class)

main/keychain/src/test/java/org/cryptomator/keychain/WindowsProtectedKeychainAccessTest.java

@@ -5,46 +5,36 @@
  *******************************************************************************/
 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.common.Environment;
 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.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockito.Mockito;
 import org.mockito.stubbing.Answer;
 
+import java.nio.file.Path;
+import java.util.Optional;
+import java.util.stream.Stream;
+
 public class WindowsProtectedKeychainAccessTest {
 
-	@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());
+	@BeforeEach
+	public void setup(@TempDir Path tempDir) {
+		Path keychainPath = tempDir.resolve("keychainfile.tmp");
+		Environment env = Mockito.mock(Environment.class);
+		Mockito.when(env.getKeychainPath()).thenReturn(Stream.of(keychainPath));
 		WinFunctions winFunctions = Mockito.mock(WinFunctions.class);
 		WinDataProtection winDataProtection = Mockito.mock(WinDataProtection.class);
 		Mockito.when(winFunctions.dataProtection()).thenReturn(winDataProtection);
 		Answer<byte[]> answerReturningFirstArg = invocation -> ((byte[]) invocation.getArgument(0)).clone();
 		Mockito.when(winDataProtection.protect(Mockito.any(), Mockito.any())).thenAnswer(answerReturningFirstArg);
 		Mockito.when(winDataProtection.unprotect(Mockito.any(), Mockito.any())).thenAnswer(answerReturningFirstArg);
-		keychain = new WindowsProtectedKeychainAccess(Optional.of(winFunctions));
-	}
-
-	@After
-	public void teardown() throws IOException {
-		Files.deleteIfExists(tmpFile);
+		keychain = new WindowsProtectedKeychainAccess(Optional.of(winFunctions), env);
 	}
 
 	@Test
@@ -55,11 +45,12 @@ public class WindowsProtectedKeychainAccessTest {
 		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);
+		Assertions.assertEquals(storedPw1, loadedPw1);
+		Assertions.assertEquals(storedPw2, loadedPw2);
 		keychain.deletePassphrase("myPassword");
-		Assert.assertNull(keychain.loadPassphrase("myPassword"));
-		Assert.assertNull(keychain.loadPassphrase("nonExistingPassword"));
+		Assertions.assertNull(keychain.loadPassphrase("myPassword"));
+		Assertions.assertNotNull(keychain.loadPassphrase("myOtherPassword"));
+		Assertions.assertNull(keychain.loadPassphrase("nonExistingPassword"));
 	}
 
 }

main/launcher/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.10</version>
 	</parent>
 	<artifactId>launcher</artifactId>
 	<name>Cryptomator Launcher</name>

main/launcher/src/main/java/org/cryptomator/launcher/ApplicationVersion.java

@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the accompanying LICENSE file.
- *******************************************************************************/
-package org.cryptomator.launcher;
-
-import java.util.Optional;
-
-public class ApplicationVersion {
-
-	public static String orElse(String other) {
-		return get().orElse(other);
-	}
-
-	public static Optional<String> get() {
-		return Optional.ofNullable(Cryptomator.class.getPackage().getImplementationVersion());
-	}
-
-}

main/launcher/src/main/java/org/cryptomator/launcher/Cryptomator.java

@@ -5,55 +5,115 @@
  *******************************************************************************/
 package org.cryptomator.launcher;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.BlockingQueue;
-
+import javafx.application.Application;
+import javafx.stage.Stage;
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.logging.DebugMode;
+import org.cryptomator.logging.LoggerConfiguration;
+import org.cryptomator.ui.controllers.MainController;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javafx.application.Application;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+import java.io.IOException;
+import java.util.Optional;
 
+@Singleton
 public class Cryptomator {
 
+	// DaggerCryptomatorComponent gets generated by Dagger.
+	// Run Maven and include target/generated-sources/annotations in your IDE.
+	private static final CryptomatorComponent CRYPTOMATOR_COMPONENT = DaggerCryptomatorComponent.create();
 	private static final Logger LOG = LoggerFactory.getLogger(Cryptomator.class);
-	static final BlockingQueue<Path> FILE_OPEN_REQUESTS = new ArrayBlockingQueue<>(10);
+
+	private final LoggerConfiguration logConfig;
+	private final DebugMode debugMode;
+	private final IpcFactory ipcFactory;
+	private final Optional<String> applicationVersion;
+
+	@Inject
+	Cryptomator(LoggerConfiguration logConfig, DebugMode debugMode, IpcFactory ipcFactory, @Named("applicationVersion") Optional<String> applicationVersion) {
+		this.logConfig = logConfig;
+		this.debugMode = debugMode;
+		this.ipcFactory = ipcFactory;
+		this.applicationVersion = applicationVersion;
+	}
 
 	public static void main(String[] args) {
-		LOG.info("Starting Cryptomator {} on {} {} ({})", ApplicationVersion.orElse("SNAPSHOT"), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH);
+		int exitCode = CRYPTOMATOR_COMPONENT.application().run(args);
+		System.exit(exitCode); // end remaining non-daemon threads.
+	}
 
-		FileOpenRequestHandler fileOpenRequestHandler = new FileOpenRequestHandler(FILE_OPEN_REQUESTS);
-		try (InterProcessCommunicator communicator = InterProcessCommunicator.start(new IpcProtocolImpl(fileOpenRequestHandler))) {
-			if (communicator.isServer()) {
-				fileOpenRequestHandler.handleLaunchArgs(args);
-				CleanShutdownPerformer.registerShutdownHook();
-				Application.launch(MainApplication.class, args);
+	/**
+	 * Main entry point of the application launcher.
+	 * @param args The arguments passed to this program via {@link #main(String[])}.
+	 * @return Nonzero exit code in case of an error.
+	 */
+	private int run(String[] args) {
+		logConfig.init();
+		LOG.info("Starting Cryptomator {} on {} {} ({})", applicationVersion.orElse("SNAPSHOT"), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH);
+		debugMode.initialize();
+
+		/*
+		 * Attempts to create an IPC connection to a running Cryptomator instance and sends it the given args.
+		 * If no external process could be reached, the args will be handled by the loopback IPC endpoint.
+		 */
+		try (IpcFactory.IpcEndpoint endpoint = ipcFactory.create()) {
+			endpoint.getRemote().handleLaunchArgs(args); // if we are the server, getRemote() returns self.
+			if (endpoint.isConnectedToRemote()) {
+				LOG.info("Found running application instance. Shutting down...");
+				return 2;
 			} else {
-				communicator.handleLaunchArgs(args);
-				LOG.info("Found running application instance. Shutting down.");
+				LOG.debug("Did not find running application instance. Launching GUI...");
+				return runGuiApplication();
 			}
 		} catch (IOException e) {
 			LOG.error("Failed to initiate inter-process communication.", e);
+			return runGuiApplication();
 		}
-		System.exit(0); // end remaining non-daemon threads.
 	}
 
-	private static class IpcProtocolImpl implements InterProcessCommunicationProtocol {
+	/**
+	 * Launches the JavaFX application and waits until shutdown is requested.
+	 * @return Nonzero exit code in case of an error.
+	 */
+	private int runGuiApplication() {
+		try {
+			CleanShutdownPerformer.registerShutdownHook();
+			Application.launch(MainApp.class);
+			LOG.info("Shutting down...");
+			return 0;
+		} catch (Throwable e) {
+			LOG.error("Terminating due to error", e);
+			return 1;
+		}
+	}
 
-		private final FileOpenRequestHandler fileOpenRequestHandler;
 
-		// TODO: inject?
-		public IpcProtocolImpl(FileOpenRequestHandler fileOpenRequestHandler) {
-			this.fileOpenRequestHandler = fileOpenRequestHandler;
+	// We need a separate FX Application class, until we can use the module system. See https://stackoverflow.com/q/54756176/4014509
+	public static class MainApp extends Application {
+
+		@Override
+		public void start(Stage primaryStage) {
+			LOG.info("JavaFX application started.");
+			primaryStage.setMinWidth(652.0);
+			primaryStage.setMinHeight(440.0);
+
+			FxApplicationComponent fxApplicationComponent = CRYPTOMATOR_COMPONENT.fxApplicationComponent() //
+					.fxApplication(this) //
+					.mainWindow(primaryStage) //
+					.build();
+
+			MainController mainCtrl = fxApplicationComponent.fxmlLoader().load("/fxml/main.fxml");
+			mainCtrl.initStage(primaryStage);
+			primaryStage.show();
 		}
 
 		@Override
-		public void handleLaunchArgs(String[] args) {
-			LOG.info("Received launch args: {}", Arrays.stream(args).reduce((a, b) -> a + ", " + b).orElse(""));
-			fileOpenRequestHandler.handleLaunchArgs(args);
+		public void stop() {
+			LOG.info("JavaFX application stopped.");
 		}
 
 	}

main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorComponent.java

@@ -0,0 +1,17 @@
+package org.cryptomator.launcher;
+
+import dagger.Component;
+import org.cryptomator.common.CommonsModule;
+import org.cryptomator.logging.LoggerModule;
+
+import javax.inject.Singleton;
+
+@Singleton
+@Component(modules = {CryptomatorModule.class, CommonsModule.class, LoggerModule.class})
+public interface CryptomatorComponent {
+
+	Cryptomator application();
+
+	FxApplicationComponent.Builder fxApplicationComponent();
+
+}

main/launcher/src/main/java/org/cryptomator/launcher/CryptomatorModule.java

@@ -0,0 +1,39 @@
+package org.cryptomator.launcher;
+
+import dagger.Module;
+import dagger.Provides;
+import org.cryptomator.common.settings.Settings;
+import org.cryptomator.common.settings.SettingsProvider;
+import org.cryptomator.ui.model.AppLaunchEvent;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+import java.util.Optional;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CountDownLatch;
+
+@Module
+class CryptomatorModule {
+
+	@Provides
+	@Singleton
+	static Settings provideSettings(SettingsProvider settingsProvider) {
+		return settingsProvider.get();
+	}
+
+	@Provides
+	@Singleton
+	@Named("launchEventQueue")
+	static BlockingQueue<AppLaunchEvent> provideFileOpenRequests() {
+		return new ArrayBlockingQueue<>(10);
+	}
+
+	@Provides
+	@Singleton
+	@Named("applicationVersion")
+	static Optional<String> provideApplicationVersion() {
+		return Optional.ofNullable(Cryptomator.class.getPackage().getImplementationVersion());
+	}
+
+}

main/launcher/src/main/java/org/cryptomator/launcher/FileOpenRequestHandler.java

@@ -6,52 +6,69 @@
  *******************************************************************************/
 package org.cryptomator.launcher;
 
+import org.cryptomator.ui.model.AppLaunchEvent;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
 import java.awt.Desktop;
+import java.awt.desktop.OpenFilesEvent;
 import java.io.File;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.Objects;
 import java.util.concurrent.BlockingQueue;
+import java.util.stream.Stream;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+@Singleton
 class FileOpenRequestHandler {
 
 	private static final Logger LOG = LoggerFactory.getLogger(FileOpenRequestHandler.class);
-	private final BlockingQueue<Path> fileOpenRequests;
+	private final BlockingQueue<AppLaunchEvent> launchEventQueue;
 
-	public FileOpenRequestHandler(BlockingQueue<Path> fileOpenRequests) {
-		this.fileOpenRequests = fileOpenRequests;
+	@Inject
+	public FileOpenRequestHandler(@Named("launchEventQueue") BlockingQueue<AppLaunchEvent> launchEventQueue) {
+		this.launchEventQueue = launchEventQueue;
 		try {
-			Desktop.getDesktop().setOpenFileHandler(e -> {
-				e.getFiles().stream().map(File::toPath).forEach(fileOpenRequests::add);
-			});
+			Desktop.getDesktop().setOpenFileHandler(this::openFiles);
 		} catch (UnsupportedOperationException e) {
 			LOG.info("Unable to setOpenFileHandler, probably not supported on this OS.");
 		}
 	}
 
+	private void openFiles(final OpenFilesEvent evt) {
+		Stream<Path> pathsToOpen = evt.getFiles().stream().map(File::toPath);
+		AppLaunchEvent launchEvent = new AppLaunchEvent(pathsToOpen);
+		tryToEnqueueFileOpenRequest(launchEvent);
+	}
+
 	public void handleLaunchArgs(String[] args) {
 		handleLaunchArgs(FileSystems.getDefault(), args);
 	}
 
 	// visible for testing
 	void handleLaunchArgs(FileSystem fs, String[] args) {
-		for (String arg : args) {
+		Stream<Path> pathsToOpen = Arrays.stream(args).map(str -> {
 			try {
-				Path path = fs.getPath(arg);
-				tryToEnqueueFileOpenRequest(path);
+				return fs.getPath(str);
 			} catch (InvalidPathException e) {
-				LOG.trace("{} not a valid path", arg);
+				LOG.trace("Argument not a valid path: {}", str);
+				return null;
 			}
-		}
+		}).filter(Objects::nonNull);
+		AppLaunchEvent launchEvent = new AppLaunchEvent(pathsToOpen);
+		tryToEnqueueFileOpenRequest(launchEvent);
 	}
 
-	private void tryToEnqueueFileOpenRequest(Path path) {
-		if (!fileOpenRequests.offer(path)) {
-			LOG.warn("{} could not be enqueued for opening.", path);
+
+	private void tryToEnqueueFileOpenRequest(AppLaunchEvent launchEvent) {
+		if (!launchEventQueue.offer(launchEvent)) {
+			LOG.warn("Could not enqueue application launch event.", launchEvent);
 		}
 	}
 

main/launcher/src/main/java/org/cryptomator/launcher/FxApplicationComponent.java

@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the accompanying LICENSE file.
+ *******************************************************************************/
+package org.cryptomator.launcher;
+
+import dagger.BindsInstance;
+import dagger.Subcomponent;
+import javafx.application.Application;
+import javafx.stage.Stage;
+import org.cryptomator.common.FxApplicationScoped;
+import org.cryptomator.ui.controllers.ViewControllerLoader;
+
+import javax.inject.Named;
+
+@FxApplicationScoped
+@Subcomponent(modules = FxApplicationModule.class)
+interface FxApplicationComponent {
+
+	ViewControllerLoader fxmlLoader();
+
+	@Subcomponent.Builder
+	interface Builder {
+
+		@BindsInstance
+		Builder fxApplication(Application application);
+
+		@BindsInstance
+		Builder mainWindow(@Named("mainWindow") Stage mainWindow);
+
+		FxApplicationComponent build();
+
+	}
+
+}

main/launcher/src/main/java/org/cryptomator/launcher/FxApplicationModule.java

@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the accompanying LICENSE file.
+ *******************************************************************************/
+package org.cryptomator.launcher;
+
+import dagger.Module;
+import dagger.Provides;
+import org.cryptomator.common.FxApplicationScoped;
+import org.cryptomator.ui.UiModule;
+
+import javax.inject.Named;
+import java.util.function.Consumer;
+
+@Module(includes = {UiModule.class})
+class FxApplicationModule {
+
+	@Provides
+	@FxApplicationScoped
+	@Named("shutdownTaskScheduler")
+	Consumer<Runnable> provideShutdownTaskScheduler() {
+		return CleanShutdownPerformer::scheduleShutdownTask;
+	}
+
+}

main/launcher/src/main/java/org/cryptomator/launcher/InterProcessCommunicator.java

@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the accompanying LICENSE file.
- *******************************************************************************/
-package org.cryptomator.launcher;
-
-import java.io.Closeable;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.nio.ByteBuffer;
-import java.nio.channels.ReadableByteChannel;
-import java.nio.channels.WritableByteChannel;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-import java.rmi.ConnectException;
-import java.rmi.ConnectIOException;
-import java.rmi.NotBoundException;
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.registry.LocateRegistry;
-import java.rmi.registry.Registry;
-import java.rmi.server.RMIClientSocketFactory;
-import java.rmi.server.RMIServerSocketFactory;
-import java.rmi.server.RMISocketFactory;
-import java.rmi.server.UnicastRemoteObject;
-
-import org.apache.commons.lang3.SystemUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.io.MoreFiles;
-
-/**
- * First running application on a machine opens a server socket. Further processes will connect as clients.
- */
-abstract class InterProcessCommunicator implements InterProcessCommunicationProtocol, Closeable {
-
-	private static final Logger LOG = LoggerFactory.getLogger(InterProcessCommunicator.class);
-	private static final String RMI_NAME = "Cryptomator";
-
-	public abstract boolean isServer();
-
-	/**
-	 * @param endpoint The server-side communication endpoint.
-	 * @return Either a client or a server communicator.
-	 * @throws IOException In case of communication errors.
-	 */
-	public static InterProcessCommunicator start(InterProcessCommunicationProtocol endpoint) throws IOException {
-		return start(getIpcPortPath(), endpoint);
-	}
-
-	// visible for testing
-	static InterProcessCommunicator start(Path portFilePath, InterProcessCommunicationProtocol endpoint) throws IOException {
-		System.setProperty("java.rmi.server.hostname", "localhost");
-		try {
-			// try to connect to existing server:
-			ClientCommunicator client = new ClientCommunicator(portFilePath);
-			LOG.trace("Connected to running process.");
-			return client;
-		} catch (ConnectException | ConnectIOException | NotBoundException e) {
-			LOG.debug("Could not connect to running process.");
-			// continue
-		}
-
-		// spawn a new server:
-		LOG.trace("Spawning new server...");
-		ServerCommunicator server = new ServerCommunicator(endpoint, portFilePath);
-		LOG.debug("Server listening on port {}.", server.getPort());
-		return server;
-	}
-
-	private static Path getIpcPortPath() {
-		final String settingsPathProperty = System.getProperty("cryptomator.ipcPortPath");
-		if (settingsPathProperty == null) {
-			LOG.warn("System property cryptomator.ipcPortPath not set.");
-			return Paths.get(".ipcPort.tmp");
-		} else {
-			return Paths.get(replaceHomeDir(settingsPathProperty));
-		}
-	}
-
-	private static String replaceHomeDir(String path) {
-		if (path.startsWith("~/")) {
-			return SystemUtils.USER_HOME + path.substring(1);
-		} else {
-			return path;
-		}
-	}
-
-	public static class ClientCommunicator extends InterProcessCommunicator {
-
-		private final IpcProtocolRemote remote;
-
-		private ClientCommunicator(Path portFilePath) throws ConnectException, NotBoundException, RemoteException {
-			if (Files.notExists(portFilePath)) {
-				throw new ConnectException("No IPC port file.");
-			}
-			try {
-				int port = ClientCommunicator.readPort(portFilePath);
-				LOG.debug("Connecting to port {}...", port);
-				Registry registry = LocateRegistry.getRegistry("localhost", port, new ClientSocketFactory());
-				this.remote = (IpcProtocolRemote) registry.lookup(RMI_NAME);
-			} catch (IOException e) {
-				throw new ConnectException("Error reading IPC port file.");
-			}
-		}
-
-		private static int readPort(Path portFilePath) throws IOException {
-			ByteBuffer buf = ByteBuffer.allocate(Integer.BYTES);
-			try (ReadableByteChannel ch = Files.newByteChannel(portFilePath, StandardOpenOption.READ)) {
-				if (ch.read(buf) == Integer.BYTES) {
-					buf.flip();
-					return buf.getInt();
-				} else {
-					throw new IOException("Invalid IPC port file.");
-				}
-			}
-		}
-
-		@Override
-		public void handleLaunchArgs(String[] args) {
-			try {
-				remote.handleLaunchArgs(args);
-			} catch (RemoteException e) {
-				throw new RuntimeException(e);
-			}
-		}
-
-		@Override
-		public boolean isServer() {
-			return false;
-		}
-
-		@Override
-		public void close() {
-			// no-op
-		}
-
-	}
-
-	public static class ServerCommunicator extends InterProcessCommunicator {
-
-		private final ServerSocket socket;
-		private final Registry registry;
-		private final IpcProtocolRemoteImpl remote;
-		private final Path portFilePath;
-
-		private ServerCommunicator(InterProcessCommunicationProtocol delegate, Path portFilePath) throws IOException {
-			this.socket = new ServerSocket(0, Byte.MAX_VALUE, InetAddress.getByName("localhost"));
-			RMIClientSocketFactory csf = RMISocketFactory.getDefaultSocketFactory();
-			SingletonServerSocketFactory ssf = new SingletonServerSocketFactory(socket);
-			this.registry = LocateRegistry.createRegistry(0, csf, ssf);
-			this.remote = new IpcProtocolRemoteImpl(delegate);
-			UnicastRemoteObject.exportObject(remote, 0);
-			registry.rebind(RMI_NAME, remote);
-			this.portFilePath = portFilePath;
-			ServerCommunicator.writePort(portFilePath, socket.getLocalPort());
-		}
-
-		private static void writePort(Path portFilePath, int port) throws IOException {
-			ByteBuffer buf = ByteBuffer.allocate(Integer.BYTES);
-			buf.putInt(port);
-			buf.flip();
-			MoreFiles.createParentDirectories(portFilePath);
-			try (WritableByteChannel ch = Files.newByteChannel(portFilePath, StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) {
-				if (ch.write(buf) != Integer.BYTES) {
-					throw new IOException("Did not write expected number of bytes.");
-				}
-			}
-		}
-
-		@Override
-		public void handleLaunchArgs(String[] args) {
-			throw new UnsupportedOperationException("Server doesn't invoke methods.");
-		}
-
-		@Override
-		public boolean isServer() {
-			return true;
-		}
-
-		private int getPort() {
-			return socket.getLocalPort();
-		}
-
-		@Override
-		public void close() {
-			try {
-				registry.unbind(RMI_NAME);
-				UnicastRemoteObject.unexportObject(remote, true);
-				socket.close();
-				Files.deleteIfExists(portFilePath);
-				LOG.debug("Server shut down.");
-			} catch (NotBoundException | IOException e) {
-				LOG.warn("Failed to close IPC Server.", e);
-			}
-		}
-
-	}
-
-	private static interface IpcProtocolRemote extends Remote {
-		void handleLaunchArgs(String[] args) throws RemoteException;
-	}
-
-	private static class IpcProtocolRemoteImpl implements IpcProtocolRemote {
-
-		private final InterProcessCommunicationProtocol delegate;
-
-		protected IpcProtocolRemoteImpl(InterProcessCommunicationProtocol delegate) throws RemoteException {
-			this.delegate = delegate;
-		}
-
-		@Override
-		public void handleLaunchArgs(String[] args) {
-			delegate.handleLaunchArgs(args);
-		}
-
-	}
-
-	/**
-	 * Always returns the same pre-constructed server socket.
-	 */
-	private static class SingletonServerSocketFactory implements RMIServerSocketFactory {
-
-		private final ServerSocket socket;
-
-		public SingletonServerSocketFactory(ServerSocket socket) {
-			this.socket = socket;
-		}
-
-		@Override
-		public synchronized ServerSocket createServerSocket(int port) throws IOException {
-			if (port != 0) {
-				throw new IllegalArgumentException("This factory doesn't support specific ports.");
-			}
-			return this.socket;
-		}
-
-	}
-
-	/**
-	 * Creates client sockets with short timeouts.
-	 */
-	private static class ClientSocketFactory implements RMIClientSocketFactory {
-
-		@Override
-		public Socket createSocket(String host, int port) throws IOException {
-			return new SocketWithFixedTimeout(host, port, 1000);
-		}
-
-	}
-
-	private static class SocketWithFixedTimeout extends Socket {
-
-		public SocketWithFixedTimeout(String host, int port, int timeoutInMs) throws UnknownHostException, IOException {
-			super(host, port);
-			super.setSoTimeout(timeoutInMs);
-		}
-
-		@Override
-		public synchronized void setSoTimeout(int timeout) throws SocketException {
-			// do nothing, timeout is fixed
-		}
-
-	}
-
-}

main/launcher/src/main/java/org/cryptomator/launcher/IpcFactory.java

@@ -0,0 +1,258 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the accompanying LICENSE file.
+ *******************************************************************************/
+package org.cryptomator.launcher;
+
+import com.google.common.io.MoreFiles;
+import org.cryptomator.common.Environment;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.io.Closeable;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.rmi.NotBoundException;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
+import java.rmi.server.RMIClientSocketFactory;
+import java.rmi.server.RMIServerSocketFactory;
+import java.rmi.server.RMISocketFactory;
+import java.rmi.server.UnicastRemoteObject;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * First running application on a machine opens a server socket. Further processes will connect as clients.
+ */
+@Singleton
+class IpcFactory {
+
+	private static final Logger LOG = LoggerFactory.getLogger(IpcFactory.class);
+	private static final String RMI_NAME = "Cryptomator";
+
+	private final List<Path> portFilePaths;
+	private final IpcProtocolImpl ipcHandler;
+
+	@Inject
+	public IpcFactory(Environment env, IpcProtocolImpl ipcHandler) {
+		this.portFilePaths = env.getIpcPortPath().collect(Collectors.toUnmodifiableList());
+		this.ipcHandler = ipcHandler;
+	}
+
+	public IpcEndpoint create() {
+		if (portFilePaths.isEmpty()) {
+			LOG.warn("No IPC port file path specified.");
+			return new SelfEndpoint(ipcHandler);
+		} else {
+			System.setProperty("java.rmi.server.hostname", "localhost");
+			return attemptClientConnection().or(this::createServerEndpoint).orElseGet(() -> new SelfEndpoint(ipcHandler));
+		}
+	}
+
+	private Optional<IpcEndpoint> attemptClientConnection() {
+		for (Path portFilePath : portFilePaths) {
+			try {
+				int port = readPort(portFilePath);
+				LOG.debug("[Client] Connecting to port {}...", port);
+				Registry registry = LocateRegistry.getRegistry("localhost", port, new ClientSocketFactory());
+				IpcProtocol remoteInterface = (IpcProtocol) registry.lookup(RMI_NAME);
+				return Optional.of(new ClientEndpoint(remoteInterface));
+			} catch (NotBoundException | IOException e) {
+				LOG.debug("[Client] Failed to connect.");
+				// continue with next portFilePath...
+			}
+		}
+		return Optional.empty();
+	}
+
+	private int readPort(Path portFilePath) throws IOException {
+		try (ReadableByteChannel ch = Files.newByteChannel(portFilePath, StandardOpenOption.READ)) {
+			LOG.debug("[Client] Reading IPC port from {}", portFilePath);
+			ByteBuffer buf = ByteBuffer.allocate(Integer.BYTES);
+			if (ch.read(buf) == Integer.BYTES) {
+				buf.flip();
+				return buf.getInt();
+			} else {
+				throw new IOException("Invalid IPC port file.");
+			}
+		}
+	}
+
+	private Optional<IpcEndpoint> createServerEndpoint() {
+		assert !portFilePaths.isEmpty();
+		Path portFilePath = portFilePaths.get(0);
+		try {
+			ServerSocket socket = new ServerSocket(0, Byte.MAX_VALUE, InetAddress.getByName("localhost"));
+			RMIClientSocketFactory csf = RMISocketFactory.getDefaultSocketFactory();
+			SingletonServerSocketFactory ssf = new SingletonServerSocketFactory(socket);
+			Registry registry = LocateRegistry.createRegistry(0, csf, ssf);
+			UnicastRemoteObject.exportObject(ipcHandler, 0);
+			registry.rebind(RMI_NAME, ipcHandler);
+			writePort(portFilePath, socket.getLocalPort());
+			return Optional.of(new ServerEndpoint(ipcHandler, socket, registry, portFilePath));
+		} catch (IOException e) {
+			LOG.warn("[Server] Failed to create IPC server.", e);
+			return Optional.empty();
+		}
+	}
+
+	private void writePort(Path portFilePath, int port) throws IOException {
+		ByteBuffer buf = ByteBuffer.allocate(Integer.BYTES);
+		buf.putInt(port);
+		buf.flip();
+		MoreFiles.createParentDirectories(portFilePath);
+		try (WritableByteChannel ch = Files.newByteChannel(portFilePath, StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) {
+			if (ch.write(buf) != Integer.BYTES) {
+				throw new IOException("Did not write expected number of bytes.");
+			}
+		}
+		LOG.debug("[Server] Wrote IPC port {} to {}", port, portFilePath);
+	}
+
+	interface IpcEndpoint extends Closeable {
+
+		boolean isConnectedToRemote();
+
+		IpcProtocol getRemote();
+
+	}
+
+	static class SelfEndpoint implements IpcEndpoint {
+
+		protected final IpcProtocol remoteObject;
+
+		SelfEndpoint(IpcProtocol remoteObject) {
+			this.remoteObject = remoteObject;
+		}
+
+		@Override
+		public boolean isConnectedToRemote() {
+			return false;
+		}
+
+		@Override
+		public IpcProtocol getRemote() {
+			return remoteObject;
+		}
+
+		@Override
+		public void close() {
+			// no-op
+		}
+	}
+
+	static class ClientEndpoint implements IpcEndpoint {
+
+		private final IpcProtocol remoteInterface;
+
+		public ClientEndpoint(IpcProtocol remoteInterface) {
+			this.remoteInterface = remoteInterface;
+		}
+
+		public IpcProtocol getRemote() {
+			return remoteInterface;
+		}
+
+		@Override
+		public boolean isConnectedToRemote() {
+			return true;
+		}
+
+		@Override
+		public void close() {
+			// no-op
+		}
+
+	}
+
+	class ServerEndpoint extends SelfEndpoint {
+
+		private final ServerSocket socket;
+		private final Registry registry;
+		private final Path portFilePath;
+
+		private ServerEndpoint(IpcProtocol remoteObject, ServerSocket socket, Registry registry, Path portFilePath) {
+			super(remoteObject);
+			this.socket = socket;
+			this.registry = registry;
+			this.portFilePath = portFilePath;
+		}
+
+		@Override
+		public void close() {
+			try {
+				registry.unbind(RMI_NAME);
+				UnicastRemoteObject.unexportObject(remoteObject, true);
+				socket.close();
+				Files.deleteIfExists(portFilePath);
+				LOG.debug("[Server] Shut down");
+			} catch (NotBoundException | IOException e) {
+				LOG.warn("[Server] Error shutting down:", e);
+			}
+		}
+
+	}
+
+	/**
+	 * Always returns the same pre-constructed server socket.
+	 */
+	private static class SingletonServerSocketFactory implements RMIServerSocketFactory {
+
+		private final ServerSocket socket;
+
+		public SingletonServerSocketFactory(ServerSocket socket) {
+			this.socket = socket;
+		}
+
+		@Override
+		public synchronized ServerSocket createServerSocket(int port) throws IOException {
+			if (port != 0) {
+				throw new IllegalArgumentException("This factory doesn't support specific ports.");
+			}
+			return this.socket;
+		}
+
+	}
+
+	/**
+	 * Creates client sockets with short timeouts.
+	 */
+	private static class ClientSocketFactory implements RMIClientSocketFactory {
+
+		@Override
+		public Socket createSocket(String host, int port) throws IOException {
+			return new SocketWithFixedTimeout(host, port, 1000);
+		}
+
+	}
+
+	private static class SocketWithFixedTimeout extends Socket {
+
+		public SocketWithFixedTimeout(String host, int port, int timeoutInMs) throws UnknownHostException, IOException {
+			super(host, port);
+			super.setSoTimeout(timeoutInMs);
+		}
+
+		@Override
+		public synchronized void setSoTimeout(int timeout) throws SocketException {
+			// do nothing, timeout is fixed
+		}
+
+	}
+
+}

main/launcher/src/main/java/org/cryptomator/launcher/IpcProtocol.java

@@ -5,6 +5,11 @@
  *******************************************************************************/
 package org.cryptomator.launcher;
 
-public interface InterProcessCommunicationProtocol {
-	void handleLaunchArgs(String[] args);
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
+interface IpcProtocol extends Remote {
+
+	void handleLaunchArgs(String[] args) throws RemoteException;
+
 }

main/launcher/src/main/java/org/cryptomator/launcher/IpcProtocolImpl.java

@@ -0,0 +1,28 @@
+package org.cryptomator.launcher;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Arrays;
+
+@Singleton
+class IpcProtocolImpl implements IpcProtocol {
+
+	private static final Logger LOG = LoggerFactory.getLogger(IpcProtocolImpl.class);
+
+	private final FileOpenRequestHandler fileOpenRequestHandler;
+
+	@Inject
+	public IpcProtocolImpl(FileOpenRequestHandler fileOpenRequestHandler) {
+		this.fileOpenRequestHandler = fileOpenRequestHandler;
+	}
+
+	@Override
+	public void handleLaunchArgs(String[] args) {
+		LOG.info("Received launch args: {}", Arrays.stream(args).reduce((a, b) -> a + ", " + b).orElse(""));
+		fileOpenRequestHandler.handleLaunchArgs(args);
+	}
+
+}

main/launcher/src/main/java/org/cryptomator/launcher/LauncherComponent.java

@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the accompanying LICENSE file.
- *******************************************************************************/
-package org.cryptomator.launcher;
-
-import javax.inject.Singleton;
-
-import org.cryptomator.logging.DebugMode;
-import org.cryptomator.ui.controllers.ViewControllerLoader;
-
-import dagger.Component;
-
-@Singleton
-@Component(modules = LauncherModule.class)
-interface LauncherComponent {
-
-	ViewControllerLoader fxmlLoader();
-
-	DebugMode debugMode();
-
-}

main/launcher/src/main/java/org/cryptomator/launcher/LauncherModule.java

@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the accompanying LICENSE file.
- *******************************************************************************/
-package org.cryptomator.launcher;
-
-import java.nio.file.Path;
-import java.util.Optional;
-import java.util.concurrent.BlockingQueue;
-import java.util.function.Consumer;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-
-import org.cryptomator.ui.UiModule;
-
-import dagger.Module;
-import dagger.Provides;
-import javafx.application.Application;
-import javafx.stage.Stage;
-
-@Module(includes = {UiModule.class})
-class LauncherModule {
-
-	private final Application application;
-	private final Stage mainWindow;
-
-	public LauncherModule(Application application, Stage mainWindow) {
-		this.application = application;
-		this.mainWindow = mainWindow;
-	}
-
-	@Provides
-	@Singleton
-	Application provideApplication() {
-		return application;
-	}
-
-	@Provides
-	@Singleton
-	@Named("applicationVersion")
-	Optional<String> provideApplicationVersion() {
-		return ApplicationVersion.get();
-	}
-
-	@Provides
-	@Singleton
-	@Named("mainWindow")
-	Stage provideMainWindow() {
-		return mainWindow;
-	}
-
-	@Provides
-	@Singleton
-	@Named("fileOpenRequests")
-	BlockingQueue<Path> provideFileOpenRequests() {
-		return Cryptomator.FILE_OPEN_REQUESTS;
-	}
-
-	@Provides
-	@Singleton
-	@Named("shutdownTaskScheduler")
-	Consumer<Runnable> provideShutdownTaskScheduler() {
-		return CleanShutdownPerformer::scheduleShutdownTask;
-	}
-
-}

main/launcher/src/main/java/org/cryptomator/launcher/MainApplication.java

@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the accompanying LICENSE file.
- *******************************************************************************/
-package org.cryptomator.launcher;
-
-import org.cryptomator.ui.controllers.MainController;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javafx.application.Application;
-import javafx.application.Platform;
-import javafx.fxml.FXMLLoader;
-import javafx.stage.Stage;
-
-public class MainApplication extends Application {
-
-	private static final Logger LOG = LoggerFactory.getLogger(MainApplication.class);
-	private Stage primaryStage;
-
-	@Override
-	public void start(Stage primaryStage) throws Exception {
-		LOG.info("JavaFX application started.");
-		this.primaryStage = primaryStage;
-		setupFXMLClassLoader();
-
-		LauncherModule launcherModule = new LauncherModule(this, primaryStage);
-		LauncherComponent launcherComponent = DaggerLauncherComponent.builder() //
-				.launcherModule(launcherModule) //
-				.build();
-
-		launcherComponent.debugMode().initialize();
-
-		MainController mainCtrl = launcherComponent.fxmlLoader().load("/fxml/main.fxml");
-		mainCtrl.initStage(primaryStage);
-
-		primaryStage.show();
-	}
-
-	@Override
-	public void stop() throws Exception {
-		assert primaryStage != null;
-		primaryStage.hide();
-		LOG.info("JavaFX application stopped.");
-	}
-
-	// fix discussed in https://github.com/cryptomator/cryptomator/pull/29
-	private void setupFXMLClassLoader() {
-		ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
-		FXMLLoader.setDefaultClassLoader(contextClassLoader);
-		Platform.runLater(() -> {
-			/*
-			 * This fixes a bug on OSX where the magic file open handler leads to no context class loader being set in the AppKit (event)
-			 * thread if the application is not started opening a file.
-			 */
-			if (Thread.currentThread().getContextClassLoader() == null) {
-				Thread.currentThread().setContextClassLoader(contextClassLoader);
-			}
-		});
-	}
-
-}

main/launcher/src/main/java/org/cryptomator/logging/DebugMode.java

@@ -5,77 +5,55 @@
  *******************************************************************************/
 package org.cryptomator.logging;
 
-import static java.util.Arrays.asList;
-
-import java.util.Collection;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.cryptomator.common.settings.Settings;
-import org.slf4j.ILoggerFactory;
-import org.slf4j.LoggerFactory;
-
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
+import javafx.beans.value.ObservableValue;
+import org.cryptomator.common.settings.Settings;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Map;
 
 @Singleton
 public class DebugMode {
 
 	private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(DebugMode.class);
 
-	private static final Collection<LoggerUpgrade> LOGGER_UPGRADES = asList( //
-			loggerUpgrade(org.slf4j.Logger.ROOT_LOGGER_NAME, Level.INFO), //
-			loggerUpgrade("org.cryptomator", Level.TRACE), //
-			loggerUpgrade("org.eclipse.jetty.server.HttpChannel", Level.DEBUG) //
-	);
-
 	private final Settings settings;
+	private final LoggerContext context;
 
 	@Inject
-	public DebugMode(Settings settings) {
+	public DebugMode(Settings settings, LoggerContext context) {
 		this.settings = settings;
+		this.context = context;
 	}
 
 	public void initialize() {
-		if (settings.debugMode().get()) {
-			enable();
-			LOG.debug("Debug mode initialized");
-		}
+		setLogLevels(settings.debugMode().get());
+		settings.debugMode().addListener(this::logLevelChanged);
 	}
 
-	private void enable() {
-		ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory();
-		if (loggerFactory instanceof LoggerContext) {
-			LoggerContext context = (LoggerContext) loggerFactory;
-			LOGGER_UPGRADES.forEach(loggerUpgrade -> loggerUpgrade.execute(context));
+	private void logLevelChanged(@SuppressWarnings("unused") ObservableValue<? extends Boolean> observable, @SuppressWarnings("unused") Boolean oldValue, Boolean newValue) {
+		setLogLevels(newValue);
+	}
+
+	private void setLogLevels(boolean debugMode) {
+		if (debugMode) {
+			setLogLevels(LoggerModule.DEBUG_LOG_LEVELS);
+			LOG.debug("Debug mode enabled");
 		} else {
-			LOG.warn("SLF4J not bound to Logback.");
+			LOG.debug("Debug mode disabled");
+			setLogLevels(LoggerModule.DEFAULT_LOG_LEVELS);
 		}
 	}
 
-	private static LoggerUpgrade loggerUpgrade(String loggerName, Level minLevel) {
-		return new LoggerUpgrade(loggerName, minLevel);
-	}
-
-	private static class LoggerUpgrade {
-
-		private final Level level;
-		private final String loggerName;
-
-		public LoggerUpgrade(String loggerName, Level minLevel) {
-			this.loggerName = loggerName;
-			this.level = minLevel;
+	private void setLogLevels(Map<String, Level> logLevels) {
+		for (Map.Entry<String, Level> loglevel : logLevels.entrySet()) {
+			Logger logger = context.getLogger(loglevel.getKey());
+			logger.setLevel(loglevel.getValue());
 		}
-
-		public void execute(LoggerContext context) {
-			Logger logger = context.getLogger(loggerName);
-			if (logger != null && logger.getEffectiveLevel().isGreaterOrEqual(level)) {
-				logger.setLevel(level);
-			}
-		}
-
 	}
 
 }

main/launcher/src/main/java/org/cryptomator/logging/LoggerConfiguration.java

@@ -0,0 +1,71 @@
+package org.cryptomator.logging;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.Appender;
+import ch.qos.logback.core.hook.DelayingShutdownHook;
+import ch.qos.logback.core.util.Duration;
+import org.cryptomator.common.Environment;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+import java.util.Map;
+
+@Singleton
+public class LoggerConfiguration {
+
+	private static final double SHUTDOWN_DELAY_MS = 100;
+
+	private final LoggerContext context;
+	private final Environment environment;
+	private final Appender<ILoggingEvent> stdout;
+	private final Appender<ILoggingEvent> upgrade;
+	private final Appender<ILoggingEvent> file;
+
+	@Inject
+	LoggerConfiguration(LoggerContext context, //
+						Environment environment, //
+						@Named("stdoutAppender") Appender<ILoggingEvent> stdout, //
+						@Named("upgradeAppender") Appender<ILoggingEvent> upgrade, //
+						@Named("fileAppender") Appender<ILoggingEvent> file) {
+		this.context = context;
+		this.environment = environment;
+		this.stdout = stdout;
+		this.upgrade = upgrade;
+		this.file = file;
+	}
+
+	public void init() {
+		if (environment.useCustomLogbackConfig()) {
+			Logger root = context.getLogger(Logger.ROOT_LOGGER_NAME);
+			root.info("Using external logback configuration file.");
+		} else {
+			context.reset();
+
+			// configure loggers:
+			for (Map.Entry<String, Level> loglevel : LoggerModule.DEFAULT_LOG_LEVELS.entrySet()) {
+				Logger logger = context.getLogger(loglevel.getKey());
+				logger.setLevel(loglevel.getValue());
+				logger.setAdditive(false);
+				logger.addAppender(stdout);
+				logger.addAppender(file);
+			}
+
+			// configure upgrade logger:
+			Logger upgrades = context.getLogger("org.cryptomator.ui.model.upgrade");
+			upgrades.setLevel(Level.DEBUG);
+			upgrades.addAppender(stdout);
+			upgrades.addAppender(upgrade);
+			upgrades.setAdditive(false);
+
+			// add shutdown hook
+			DelayingShutdownHook shutdownHook = new DelayingShutdownHook();
+			shutdownHook.setContext(context);
+			shutdownHook.setDelay(Duration.buildByMilliseconds(SHUTDOWN_DELAY_MS));
+		}
+	}
+
+}

main/launcher/src/main/java/org/cryptomator/logging/LoggerModule.java

@@ -0,0 +1,127 @@
+package org.cryptomator.logging;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.Appender;
+import ch.qos.logback.core.ConsoleAppender;
+import ch.qos.logback.core.FileAppender;
+import ch.qos.logback.core.helpers.NOPAppender;
+import ch.qos.logback.core.hook.DelayingShutdownHook;
+import ch.qos.logback.core.rolling.FixedWindowRollingPolicy;
+import ch.qos.logback.core.rolling.RollingFileAppender;
+import ch.qos.logback.core.util.Duration;
+import dagger.Module;
+import dagger.Provides;
+import org.cryptomator.common.Environment;
+import org.slf4j.ILoggerFactory;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+import java.nio.file.Path;
+import java.util.Map;
+
+@Module
+public class LoggerModule {
+
+	private static final String UPGRADE_FILENAME = "upgrade.log";
+	private static final String LOGFILE_NAME = "cryptomator0.log";
+	private static final String LOGFILE_ROLLING_PATTERN = "cryptomator%i.log";
+	private static final int LOGFILE_ROLLING_MIN = 1;
+	private static final int LOGFILE_ROLLING_MAX = 9;
+	private static final String LOG_PATTERN = "%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n";
+	static final Map<String, Level> DEFAULT_LOG_LEVELS = Map.of( //
+			Logger.ROOT_LOGGER_NAME, Level.INFO, //
+			"org.cryptomator", Level.INFO //
+	);
+	static final Map<String, Level> DEBUG_LOG_LEVELS = Map.of( //
+			Logger.ROOT_LOGGER_NAME, Level.INFO, //
+			"org.cryptomator", Level.TRACE //
+	);
+
+	@Provides
+	@Singleton
+	static LoggerContext provideLoggerContext() {
+		ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory();
+		if (loggerFactory instanceof LoggerContext) {
+			return (LoggerContext) loggerFactory;
+		} else {
+			throw new IllegalStateException("SLF4J not bound to Logback.");
+		}
+	}
+
+	@Provides
+	@Singleton
+	static PatternLayoutEncoder provideLayoutEncoder(LoggerContext context) {
+		PatternLayoutEncoder ple = new PatternLayoutEncoder();
+		ple.setPattern(LOG_PATTERN);
+		ple.setContext(context);
+		ple.start();
+		return ple;
+	}
+
+	@Provides
+	@Singleton
+	@Named("stdoutAppender")
+	static Appender<ILoggingEvent> provideStdoutAppender(LoggerContext context, PatternLayoutEncoder encoder) {
+		ConsoleAppender<ILoggingEvent> appender = new ConsoleAppender<>();
+		appender.setContext(context);
+		appender.setEncoder(encoder);
+		appender.start();
+		return appender;
+	}
+
+	@Provides
+	@Singleton
+	@Named("fileAppender")
+	static Appender<ILoggingEvent> provideFileAppender(LoggerContext context, PatternLayoutEncoder encoder, Environment environment) {
+		if (environment.getLogDir().isPresent()) {
+			Path logDir = environment.getLogDir().get();
+			RollingFileAppender<ILoggingEvent> appender = new RollingFileAppender<>();
+			appender.setContext(context);
+			appender.setFile(logDir.resolve(LOGFILE_NAME).toString());
+			appender.setEncoder(encoder);
+			LaunchBasedTriggeringPolicy triggeringPolicy = new LaunchBasedTriggeringPolicy();
+			triggeringPolicy.setContext(context);
+			triggeringPolicy.start();
+			appender.setTriggeringPolicy(triggeringPolicy);
+			FixedWindowRollingPolicy rollingPolicy = new FixedWindowRollingPolicy();
+			rollingPolicy.setContext(context);
+			rollingPolicy.setFileNamePattern(logDir.resolve(LOGFILE_ROLLING_PATTERN).toString());
+			rollingPolicy.setMinIndex(LOGFILE_ROLLING_MIN);
+			rollingPolicy.setMaxIndex(LOGFILE_ROLLING_MAX);
+			rollingPolicy.setParent(appender);
+			rollingPolicy.start();
+			appender.setRollingPolicy(rollingPolicy);
+			appender.start();
+			return appender;
+		} else {
+			NOPAppender appender = new NOPAppender<>();
+			appender.setContext(context);
+			return appender;
+		}
+	}
+
+	@Provides
+	@Singleton
+	@Named("upgradeAppender")
+	static Appender<ILoggingEvent> provideUpgradeAppender(LoggerContext context, PatternLayoutEncoder encoder, Environment environment) {
+		if (environment.getLogDir().isPresent()) {
+			FileAppender<ILoggingEvent> appender = new FileAppender<>();
+			appender.setFile(environment.getLogDir().get().resolve(UPGRADE_FILENAME).toString());
+			appender.setContext(context);
+			appender.setEncoder(encoder);
+			appender.start();
+			return appender;
+		} else {
+			NOPAppender appender = new NOPAppender<>();
+			appender.setContext(context);
+			return appender;
+		}
+	}
+
+
+}

main/launcher/src/test/java/org/cryptomator/launcher/FileOpenRequestHandlerTest.java

@@ -5,72 +5,69 @@
  *******************************************************************************/
 package org.cryptomator.launcher;
 
+import org.cryptomator.ui.model.AppLaunchEvent;
+import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
 import java.io.IOException;
 import java.nio.file.FileSystem;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.spi.FileSystemProvider;
+import java.nio.file.Paths;
+import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.mockito.Mockito;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class FileOpenRequestHandlerTest {
 
-	@Test
-	public void testOpenArgsWithCorrectPaths() throws IOException {
-		Path p1 = Mockito.mock(Path.class);
-		Path p2 = Mockito.mock(Path.class);
-		FileSystem fs = Mockito.mock(FileSystem.class);
-		FileSystemProvider provider = Mockito.mock(FileSystemProvider.class);
-		BasicFileAttributes attrs = Mockito.mock(BasicFileAttributes.class);
-		Mockito.when(p1.getFileSystem()).thenReturn(fs);
-		Mockito.when(p2.getFileSystem()).thenReturn(fs);
-		Mockito.when(fs.provider()).thenReturn(provider);
-		Mockito.when(fs.getPath(Mockito.anyString())).thenReturn(p1, p2);
-		Mockito.when(provider.readAttributes(Mockito.any(), Mockito.eq(BasicFileAttributes.class))).thenReturn(attrs);
+	private FileOpenRequestHandler inTest;
+	private BlockingQueue<AppLaunchEvent> queue;
 
-		BlockingQueue<Path> queue = new ArrayBlockingQueue<>(10);
-		FileOpenRequestHandler handler = new FileOpenRequestHandler(queue);
-		handler.handleLaunchArgs(fs, new String[] {"foo", "bar"});
-
-		Assert.assertEquals(p1, queue.poll());
-		Assert.assertEquals(p2, queue.poll());
+	@BeforeEach
+	public void setup() {
+		queue = new ArrayBlockingQueue<>(1);
+		inTest = new FileOpenRequestHandler(queue);
 	}
 
 	@Test
+	@DisplayName("./cryptomator.exe foo bar")
+	public void testOpenArgsWithCorrectPaths() throws IOException {
+		inTest.handleLaunchArgs(new String[]{"foo", "bar"});
+
+		AppLaunchEvent evt = queue.poll();
+		Assertions.assertNotNull(evt);
+		List<Path> paths = evt.getPathsToOpen().collect(Collectors.toList());
+		MatcherAssert.assertThat(paths, CoreMatchers.hasItems(Paths.get("foo"), Paths.get("bar")));
+	}
+
+	@Test
+	@DisplayName("./cryptomator.exe foo (with 'foo' being an invalid path)")
 	public void testOpenArgsWithIncorrectPaths() throws IOException {
 		FileSystem fs = Mockito.mock(FileSystem.class);
-		Mockito.when(fs.getPath(Mockito.anyString())).thenThrow(new InvalidPathException("foo", "foo is not a path"));
+		Mockito.when(fs.getPath("foo")).thenThrow(new InvalidPathException("foo", "foo is not a path"));
+		inTest.handleLaunchArgs(fs, new String[]{"foo"});
 
-		@SuppressWarnings("unchecked")
-		BlockingQueue<Path> queue = Mockito.mock(BlockingQueue.class);
-		FileOpenRequestHandler handler = new FileOpenRequestHandler(queue);
-		handler.handleLaunchArgs(fs, new String[] {"foo"});
-
-		Mockito.verifyNoMoreInteractions(queue);
+		AppLaunchEvent evt = queue.poll();
+		Assertions.assertNotNull(evt);
+		List<Path> paths = evt.getPathsToOpen().collect(Collectors.toList());
+		Assertions.assertTrue(paths.isEmpty());
 	}
 
 	@Test
+	@DisplayName("./cryptomator.exe foo (with full event queue)")
 	public void testOpenArgsWithFullQueue() throws IOException {
-		Path p = Mockito.mock(Path.class);
-		FileSystem fs = Mockito.mock(FileSystem.class);
-		FileSystemProvider provider = Mockito.mock(FileSystemProvider.class);
-		BasicFileAttributes attrs = Mockito.mock(BasicFileAttributes.class);
-		Mockito.when(p.getFileSystem()).thenReturn(fs);
-		Mockito.when(fs.provider()).thenReturn(provider);
-		Mockito.when(fs.getPath(Mockito.anyString())).thenReturn(p);
-		Mockito.when(provider.readAttributes(Mockito.eq(p), Mockito.eq(BasicFileAttributes.class))).thenReturn(attrs);
-		Mockito.when(attrs.isRegularFile()).thenReturn(true);
+		queue.add(new AppLaunchEvent(Stream.empty()));
+		Assumptions.assumeTrue(queue.remainingCapacity() == 0);
 
-		@SuppressWarnings("unchecked")
-		BlockingQueue<Path> queue = Mockito.mock(BlockingQueue.class);
-		Mockito.when(queue.offer(Mockito.any())).thenReturn(false);
-		FileOpenRequestHandler handler = new FileOpenRequestHandler(queue);
-		handler.handleLaunchArgs(fs, new String[] {"foo"});
+		inTest.handleLaunchArgs(new String[]{"foo"});
 	}
 
 }

main/launcher/src/test/java/org/cryptomator/launcher/InterProcessCommunicatorTest.java

@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the accompanying LICENSE file.
- *******************************************************************************/
-package org.cryptomator.launcher;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.channels.SeekableByteChannel;
-import java.nio.file.FileSystem;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.spi.FileSystemProvider;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-public class InterProcessCommunicatorTest {
-
-	Path portFilePath = Mockito.mock(Path.class);
-	Path portFileParentPath = Mockito.mock(Path.class);
-	BasicFileAttributes portFileParentPathAttrs = Mockito.mock(BasicFileAttributes.class);
-	FileSystem fs = Mockito.mock(FileSystem.class);
-	FileSystemProvider provider = Mockito.mock(FileSystemProvider.class);
-	SeekableByteChannel portFileChannel = Mockito.mock(SeekableByteChannel.class);
-	AtomicInteger port = new AtomicInteger(-1);
-
-	@Before
-	public void setup() throws IOException {
-		Mockito.when(portFilePath.getFileSystem()).thenReturn(fs);
-		Mockito.when(portFilePath.toAbsolutePath()).thenReturn(portFilePath);
-		Mockito.when(portFilePath.normalize()).thenReturn(portFilePath);
-		Mockito.when(portFilePath.getParent()).thenReturn(portFileParentPath);
-		Mockito.when(portFileParentPath.getFileSystem()).thenReturn(fs);
-		Mockito.when(fs.provider()).thenReturn(provider);
-		Mockito.when(provider.readAttributes(portFileParentPath, BasicFileAttributes.class)).thenReturn(portFileParentPathAttrs);
-		Mockito.when(portFileParentPathAttrs.isDirectory()).thenReturn(false, true); // Guava's MoreFiles will check if dir exists before attempting to create them.
-		Mockito.when(provider.newByteChannel(Mockito.eq(portFilePath), Mockito.any(), Mockito.any())).thenReturn(portFileChannel);
-		Mockito.when(portFileChannel.read(Mockito.any())).then(invocation -> {
-			ByteBuffer buf = invocation.getArgument(0);
-			buf.putInt(port.get());
-			return Integer.BYTES;
-		});
-		Mockito.when(portFileChannel.write(Mockito.any())).then(invocation -> {
-			ByteBuffer buf = invocation.getArgument(0);
-			port.set(buf.getInt());
-			return Integer.BYTES;
-		});
-	}
-
-	@Test(expected = UnsupportedOperationException.class)
-	public void testStartWithDummyPort1() throws IOException {
-		port.set(0);
-		InterProcessCommunicationProtocol protocol = Mockito.mock(InterProcessCommunicationProtocol.class);
-		try (InterProcessCommunicator result = InterProcessCommunicator.start(portFilePath, protocol)) {
-			Assert.assertTrue(result.isServer());
-			Mockito.verify(provider).createDirectory(portFileParentPath);
-			Mockito.verifyZeroInteractions(protocol);
-			result.handleLaunchArgs(new String[] {"foo"});
-		}
-	}
-
-	@Test
-	public void testStartWithDummyPort2() throws IOException {
-		Mockito.doThrow(new NoSuchFileException("port file")).when(provider).checkAccess(portFilePath);
-
-		InterProcessCommunicationProtocol protocol = Mockito.mock(InterProcessCommunicationProtocol.class);
-		try (InterProcessCommunicator result = InterProcessCommunicator.start(portFilePath, protocol)) {
-			Assert.assertTrue(result.isServer());
-			Mockito.verify(provider).createDirectory(portFileParentPath);
-			Mockito.verifyZeroInteractions(protocol);
-		}
-	}
-
-	@Test
-	public void testInterProcessCommunication() throws IOException, InterruptedException {
-		port.set(-1);
-		InterProcessCommunicationProtocol protocol = Mockito.mock(InterProcessCommunicationProtocol.class);
-		try (InterProcessCommunicator result1 = InterProcessCommunicator.start(portFilePath, protocol)) {
-			Assert.assertTrue(result1.isServer());
-			Mockito.verify(provider, Mockito.times(1)).createDirectory(portFileParentPath);
-			Mockito.verifyZeroInteractions(protocol);
-
-			try (InterProcessCommunicator result2 = InterProcessCommunicator.start(portFilePath, null)) {
-				Assert.assertFalse(result2.isServer());
-				Mockito.verify(provider, Mockito.times(1)).createDirectory(portFileParentPath);
-				Assert.assertNotSame(result1, result2);
-
-				result2.handleLaunchArgs(new String[] {"foo"});
-				Mockito.verify(protocol).handleLaunchArgs(new String[] {"foo"});
-			}
-		}
-	}
-
-}

main/launcher/src/test/java/org/cryptomator/launcher/IpcFactoryTest.java

@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Skymatic UG (haftungsbeschränkt).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the accompanying LICENSE file.
+ *******************************************************************************/
+package org.cryptomator.launcher;
+
+import org.cryptomator.common.Environment;
+import org.cryptomator.launcher.IpcFactory.IpcEndpoint;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.mockito.Mockito;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+public class IpcFactoryTest {
+
+	private Environment environment = Mockito.mock(Environment.class);
+	private IpcProtocolImpl protocolHandler = Mockito.mock(IpcProtocolImpl.class);
+
+	@Test
+	@DisplayName("Wihout IPC port files")
+	public void testNoIpcWithoutPortFile() throws IOException {
+		IpcFactory inTest = new IpcFactory(environment, protocolHandler);
+
+		Mockito.when(environment.getIpcPortPath()).thenReturn(Stream.empty());
+		try (IpcEndpoint endpoint1 = inTest.create()) {
+			Assertions.assertEquals(IpcFactory.SelfEndpoint.class, endpoint1.getClass());
+			Assertions.assertFalse(endpoint1.isConnectedToRemote());
+			Assertions.assertSame(protocolHandler, endpoint1.getRemote());
+			try (IpcEndpoint endpoint2 = inTest.create()) {
+				Assertions.assertEquals(IpcFactory.SelfEndpoint.class, endpoint2.getClass());
+				Assertions.assertNotSame(endpoint1, endpoint2);
+				Assertions.assertFalse(endpoint2.isConnectedToRemote());
+				Assertions.assertSame(protocolHandler, endpoint2.getRemote());
+			}
+		}
+	}
+
+	@Test
+	@DisplayName("Start server and client with port shared via file")
+	public void testInterProcessCommunication(@TempDir Path tmpDir) throws IOException {
+		Path portFile = tmpDir.resolve("testPortFile");
+		Mockito.when(environment.getIpcPortPath()).thenReturn(Stream.of(portFile));
+		IpcFactory inTest = new IpcFactory(environment, protocolHandler);
+
+		Assertions.assertFalse(Files.exists(portFile));
+		try (IpcEndpoint endpoint1 = inTest.create()) {
+			Assertions.assertEquals(IpcFactory.ServerEndpoint.class, endpoint1.getClass());
+			Assertions.assertFalse(endpoint1.isConnectedToRemote());
+			Assertions.assertTrue(Files.exists(portFile));
+			Assertions.assertSame(protocolHandler, endpoint1.getRemote());
+			Mockito.verifyZeroInteractions(protocolHandler);
+			try (IpcEndpoint endpoint2 = inTest.create()) {
+				Assertions.assertEquals(IpcFactory.ClientEndpoint.class, endpoint2.getClass());
+				Assertions.assertNotSame(endpoint1, endpoint2);
+				Assertions.assertTrue(endpoint2.isConnectedToRemote());
+				Assertions.assertNotSame(protocolHandler, endpoint2.getRemote());
+				Mockito.verifyZeroInteractions(protocolHandler);
+				endpoint2.getRemote().handleLaunchArgs(new String[] {"foo"});
+				Mockito.verify(protocolHandler).handleLaunchArgs(new String[] {"foo"});
+			}
+		}
+	}
+
+}

main/launcher/src/test/java/org/cryptomator/logging/LaunchBasedTriggeringPolicyTest.java

@@ -5,12 +5,12 @@
  *******************************************************************************/
 package org.cryptomator.logging;
 
-import java.io.File;
-
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
+import java.io.File;
+
 public class LaunchBasedTriggeringPolicyTest {
 
 	@Test
@@ -21,15 +21,15 @@ public class LaunchBasedTriggeringPolicyTest {
 
 		// 1st invocation
 		boolean triggered = policy.isTriggeringEvent(activeFile, event);
-		Assert.assertTrue(triggered);
+		Assertions.assertTrue(triggered);
 
 		// 2nd invocation
 		triggered = policy.isTriggeringEvent(activeFile, event);
-		Assert.assertFalse(triggered);
+		Assertions.assertFalse(triggered);
 
 		// 3rd invocation
 		triggered = policy.isTriggeringEvent(activeFile, event);
-		Assert.assertFalse(triggered);
+		Assertions.assertFalse(triggered);
 
 		Mockito.verifyZeroInteractions(activeFile);
 		Mockito.verifyZeroInteractions(event);

main/launcher/src/test/resources/logback-test.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xml>
-<!-- log config used during unit tests and starts from IDE. For production please specify -Dlogback.configurationFile=/path/to/config -->
-<configuration>
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-		</encoder>
-	</appender>
-
-	<logger name="org.cryptomator" level="DEBUG" />
-	<logger name="org.eclipse.jetty" level="INFO" />
-	<logger name="org.eclipse.jetty.server.Server" level="DEBUG" />
-	<logger name="org.apache" level="INFO" />
-
-	<root level="INFO">
-		<appender-ref ref="STDOUT" />
-	</root>
-</configuration>

main/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
-	<version>1.4.0-SNAPSHOT</version>
+	<version>1.4.10</version>
 	<packaging>pom</packaging>
 	<name>Cryptomator</name>
 
@@ -24,28 +24,30 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- dependency versions -->
-		<cryptomator.cryptolib.version>1.2.0</cryptomator.cryptolib.version>
-		<cryptomator.cryptofs.version>1.5.1</cryptomator.cryptofs.version>
-		<cryptomator.webdav.version>1.0.4</cryptomator.webdav.version>
+		<cryptomator.cryptolib.version>1.2.1</cryptomator.cryptolib.version>
+		<cryptomator.cryptofs.version>1.8.3</cryptomator.cryptofs.version>
 		<cryptomator.jni.version>2.0.0</cryptomator.jni.version>
-		<cryptomator.fuse.version>0.1.3</cryptomator.fuse.version>
+		<cryptomator.fuse.version>1.1.2</cryptomator.fuse.version>
+		<cryptomator.dokany.version>1.1.7</cryptomator.dokany.version>
+		<cryptomator.webdav.version>1.0.10</cryptomator.webdav.version>
 
-		<commons-io.version>2.5</commons-io.version>
-		<commons-lang3.version>3.6</commons-lang3.version>
+		<javafx.version>12</javafx.version>
+
+		<commons-io.version>2.6</commons-io.version>
+		<commons-lang3.version>3.8.1</commons-lang3.version>
 
 		<easybind.version>1.0.3</easybind.version>
-		
-		<guava.version>23.6-jre</guava.version>
-		<dagger.version>2.14.1</dagger.version>
-		<gson.version>2.8.2</gson.version>
-		
-		<slf4j.version>1.7.25</slf4j.version>
+
+		<guava.version>27.1-jre</guava.version>
+		<dagger.version>2.22.1</dagger.version>
+		<gson.version>2.8.5</gson.version>
+
+		<slf4j.version>1.7.26</slf4j.version>
 		<logback.version>1.2.3</logback.version>
-		
-		<junit.version>4.12</junit.version>
-		<junit.hierarchicalrunner.version>4.12.1</junit.hierarchicalrunner.version>
-		<mockito.version>2.11.0</mockito.version>
-		<hamcrest.version>1.3</hamcrest.version> <!-- keep in sync with version required by JUnit -->
+
+		<junit.jupiter.version>5.4.2</junit.jupiter.version>
+		<mockito.version>2.27.0</mockito.version>
+		<hamcrest.version>2.1</hamcrest.version>
 	</properties>
 
 	<repositories>
@@ -59,6 +61,10 @@
 				<enabled>true</enabled>
 			</snapshots>
 		</repository>
+		<repository>
+			<id>jcenter</id>
+			<url>http://jcenter.bintray.com</url>
+		</repository>
 	</repositories>
 
 	<dependencyManagement>
@@ -101,6 +107,11 @@
 				<artifactId>fuse-nio-adapter</artifactId>
 				<version>${cryptomator.fuse.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.cryptomator</groupId>
+				<artifactId>dokany-nio-adapter</artifactId>
+				<version>${cryptomator.dokany.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>org.cryptomator</groupId>
 				<artifactId>webdav-nio-adapter</artifactId>
@@ -112,6 +123,23 @@
 				<version>${cryptomator.jni.version}</version>
 			</dependency>
 
+			<!-- JavaFX -->
+			<dependency>
+				<groupId>org.openjfx</groupId>
+				<artifactId>javafx-base</artifactId>
+				<version>${javafx.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.openjfx</groupId>
+				<artifactId>javafx-controls</artifactId>
+				<version>${javafx.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.openjfx</groupId>
+				<artifactId>javafx-fxml</artifactId>
+				<version>${javafx.version}</version>
+			</dependency>
+
 			<!-- Logging -->
 			<dependency>
 				<groupId>org.slf4j</groupId>
@@ -172,20 +200,10 @@
 
 			<!-- JUnit / Mockito / Hamcrest -->
 			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>${junit.version}</version>
-				<exclusions>
-					<exclusion>
-						<artifactId>hamcrest-core</artifactId>
-						<groupId>org.hamcrest</groupId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>de.bechte.junit</groupId>
-				<artifactId>junit-hierarchicalcontextrunner</artifactId>
-				<version>${junit.hierarchicalrunner.version}</version>
+				<groupId>org.junit.jupiter</groupId>
+				<artifactId>junit-jupiter</artifactId>
+				<version>${junit.jupiter.version}</version>
+				<scope>test</scope>
 			</dependency>
 			<dependency>
 				<groupId>org.mockito</groupId>
@@ -194,9 +212,15 @@
 			</dependency>
 			<dependency>
 				<groupId>org.hamcrest</groupId>
-				<artifactId>hamcrest-all</artifactId>
+				<artifactId>hamcrest</artifactId>
 				<version>${hamcrest.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.openjfx</groupId>
+				<artifactId>javafx-swing</artifactId>
+				<version>${javafx.version}</version>
+				<scope>test</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 
@@ -207,13 +231,12 @@
 			<artifactId>slf4j-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<scope>test</scope>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-all</artifactId>
+			<artifactId>hamcrest</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -221,11 +244,6 @@
 			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>de.bechte.junit</groupId>
-			<artifactId>junit-hierarchicalcontextrunner</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 
 	<modules>
@@ -239,15 +257,11 @@
 		<profile>
 			<id>release</id>
 			<modules>
-				<module>uber-jar</module>
-				<module>ant-kit</module>
+				<module>buildkit</module>
 			</modules>
 		</profile>
 		<profile>
 			<id>coverage</id>
-			<modules>
-				<module>jacoco-report</module>
-			</modules>
 			<build>
 				<plugins>
 					<plugin>
@@ -264,7 +278,7 @@
 			<plugins>
 				<plugin>
 					<artifactId>maven-dependency-plugin</artifactId>
-					<version>3.0.2</version>
+					<version>3.1.0</version>
 					<executions>
 						<execution>
 							<id>copy-libs</id>
@@ -278,10 +292,22 @@
 						</execution>
 					</executions>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<configuration>
+						<archive>
+							<manifest>
+								<!-- adds Implementation-Version which can be read during runtime -->
+								<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+							</manifest>
+						</archive>
+					</configuration>
+				</plugin>
 				<plugin>
 					<groupId>org.jacoco</groupId>
 					<artifactId>jacoco-maven-plugin</artifactId>
-					<version>0.7.9</version>
+					<version>0.8.2</version>
 					<executions>
 						<execution>
 							<id>prepare-agent</id>
@@ -289,6 +315,12 @@
 								<goal>prepare-agent</goal>
 							</goals>
 						</execution>
+						<execution>
+							<id>report</id>
+							<goals>
+								<goal>report</goal>
+							</goals>
+						</execution>
 					</executions>
 					<configuration>
 						<excludes>
@@ -302,15 +334,9 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.7.0</version>
+				<version>3.8.0</version>
 				<configuration>
-					<source>9</source>
-					<target>9</target>
-					<release>9</release>
-					<compilerArgs>
-						<arg>--add-modules</arg>
-						<arg>jdk.incubator.httpclient</arg>
-					</compilerArgs>
+					<release>11</release>
 					<annotationProcessorPaths>
 						<path>
 							<groupId>com.google.dagger</groupId>
@@ -320,6 +346,11 @@
 					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.22.1</version>
+			</plugin>
 		</plugins>
 	</build>
 

main/uber-jar/pom.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.cryptomator</groupId>
-		<artifactId>main</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
-	</parent>
-	<artifactId>uber-jar</artifactId>
-	<name>Single über jar with all dependencies</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>launcher</artifactId>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.0.0</version>
-				<executions>
-					<execution>
-						<id>make-assembly</id>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<finalName>Cryptomator-${project.version}</finalName>
-					<createDependencyReducedPom>false</createDependencyReducedPom>
-					<transformers>
-						<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-							<manifestEntries>
-								<Main-Class>org.cryptomator.launcher.Cryptomator</Main-Class>
-								<Implementation-Version>${project.version}</Implementation-Version>
-							</manifestEntries>
-						</transformer>
-					</transformers>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>

main/uber-jar/src/main/resources/logback.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xml>
-<!-- log config used during unit tests and starts from IDE. For production please specify -Dlogback.configurationFile=/path/to/config -->
-<configuration>
-
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-		</encoder>
-	</appender>
-
-	<logger name="org.cryptomator" level="DEBUG" />
-	<logger name="org.eclipse.jetty" level="INFO" />
-	<logger name="org.eclipse.jetty.server.Server" level="INFO" />
-	<logger name="org.apache" level="INFO" />
-
-	<root level="INFO">
-		<appender-ref ref="STDOUT" />
-	</root>
-</configuration>

main/ui/pom.xml

@@ -4,35 +4,40 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.10</version>
 	</parent>
 	<artifactId>ui</artifactId>
 	<name>Cryptomator GUI</name>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>keychain</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>commons</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>cryptofs</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.cryptomator</groupId>
-			<artifactId>webdav-nio-adapter</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>jni</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
-			<artifactId>keychain</artifactId>
+			<artifactId>fuse-nio-adapter</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
-			<artifactId>fuse-nio-adapter</artifactId>
+			<artifactId>dokany-nio-adapter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>webdav-nio-adapter</artifactId>
 		</dependency>
 
 		<!-- CryptoLib -->
@@ -41,6 +46,16 @@
 			<artifactId>cryptolib</artifactId>
 		</dependency>
 		
+		<!-- JavaFx -->
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-controls</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-fxml</artifactId>
+		</dependency>
+
 		<!-- EasyBind -->
 		<dependency>
 			<groupId>org.fxmisc.easybind</groupId>
@@ -94,5 +109,10 @@
 			<version>1.1</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.openjfx</groupId>
+			<artifactId>javafx-swing</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>

main/ui/src/main/java/org/cryptomator/ui/ExitUtil.java

@@ -9,6 +9,24 @@
  *******************************************************************************/
 package org.cryptomator.ui;
 
+import javafx.application.Platform;
+import javafx.stage.Stage;
+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.FxApplicationScoped;
+import org.cryptomator.common.settings.Settings;
+import org.cryptomator.jni.JniException;
+import org.cryptomator.jni.MacApplicationUiState;
+import org.cryptomator.jni.MacFunctions;
+import org.cryptomator.ui.l10n.Localization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+import javax.swing.SwingUtilities;
 import java.awt.AWTException;
 import java.awt.Image;
 import java.awt.MenuItem;
@@ -24,27 +42,7 @@ import java.io.IOException;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-import javax.swing.SwingUtilities;
-
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.settings.Settings;
-import org.cryptomator.jni.JniException;
-import org.cryptomator.jni.MacApplicationUiState;
-import org.cryptomator.jni.MacFunctions;
-import org.cryptomator.ui.l10n.Localization;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javafx.application.Platform;
-import javafx.stage.Stage;
-
-@Singleton
+@FxApplicationScoped
 public class ExitUtil {
 
 	private static final Logger LOG = LoggerFactory.getLogger(ExitUtil.class);
@@ -53,6 +51,7 @@ public class ExitUtil {
 	private final Localization localization;
 	private final Settings settings;
 	private final Optional<MacFunctions> macFunctions;
+	private TrayIcon trayIcon;
 
 	@Inject
 	public ExitUtil(@Named("mainWindow") Stage mainWindow, Localization localization, Settings settings, Optional<MacFunctions> macFunctions) {
@@ -82,7 +81,7 @@ public class ExitUtil {
 	}
 
 	private void initTrayIconExitHandler(Runnable exitCommand) {
-		final TrayIcon trayIcon = createTrayIcon(exitCommand);
+		trayIcon = createTrayIcon(exitCommand);
 		try {
 			// double clicking tray icon should open Cryptomator
 			if (SystemUtils.IS_OS_WINDOWS) {
@@ -118,14 +117,7 @@ public class ExitUtil {
 		exitItem.addActionListener(e -> exitCommand.run());
 		popup.add(exitItem);
 
-		final Image image;
-		if (SystemUtils.IS_OS_MAC_OSX && isMacMenuBarDarkMode()) {
-			image = Toolkit.getDefaultToolkit().getImage(getClass().getResource("/tray_icon_mac_white.png"));
-		} else if (SystemUtils.IS_OS_MAC_OSX) {
-			image = Toolkit.getDefaultToolkit().getImage(getClass().getResource("/tray_icon_mac_black.png"));
-		} else {
-			image = Toolkit.getDefaultToolkit().getImage(getClass().getResource("/tray_icon.png"));
-		}
+		final Image image = getAppropriateTrayIconImage(true);
 
 		return new TrayIcon(image, localization.getString("app.name"), popup);
 	}
@@ -202,4 +194,23 @@ public class ExitUtil {
 		});
 	}
 
+	public void updateTrayIcon(boolean areAllVaultsLocked) {
+		if (trayIcon != null) {
+			Image image = getAppropriateTrayIconImage(areAllVaultsLocked);
+			trayIcon.setImage(image);
+		}
+	}
+
+	private Image getAppropriateTrayIconImage(boolean areAllVaultsLocked) {
+		String resourceName;
+		if (SystemUtils.IS_OS_MAC_OSX && isMacMenuBarDarkMode()) {
+			resourceName = areAllVaultsLocked ? "/tray_icon_mac_white.png" : "/tray_icon_unlocked_mac_white.png";
+		} else if (SystemUtils.IS_OS_MAC_OSX) {
+			resourceName = areAllVaultsLocked ? "/tray_icon_mac_black.png" : "/tray_icon_unlocked_mac_black.png";
+		} else {
+			resourceName = areAllVaultsLocked ? "/tray_icon.png" : "/tray_icon_unlocked.png";
+		}
+		return Toolkit.getDefaultToolkit().getImage(getClass().getResource(resourceName));
+	}
+
 }

main/ui/src/main/java/org/cryptomator/ui/UiModule.java

@@ -8,46 +8,61 @@
  *******************************************************************************/
 package org.cryptomator.ui;
 
-import java.net.InetSocketAddress;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.function.Consumer;
-
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import dagger.Module;
 import dagger.Provides;
 import javafx.beans.binding.Binding;
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.CommonsModule;
+import org.cryptomator.common.FxApplicationScoped;
 import org.cryptomator.common.settings.Settings;
-import org.cryptomator.common.settings.SettingsProvider;
 import org.cryptomator.frontend.webdav.WebDavServer;
 import org.cryptomator.keychain.KeychainModule;
 import org.cryptomator.ui.controllers.ViewControllerModule;
 import org.cryptomator.ui.model.VaultComponent;
 import org.fxmisc.easybind.EasyBind;
 
-@Module(includes = {ViewControllerModule.class, CommonsModule.class, KeychainModule.class}, subcomponents = {VaultComponent.class})
+import javax.inject.Named;
+import java.net.InetSocketAddress;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+
+@Module(includes = {ViewControllerModule.class, KeychainModule.class}, subcomponents = {VaultComponent.class})
 public class UiModule {
 
-	@Provides
-	@Singleton
-	Settings provideSettings(SettingsProvider settingsProvider) {
-		return settingsProvider.get();
-	}
+	private static final int NUM_SCHEDULER_THREADS = 4;
 
 	@Provides
-	@Singleton
-	ExecutorService provideExecutorService(@Named("shutdownTaskScheduler") Consumer<Runnable> shutdownTaskScheduler) {
-		ExecutorService executorService = Executors.newCachedThreadPool();
+	@FxApplicationScoped
+	ScheduledExecutorService provideScheduledExecutorService(@Named("shutdownTaskScheduler") Consumer<Runnable> shutdownTaskScheduler) {
+		final AtomicInteger threadNumber = new AtomicInteger(1);
+		ScheduledExecutorService executorService = Executors.newScheduledThreadPool(NUM_SCHEDULER_THREADS, r -> {
+			Thread t = new Thread(r);
+			t.setName("Scheduler Thread " + threadNumber.getAndIncrement());
+			t.setDaemon(true);
+			return t;
+		});
 		shutdownTaskScheduler.accept(executorService::shutdown);
 		return executorService;
 	}
 
 	@Provides
-	@Singleton
+	@FxApplicationScoped
+	ExecutorService provideExecutorService(@Named("shutdownTaskScheduler") Consumer<Runnable> shutdownTaskScheduler) {
+		final AtomicInteger threadNumber = new AtomicInteger(1);
+		ExecutorService executorService = Executors.newCachedThreadPool(r -> {
+			Thread t = new Thread(r);
+			t.setName("Background Thread " + threadNumber.getAndIncrement());
+			t.setDaemon(true);
+			return t;
+		});
+		shutdownTaskScheduler.accept(executorService::shutdown);
+		return executorService;
+	}
+
+	@Provides
+	@FxApplicationScoped
 	Binding<InetSocketAddress> provideServerSocketAddressBinding(Settings settings) {
 		return EasyBind.map(settings.port(), (Number port) -> {
 			String host = SystemUtils.IS_OS_WINDOWS ? "127.0.0.1" : "localhost";
@@ -56,7 +71,7 @@ public class UiModule {
 	}
 
 	@Provides
-	@Singleton
+	@FxApplicationScoped
 	WebDavServer provideWebDavServer(Binding<InetSocketAddress> serverSocketAddressBinding) {
 		WebDavServer server = WebDavServer.create();
 		// no need to unsubscribe eventually, because server is a singleton

main/ui/src/main/java/org/cryptomator/ui/controllers/ChangePasswordController.java

@@ -9,26 +9,9 @@
  *******************************************************************************/
 package org.cryptomator.ui.controllers;
 
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.util.Objects;
-import java.util.Optional;
-
-import javax.inject.Inject;
-
-import org.cryptomator.cryptolib.api.InvalidPassphraseException;
-import org.cryptomator.cryptolib.api.UnsupportedVaultFormatException;
-import org.cryptomator.ui.controls.SecPasswordField;
-import org.cryptomator.ui.l10n.Localization;
-import org.cryptomator.ui.model.Vault;
-import org.cryptomator.ui.util.PasswordStrengthUtil;
-import org.fxmisc.easybind.EasyBind;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import javafx.application.Application;
 import javafx.application.Platform;
-import javafx.beans.binding.BooleanBinding;
+import javafx.beans.Observable;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.event.ActionEvent;
@@ -40,6 +23,21 @@ import javafx.scene.control.Label;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Region;
 import javafx.scene.text.Text;
+import org.cryptomator.cryptolib.api.InvalidPassphraseException;
+import org.cryptomator.cryptolib.api.UnsupportedVaultFormatException;
+import org.cryptomator.ui.controls.SecPasswordField;
+import org.cryptomator.ui.l10n.Localization;
+import org.cryptomator.ui.model.Vault;
+import org.cryptomator.ui.util.PasswordStrengthUtil;
+import org.fxmisc.easybind.EasyBind;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.util.Objects;
+import java.util.Optional;
 
 public class ChangePasswordController implements ViewController {
 
@@ -48,7 +46,7 @@ public class ChangePasswordController implements ViewController {
 	private final Application app;
 	private final PasswordStrengthUtil strengthRater;
 	private final Localization localization;
-	private final IntegerProperty passwordStrength = new SimpleIntegerProperty(); // 0-4
+	private final IntegerProperty passwordStrength = new SimpleIntegerProperty(-1); // 0-4
 	private Optional<ChangePasswordListener> listener = Optional.empty();
 	private Vault vault;
 
@@ -100,11 +98,9 @@ public class ChangePasswordController implements ViewController {
 
 	@Override
 	public void initialize() {
-		BooleanBinding oldPasswordIsEmpty = oldPasswordField.textProperty().isEmpty();
-		BooleanBinding newPasswordIsEmpty = newPasswordField.textProperty().isEmpty();
-		BooleanBinding passwordsDiffer = newPasswordField.textProperty().isNotEqualTo(retypePasswordField.textProperty());
-		changePasswordButton.disableProperty().bind(oldPasswordIsEmpty.or(newPasswordIsEmpty.or(passwordsDiffer)));
-		passwordStrength.bind(EasyBind.map(newPasswordField.textProperty(), strengthRater::computeRate));
+		oldPasswordField.textProperty().addListener(this::passwordsChanged);
+		newPasswordField.textProperty().addListener(this::passwordsChanged);
+		retypePasswordField.textProperty().addListener(this::passwordsChanged);
 
 		passwordStrengthLevel0.backgroundProperty().bind(EasyBind.combine(passwordStrength, new SimpleIntegerProperty(0), strengthRater::getBackgroundWithStrengthColor));
 		passwordStrengthLevel1.backgroundProperty().bind(EasyBind.combine(passwordStrength, new SimpleIntegerProperty(1), strengthRater::getBackgroundWithStrengthColor));
@@ -114,6 +110,14 @@ public class ChangePasswordController implements ViewController {
 		passwordStrengthLabel.textProperty().bind(EasyBind.map(passwordStrength, strengthRater::getStrengthDescription));
 	}
 
+	private void passwordsChanged(@SuppressWarnings("unused") Observable observable) {
+		boolean oldPasswordEmpty = oldPasswordField.getCharacters().length() == 0;
+		boolean newPasswordEmpty = newPasswordField.getCharacters().length() == 0;
+		boolean passwordsEqual = newPasswordField.getCharacters().equals(retypePasswordField.getCharacters());
+		changePasswordButton.setDisable(oldPasswordEmpty || newPasswordEmpty || !passwordsEqual);
+		passwordStrength.set(strengthRater.computeRate(newPasswordField.getCharacters().toString()));
+	}
+
 	@Override
 	public Parent getRoot() {
 		return root;

main/ui/src/main/java/org/cryptomator/ui/controllers/InitializeController.java

@@ -9,13 +9,17 @@
  ******************************************************************************/
 package org.cryptomator.ui.controllers;
 
-import java.io.IOException;
-import java.nio.file.FileAlreadyExistsException;
-import java.util.Objects;
-import java.util.Optional;
-
-import javax.inject.Inject;
-
+import javafx.application.Platform;
+import javafx.beans.Observable;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.Parent;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.layout.GridPane;
+import javafx.scene.layout.Region;
 import org.cryptomator.ui.controls.SecPasswordField;
 import org.cryptomator.ui.l10n.Localization;
 import org.cryptomator.ui.model.Vault;
@@ -24,17 +28,11 @@ import org.fxmisc.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javafx.application.Platform;
-import javafx.beans.binding.BooleanBinding;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.value.ObservableValue;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.Parent;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.layout.GridPane;
-import javafx.scene.layout.Region;
+import javax.inject.Inject;
+import java.io.IOException;
+import java.nio.file.FileAlreadyExistsException;
+import java.util.Objects;
+import java.util.Optional;
 
 public class InitializeController implements ViewController {
 
@@ -42,7 +40,7 @@ public class InitializeController implements ViewController {
 
 	private final Localization localization;
 	private final PasswordStrengthUtil strengthRater;
-	private ObservableValue<Integer> passwordStrength; // 0-4
+	private IntegerProperty passwordStrength = new SimpleIntegerProperty(-1); // strengths: 0-4
 	private Optional<InitializationListener> listener = Optional.empty();
 	private Vault vault;
 
@@ -87,10 +85,8 @@ public class InitializeController implements ViewController {
 
 	@Override
 	public void initialize() {
-		BooleanBinding passwordIsEmpty = passwordField.textProperty().isEmpty();
-		BooleanBinding passwordsDiffer = passwordField.textProperty().isNotEqualTo(retypePasswordField.textProperty());
-		okButton.disableProperty().bind(passwordIsEmpty.or(passwordsDiffer));
-		passwordStrength = EasyBind.map(passwordField.textProperty(), strengthRater::computeRate);
+		passwordField.textProperty().addListener(this::passwordsChanged);
+		retypePasswordField.textProperty().addListener(this::passwordsChanged);
 
 		passwordStrengthLevel0.backgroundProperty().bind(EasyBind.combine(passwordStrength, new SimpleIntegerProperty(0), strengthRater::getBackgroundWithStrengthColor));
 		passwordStrengthLevel1.backgroundProperty().bind(EasyBind.combine(passwordStrength, new SimpleIntegerProperty(1), strengthRater::getBackgroundWithStrengthColor));
@@ -100,6 +96,13 @@ public class InitializeController implements ViewController {
 		passwordStrengthLabel.textProperty().bind(EasyBind.map(passwordStrength, strengthRater::getStrengthDescription));
 	}
 
+	private void passwordsChanged(@SuppressWarnings("unused") Observable observable) {
+		boolean passwordsEmpty = passwordField.getCharacters().length() == 0;
+		boolean passwordsEqual = passwordField.getCharacters().equals(retypePasswordField.getCharacters());
+		okButton.setDisable(passwordsEmpty || !passwordsEqual);
+		passwordStrength.set(strengthRater.computeRate(passwordField.getCharacters().toString()));
+	}
+
 	@Override
 	public Parent getRoot() {
 		return root;

main/ui/src/main/java/org/cryptomator/ui/controllers/MainController.java

@@ -2,31 +2,13 @@
  * Copyright (c) 2014, 2017 Sebastian Stenzel
  * All rights reserved.
  * This program and the accompanying materials are made available under the terms of the accompanying LICENSE file.
- * 
+ *
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  *     Jean-Noël Charon - confirmation dialog on vault removal
  ******************************************************************************/
 package org.cryptomator.ui.controllers;
 
-import java.awt.Desktop;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ExecutorService;
-import java.util.stream.Stream;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import javafx.application.Application;
 import javafx.application.Platform;
 import javafx.beans.binding.Binding;
@@ -38,7 +20,6 @@ import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.geometry.Side;
 import javafx.scene.Parent;
@@ -61,27 +42,47 @@ import javafx.scene.layout.Pane;
 import javafx.scene.text.Font;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
+import javafx.util.Duration;
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.FxApplicationScoped;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.ui.ExitUtil;
 import org.cryptomator.ui.controls.DirectoryListCell;
 import org.cryptomator.ui.l10n.Localization;
+import org.cryptomator.ui.model.AppLaunchEvent;
 import org.cryptomator.ui.model.AutoUnlocker;
-import org.cryptomator.ui.model.UpgradeStrategies;
-import org.cryptomator.ui.model.UpgradeStrategy;
 import org.cryptomator.ui.model.Vault;
 import org.cryptomator.ui.model.VaultFactory;
 import org.cryptomator.ui.model.VaultList;
+import org.cryptomator.ui.model.upgrade.UpgradeStrategies;
+import org.cryptomator.ui.model.upgrade.UpgradeStrategy;
 import org.cryptomator.ui.util.DialogBuilderUtil;
+import org.cryptomator.ui.util.Tasks;
 import org.fxmisc.easybind.EasyBind;
 import org.fxmisc.easybind.Subscription;
 import org.fxmisc.easybind.monadic.MonadicBinding;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.awt.Desktop;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.stream.Stream;
+
 import static org.cryptomator.ui.util.DialogBuilderUtil.buildErrorDialog;
 
-@Singleton
+@FxApplicationScoped
 public class MainController implements ViewController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(MainController.class);
@@ -92,7 +93,7 @@ public class MainController implements ViewController {
 	private final ExitUtil exitUtil;
 	private final Localization localization;
 	private final ExecutorService executorService;
-	private final BlockingQueue<Path> fileOpenRequests;
+	private final BlockingQueue<AppLaunchEvent> launchEventQueue;
 	private final VaultFactory vaultFactoy;
 	private final ViewControllerLoader viewControllerLoader;
 	private final ObjectProperty<ViewController> activeController = new SimpleObjectProperty<>();
@@ -109,11 +110,11 @@ public class MainController implements ViewController {
 	private Subscription subs = Subscription.EMPTY;
 
 	@Inject
-	public MainController(@Named("mainWindow") Stage mainWindow, ExecutorService executorService, @Named("fileOpenRequests") BlockingQueue<Path> fileOpenRequests, ExitUtil exitUtil, Localization localization,
-			VaultFactory vaultFactoy, ViewControllerLoader viewControllerLoader, UpgradeStrategies upgradeStrategies, VaultList vaults, AutoUnlocker autoUnlocker) {
+	public MainController(@Named("mainWindow") Stage mainWindow, ExecutorService executorService, @Named("launchEventQueue") BlockingQueue<AppLaunchEvent> launchEventQueue, ExitUtil exitUtil, Localization localization,
+						  VaultFactory vaultFactoy, ViewControllerLoader viewControllerLoader, UpgradeStrategies upgradeStrategies, VaultList vaults, AutoUnlocker autoUnlocker) {
 		this.mainWindow = mainWindow;
 		this.executorService = executorService;
-		this.fileOpenRequests = fileOpenRequests;
+		this.launchEventQueue = launchEventQueue;
 		this.exitUtil = exitUtil;
 		this.localization = localization;
 		this.vaultFactoy = vaultFactoy;
@@ -125,6 +126,7 @@ public class MainController implements ViewController {
 		this.upgradeStrategyForSelectedVault = EasyBind.monadic(selectedVault).map(upgradeStrategies::getUpgradeStrategy);
 		this.areAllVaultsLocked = Bindings.isEmpty(FXCollections.observableList(vaults, Vault::observables).filtered(Vault.NOT_LOCKED));
 
+		EasyBind.subscribe(areAllVaultsLocked, exitUtil::updateTrayIcon);
 		EasyBind.subscribe(areAllVaultsLocked, Platform::setImplicitExit);
 		autoUnlocker.unlockAllSilently();
 
@@ -210,13 +212,36 @@ public class MainController implements ViewController {
 			stage.getIcons().add(new Image(getClass().getResourceAsStream("/window_icon_32.png")));
 			Application.setUserAgentStylesheet(getClass().getResource("/css/win_theme.css").toString());
 		}
-		exitUtil.initExitHandler(this::gracefulShutdown);
+		exitUtil.initExitHandler(() -> Platform.runLater(this::gracefulShutdown));
 		listenToFileOpenRequests(stage);
 	}
 
 	private void gracefulShutdown() {
 		vaults.filtered(Vault.NOT_LOCKED).forEach(Vault::prepareForShutdown);
-		Platform.runLater(Platform::exit);
+		if (!vaults.filtered(Vault.NOT_LOCKED).isEmpty()) {
+			mainWindow.show(); // to keep the application open
+			ButtonType tryAgainButtonType = new ButtonType(localization.getString("main.gracefulShutdown.button.tryAgain"));
+			ButtonType forceShutdownButtonType = new ButtonType(localization.getString("main.gracefulShutdown.button.forceShutdown"));
+			Alert gracefulShutdownDialog = DialogBuilderUtil.buildGracefulShutdownDialog(
+					localization.getString("main.gracefulShutdown.dialog.title"), localization.getString("main.gracefulShutdown.dialog.header"), localization.getString("main.gracefulShutdown.dialog.content"),
+					forceShutdownButtonType, ButtonType.CANCEL, forceShutdownButtonType, tryAgainButtonType);
+			Optional<ButtonType> choice = gracefulShutdownDialog.showAndWait();
+			choice.ifPresent(btnType -> {
+				if (tryAgainButtonType.equals(btnType)) {
+					gracefulShutdown();
+				} else if (forceShutdownButtonType.equals(btnType)) {
+					Platform.runLater(Platform::exit);
+				} else {
+					if (!vaults.filtered(Vault.NOT_LOCKED).isEmpty()) {
+						showUnlockedView(vaults.get(0), false); //if there are still unlocked vaults, show one of them
+					} else {
+						showUnlockView(UnlockController.State.UNLOCKING); //otherwise show any vault
+					}
+				}
+			});
+		} else {
+			Platform.runLater(Platform::exit);
+		}
 	}
 
 	private void loadFont(String resourcePath) {
@@ -228,22 +253,13 @@ public class MainController implements ViewController {
 	}
 
 	private void listenToFileOpenRequests(Stage stage) {
-		executorService.submit(() -> {
-			while (!Thread.interrupted()) {
-				try {
-					final Path path = fileOpenRequests.take();
-					Platform.runLater(() -> {
-						addVault(path, true);
-						stage.setIconified(false);
-						stage.show();
-						stage.toFront();
-						stage.requestFocus();
-					});
-				} catch (InterruptedException e) {
-					Thread.currentThread().interrupt();
-				}
-			}
-		});
+		Tasks.create(launchEventQueue::take).onSuccess(event -> {
+			stage.setIconified(false);
+			stage.show();
+			stage.toFront();
+			stage.requestFocus();
+			event.getPathsToOpen().forEach(path -> addVault(path, true));
+		}).schedulePeriodically(executorService, Duration.ZERO, Duration.ZERO);
 	}
 
 	private ListCell<Vault> createDirecoryListCell(ListView<Vault> param) {
@@ -258,7 +274,7 @@ public class MainController implements ViewController {
 	// ****************************************
 
 	@FXML
-	private void didClickAddVault(ActionEvent event) {
+	private void didClickAddVault() {
 		if (addVaultContextMenu.isShowing()) {
 			addVaultContextMenu.hide();
 		} else {
@@ -267,7 +283,7 @@ public class MainController implements ViewController {
 	}
 
 	@FXML
-	private void didClickCreateNewVault(ActionEvent event) {
+	private void didClickCreateNewVault() {
 		final FileChooser fileChooser = new FileChooser();
 		final File file = fileChooser.showSaveDialog(mainWindow);
 		if (file == null) {
@@ -300,7 +316,7 @@ public class MainController implements ViewController {
 	}
 
 	@FXML
-	private void didClickAddExistingVaults(ActionEvent event) {
+	private void didClickAddExistingVaults() {
 		final FileChooser fileChooser = new FileChooser();
 		fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("Cryptomator Masterkey", "*.cryptomator"));
 		final List<File> files = fileChooser.showOpenMultipleDialog(mainWindow);
@@ -313,7 +329,7 @@ public class MainController implements ViewController {
 
 	/**
 	 * adds the given directory or selects it if it is already in the list of directories.
-	 * 
+	 *
 	 * @param path to a vault directory or masterkey file
 	 */
 	public void addVault(final Path path, boolean select) {
@@ -343,7 +359,7 @@ public class MainController implements ViewController {
 	}
 
 	@FXML
-	private void didClickRemoveSelectedEntry(ActionEvent e) {
+	private void didClickRemoveSelectedEntry() {
 		Alert confirmDialog = DialogBuilderUtil.buildConfirmationDialog( //
 				localization.getString("main.directoryList.remove.confirmation.title"), //
 				localization.getString("main.directoryList.remove.confirmation.header"), //
@@ -362,12 +378,12 @@ public class MainController implements ViewController {
 	}
 
 	@FXML
-	private void didClickChangePassword(ActionEvent e) {
+	private void didClickChangePassword() {
 		showChangePasswordView();
 	}
 
 	@FXML
-	private void didClickShowSettings(ActionEvent e) {
+	private void didClickShowSettings() {
 		toggleShowSettings();
 	}
 
@@ -395,7 +411,7 @@ public class MainController implements ViewController {
 			return;
 		}
 		if (newValue.getState() != Vault.State.LOCKED) {
-			this.showUnlockedView(newValue);
+			this.showUnlockedView(newValue, false);
 		} else if (!newValue.doesVaultDirectoryExist()) {
 			this.showNotFoundView();
 		} else if (newValue.isValidVaultDirectory() && upgradeStrategyForSelectedVault.isPresent()) {
@@ -414,7 +430,13 @@ public class MainController implements ViewController {
 	}
 
 	private void didPressKeyOnRoot(KeyEvent event) {
-		if ((event.isMetaDown() || event.isControlDown()) && event.getCode().isDigitKey()) {
+		boolean triggered;
+		if (SystemUtils.IS_OS_MAC) {
+			triggered = event.isMetaDown();
+		} else {
+			triggered = event.isControlDown() && !event.isAltDown();
+		}
+		if (triggered && event.getCode().isDigitKey()) {
 			int digit = Integer.valueOf(event.getText());
 			switch (digit) {
 				case 0: {
@@ -494,22 +516,25 @@ public class MainController implements ViewController {
 
 	public void didUnlock(Vault vault) {
 		if (vault.equals(selectedVault.getValue())) {
-			this.showUnlockedView(vault);
+			this.showUnlockedView(vault, vault.getVaultSettings().revealAfterMount().getValue());
 		}
 	}
 
-	private void showUnlockedView(Vault vault) {
-		final UnlockedController ctrl = unlockedVaults.computeIfAbsent(vault, k -> {
-			return viewControllerLoader.load("/fxml/unlocked.fxml");
-		});
+	private void showUnlockedView(Vault vault, boolean reveal) {
+		final UnlockedController ctrl = unlockedVaults.computeIfAbsent(vault, k -> viewControllerLoader.load("/fxml/unlocked.fxml"));
 		ctrl.setVault(vault);
 		ctrl.setListener(this::didLock);
+		if (reveal) {
+			ctrl.revealVault(vault);
+		}
 		activeController.set(ctrl);
 	}
 
 	public void didLock(UnlockedController ctrl) {
 		unlockedVaults.remove(ctrl.getVault());
-		showUnlockView(UnlockController.State.UNLOCKING);
+		if (ctrl.getVault().getId() == selectedVault.get().getId()) {
+			showUnlockView(UnlockController.State.UNLOCKING);
+		}
 		activeController.get().focus();
 	}
 

main/ui/src/main/java/org/cryptomator/ui/controllers/NotFoundController.java

@@ -5,14 +5,14 @@
  *******************************************************************************/
 package org.cryptomator.ui.controllers;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
 import javafx.scene.layout.VBox;
+import org.cryptomator.common.FxApplicationScoped;
 
-@Singleton
+import javax.inject.Inject;
+
+@FxApplicationScoped
 public class NotFoundController implements ViewController {
 
 	@Inject

main/ui/src/main/java/org/cryptomator/ui/controllers/SettingsController.java

@@ -8,17 +8,13 @@
  ******************************************************************************/
 package org.cryptomator.ui.controllers;
 
-import java.util.Optional;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Strings;
+import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.scene.Group;
 import javafx.scene.Parent;
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
@@ -26,15 +22,20 @@ import javafx.scene.control.ChoiceBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.input.KeyEvent;
-import javafx.scene.layout.GridPane;
 import javafx.scene.layout.VBox;
 import javafx.util.StringConverter;
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.settings.VolumeImpl;
+import org.cryptomator.common.FxApplicationScoped;
 import org.cryptomator.common.settings.Settings;
+import org.cryptomator.common.settings.VolumeImpl;
 import org.cryptomator.ui.l10n.Localization;
+import org.cryptomator.ui.model.Volume;
 
-@Singleton
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.util.Optional;
+
+@FxApplicationScoped
 public class SettingsController implements ViewController {
 
 	private static final CharMatcher DIGITS_MATCHER = CharMatcher.inRange('0', '9');
@@ -48,16 +49,13 @@ public class SettingsController implements ViewController {
 		this.localization = localization;
 		this.settings = settings;
 		this.applicationVersion = applicationVersion;
+		this.webdavSettings = new Group();
 	}
 
 	@FXML
 	private CheckBox checkForUpdatesCheckbox;
 
-	@FXML
-	private GridPane webdavVolume;
-
-	@FXML
-	private GridPane fuseVolume;
+	private Group webdavSettings;
 
 	@FXML
 	private Label portFieldLabel;
@@ -77,9 +75,6 @@ public class SettingsController implements ViewController {
 	@FXML
 	private ChoiceBox<String> prefGvfsScheme;
 
-	@FXML
-	private Label volumeLabel;
-
 	@FXML
 	private ChoiceBox<VolumeImpl> volume;
 
@@ -96,19 +91,21 @@ public class SettingsController implements ViewController {
 		checkForUpdatesCheckbox.setSelected(settings.checkForUpdates().get() && !areUpdatesManagedExternally());
 
 		//NIOADAPTER
-		volume.getItems().addAll(getSupportedAdapters());
-		volume.setValue(settings.volumeImpl().get());
-		volume.setVisible(true);
+		volume.getItems().addAll(Volume.getCurrentSupportedAdapters());
+		volume.setValue(settings.preferredVolumeImpl().get());
 		volume.setConverter(new NioAdapterImplStringConverter());
+		volume.valueProperty().addListener(this::setVisibilityGvfsElements);
 
 		//WEBDAV
-		webdavVolume.visibleProperty().bind(volume.valueProperty().isEqualTo(VolumeImpl.WEBDAV));
-		webdavVolume.managedProperty().bind(webdavVolume.visibleProperty());
-		prefGvfsScheme.managedProperty().bind(webdavVolume.visibleProperty());
-		prefGvfsSchemeLabel.managedProperty().bind(webdavVolume.visibleProperty());
-		portFieldLabel.managedProperty().bind(webdavVolume.visibleProperty());
-		changePortButton.managedProperty().bind(webdavVolume.visibleProperty());
-		portField.managedProperty().bind(webdavVolume.visibleProperty());
+		webdavSettings.visibleProperty().bind(volume.valueProperty().isEqualTo(VolumeImpl.WEBDAV));
+		webdavSettings.managedProperty().bind(webdavSettings.visibleProperty());
+		prefGvfsScheme.managedProperty().bind(webdavSettings.visibleProperty());
+		prefGvfsSchemeLabel.managedProperty().bind(webdavSettings.visibleProperty());
+		portFieldLabel.managedProperty().bind(webdavSettings.visibleProperty());
+		portFieldLabel.visibleProperty().bind(webdavSettings.visibleProperty());
+		changePortButton.managedProperty().bind(webdavSettings.visibleProperty());
+		portField.managedProperty().bind(webdavSettings.visibleProperty());
+		portField.visibleProperty().bind(webdavSettings.visibleProperty());
 		portField.setText(String.valueOf(settings.port().intValue()));
 		portField.addEventFilter(KeyEvent.KEY_TYPED, this::filterNumericKeyEvents);
 		changePortButton.visibleProperty().bind(settings.port().asString().isNotEqualTo(portField.textProperty()));
@@ -119,30 +116,21 @@ public class SettingsController implements ViewController {
 		prefGvfsSchemeLabel.setVisible(SystemUtils.IS_OS_LINUX);
 		prefGvfsScheme.setVisible(SystemUtils.IS_OS_LINUX);
 
-		//FUSE
-		fuseVolume.visibleProperty().bind(volume.valueProperty().isEqualTo(VolumeImpl.FUSE));
-		fuseVolume.managedProperty().bind(fuseVolume.visibleProperty());
-
 		debugModeCheckbox.setSelected(settings.debugMode().get());
 
 		settings.checkForUpdates().bind(checkForUpdatesCheckbox.selectedProperty());
 		settings.preferredGvfsScheme().bind(prefGvfsScheme.valueProperty());
-		settings.volumeImpl().bind(volume.valueProperty());
+		settings.preferredVolumeImpl().bind(volume.valueProperty());
 		settings.debugMode().bind(debugModeCheckbox.selectedProperty());
 	}
 
-	//TODO: how to implement this?
-	private VolumeImpl[] getSupportedAdapters() {
-		return new VolumeImpl[]{VolumeImpl.FUSE, VolumeImpl.WEBDAV};
-	}
-
 	@Override
 	public Parent getRoot() {
 		return root;
 	}
 
 	@FXML
-	private void changePort(ActionEvent evt) {
+	private void changePort() {
 		assert isPortValid() : "Button must be disabled, if port is invalid.";
 		try {
 			int port = Integer.parseInt(portField.getText());
@@ -155,11 +143,8 @@ public class SettingsController implements ViewController {
 	private boolean isPortValid() {
 		try {
 			int port = Integer.parseInt(portField.getText());
-			if (port == 0 || port >= Settings.MIN_PORT && port <= Settings.MAX_PORT) {
-				return true;
-			} else {
-				return false;
-			}
+			return port == 0 // choose port automatically
+					|| port >= Settings.MIN_PORT && port <= Settings.MAX_PORT; // port within range
 		} catch (NumberFormatException e) {
 			return false;
 		}
@@ -171,6 +156,11 @@ public class SettingsController implements ViewController {
 		}
 	}
 
+	private void setVisibilityGvfsElements(@SuppressWarnings("unused") Observable obs, @SuppressWarnings("unused")Object oldValue, Object newValue) {
+		prefGvfsSchemeLabel.setVisible(SystemUtils.IS_OS_LINUX && ((VolumeImpl) newValue).getDisplayName().equals("WebDAV"));
+		prefGvfsScheme.setVisible(SystemUtils.IS_OS_LINUX && ((VolumeImpl) newValue).getDisplayName().equals("WebDAV"));
+	}
+
 	private boolean areUpdatesManagedExternally() {
 		return Boolean.parseBoolean(System.getProperty("cryptomator.updatesManagedExternally", "false"));
 	}

main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java

@@ -8,44 +8,11 @@
  ******************************************************************************/
 package org.cryptomator.ui.controllers;
 
-import java.io.IOException;
-import java.nio.file.*;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Objects;
-import java.util.Optional;
-
-import javax.inject.Inject;
-
-import javafx.beans.binding.Bindings;
-import javafx.scene.layout.HBox;
-import org.apache.commons.lang3.CharUtils;
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.settings.VolumeImpl;
-import org.cryptomator.common.settings.Settings;
-import org.cryptomator.common.settings.VaultSettings;
-import org.cryptomator.cryptolib.api.InvalidPassphraseException;
-import org.cryptomator.cryptolib.api.UnsupportedVaultFormatException;
-import org.cryptomator.frontend.webdav.ServerLifecycleException;
-import org.cryptomator.keychain.KeychainAccess;
-import org.cryptomator.ui.controls.SecPasswordField;
-import org.cryptomator.ui.l10n.Localization;
-import org.cryptomator.ui.model.Vault;
-import org.cryptomator.ui.model.WindowsDriveLetters;
-import org.cryptomator.ui.util.AsyncTaskService;
-import org.cryptomator.ui.util.DialogBuilderUtil;
-import org.fxmisc.easybind.EasyBind;
-import org.fxmisc.easybind.Subscription;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Strings;
-
 import javafx.application.Application;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Parent;
 import javafx.scene.control.Alert;
@@ -59,8 +26,42 @@ import javafx.scene.control.ProgressIndicator;
 import javafx.scene.control.TextField;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.GridPane;
+import javafx.scene.layout.HBox;
 import javafx.scene.text.Text;
+import javafx.stage.DirectoryChooser;
+import javafx.stage.Stage;
 import javafx.util.StringConverter;
+import org.apache.commons.lang3.CharUtils;
+import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.settings.Settings;
+import org.cryptomator.common.settings.VaultSettings;
+import org.cryptomator.common.settings.VolumeImpl;
+import org.cryptomator.cryptolib.api.InvalidPassphraseException;
+import org.cryptomator.cryptolib.api.UnsupportedVaultFormatException;
+import org.cryptomator.keychain.KeychainAccess;
+import org.cryptomator.ui.controls.SecPasswordField;
+import org.cryptomator.ui.l10n.Localization;
+import org.cryptomator.ui.model.Vault;
+import org.cryptomator.ui.model.WindowsDriveLetters;
+import org.cryptomator.ui.util.DialogBuilderUtil;
+import org.cryptomator.ui.util.Tasks;
+import org.fxmisc.easybind.EasyBind;
+import org.fxmisc.easybind.Subscription;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.io.File;
+import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.NotDirectoryException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
 
 public class UnlockController implements ViewController {
 
@@ -72,24 +73,26 @@ public class UnlockController implements ViewController {
 			.precomputed();
 
 	private final Application app;
+	private final Stage mainWindow;
 	private final Localization localization;
-	private final AsyncTaskService asyncTaskService;
 	private final WindowsDriveLetters driveLetters;
 	private final ChangeListener<Character> driveLetterChangeListener = this::winDriveLetterDidChange;
 	private final Optional<KeychainAccess> keychainAccess;
 	private final Settings settings;
+	private final ExecutorService executor;
 	private Vault vault;
 	private Optional<UnlockListener> listener = Optional.empty();
 	private Subscription vaultSubs = Subscription.EMPTY;
 
 	@Inject
-	public UnlockController(Application app, Localization localization, AsyncTaskService asyncTaskService, WindowsDriveLetters driveLetters, Optional<KeychainAccess> keychainAccess, Settings settings) {
+	public UnlockController(Application app, @Named("mainWindow") Stage mainWindow, Localization localization, WindowsDriveLetters driveLetters, Optional<KeychainAccess> keychainAccess, Settings settings, ExecutorService executor) {
 		this.app = app;
+		this.mainWindow = mainWindow;
 		this.localization = localization;
-		this.asyncTaskService = asyncTaskService;
 		this.driveLetters = driveLetters;
 		this.keychainAccess = keychainAccess;
 		this.settings = settings;
+		this.executor = executor;
 	}
 
 	@FXML
@@ -102,14 +105,11 @@ public class UnlockController implements ViewController {
 	private Button unlockButton;
 
 	@FXML
-	private Label successMessage;
+	private Text messageText;
 
 	@FXML
 	private CheckBox savePassword;
 
-	@FXML
-	private CheckBox mountAfterUnlock;
-
 	@FXML
 	private TextField mountName;
 
@@ -123,25 +123,19 @@ public class UnlockController implements ViewController {
 	private ChoiceBox<Character> winDriveLetter;
 
 	@FXML
-	private CheckBox useOwnMountPath;
+	private CheckBox useCustomMountPoint;
 
 	@FXML
-	private HBox mountPathBox;
+	private HBox customMountPoint;
 
 	@FXML
-	private Label mountPathLabel;
-
-	@FXML
-	private TextField mountPath;
-
-	@FXML
-	private Button changeMountPathButton;
+	private Label customMountPointLabel;
 
 	@FXML
 	private ProgressIndicator progressIndicator;
 
 	@FXML
-	private Text messageText;
+	private Text progressText;
 
 	@FXML
 	private Hyperlink downloadsPageLink;
@@ -155,47 +149,31 @@ public class UnlockController implements ViewController {
 	@FXML
 	private CheckBox unlockAfterStartup;
 
+	@FXML
+	private CheckBox useReadOnlyMode;
+
 	@Override
 	public void initialize() {
 		advancedOptions.managedProperty().bind(advancedOptions.visibleProperty());
 		unlockButton.disableProperty().bind(passwordField.textProperty().isEmpty());
-		mountName.disableProperty().bind(mountAfterUnlock.selectedProperty().not());
-		revealAfterMount.disableProperty().bind(mountAfterUnlock.selectedProperty().not());
 		mountName.addEventFilter(KeyEvent.KEY_TYPED, this::filterAlphanumericKeyEvents);
 		mountName.textProperty().addListener(this::mountNameDidChange);
 		savePassword.setDisable(!keychainAccess.isPresent());
 		unlockAfterStartup.disableProperty().bind(savePassword.disabledProperty().or(savePassword.selectedProperty().not()));
 
-		mountPathLabel.setVisible(false);
-		mountPathBox.visibleProperty().bind(mountPathLabel.visibleProperty());
-		mountPathBox.managedProperty().bind(mountPathLabel.managedProperty());
-		mountPath.visibleProperty().bind(mountPathLabel.visibleProperty());
-		mountPath.managedProperty().bind(mountPathLabel.managedProperty());
-		changeMountPathButton.visibleProperty().bind(mountPathLabel.visibleProperty());
-		changeMountPathButton.managedProperty().bind(mountPathLabel.managedProperty());
+		customMountPoint.visibleProperty().bind(useCustomMountPoint.selectedProperty());
+		customMountPoint.managedProperty().bind(useCustomMountPoint.selectedProperty());
+		winDriveLetter.setConverter(new WinDriveLetterLabelConverter());
 
-		if (SystemUtils.IS_OS_WINDOWS) {
-			winDriveLetter.setConverter(new WinDriveLetterLabelConverter());
-			useOwnMountPath.setVisible(false);
-			useOwnMountPath.setManaged(false);
-			mountPathLabel.setManaged(false);
-			//dirty cheat
-			mountPathBox.setMouseTransparent(true);
-		} else {
+		if (!SystemUtils.IS_OS_WINDOWS) {
 			winDriveLetterLabel.setVisible(false);
 			winDriveLetterLabel.setManaged(false);
 			winDriveLetter.setVisible(false);
 			winDriveLetter.setManaged(false);
-			if (VolumeImpl.WEBDAV.equals(settings.volumeImpl().get())) {
-				useOwnMountPath.setVisible(false);
-				useOwnMountPath.setManaged(false);
-				mountPathLabel.setManaged(false);
-			}
 		}
-		changeMountPathButton.disableProperty().bind(Bindings.createBooleanBinding(this::isDirVaild, mountPath.textProperty()).not());
-
 	}
 
+
 	@Override
 	public Parent getRoot() {
 		return root;
@@ -221,8 +199,8 @@ public class UnlockController implements ViewController {
 		advancedOptions.setVisible(false);
 		advancedOptionsButton.setText(localization.getString("unlock.button.advancedOptions.show"));
 		progressIndicator.setVisible(false);
-		successMessage.setVisible(state.successMessage().isPresent());
-		state.successMessage().map(localization::getString).ifPresent(successMessage::setText);
+		progressText.setText(null);
+		state.successMessage().map(localization::getString).ifPresent(messageText::setText);
 		if (SystemUtils.IS_OS_WINDOWS) {
 			winDriveLetter.valueProperty().removeListener(driveLetterChangeListener);
 			winDriveLetter.getItems().clear();
@@ -230,41 +208,77 @@ public class UnlockController implements ViewController {
 			winDriveLetter.getItems().addAll(driveLetters.getAvailableDriveLetters());
 			winDriveLetter.getItems().sort(new WinDriveLetterComparator());
 			winDriveLetter.valueProperty().addListener(driveLetterChangeListener);
-		}
-		downloadsPageLink.setVisible(false);
-		messageText.setText(null);
-		mountName.setText(vault.getMountName());
-		if (SystemUtils.IS_OS_WINDOWS) {
 			chooseSelectedDriveLetter();
 		}
+		downloadsPageLink.setVisible(false);
+		mountName.setText(vault.getMountName());
 		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.setPassword(storedPw);
 				passwordField.selectRange(storedPw.length, storedPw.length);
 				Arrays.fill(storedPw, ' ');
 			}
 		}
 		VaultSettings vaultSettings = vault.getVaultSettings();
 		unlockAfterStartup.setSelected(savePassword.isSelected() && vaultSettings.unlockAfterStartup().get());
-		mountAfterUnlock.setSelected(vaultSettings.mountAfterUnlock().get());
 		revealAfterMount.setSelected(vaultSettings.revealAfterMount().get());
-		useOwnMountPath.setSelected(vaultSettings.usesIndividualMountPath().get());
+
+		// WEBDAV-dependent controls:
+		if (VolumeImpl.WEBDAV.equals(settings.preferredVolumeImpl().get())) {
+			useCustomMountPoint.setVisible(false);
+			useCustomMountPoint.setManaged(false);
+		} else {
+			useCustomMountPoint.setVisible(true);
+			useCustomMountPoint.setSelected(vaultSettings.usesIndividualMountPath().get());
+			if (Strings.isNullOrEmpty(vaultSettings.individualMountPath().get())) {
+				customMountPointLabel.setText(localization.getString("unlock.label.chooseMountPath"));
+			} else {
+				customMountPointLabel.setText(displayablePath(vaultSettings.individualMountPath().getValueSafe()));
+			}
+		}
+
+		// DOKANY-dependent controls:
+		if (VolumeImpl.DOKANY.equals(settings.preferredVolumeImpl().get())) {
+			winDriveLetter.visibleProperty().bind(useCustomMountPoint.selectedProperty().not());
+			winDriveLetter.managedProperty().bind(useCustomMountPoint.selectedProperty().not());
+			winDriveLetterLabel.visibleProperty().bind(useCustomMountPoint.selectedProperty().not());
+			winDriveLetterLabel.managedProperty().bind(useCustomMountPoint.selectedProperty().not());
+			// readonly not yet supported by dokany
+			useReadOnlyMode.setSelected(false);
+			useReadOnlyMode.setVisible(false);
+			useReadOnlyMode.setManaged(false);
+		} else {
+			useReadOnlyMode.setSelected(vaultSettings.usesReadOnlyMode().get());
+		}
+
+		// OS-dependent controls:
+		if (SystemUtils.IS_OS_WINDOWS) {
+			winDriveLetter.visibleProperty().bind(useCustomMountPoint.selectedProperty().not());
+			winDriveLetter.managedProperty().bind(useCustomMountPoint.selectedProperty().not());
+			winDriveLetterLabel.visibleProperty().bind(useCustomMountPoint.selectedProperty().not());
+			winDriveLetterLabel.managedProperty().bind(useCustomMountPoint.selectedProperty().not());
+		}
 
 		vaultSubs = vaultSubs.and(EasyBind.subscribe(unlockAfterStartup.selectedProperty(), vaultSettings.unlockAfterStartup()::set));
-		vaultSubs = vaultSubs.and(EasyBind.subscribe(mountAfterUnlock.selectedProperty(), vaultSettings.mountAfterUnlock()::set));
 		vaultSubs = vaultSubs.and(EasyBind.subscribe(revealAfterMount.selectedProperty(), vaultSettings.revealAfterMount()::set));
-		vaultSubs = vaultSubs.and(EasyBind.subscribe(useOwnMountPath.selectedProperty(), vaultSettings.usesIndividualMountPath()::set));
-
-		changeMountPathButton.visibleProperty().bind(
-				vaultSettings.individualMountPath().isNotEqualTo(mountPath.textProperty())
-		);
-		mountPath.textProperty().setValue(vaultSettings.individualMountPath().getValueSafe());
-		mountPathLabel.visibleProperty().bind(useOwnMountPath.selectedProperty());
+		vaultSubs = vaultSubs.and(EasyBind.subscribe(useCustomMountPoint.selectedProperty(), vaultSettings.usesIndividualMountPath()::set));
+		vaultSubs = vaultSubs.and(EasyBind.subscribe(useReadOnlyMode.selectedProperty(), vaultSettings.usesReadOnlyMode()::set));
+	}
 
+	private String displayablePath(String path) {
+		Path homeDir = Paths.get(SystemUtils.USER_HOME);
+		Path p = Paths.get(path);
+		if (p.startsWith(homeDir)) {
+			Path relativePath = homeDir.relativize(p);
+			String homePrefix = SystemUtils.IS_OS_WINDOWS ? "~\\" : "~/";
+			return homePrefix + relativePath.toString();
+		} else {
+			return p.toString();
+		}
 	}
 
 	// ****************************************
@@ -272,7 +286,7 @@ public class UnlockController implements ViewController {
 	// ****************************************
 
 	@FXML
-	public void didClickDownloadsLink(ActionEvent event) {
+	public void didClickDownloadsLink() {
 		app.getHostServices().showDocument("https://cryptomator.org/downloads/#allVersions");
 	}
 
@@ -281,8 +295,8 @@ public class UnlockController implements ViewController {
 	// ****************************************
 
 	@FXML
-	private void didClickAdvancedOptionsButton(ActionEvent event) {
-		successMessage.setVisible(false);
+	private void didClickAdvancedOptionsButton() {
+		messageText.setText(null);
 		advancedOptions.setVisible(!advancedOptions.isVisible());
 		if (advancedOptions.isVisible()) {
 			advancedOptionsButton.setText(localization.getString("unlock.button.advancedOptions.hide"));
@@ -291,35 +305,13 @@ public class UnlockController implements ViewController {
 		}
 	}
 
-	@FXML
-	private void didClickchangeMountPathButton(ActionEvent event) {
-		assert isDirVaild();
-		vault.setMountPath(mountPath.getText());
-	}
-
-	private boolean isDirVaild() {
-		try {
-			if (!mountPath.textProperty().isEmpty().get()) {
-				Path p = Paths.get(mountPath.textProperty().get());
-				return Files.isDirectory(p) && Files.isReadable(p) && Files.isWritable(p) && Files.isExecutable(p);
-			} else {
-				return false;
-			}
-
-		} catch (InvalidPathException e) {
-			LOG.info("Invalid path");
-			return false;
-		}
-	}
-
-
 	private void filterAlphanumericKeyEvents(KeyEvent t) {
 		if (!Strings.isNullOrEmpty(t.getCharacter()) && !ALPHA_NUMERIC_MATCHER.matchesAllOf(t.getCharacter())) {
 			t.consume();
 		}
 	}
 
-	private void mountNameDidChange(ObservableValue<? extends String> property, String oldValue, String newValue) {
+	private void mountNameDidChange(@SuppressWarnings("unused") ObservableValue<? extends String> property, @SuppressWarnings("unused")String oldValue, String newValue) {
 		// newValue is guaranteed to be a-z0-9_, see #filterAlphanumericKeyEvents
 		if (newValue.isEmpty()) {
 			mountName.setText(vault.getMountName());
@@ -328,6 +320,16 @@ public class UnlockController implements ViewController {
 		}
 	}
 
+	@FXML
+	public void didClickChooseCustomMountPoint() {
+		DirectoryChooser dirChooser = new DirectoryChooser();
+		File file = dirChooser.showDialog(mainWindow);
+		if (file != null) {
+			customMountPointLabel.setText(displayablePath(file.toString()));
+			vault.setCustomMountPath(file.toString());
+		}
+	}
+
 	/**
 	 * Converts 'C' to "C:" to translate between model and GUI.
 	 */
@@ -338,7 +340,7 @@ public class UnlockController implements ViewController {
 			if (letter == null) {
 				return localization.getString("unlock.choicebox.winDriveLetter.auto");
 			} else {
-				return Character.toString(letter) + ":";
+				return letter + ":";
 			}
 		}
 
@@ -370,7 +372,7 @@ public class UnlockController implements ViewController {
 		}
 	}
 
-	private void winDriveLetterDidChange(ObservableValue<? extends Character> property, Character oldValue, Character newValue) {
+	private void winDriveLetterDidChange(@SuppressWarnings("unused") ObservableValue<? extends Character> property, @SuppressWarnings("unused") Character oldValue, Character newValue) {
 		vault.setWinDriveLetter(newValue);
 	}
 
@@ -394,7 +396,7 @@ public class UnlockController implements ViewController {
 	// ****************************************
 
 	@FXML
-	private void didClickSavePasswordCheckbox(ActionEvent event) {
+	private void didClickSavePasswordCheckbox() {
 		if (!savePassword.isSelected() && hasStoredPassword()) {
 			Alert confirmDialog = DialogBuilderUtil.buildConfirmationDialog( //
 					localization.getString("unlock.savePassword.delete.confirmation.title"), //
@@ -425,20 +427,24 @@ public class UnlockController implements ViewController {
 	// ****************************************
 
 	@FXML
-	private void didClickUnlockButton(ActionEvent event) {
+	private void didClickUnlockButton() {
 		advancedOptions.setDisable(true);
+		advancedOptions.setVisible(false);
+		advancedOptionsButton.setText(localization.getString("unlock.button.advancedOptions.show"));
 		progressIndicator.setVisible(true);
 
 		CharSequence password = passwordField.getCharacters();
-		asyncTaskService.asyncTaskOf(() -> {
+		Tasks.create(() -> {
+			progressText.setText(localization.getString("unlock.pendingMessage.unlocking"));
 			vault.unlock(password);
 			if (keychainAccess.isPresent() && savePassword.isSelected()) {
 				keychainAccess.get().storePassphrase(vault.getId(), password);
 			}
 		}).onSuccess(() -> {
-			messageText.setText(null);
+			messageText.setText("");
 			downloadsPageLink.setVisible(false);
 			listener.ifPresent(lstnr -> lstnr.didUnlock(vault));
+			passwordField.swipe();
 		}).onError(InvalidPassphraseException.class, e -> {
 			messageText.setText(localization.getString("unlock.errorMessage.wrongPassword"));
 			passwordField.selectAll();
@@ -454,19 +460,32 @@ public class UnlockController implements ViewController {
 			} else if (e.getDetectedVersion() == Integer.MAX_VALUE) {
 				messageText.setText(localization.getString("unlock.errorMessage.unauthenticVersionMac"));
 			}
-		}).onError(ServerLifecycleException.class, e -> {
-			LOG.error("Unlock failed for technical reasons.", e);
-			messageText.setText(localization.getString("unlock.errorMessage.unlockFailed"));
-		}).onError(IOException.class, e -> {
+		}).onError(NotDirectoryException.class, e -> {
+			LOG.error("Unlock failed. Mount point not a directory: {}", e.getMessage());
+			advancedOptions.setVisible(true);
+			messageText.setText(null);
+			showUnlockFailedErrorDialog("unlock.failedDialog.content.mountPathNonExisting");
+		}).onError(DirectoryNotEmptyException.class, e -> {
+			LOG.error("Unlock failed. Mount point not empty: {}", e.getMessage());
+			advancedOptions.setVisible(true);
+			messageText.setText(null);
+			showUnlockFailedErrorDialog("unlock.failedDialog.content.mountPathNotEmpty");
+		}).onError(Exception.class, e -> { // including RuntimeExceptions
 			LOG.error("Unlock failed for technical reasons.", e);
 			messageText.setText(localization.getString("unlock.errorMessage.unlockFailed"));
 		}).andFinally(() -> {
-			if (!savePassword.isSelected()) {
-				passwordField.swipe();
-			}
 			advancedOptions.setDisable(false);
 			progressIndicator.setVisible(false);
-		}).run();
+			progressText.setText(null);
+		}).runOnce(executor);
+	}
+
+	private void showUnlockFailedErrorDialog(String localizableContentKey) {
+		String title = localization.getString("unlock.failedDialog.title");
+		String header = localization.getString("unlock.failedDialog.header");
+		String content = localization.getString(localizableContentKey);
+		Alert alert = DialogBuilderUtil.buildErrorDialog(title, header, content, ButtonType.OK);
+		alert.show();
 	}
 
 	/* callback */
@@ -484,9 +503,9 @@ public class UnlockController implements ViewController {
 	/* state */
 
 	public enum State {
-		UNLOCKING(null),
-		INITIALIZED("unlock.successLabel.vaultCreated"),
-		PASSWORD_CHANGED("unlock.successLabel.passwordChanged"),
+		UNLOCKING(null), //
+		INITIALIZED("unlock.successLabel.vaultCreated"), //
+		PASSWORD_CHANGED("unlock.successLabel.passwordChanged"), //
 		UPGRADED("unlock.successLabel.upgraded");
 
 		private Optional<String> successMessage;

main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockedController.java

@@ -2,35 +2,15 @@
  * Copyright (c) 2014, 2017 Sebastian Stenzel
  * All rights reserved.
  * This program and the accompanying materials are made available under the terms of the accompanying LICENSE file.
- * 
+ *
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
 package org.cryptomator.ui.controllers;
 
-import static java.lang.String.format;
-
-import java.io.IOException;
-import java.util.Optional;
-
-import javax.inject.Inject;
-
-import org.cryptomator.frontend.webdav.ServerLifecycleException;
-import org.cryptomator.frontend.webdav.mount.Mounter.CommandFailedException;
-import org.cryptomator.ui.l10n.Localization;
-import org.cryptomator.ui.model.Vault;
-import org.cryptomator.ui.util.AsyncTaskService;
-import org.cryptomator.ui.util.DialogBuilderUtil;
-import org.fxmisc.easybind.EasyBind;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.util.concurrent.Runnables;
-
 import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
-import javafx.beans.binding.ObjectExpression;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.event.ActionEvent;
@@ -46,25 +26,34 @@ import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ContextMenu;
 import javafx.scene.control.Label;
-import javafx.scene.control.MenuItem;
 import javafx.scene.control.ToggleButton;
-import javafx.scene.input.Clipboard;
-import javafx.scene.input.ClipboardContent;
 import javafx.scene.layout.VBox;
 import javafx.stage.PopupWindow.AnchorLocation;
 import javafx.util.Duration;
+import org.cryptomator.ui.l10n.Localization;
+import org.cryptomator.ui.model.Vault;
+import org.cryptomator.ui.util.DialogBuilderUtil;
+import org.cryptomator.ui.util.Tasks;
+import org.fxmisc.easybind.EasyBind;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+
+import static java.lang.String.format;
 
 public class UnlockedController implements ViewController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(UnlockedController.class);
 
 	private static final int IO_SAMPLING_STEPS = 100;
-	private static final double IO_SAMPLING_INTERVAL = 0.25;
+	private static final double IO_SAMPLING_INTERVAL = 0.5;
 
 	private final Localization localization;
-	private final AsyncTaskService asyncTaskService;
+	private final ExecutorService executor;
 	private final ObjectProperty<Vault> vault = new SimpleObjectProperty<>();
-	private final ObjectExpression<Vault.State> vaultState = ObjectExpression.objectExpression(EasyBind.select(vault).selectObject(Vault::stateProperty));
 	private Optional<LockListener> listener = Optional.empty();
 	private Timeline ioAnimation;
 
@@ -83,30 +72,17 @@ public class UnlockedController implements ViewController {
 	@FXML
 	private ContextMenu moreOptionsMenu;
 
-	@FXML
-	private MenuItem mountVaultMenuItem;
-
-	@FXML
-	private MenuItem unmountVaultMenuItem;
-
-	@FXML
-	private MenuItem revealVaultMenuItem;
-
 	@FXML
 	private VBox root;
 
 	@Inject
-	public UnlockedController(Localization localization, AsyncTaskService asyncTaskService) {
+	public UnlockedController(Localization localization, ExecutorService executor) {
 		this.localization = localization;
-		this.asyncTaskService = asyncTaskService;
+		this.executor = executor;
 	}
 
 	@Override
 	public void initialize() {
-		mountVaultMenuItem.disableProperty().bind(vaultState.isEqualTo(Vault.State.UNLOCKED).not()); // enable when unlocked
-		unmountVaultMenuItem.disableProperty().bind(vaultState.isEqualTo(Vault.State.MOUNTED).not()); // enable when mounted
-		revealVaultMenuItem.disableProperty().bind(vaultState.isEqualTo(Vault.State.MOUNTED).not()); // enable when mounted
-
 		EasyBind.subscribe(vault, this::vaultChanged);
 		EasyBind.subscribe(moreOptionsMenu.showingProperty(), moreOptionsButton::setSelected);
 	}
@@ -121,86 +97,29 @@ public class UnlockedController implements ViewController {
 			return;
 		}
 
-		if (newVault.getState() == Vault.State.UNLOCKED && newVault.getVaultSettings().mountAfterUnlock().get()) {
-			mountVault(newVault);
-		}
-
 		// (re)start throughput statistics:
 		stopIoSampling();
 		startIoSampling();
 	}
 
 	@FXML
-	private void didClickLockVault(ActionEvent event) {
-		regularUnmountVault(this::lockVault);
+	private void didClickLockVault() {
+		regularLockVault(this::lockVaultSucceeded);
 	}
 
-	private void lockVault() {
-		try {
-			vault.get().lock();
-		} catch (ServerLifecycleException | IOException e) {
-			LOG.error("Lock failed", e);
-		}
+	private void lockVaultSucceeded() {
 		listener.ifPresent(listener -> listener.didLock(this));
 	}
 
-	@FXML
-	private void didClickMoreOptions(ActionEvent event) {
-		if (moreOptionsMenu.isShowing()) {
-			moreOptionsMenu.hide();
-		} else {
-			moreOptionsMenu.setAnchorLocation(AnchorLocation.CONTENT_TOP_RIGHT);
-			moreOptionsMenu.show(moreOptionsButton, Side.BOTTOM, moreOptionsButton.getWidth(), 0.0);
-		}
-	}
-
-	@FXML
-	public void didClickMountVault(ActionEvent event) {
-		mountVault(vault.get());
-	}
-
-	private void mountVault(Vault vault) {
-		asyncTaskService.asyncTaskOf(() -> {
-			vault.mount();
-		}).onSuccess(() -> {
-			LOG.trace("Mount succeeded.");
-			messageLabel.setText(null);
-			if (vault.getVaultSettings().revealAfterMount().get()) {
-				revealVault(vault);
-			}
-		}).onError(CommandFailedException.class, e -> {
-			LOG.error("Mount failed.", e);
-			// TODO Markus Kreusch #393: hyperlink auf FAQ oder sowas?
-			messageLabel.setText(localization.getString("unlocked.label.mountFailed"));
-		}).run();
-	}
-
-	@FXML
-	public void didClickUnmountVault(ActionEvent event) {
-		regularUnmountVault(Runnables.doNothing());
-	}
-
-	private void regularUnmountVault(Runnable onSuccess) {
-		asyncTaskService.asyncTaskOf(() -> {
-			vault.get().unmount();
+	private void regularLockVault(Runnable onSuccess) {
+		Tasks.create(() -> {
+			vault.get().lock(false);
 		}).onSuccess(() -> {
 			LOG.trace("Regular unmount succeeded.");
 			onSuccess.run();
 		}).onError(Exception.class, e -> {
 			onRegularUnmountVaultFailed(e, onSuccess);
-		}).run();
-	}
-
-	private void forcedUnmountVault(Runnable onSuccess) {
-		asyncTaskService.asyncTaskOf(() -> {
-			vault.get().unmountForced();
-		}).onSuccess(() -> {
-			LOG.trace("Forced unmount succeeded.");
-			onSuccess.run();
-		}).onError(Exception.class, e -> {
-			LOG.error("Forced unmount failed.", e);
-			messageLabel.setText(localization.getString("unlocked.label.unmountFailed"));
-		}).run();
+		}).runOnce(executor);
 	}
 
 	private void onRegularUnmountVaultFailed(Exception e, Runnable onSuccess) {
@@ -214,7 +133,7 @@ public class UnlockedController implements ViewController {
 
 			Optional<ButtonType> choice = confirmDialog.showAndWait();
 			if (ButtonType.YES.equals(choice.get())) {
-				forcedUnmountVault(onSuccess);
+				forcedLockVault(onSuccess);
 			} else {
 				LOG.trace("Unmount cancelled.", e);
 			}
@@ -224,29 +143,43 @@ public class UnlockedController implements ViewController {
 		}
 	}
 
+	private void forcedLockVault(Runnable onSuccess) {
+		Tasks.create(() -> {
+			vault.get().lock(true);
+		}).onSuccess(() -> {
+			LOG.trace("Forced unmount succeeded.");
+			onSuccess.run();
+		}).onError(Exception.class, e -> {
+			LOG.error("Forced unmount failed.", e);
+			messageLabel.setText(localization.getString("unlocked.label.unmountFailed"));
+		}).runOnce(executor);
+	}
+
 	@FXML
-	private void didClickRevealVault(ActionEvent event) {
+	private void didClickMoreOptions() {
+		if (moreOptionsMenu.isShowing()) {
+			moreOptionsMenu.hide();
+		} else {
+			moreOptionsMenu.setAnchorLocation(AnchorLocation.CONTENT_TOP_RIGHT);
+			moreOptionsMenu.show(moreOptionsButton, Side.BOTTOM, moreOptionsButton.getWidth(), 0.0);
+		}
+	}
+
+	@FXML
+	private void didClickRevealVault() {
 		revealVault(vault.get());
 	}
 
-	private void revealVault(Vault vault) {
-		asyncTaskService.asyncTaskOf(() -> {
+	void revealVault(Vault vault) {
+		Tasks.create(() -> {
 			vault.reveal();
 		}).onSuccess(() -> {
 			LOG.trace("Reveal succeeded.");
 			messageLabel.setText(null);
-		}).onError(CommandFailedException.class, e -> {
+		}).onError(Exception.class, e -> {
 			LOG.error("Reveal failed.", e);
 			messageLabel.setText(localization.getString("unlocked.label.revealFailed"));
-		}).run();
-	}
-
-	@FXML
-	private void didClickCopyUrl(ActionEvent event) {
-		ClipboardContent clipboardContent = new ClipboardContent();
-		clipboardContent.putUrl(vault.get().getFilesystemRootUrl());
-		clipboardContent.putString(vault.get().getFilesystemRootUrl());
-		Clipboard.getSystemClipboard().setContent(clipboardContent);
+		}).runOnce(executor);
 	}
 
 	// ****************************************
@@ -278,43 +211,42 @@ public class UnlockedController implements ViewController {
 	private class IoSamplingAnimationHandler implements EventHandler<ActionEvent> {
 
 		private static final double BYTES_TO_MEGABYTES_FACTOR = 1.0 / IO_SAMPLING_INTERVAL / 1024.0 / 1024.0;
-		private static final double SMOOTHING_FACTOR = 0.3;
-		private static final long EFFECTIVELY_ZERO = 100000; // 100kb
 		private final Series<Number, Number> decryptedBytes;
 		private final Series<Number, Number> encryptedBytes;
-		private int step = 0;
-		private long oldDecBytes = 0;
-		private long oldEncBytes = 0;
 
 		public IoSamplingAnimationHandler(Series<Number, Number> decryptedBytes, Series<Number, Number> encryptedBytes) {
 			this.decryptedBytes = decryptedBytes;
 			this.encryptedBytes = encryptedBytes;
+
+			// initialize data once and change value of datapoints later:
+			for (int i = 0; i < IO_SAMPLING_STEPS; i++) {
+				decryptedBytes.getData().add(new Data<>(i, 0));
+				encryptedBytes.getData().add(new Data<>(i, 0));
+			}
+
+			xAxis.setLowerBound(0);
+			xAxis.setUpperBound(IO_SAMPLING_STEPS);
 		}
 
 		@Override
 		public void handle(ActionEvent event) {
-			step++;
+			// move all values one step:
+			for (int i = 0; i < IO_SAMPLING_STEPS - 1; i++) {
+				int j = i + 1;
+				Number tmp = decryptedBytes.getData().get(j).getYValue();
+				decryptedBytes.getData().get(i).setYValue(tmp);
 
+				tmp = encryptedBytes.getData().get(j).getYValue();
+				encryptedBytes.getData().get(i).setYValue(tmp);
+			}
+
+			// add latest value:
 			final long decBytes = vault.get().pollBytesRead();
-			final double smoothedDecBytes = oldDecBytes + SMOOTHING_FACTOR * (decBytes - oldDecBytes);
-			final double smoothedDecMb = smoothedDecBytes * BYTES_TO_MEGABYTES_FACTOR;
-			oldDecBytes = smoothedDecBytes > EFFECTIVELY_ZERO ? (long) smoothedDecBytes : 0l;
-			decryptedBytes.getData().add(new Data<Number, Number>(step, smoothedDecMb));
-			if (decryptedBytes.getData().size() > IO_SAMPLING_STEPS) {
-				decryptedBytes.getData().remove(0);
-			}
-
+			final double decMb = decBytes * BYTES_TO_MEGABYTES_FACTOR;
 			final long encBytes = vault.get().pollBytesWritten();
-			final double smoothedEncBytes = oldEncBytes + SMOOTHING_FACTOR * (encBytes - oldEncBytes);
-			final double smoothedEncMb = smoothedEncBytes * BYTES_TO_MEGABYTES_FACTOR;
-			oldEncBytes = smoothedEncBytes > EFFECTIVELY_ZERO ? (long) smoothedEncBytes : 0l;
-			encryptedBytes.getData().add(new Data<Number, Number>(step, smoothedEncMb));
-			if (encryptedBytes.getData().size() > IO_SAMPLING_STEPS) {
-				encryptedBytes.getData().remove(0);
-			}
-
-			xAxis.setLowerBound(step - IO_SAMPLING_STEPS);
-			xAxis.setUpperBound(step);
+			final double encMb = encBytes * BYTES_TO_MEGABYTES_FACTOR;
+			decryptedBytes.getData().get(IO_SAMPLING_STEPS - 1).setYValue(decMb);
+			encryptedBytes.getData().get(IO_SAMPLING_STEPS - 1).setYValue(encMb);
 		}
 	}
 
@@ -336,6 +268,7 @@ public class UnlockedController implements ViewController {
 
 	@FunctionalInterface
 	interface LockListener {
+
 		void didLock(UnlockedController ctrl);
 	}
 

main/ui/src/main/java/org/cryptomator/ui/controllers/UpgradeController.java

@@ -5,19 +5,10 @@
  *******************************************************************************/
 package org.cryptomator.ui.controllers;
 
+import javax.inject.Inject;
 import java.util.Objects;
 import java.util.Optional;
-
-import javax.inject.Inject;
-
-import org.cryptomator.ui.controls.SecPasswordField;
-import org.cryptomator.ui.l10n.Localization;
-import org.cryptomator.ui.model.UpgradeStrategies;
-import org.cryptomator.ui.model.UpgradeStrategy;
-import org.cryptomator.ui.model.UpgradeStrategy.UpgradeFailedException;
-import org.cryptomator.ui.model.Vault;
-import org.cryptomator.ui.util.AsyncTaskService;
-import org.fxmisc.easybind.EasyBind;
+import java.util.concurrent.ExecutorService;
 
 import javafx.beans.binding.BooleanExpression;
 import javafx.beans.property.ObjectProperty;
@@ -30,19 +21,26 @@ import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.layout.GridPane;
+import org.cryptomator.ui.controls.SecPasswordField;
+import org.cryptomator.ui.model.upgrade.UpgradeStrategies;
+import org.cryptomator.ui.model.upgrade.UpgradeStrategy;
+import org.cryptomator.ui.model.upgrade.UpgradeStrategy.UpgradeFailedException;
+import org.cryptomator.ui.model.Vault;
+import org.cryptomator.ui.util.Tasks;
+import org.fxmisc.easybind.EasyBind;
 
 public class UpgradeController implements ViewController {
 
 	private final ObjectProperty<UpgradeStrategy> strategy = new SimpleObjectProperty<>();
 	private final UpgradeStrategies strategies;
-	private final AsyncTaskService asyncTaskService;
+	private final ExecutorService executor;
 	private Optional<UpgradeListener> listener = Optional.empty();
 	private Vault vault;
 
 	@Inject
-	public UpgradeController(Localization localization, UpgradeStrategies strategies, AsyncTaskService asyncTaskService) {
+	public UpgradeController(UpgradeStrategies strategies, ExecutorService executor) {
 		this.strategies = strategies;
-		this.asyncTaskService = asyncTaskService;
+		this.executor = executor;
 	}
 
 	@FXML
@@ -122,8 +120,8 @@ public class UpgradeController implements ViewController {
 	private void upgrade(UpgradeStrategy instruction) {
 		passwordField.setDisable(true);
 		progressIndicator.setVisible(true);
-		asyncTaskService //
-				.asyncTaskOf(() -> {
+		Tasks //
+				.create(() -> {
 					if (!instruction.isApplicable(vault)) {
 						throw new IllegalStateException("No ugprade needed for " + vault.getPath());
 					}
@@ -137,7 +135,7 @@ public class UpgradeController implements ViewController {
 					progressIndicator.setVisible(false);
 					passwordField.setDisable(false);
 					passwordField.swipe();
-				}).run();
+				}).runOnce(executor);
 	}
 
 	private void showNextUpgrade() {

main/ui/src/main/java/org/cryptomator/ui/controllers/ViewControllerLoader.java

@@ -5,20 +5,18 @@
  *******************************************************************************/
 package org.cryptomator.ui.controllers;
 
+import javafx.fxml.FXMLLoader;
+import org.cryptomator.common.FxApplicationScoped;
+import org.cryptomator.ui.l10n.Localization;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.util.Map;
 
-import javax.inject.Inject;
-import javax.inject.Provider;
-import javax.inject.Singleton;
-
-import org.cryptomator.ui.l10n.Localization;
-
-import javafx.fxml.FXMLLoader;
-
-@Singleton
+@FxApplicationScoped
 public class ViewControllerLoader {
 
 	private final Map<Class<? extends ViewController>, Provider<ViewController>> controllerProviders;

main/ui/src/main/java/org/cryptomator/ui/controllers/WelcomeController.java

@@ -2,25 +2,12 @@
  * Copyright (c) 2014, 2017 Sebastian Stenzel
  * All rights reserved.
  * This program and the accompanying materials are made available under the terms of the accompanying LICENSE file.
- * 
+ *
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
 package org.cryptomator.ui.controllers;
 
-import java.net.URI;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.time.Duration;
-import java.util.Comparator;
-import java.util.Map;
-import java.util.Optional;
-import java.util.ResourceBundle;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
@@ -30,21 +17,37 @@ import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.Parent;
+import javafx.scene.control.ButtonType;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
 import javafx.scene.control.ProgressIndicator;
 import javafx.scene.layout.VBox;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.HttpRequest;
-import jdk.incubator.http.HttpResponse;
 import org.apache.commons.lang3.SystemUtils;
+import org.cryptomator.common.FxApplicationScoped;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.ui.l10n.Localization;
-import org.cryptomator.ui.util.AsyncTaskService;
+import org.cryptomator.ui.util.Tasks;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@Singleton
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.Optional;
+import java.util.ResourceBundle;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import static org.cryptomator.ui.util.DialogBuilderUtil.buildYesNoDialog;
+
+@FxApplicationScoped
 public class WelcomeController implements ViewController {
 
 	private static final Logger LOG = LoggerFactory.getLogger(WelcomeController.class);
@@ -54,17 +57,17 @@ public class WelcomeController implements ViewController {
 	private final Localization localization;
 	private final Settings settings;
 	private final Comparator<String> semVerComparator;
-	private final AsyncTaskService asyncTaskService;
+	private final ScheduledExecutorService executor;
 
 	@Inject
 	public WelcomeController(Application app, @Named("applicationVersion") Optional<String> applicationVersion, Localization localization, Settings settings, @Named("SemVer") Comparator<String> semVerComparator,
-			AsyncTaskService asyncTaskService) {
+							 ScheduledExecutorService executor) {
 		this.app = app;
 		this.applicationVersion = applicationVersion;
 		this.localization = localization;
 		this.settings = settings;
 		this.semVerComparator = semVerComparator;
-		this.asyncTaskService = asyncTaskService;
+		this.executor = executor;
 	}
 
 	@FXML
@@ -86,6 +89,8 @@ public class WelcomeController implements ViewController {
 	public void initialize(URL location, ResourceBundle resources) {
 		if (areUpdatesManagedExternally()) {
 			checkForUpdatesContainer.setVisible(false);
+		} else if (!settings.askedForUpdateCheck().get()) {
+			this.askForUpdateCheck();
 		} else if (settings.checkForUpdates().get()) {
 			this.checkForUpdates();
 		}
@@ -104,34 +109,63 @@ public class WelcomeController implements ViewController {
 		return Boolean.parseBoolean(System.getProperty("cryptomator.updatesManagedExternally", "false"));
 	}
 
+	private void askForUpdateCheck() {
+		Tasks.create(() -> {}).onSuccess(() -> {
+			Optional<ButtonType> result = buildYesNoDialog(
+					localization.getString("welcome.askForUpdateCheck.dialog.title"),
+					localization.getString("welcome.askForUpdateCheck.dialog.header"),
+					localization.getString("welcome.askForUpdateCheck.dialog.content"),
+					ButtonType.YES).showAndWait();
+			if (result.isPresent()) {
+				settings.askedForUpdateCheck().set(true);
+				settings.checkForUpdates().set(result.get().equals(ButtonType.YES));
+			}
+			if (settings.checkForUpdates().get()) {
+				this.checkForUpdates();
+			}
+		}).scheduleOnce(executor, 1, TimeUnit.SECONDS);
+	}
+
 	private void checkForUpdates() {
 		checkForUpdatesStatus.setText(localization.getString("welcome.checkForUpdates.label.currentlyChecking"));
 		checkForUpdatesIndicator.setVisible(true);
-		asyncTaskService.asyncTaskOf(() -> {
+		Tasks.create(() -> {
 			String userAgent = String.format("Cryptomator VersionChecker/%s %s %s (%s)", applicationVersion.orElse("SNAPSHOT"), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH);
-			HttpClient client = HttpClient.newHttpClient();
-			HttpRequest request = HttpRequest.newBuilder()
-					.GET()
-					.uri(new URI("https://api.cryptomator.org/updates/latestVersion.json"))
-					.header("User-Agent", userAgent)
-					.timeout(Duration.ofSeconds(5))
-					.build();
-			HttpResponse<String> response = client.send(request, HttpResponse.BodyHandler.asString(StandardCharsets.UTF_8));
-			if (response.statusCode() == 200) {
+			URL url = URI.create("https://api.cryptomator.org/updates/latestVersion.json").toURL();
+			HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+			conn.addRequestProperty("User-Agent", userAgent);
+			conn.connect();
+			try {
+				if (conn.getResponseCode() != HttpURLConnection.HTTP_OK) {
+					return Optional.<byte[]>empty();
+				}
+				try (InputStream in = conn.getInputStream(); ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+					in.transferTo(out);
+					return Optional.of(out.toByteArray());
+				}
+			} finally {
+				conn.disconnect();
+			}
+		}).onSuccess(response -> {
+			response.ifPresent(bytes -> {
 				Gson gson = new GsonBuilder().setLenient().create();
-				Map<String, String> map = gson.fromJson(response.body(), new TypeToken<Map<String, String>>() {
+				String json = new String(bytes, StandardCharsets.UTF_8);
+				Map<String, String> map = gson.fromJson(json, new TypeToken<Map<String, String>>() {
 				}.getType());
 				if (map != null) {
 					this.compareVersions(map);
 				}
-			}
+			});
+		}).onError(Exception.class, e -> {
+			LOG.warn("Error checking for updates", e);
 		}).andFinally(() -> {
 			checkForUpdatesStatus.setText("");
 			checkForUpdatesIndicator.setVisible(false);
-		}).run();
+		}).runOnce(executor);
 	}
 
 	private void compareVersions(final Map<String, String> latestVersions) {
+		assert Platform.isFxApplicationThread();
 		final String latestVersion;
 		if (SystemUtils.IS_OS_MAC_OSX) {
 			latestVersion = latestVersions.get("mac");
@@ -147,11 +181,9 @@ public class WelcomeController implements ViewController {
 		LOG.info("Current version: {}, lastest version: {}", currentVersion, latestVersion);
 		if (currentVersion != null && semVerComparator.compare(currentVersion, latestVersion) < 0) {
 			final String msg = String.format(localization.getString("welcome.newVersionMessage"), latestVersion, currentVersion);
-			Platform.runLater(() -> {
-				this.updateLink.setText(msg);
-				this.updateLink.setVisible(true);
-				this.updateLink.setDisable(false);
-			});
+			this.updateLink.setText(msg);
+			this.updateLink.setVisible(true);
+			this.updateLink.setDisable(false);
 		}
 	}
 

main/ui/src/main/java/org/cryptomator/ui/controls/DirectoryListCell.java

@@ -68,9 +68,7 @@ public class DirectoryListCell extends DraggableListCell<Vault> {
 		}
 		switch (state) {
 		case UNLOCKED:
-		case MOUNTED:
-		case MOUNTING:
-		case UNMOUNTING:
+		case PROCESSING:
 			return "\uf09c";
 		case LOCKED:
 		default:
@@ -84,9 +82,7 @@ public class DirectoryListCell extends DraggableListCell<Vault> {
 		}
 		switch (state) {
 		case UNLOCKED:
-		case MOUNTED:
-		case MOUNTING:
-		case UNMOUNTING:
+		case PROCESSING:
 			return UNLOCKED_ICON_COLOR;
 		case LOCKED:
 		default:

main/ui/src/main/java/org/cryptomator/ui/controls/SecPasswordField.java

@@ -2,29 +2,85 @@
  * Copyright (c) 2014, 2017 Sebastian Stenzel
  * All rights reserved.
  * This program and the accompanying materials are made available under the terms of the accompanying LICENSE file.
- * 
+ *
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
 package org.cryptomator.ui.controls;
 
-import java.util.Arrays;
-
+import com.google.common.base.Strings;
+import javafx.beans.NamedArg;
+import javafx.beans.Observable;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.Label;
+import javafx.scene.control.OverrunStyle;
 import javafx.scene.control.PasswordField;
+import javafx.scene.control.Tooltip;
 import javafx.scene.input.DragEvent;
 import javafx.scene.input.Dragboard;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.input.TransferMode;
+import javafx.scene.paint.Color;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
+
+import java.awt.Toolkit;
+import java.nio.CharBuffer;
+import java.text.Normalizer;
+import java.text.Normalizer.Form;
+import java.util.Arrays;
 
 /**
- * Compromise in security. While the text can be swiped, any access to the {@link #getText()} method will create a copy of the String in the heap.
+ * Patched PasswordField that doesn't create String copies of the password in memory. Instead the password is stored in a char[] that can be swiped.
+ *
+ * @implNote Since {@link #setText(String)} is final, we can not override its behaviour. For that reason you should not use the {@link #textProperty()} for anything else than display purposes.
  */
 public class SecPasswordField extends PasswordField {
 
 	private static final char SWIPE_CHAR = ' ';
+	private static final int INITIAL_BUFFER_SIZE = 50;
+	private static final int GROW_BUFFER_SIZE = 50;
+	private static final String PLACEHOLDER = "*";
+	private static final double PADDING = 2.0;
+	private static final double INDICATOR_PADDING = 4.0;
+	private static final Color INDICATOR_COLOR = new Color(0.901, 0.494, 0.133, 1.0);
+
+	private final Tooltip tooltip = new Tooltip();
+	private final Label indicator = new Label();
+	private final String nonPrintableCharsWarning;
+	private final String capslockWarning;
+
+	private char[] content = new char[INITIAL_BUFFER_SIZE];
+	private int length = 0;
 
 	public SecPasswordField() {
-		this.onDragOverProperty().set(this::handleDragOver);
-		this.onDragDroppedProperty().set(this::handleDragDropped);
+		this("", "");
+	}
+
+	public SecPasswordField(@NamedArg("nonPrintableCharsWarning") String nonPrintableCharsWarning, @NamedArg("capslockWarning") String capslockWarning) {
+		this.nonPrintableCharsWarning = nonPrintableCharsWarning;
+		this.capslockWarning = capslockWarning;
+		indicator.setPadding(new Insets(PADDING, INDICATOR_PADDING, PADDING, INDICATOR_PADDING));
+		indicator.setAlignment(Pos.CENTER_RIGHT);
+		indicator.setMouseTransparent(true);
+		indicator.setTextOverrun(OverrunStyle.CLIP);
+		indicator.setTextFill(INDICATOR_COLOR);
+		indicator.setFont(Font.font(indicator.getFont().getFamily(), 15.0));
+		this.getChildren().add(indicator);
+		this.setTooltip(tooltip);
+		this.addEventHandler(DragEvent.DRAG_OVER, this::handleDragOver);
+		this.addEventHandler(DragEvent.DRAG_DROPPED, this::handleDragDropped);
+		this.addEventHandler(KeyEvent.ANY, this::handleKeyEvent);
+		this.focusedProperty().addListener(this::focusedChanged);
+	}
+
+	@Override
+	protected void layoutChildren() {
+		super.layoutChildren();
+		indicator.relocate(0.0, 0.0);
+		indicator.resize(getWidth(), getHeight());
 	}
 
 	private void handleDragOver(DragEvent event) {
@@ -43,26 +99,160 @@ public class SecPasswordField extends PasswordField {
 		event.consume();
 	}
 
+	private void handleKeyEvent(KeyEvent e) {
+		if (e.getCode() == KeyCode.CAPS) {
+			updateVisualHints(true);
+		}
+	}
+
+	private void focusedChanged(@SuppressWarnings("unused") Observable observable) {
+		updateVisualHints(isFocused());
+	}
+
+	private void updateVisualHints(boolean focused) {
+		StringBuilder tooltipSb = new StringBuilder();
+		StringBuilder indicatorSb = new StringBuilder();
+		if (containsNonPrintableCharacters()) {
+			indicatorSb.append('⚠');
+			tooltipSb.append("- ").append(nonPrintableCharsWarning).append('\n');
+		}
+		// AWT code needed until https://bugs.openjdk.java.net/browse/JDK-8090882 is closed:
+		if (focused && Toolkit.getDefaultToolkit().getLockingKeyState(java.awt.event.KeyEvent.VK_CAPS_LOCK)) {
+			indicatorSb.append('⇪');
+			tooltipSb.append("- ").append(capslockWarning).append('\n');
+		}
+		indicator.setText(indicatorSb.toString());
+		if (!indicator.getText().isEmpty()) {
+			setPadding(new Insets(PADDING, getIndicatorWidth(), PADDING, PADDING));
+		} else {
+			setPadding(new Insets(PADDING));
+		}
+		tooltip.setText(tooltipSb.toString());
+		if (tooltip.getText().isEmpty()) {
+			setTooltip(null);
+		} else {
+			setTooltip(tooltip);
+		}
+	}
+
+	private double getIndicatorWidth() {
+		return new Text(indicator.getText()).getLayoutBounds().getWidth() + INDICATOR_PADDING * 2.0;
+	}
+
 	/**
-	 * {@link #getContent()} uses a StringBuilder, which in turn is backed by a char[].
-	 * The delete operation of AbstractStringBuilder closes the gap, that forms by deleting chars, by moving up the following chars.
-	 * <br/>
-	 * Imagine the following example with <code>pass</code> being the password, <code>x</code> being the swipe char and <code>'</code> being the offset of the char array:
-	 * <ol>
-	 * <li>Append filling chars to the end of the password: <code>passxxxx'</code></li>
-	 * <li>Delete first 4 chars. Internal implementation will then copy subsequent chars to the position, where the deletion occured: <code>xxxx'xxxx</code></li>
-	 * <li>Delete first 4 chars again, as we appended 4 chars in step 1: <code>'xxxxxx</code></li>
-	 * </ol>
+	 * @return <code>true</code> if any {@link Character#isISOControl(char) control character} is present in the current value of this password field.
+	 * @implNote runs in O(n)
+	 */
+	boolean containsNonPrintableCharacters() {
+		for (int i = 0; i < length; i++) {
+			if (Character.isISOControl(content[i])) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Replaces a range of characters with the given text.
+	 * The text will be normalized to <a href="https://www.unicode.org/glossary/#normalization_form_c">NFC</a>.
+	 *
+	 * @param start The starting index in the range, inclusive. This must be &gt;= 0 and &lt; the end.
+	 * @param end The ending index in the range, exclusive. This is one-past the last character to
+	 * delete (consistent with the String manipulation methods). This must be &gt; the start,
+	 * and &lt;= the length of the text.
+	 * @param text The text that is to replace the range. This must not be null.
+	 * @implNote Internally calls {@link PasswordField#replaceText(int, int, String)} with a dummy String for visual purposes.
+	 */
+	@Override
+	public void replaceText(int start, int end, String text) {
+		String normalizedText = Normalizer.normalize(text, Form.NFC);
+		int removed = end - start;
+		int added = normalizedText.length();
+		int delta = added - removed;
+
+		// ensure sufficient content buffer size
+		int oldLength = length;
+		this.length += delta;
+		growContentIfNeeded();
+
+		// shift existing content
+		if (delta != 0 && start < oldLength) {
+			System.arraycopy(content, end, content, end + delta, oldLength - end);
+		}
+
+		// copy new text to content buffer
+		normalizedText.getChars(0, normalizedText.length(), content, start);
+
+		// trigger visual hints
+		updateVisualHints(true);
+		String placeholderString = Strings.repeat(PLACEHOLDER, normalizedText.length());
+		super.replaceText(start, end, placeholderString);
+	}
+
+	private void growContentIfNeeded() {
+		if (length > content.length) {
+			char[] newContent = new char[length + GROW_BUFFER_SIZE];
+			System.arraycopy(content, 0, newContent, 0, content.length);
+			swipe(content);
+			this.content = newContent;
+		}
+	}
+
+	/**
+	 * Creates a CharSequence by wrapping the password characters.
+	 *
+	 * @return A character sequence backed by the SecPasswordField's buffer (not a copy).
+	 * @implNote The CharSequence will not copy the backing char[].
+	 * Therefore any mutation to the SecPasswordField's content will mutate or eventually swipe the returned CharSequence.
+	 * @implSpec The CharSequence is usually in <a href="https://www.unicode.org/glossary/#normalization_form_c">NFC</a> representation (unless NFD-encoded char[] is set via {@link #setPassword(char[])}).
+	 * @see #swipe()
+	 */
+	@Override
+	public CharSequence getCharacters() {
+		return CharBuffer.wrap(content, 0, length);
+	}
+
+	/**
+	 * Convenience method wrapper for {@link #setPassword(char[])}.
+	 *
+	 * @param password
+	 * @see #setPassword(char[])
+	 */
+	public void setPassword(CharSequence password) {
+		char[] buf = new char[password.length()];
+		for (int i = 0; i < password.length(); i++) {
+			buf[i] = password.charAt(i);
+		}
+		setPassword(buf);
+		Arrays.fill(buf, SWIPE_CHAR);
+	}
+
+	/**
+	 * Directly sets the content of this password field to a copy of the given password.
+	 * No conversion whatsoever happens. If you want to normalize the unicode representation of the password,
+	 * do it before calling this method.
+	 *
+	 * @param password
+	 */
+	public void setPassword(char[] password) {
+		swipe();
+		content = Arrays.copyOf(password, password.length);
+		length = password.length;
+
+		String placeholderString = Strings.repeat(PLACEHOLDER, password.length);
+		setText(placeholderString);
+	}
+
+	/**
+	 * Destroys the stored password by overriding each character with a different character.
 	 */
 	public void swipe() {
-		final int pwLength = this.getContent().length();
-		final char[] fillingChars = new char[pwLength];
-		Arrays.fill(fillingChars, SWIPE_CHAR);
-		this.getContent().insert(pwLength, new String(fillingChars), false);
-		this.getContent().delete(0, pwLength, true);
-		this.getContent().delete(0, pwLength, true);
-		// previous text has now been overwritten. but we still need to update the text to trigger some property bindings:
-		this.clear();
+		swipe(content);
+		length = 0;
+	}
+
+	private void swipe(char[] buffer) {
+		Arrays.fill(buffer, SWIPE_CHAR);
 	}
 
 }

main/ui/src/main/java/org/cryptomator/ui/l10n/Localization.java

@@ -5,6 +5,13 @@
  *******************************************************************************/
 package org.cryptomator.ui.l10n;
 
+import com.google.common.collect.Sets;
+import org.apache.commons.lang3.StringUtils;
+import org.cryptomator.common.FxApplicationScoped;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -19,16 +26,7 @@ import java.util.Objects;
 import java.util.PropertyResourceBundle;
 import java.util.ResourceBundle;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.Sets;
-
-@Singleton
+@FxApplicationScoped
 public class Localization extends ResourceBundle {
 
 	private static final Logger LOG = LoggerFactory.getLogger(Localization.class);

main/ui/src/main/java/org/cryptomator/ui/model/AppLaunchEvent.java

@@ -0,0 +1,15 @@
+package org.cryptomator.ui.model;
+
+import java.nio.file.Path;
+import java.util.stream.Stream;
+
+public class AppLaunchEvent {
+
+	private final Stream<Path> pathsToOpen;
+
+	public AppLaunchEvent(Stream<Path> pathsToOpen) {this.pathsToOpen = pathsToOpen;}
+
+	public Stream<Path> getPathsToOpen() {
+		return pathsToOpen;
+	}
+}

main/ui/src/main/java/org/cryptomator/ui/model/AutoUnlocker.java

@@ -5,6 +5,13 @@
  *******************************************************************************/
 package org.cryptomator.ui.model;
 
+import org.cryptomator.common.FxApplicationScoped;
+import org.cryptomator.cryptolib.api.CryptoException;
+import org.cryptomator.keychain.KeychainAccess;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
 import java.io.IOException;
 import java.nio.CharBuffer;
 import java.util.Arrays;
@@ -14,15 +21,7 @@ import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.cryptomator.cryptolib.api.CryptoException;
-import org.cryptomator.keychain.KeychainAccess;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@Singleton
+@FxApplicationScoped
 public class AutoUnlocker {
 
 	private static final Logger LOG = LoggerFactory.getLogger(AutoUnlocker.class);
@@ -73,33 +72,21 @@ public class AutoUnlocker {
 		}
 		try {
 			vault.unlock(CharBuffer.wrap(storedPw));
-			mountSilently(vault);
-		} catch (IOException | CryptoException e) {
+			revealSilently(vault);
+		} catch (IOException | CryptoException | Volume.VolumeException e) {
 			LOG.error("Auto unlock failed.", e);
 		} finally {
 			Arrays.fill(storedPw, ' ');
 		}
 	}
 
-	private void mountSilently(Vault unlockedVault) {
-		if (!unlockedVault.getVaultSettings().mountAfterUnlock().get()) {
-			return;
-		}
-		try {
-			unlockedVault.mount();
-			revealSilently(unlockedVault);
-		} catch (CommandFailedException e) {
-			LOG.error("Auto unlock succeded, but mounting the drive failed.", e);
-		}
-	}
-
 	private void revealSilently(Vault mountedVault) {
 		if (!mountedVault.getVaultSettings().revealAfterMount().get()) {
 			return;
 		}
 		try {
 			mountedVault.reveal();
-		} catch (CommandFailedException e) {
+		} catch (Volume.VolumeException e) {
 			LOG.error("Auto unlock succeded, but revealing the drive failed.", e);
 		}
 	}

main/ui/src/main/java/org/cryptomator/ui/model/CommandFailedException.java

@@ -1,17 +0,0 @@
-package org.cryptomator.ui.model;
-
-public class CommandFailedException extends Exception {
-
-	public CommandFailedException(String message) {
-		super(message);
-	}
-
-	public CommandFailedException(Throwable cause) {
-		super(cause);
-	}
-
-	public CommandFailedException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-}

main/ui/src/main/java/org/cryptomator/ui/model/DokanyVolume.java

@@ -0,0 +1,105 @@
+package org.cryptomator.ui.model;
+
+import com.google.common.base.Strings;
+import org.cryptomator.common.settings.VaultSettings;
+import org.cryptomator.cryptofs.CryptoFileSystem;
+import org.cryptomator.frontend.dokany.Mount;
+import org.cryptomator.frontend.dokany.MountFactory;
+import org.cryptomator.frontend.dokany.MountFailedException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.inject.Inject;
+import java.io.IOException;
+import java.nio.file.DirectoryNotEmptyException;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.NotDirectoryException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Optional;
+import java.util.concurrent.ExecutorService;
+
+public class DokanyVolume implements Volume {
+
+	private static final Logger LOG = LoggerFactory.getLogger(DokanyVolume.class);
+
+	private static final String FS_TYPE_NAME = "Cryptomator File System";
+
+	private final VaultSettings vaultSettings;
+	private final MountFactory mountFactory;
+	private final WindowsDriveLetters windowsDriveLetters;
+	private Mount mount;
+
+	@Inject
+	public DokanyVolume(VaultSettings vaultSettings, ExecutorService executorService, WindowsDriveLetters windowsDriveLetters) {
+		this.vaultSettings = vaultSettings;
+		this.mountFactory = new MountFactory(executorService);
+		this.windowsDriveLetters = windowsDriveLetters;
+	}
+
+	@Override
+	public boolean isSupported() {
+		return DokanyVolume.isSupportedStatic();
+	}
+
+	@Override
+	public void mount(CryptoFileSystem fs) throws VolumeException, IOException {
+		Path mountPath = getMountPoint();
+		String mountName = vaultSettings.mountName().get();
+		try {
+			this.mount = mountFactory.mount(fs.getPath("/"), mountPath, mountName, FS_TYPE_NAME);
+		} catch (MountFailedException e) {
+			if (vaultSettings.getIndividualMountPath().isPresent()) {
+				LOG.warn("Failed to mount vault into {}. Is this directory currently accessed by another process (e.g. Windows Explorer)?", mountPath);
+			}
+			throw new VolumeException("Unable to mount Filesystem", e);
+		}
+	}
+
+	private Path getMountPoint() throws VolumeException, IOException {
+		Optional<String> optionalCustomMountPoint = vaultSettings.getIndividualMountPath();
+		if (optionalCustomMountPoint.isPresent()) {
+			Path customMountPoint = Paths.get(optionalCustomMountPoint.get());
+			checkProvidedMountPoint(customMountPoint);
+			return customMountPoint;
+		} else if (!Strings.isNullOrEmpty(vaultSettings.winDriveLetter().get())) {
+			return Paths.get(vaultSettings.winDriveLetter().get().charAt(0) + ":\\");
+		} else {
+			//auto assign drive letter
+			if (!windowsDriveLetters.getAvailableDriveLetters().isEmpty()) {
+				return Paths.get(windowsDriveLetters.getAvailableDriveLetters().iterator().next() + ":\\");
+			} else {
+				throw new VolumeException("No free drive letter available.");
+			}
+		}
+	}
+
+	private void checkProvidedMountPoint(Path mountPoint) throws IOException {
+		if (!Files.isDirectory(mountPoint)) {
+			throw new NotDirectoryException(mountPoint.toString());
+		}
+		try (DirectoryStream<Path> ds = Files.newDirectoryStream(mountPoint)) {
+			if (ds.iterator().hasNext()) {
+				throw new DirectoryNotEmptyException(mountPoint.toString());
+			}
+		}
+	}
+
+	@Override
+	public void reveal() throws VolumeException {
+		boolean success = mount.reveal();
+		if (!success) {
+			throw new VolumeException("Reveal failed.");
+		}
+	}
+
+	@Override
+	public void unmount() {
+		mount.close();
+	}
+
+	public static boolean isSupportedStatic() {
+		return MountFactory.isApplicable();
+	}
+}