Merge branch 'master' into develop

.idea/compiler.xml

@@ -23,14 +23,11 @@
           <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="commons" />
         <module name="keychain" />
         <module name="launcher" />
+        <module name="commons" />
         <module name="ui" />
       </profile>
     </annotationProcessing>
-    <bytecodeTargetLevel>
-      <module name="buildkit" target="11" />
-    </bytecodeTargetLevel>
   </component>
 </project>

.idea/modules.xml

@@ -3,7 +3,6 @@
   <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>

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

@@ -1,12 +1,15 @@
 package org.cryptomator.keychain;
 
+import org.apache.commons.lang3.SystemUtils;
+
 import java.util.Optional;
 
 public class LinuxKeychainTester {
+
 	public static boolean secretServiceIsAvailable() {
 		try {
 			Class.forName("org.freedesktop.secret.simple.SimpleCollection");
-			return true;
+			return SystemUtils.IS_OS_LINUX; // even if the classes could be loaded, secretService is only available on linux
 		} catch (ClassNotFoundException e) {
 			return false;
 		}

main/pom.xml

@@ -25,7 +25,7 @@
 
 		<!-- dependency versions -->
 		<cryptomator.cryptolib.version>1.2.1</cryptomator.cryptolib.version>
-		<cryptomator.cryptofs.version>1.8.5</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>1.8.6</cryptomator.cryptofs.version>
 		<cryptomator.jni.version>2.0.0</cryptomator.jni.version>
 		<cryptomator.fuse.version>1.2.0</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.1.9</cryptomator.dokany.version>

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

@@ -88,7 +88,7 @@ public class VaultModule {
 			LOG.error("Could not read uid/gid from USER_HOME", e);
 		}
 
-		return flags.toString();
+		return flags.toString().strip();
 	}
 
 	// see https://manpages.debian.org/testing/fuse/mount.fuse.8.en.html
@@ -111,7 +111,7 @@ public class VaultModule {
 			LOG.error("Could not read uid/gid from USER_HOME", e);
 		}
 
-		return flags.toString();
+		return flags.toString().strip();
 	}
 
 	// see https://github.com/cryptomator/dokany-nio-adapter/blob/develop/src/main/java/org/cryptomator/frontend/dokany/MountUtil.java#L30-L34
@@ -127,7 +127,7 @@ public class VaultModule {
 		flags.append(" --timeout 10000");
 		flags.append(" --allocation-unit-size 4096");
 		flags.append(" --sector-size 4096");
-		return flags.toString();
+		return flags.toString().strip();
 	}
 
 }