From df8bf11dbba7edcd5a3006e14c63e73ef2ac6624 Mon Sep 17 00:00:00 2001 From: Ralph Plawetzki Date: Mon, 8 Jul 2024 13:44:32 +0200 Subject: [PATCH] Guard isSupported() (#82) * Guard isSupported() Co-authored-by: Armin Schrenk --- .../linux/keychain/SecretServiceKeychainAccess.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccess.java b/src/main/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccess.java index 500c212..01391c5 100644 --- a/src/main/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccess.java +++ b/src/main/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccess.java @@ -16,7 +16,7 @@ @OperatingSystem(OperatingSystem.Value.LINUX) public class SecretServiceKeychainAccess implements KeychainAccessProvider { - private static Logger LOG = LoggerFactory.getLogger(SecretServiceKeychainAccess.class); + private static final Logger LOG = LoggerFactory.getLogger(SecretServiceKeychainAccess.class); private final String LABEL_FOR_SECRET_IN_KEYRING = "Cryptomator"; @@ -29,8 +29,8 @@ public String displayName() { public boolean isSupported() { try { return SimpleCollection.isAvailable(); - } catch (ExceptionInInitializerError e) { - LOG.warn("Initializing secret service keychain access failed", e.getException()); + } catch (RuntimeException | ExceptionInInitializerError e) { + LOG.warn("Initializing secret service keychain access failed", e instanceof ExceptionInInitializerError errInit ? errInit.getException() : e); return false; } }