From 903d8187e954a4f691fb204945b43c2ea23798bc Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 4 Jul 2019 15:59:16 +0200
Subject: [PATCH 1/4] Preparing 1.4.12

---
 main/buildkit/pom.xml | 2 +-
 main/commons/pom.xml  | 2 +-
 main/keychain/pom.xml | 2 +-
 main/launcher/pom.xml | 2 +-
 main/pom.xml          | 2 +-
 main/ui/pom.xml       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml
index c573072b2..e2bd5bc4f 100644
--- a/main/buildkit/pom.xml
+++ b/main/buildkit/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.4.12</version>
 	</parent>
 	<artifactId>buildkit</artifactId>
 	<packaging>pom</packaging>
diff --git a/main/commons/pom.xml b/main/commons/pom.xml
index ebb78e73f..7ded57845 100644
--- a/main/commons/pom.xml
+++ b/main/commons/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.4.12</version>
 	</parent>
 	<artifactId>commons</artifactId>
 	<name>Cryptomator Commons</name>
diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml
index 01e276cc9..bff1d5fda 100644
--- a/main/keychain/pom.xml
+++ b/main/keychain/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.4.12</version>
 	</parent>
 	<artifactId>keychain</artifactId>
 	<name>System Keychain Access</name>
diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml
index aef980622..3cac71a3f 100644
--- a/main/launcher/pom.xml
+++ b/main/launcher/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.4.12</version>
 	</parent>
 	<artifactId>launcher</artifactId>
 	<name>Cryptomator Launcher</name>
diff --git a/main/pom.xml b/main/pom.xml
index ad93007b5..da4a47b86 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>main</artifactId>
-	<version>1.5.0-SNAPSHOT</version>
+	<version>1.4.12</version>
 	<packaging>pom</packaging>
 	<name>Cryptomator</name>
 
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index 1465683f0..7ef622799 100644
--- a/main/ui/pom.xml
+++ b/main/ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>main</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>1.4.12</version>
 	</parent>
 	<artifactId>ui</artifactId>
 	<name>Cryptomator GUI</name>

From dc889b88109c0ea32eb6a7282269d534f015f79e Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Tue, 9 Jul 2019 17:04:05 +0200
Subject: [PATCH 2/4] fixes #919

---
 .idea/compiler.xml                                          | 5 +----
 .idea/modules.xml                                           | 1 -
 .../src/main/java/org/cryptomator/ui/model/VaultModule.java | 6 +++---
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index ace983167..da1897030 100644
--- a/.idea/compiler.xml
+++ b/.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>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index bca3878d6..2e793ed5c 100644
--- a/.idea/modules.xml
+++ b/.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>
\ No newline at end of file
diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java
index 5e4050d8f..fdab20bec 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/model/VaultModule.java
+++ b/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();
 	}
 
 }

From f16c887911c1ebcf58bb4cc13c4c038cd877cbe8 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 10 Jul 2019 12:48:24 +0200
Subject: [PATCH 3/4] Updated CryptoFS

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

diff --git a/main/pom.xml b/main/pom.xml
index da4a47b86..b1a27f394 100644
--- a/main/pom.xml
+++ b/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>

From 53cc93a2b4ddac9a2915647d450c0631944dbb5e Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Wed, 10 Jul 2019 15:15:37 +0200
Subject: [PATCH 4/4] don't attempt to access linux keychain on non-linux
 systems, even if classes are present (i.e. when starting from IDE) [ci skip]

---
 .../java/org/cryptomator/keychain/LinuxKeychainTester.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKeychainTester.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKeychainTester.java
index 1466e895c..67d1300c9 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxKeychainTester.java
+++ b/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;
 		}