Merge pull request #10 from purejava/keychain-isLocked

Widen integrations-api to check whether keychain is locked
cryptomator · Feb 23, 2021 · 6d9f914 · 6d9f914
2 parents dfd81a0 + 62a94fe
commit 6d9f914
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- runtime dependencies -->
-		<api.version>0.1.3</api.version>
+		<api.version>1.0.0-beta2</api.version>
 		<secret-service.version>1.5.0</secret-service.version>
 		<kdewallet.version>1.1.1</kdewallet.version>
 		<guava.version>30.0-jre</guava.version>

diff --git a/src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java b/src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java
@@ -47,6 +47,11 @@ public boolean isSupported() {
 		return wallet.map(ConnectedWallet::isSupported).orElse(false);
 	}
 
+	@Override
+	public boolean isLocked() {
+		return wallet.map(ConnectedWallet::isLocked).orElse(false);
+	}
+
 	@Override
 	public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
 		Preconditions.checkState(wallet.isPresent(), "Keychain not supported.");
@@ -84,6 +89,8 @@ public boolean isSupported() {
 			return wallet.isEnabled();
 		}
 
+		public boolean isLocked() { return !wallet.isOpen(Static.DEFAULT_WALLET); }
+
 		public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
 			try {
 				if (walletIsOpen() &&

diff --git a/src/main/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccess.java b/src/main/java/org/cryptomator/linux/keychain/SecretServiceKeychainAccess.java
@@ -19,6 +19,16 @@ public boolean isSupported() {
 		return SimpleCollection.isAvailable();
 	}
 
+	@Override
+	public boolean isLocked() {
+		try (@SuppressWarnings("unused") SimpleCollection keyring = new SimpleCollection()) {
+			// seems like we're able to access the keyring.
+			return keyring.isLocked();
+		} catch (IOException | ExceptionInInitializerError | RuntimeException e) {
+			return true;
+		}
+	}
+
 	@Override
 	public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
 		try (SimpleCollection keyring = new SimpleCollection()) {