mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-20 09:36:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.4.15'

Browse Source
This commit is contained in:
Sebastian Stenzel
2019-08-18 15:21:53 +02:00
parent 7fee6ad52f f1b96b29a7
commit f8d28ba30a
8 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/buildkit/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.14</version>
<version>1.4.15</version>
</parent>
<artifactId>buildkit</artifactId>
<packaging>pom</packaging>

2
main/commons/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.14</version>
<version>1.4.15</version>
</parent>
<artifactId>commons</artifactId>
<name>Cryptomator Commons</name>

2
main/keychain/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.14</version>
<version>1.4.15</version>
</parent>
<artifactId>keychain</artifactId>
<name>System Keychain Access</name>

2
main/keychain/src/main/java/org/cryptomator/keychain/KeychainAccessStrategy.java
View File

@@ -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();

2
main/keychain/src/main/java/org/cryptomator/keychain/LinuxSecretServiceKeychainAccessImpl.java
View File

@@ -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
main/launcher/pom.xml
View File

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

6
main/pom.xml
View File

@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.14</version>
<version>1.4.15</version>
<packaging>pom</packaging>
<name>Cryptomator</name>
@@ -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.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>

2
main/ui/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.cryptomator</groupId>
<artifactId>main</artifactId>
<version>1.4.14</version>
<version>1.4.15</version>
</parent>
<artifactId>ui</artifactId>
<name>Cryptomator GUI</name>