Merge branch 'develop' of https://github.com/cryptomator/integrations-linux into develop

Author: infeo

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

@@ -24,7 +24,17 @@ public class KDEWalletKeychainAccess implements KeychainAccessProvider {
 	public KDEWalletKeychainAccess() {
 		ConnectedWallet wallet = null;
 		try {
-			DBusConnection conn = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
+			DBusConnection conn = null;
+			try {
+				conn = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
+			} catch (RuntimeException e) {
+				if (e.getMessage() == "Cannot Resolve Session Bus Address") {
+					LOG.warn("SESSION DBus not found.");
+				}
+			}
+			if (conn == null) {
+				conn = DBusConnection.getConnection(DBusConnection.DBusBusType.SYSTEM);
+			}
 			wallet = new ConnectedWallet(conn);
 		} catch (DBusException e) {
 			LOG.warn("Connecting to D-Bus failed.", e);

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

@@ -18,7 +18,7 @@ public boolean isSupported() {
 		try (@SuppressWarnings("unused") SimpleCollection keyring = new SimpleCollection()) {
 			// seems like we're able to access the keyring.
 			return true;
-		} catch (IOException | RuntimeException e) {
+		} catch (IOException | ExceptionInInitializerError | RuntimeException e) {
 			return false;
 		}
 	}