Workarounds for uncatched exceptions

Author: infeo

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

@@ -9,6 +9,7 @@
 import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder;
 import org.freedesktop.dbus.exceptions.DBusConnectionException;
 import org.freedesktop.dbus.exceptions.DBusException;
+import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.kde.KWallet;
 import org.kde.Static;
 import org.purejava.KDEWallet;
@@ -28,7 +29,13 @@ public class KDEWalletKeychainAccess implements KeychainAccessProvider {
 	private final Optional<ConnectedWallet> wallet;
 
 	public KDEWalletKeychainAccess() {
-		this.wallet = ConnectedWallet.connect();
+		Optional<ConnectedWallet> tmp;
+		try { //TODO: remove try-catch once KDEWallet lib is fixed
+			tmp = ConnectedWallet.connect();
+		} catch (DBusExecutionException e) {
+			tmp = Optional.empty();
+		}
+		wallet = tmp;
 	}
 
 	@Override

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

@@ -4,6 +4,8 @@
 import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
+import org.freedesktop.dbus.exceptions.DBusConnectionException;
+import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.freedesktop.secret.simple.SimpleCollection;
 
 import java.io.IOException;
@@ -23,7 +25,16 @@ public String displayName() {
 
 	@Override
 	public boolean isSupported() {
-		return SimpleCollection.isAvailable();
+		try {
+			return SimpleCollection.isAvailable();
+		} catch (ExceptionInInitializerError e) {
+			//TODO: remove try-catch once secret-service lib is fixed
+			if(e.getException() instanceof DBusExecutionException) {
+				return false;
+			} else {
+				throw e;
+			}
+		}
 	}
 
 	@Override