Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Guard isSupported() #82

Merged
merged 3 commits into from
Jul 8, 2024
Merged

Guard isSupported() #82

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8648cde
Guard isSupported()
purejava Jul 6, 2024
2d4d5b4
Catch runtime exception and initError in same catch block.
infeo Jul 8, 2024
ab4c4d6
fix previous commit
infeo Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/main/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -29,6 +29,9 @@ public String displayName() {
public boolean isSupported() {
try {
return SimpleCollection.isAvailable();
} catch (RuntimeException | ExceptionInInitializerError e) {
LOG.warn("Initializing secret service keychain access failed", e instanceof ExceptionInInitializerError ? e.getException() : e);
return false;
} catch (ExceptionInInitializerError e) {
LOG.warn("Initializing secret service keychain access failed", e.getException());
return false;
Expand Down
Loading