Skip to content

Commit b84073f

Browse files
committed
added checks for system-only DBus
1 parent 25c4bc5 commit b84073f

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,15 @@ public class KDEWalletKeychainAccess implements KeychainAccessProvider {
2424
public KDEWalletKeychainAccess() {
2525
ConnectedWallet wallet = null;
2626
try {
27-
DBusConnection conn = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
27+
DBusConnection conn = null;
28+
try {
29+
conn = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
30+
} catch (RuntimeException e) {
31+
LOG.warn("SESSION DBus not found.", e);
32+
}
33+
if(conn == null){
34+
conn = DBusConnection.getConnection(DBusConnection.DBusBusType.SYSTEM);
35+
}
2836
wallet = new ConnectedWallet(conn);
2937
} catch (DBusException e) {
3038
LOG.warn("Connecting to D-Bus failed.", e);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public boolean isSupported() {
1818
try (@SuppressWarnings("unused") SimpleCollection keyring = new SimpleCollection()) {
1919
// seems like we're able to access the keyring.
2020
return true;
21-
} catch (IOException | RuntimeException e) {
21+
} catch (IOException | ExceptionInInitializerError | RuntimeException e) {
2222
return false;
2323
}
2424
}

0 commit comments

Comments
 (0)