Skip to content

Commit 870f25a

Browse files
Merge branch 'release/1.0.1'
2 parents e853418 + 91168a9 commit 870f25a

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>integrations-linux</artifactId>
8-
<version>1.0.0</version>
8+
<version>1.0.1</version>
99

1010
<name>integrations-linux</name>
1111
<description>Provides optional Linux services used by Cryptomator</description>

src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,22 @@ private static DBusConnection getNewConnection() throws DBusException {
9797
}
9898

9999
public boolean isSupported() {
100-
return wallet.isEnabled();
100+
try {
101+
return wallet.isEnabled();
102+
} catch (RuntimeException e) {
103+
LOG.warn("Failed to check if KDE Wallet is available.", e);
104+
return false;
105+
}
101106
}
102107

103-
public boolean isLocked() { return !wallet.isOpen(Static.DEFAULT_WALLET); }
108+
public boolean isLocked() {
109+
try {
110+
return !wallet.isOpen(Static.DEFAULT_WALLET);
111+
} catch (RuntimeException e) {
112+
LOG.warn("Failed to check whether KDE Wallet is open, therefore considering it closed.", e);
113+
return true;
114+
}
115+
}
104116

105117
public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
106118
try {

0 commit comments

Comments
 (0)