From c2872948906387524bf0480cadcc8fa6b5d079c3 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Sat, 17 Aug 2019 10:43:33 +0200
Subject: [PATCH 1/4] catch unchecked exceptions when checking whether linux
 keychain is accessible fixes #950, fixes #952, fixes #954

---
 .../java/org/cryptomator/keychain/KeychainAccessStrategy.java   | 2 ++
 .../keychain/LinuxSecretServiceKeychainAccessImpl.java          | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
index 30baaf99f..a248d08f5 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
@@ -9,6 +9,8 @@ interface KeychainAccessStrategy extends KeychainAccess {
 
 	/**
 	 * @return <code>true</code> if this KeychainAccessStrategy works on the current machine.
+	 * @implNote This method must not throw any exceptions and should fail fast
+	 * returning <code>false</code> if it can't determine availability of the checked strategy
 	 */
 	boolean isSupported();
 
diff --git a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java
index 542c98c42..36a139a9f 100644
--- a/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java
+++ b/main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java
@@ -14,7 +14,7 @@ class LinuxSecretServiceKeychainAccessImpl implements KeychainAccessStrategy {
 		try (@SuppressWarnings("unused") SimpleCollection keyring = new SimpleCollection()) {
 			// seems like we're able to access the keyring.
 			return true;
-		} catch (IOException e) {
+		} catch (IOException | RuntimeException e) {
 			return false;
 		}
 	}

From 2d6254b427c42cb0ac7eab618c994413fb92500e Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Sat, 17 Aug 2019 11:16:12 +0200
Subject: [PATCH 2/4] fixes #943

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

diff --git a/main/pom.xml b/main/pom.xml
index 1b58e62a3..94866c07d 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -28,7 +28,7 @@
 		<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.10</cryptomator.dokany.version>
+		<cryptomator.dokany.version>1.1.11</cryptomator.dokany.version>
 		<cryptomator.webdav.version>1.0.10</cryptomator.webdav.version>
 
 		<javafx.version>12</javafx.version>

From 6670e370504abc93cadaa48f03ad63bc3655d6e4 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Sun, 18 Aug 2019 14:46:46 +0200
Subject: [PATCH 3/4] Updated CryptoFS (which now adds a version suffix to
 masterkey backup files)

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

diff --git a/main/pom.xml b/main/pom.xml
index 94866c07d..8066ffc48 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.6</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>1.8.7</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.11</cryptomator.dokany.version>

From f1b96b29a7de20410c127251c3199134c26fff38 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Sun, 18 Aug 2019 14:47:45 +0200
Subject: [PATCH 4/4] Preparing 1.4.15

---
 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..7a719b26e 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.15</version>
 	</parent>
 	<artifactId>buildkit</artifactId>
 	<packaging>pom</packaging>
diff --git a/main/commons/pom.xml b/main/commons/pom.xml
index ebb78e73f..89c511a4f 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.15</version>
 	</parent>
 	<artifactId>commons</artifactId>
 	<name>Cryptomator Commons</name>
diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml
index 01e276cc9..f53d83112 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.15</version>
 	</parent>
 	<artifactId>keychain</artifactId>
 	<name>System Keychain Access</name>
diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml
index aef980622..c9bc1fd6a 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.15</version>
 	</parent>
 	<artifactId>launcher</artifactId>
 	<name>Cryptomator Launcher</name>
diff --git a/main/pom.xml b/main/pom.xml
index 8066ffc48..1cf752725 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.15</version>
 	<packaging>pom</packaging>
 	<name>Cryptomator</name>
 
diff --git a/main/ui/pom.xml b/main/ui/pom.xml
index 1465683f0..1b132ce2a 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.15</version>
 	</parent>
 	<artifactId>ui</artifactId>
 	<name>Cryptomator GUI</name>