Quellcode durchsuchen

Merge branch 'develop' into feature/new-ui

# Conflicts:
#	main/pom.xml
Sebastian Stenzel vor 5 Jahren
Ursprung
Commit
60bdafca94

+ 2 - 0
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();
 

+ 1 - 1
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;
 		}
 	}

+ 2 - 2
main/pom.xml

@@ -25,10 +25,10 @@
 
 		<!-- 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.1.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>