Added better exception handling; prettied up code formatting

Liboicl · Liboicl · commit 922ee1ceb294 · 2020-12-30T10:25:24.000-05:00
diff --git a/src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java b/src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java
@@ -28,9 +28,11 @@ public KDEWalletKeychainAccess() {
 			try {
 				conn = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
 			} catch (RuntimeException e) {
-				LOG.warn("SESSION DBus not found.", e);
+				if (e.getMessage() == "Cannot Resolve Session Bus Address") {
+					LOG.warn("SESSION DBus not found.");
+				}
 			}
-			if(conn == null){
+			if (conn == null) {
 				conn = DBusConnection.getConnection(DBusConnection.DBusBusType.SYSTEM);
 			}
 			wallet = new ConnectedWallet(conn);

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,11 @@ public KDEWalletKeychainAccess() {`
`28`	`28`	`try {`
`29`	`29`	`conn = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);`
`30`	`30`	`} catch (RuntimeException e) {`
`31`		`- LOG.warn("SESSION DBus not found.", e);`
	`31`	`+ if (e.getMessage() == "Cannot Resolve Session Bus Address") {`
	`32`	`+ LOG.warn("SESSION DBus not found.");`
	`33`	`+ }`
`32`	`34`	`}`
`33`		`- if(conn == null){`
	`35`	`+ if (conn == null) {`
`34`	`36`	`conn = DBusConnection.getConnection(DBusConnection.DBusBusType.SYSTEM);`
`35`	`37`	`}`
`36`	`38`	`wallet = new ConnectedWallet(conn);`