File tree Expand file tree Collapse file tree 1 file changed +4
-9
lines changed
src/main/java/org/cryptomator/linux/keychain Expand file tree Collapse file tree 1 file changed +4
-9
lines changed Original file line number Diff line number Diff line change @@ -29,13 +29,7 @@ public class KDEWalletKeychainAccess implements KeychainAccessProvider {
29
29
private final Optional <ConnectedWallet > wallet ;
30
30
31
31
public KDEWalletKeychainAccess () {
32
- Optional <ConnectedWallet > tmp ;
33
- try { //TODO: remove try-catch once KDEWallet lib is fixed
34
- tmp = ConnectedWallet .connect ();
35
- } catch (DBusExecutionException e ) {
36
- tmp = Optional .empty ();
37
- }
38
- wallet = tmp ;
32
+ this .wallet = ConnectedWallet .connect ();
39
33
}
40
34
41
35
@ Override
@@ -98,8 +92,9 @@ static Optional<ConnectedWallet> connect() {
98
92
private static DBusConnection getNewConnection () throws DBusException {
99
93
try {
100
94
return DBusConnectionBuilder .forSessionBus ().withShared (false ).build ();
101
- } catch (DBusConnectionException ce ) {
102
- LOG .warn ("SESSION DBus not found, falling back to SYSTEM DBus" );
95
+ } catch (DBusConnectionException | DBusExecutionException de ) {
96
+ LOG .warn ("Connecting to SESSION bus failed." , de );
97
+ LOG .warn ("Falling back to SYSTEM DBus" );
103
98
try {
104
99
return DBusConnectionBuilder .forSystemBus ().build ();
105
100
} catch (DBusException e ) {
You can’t perform that action at this time.
0 commit comments