File tree Expand file tree Collapse file tree
src/main/java/org/cryptomator/linux/keychain Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -29,13 +29,7 @@ public class KDEWalletKeychainAccess implements KeychainAccessProvider {
2929 private final Optional <ConnectedWallet > wallet ;
3030
3131 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 ();
3933 }
4034
4135 @ Override
@@ -98,8 +92,9 @@ static Optional<ConnectedWallet> connect() {
9892 private static DBusConnection getNewConnection () throws DBusException {
9993 try {
10094 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" );
10398 try {
10499 return DBusConnectionBuilder .forSystemBus ().build ();
105100 } catch (DBusException e ) {
You can’t perform that action at this time.
0 commit comments