Merge branch 'develop' into main

Author: purejava

README.md

@@ -1,6 +1,9 @@
 # keepassxc-cryptomator
 ![keepassxc-cryptomator](keepassxc-cryptomator.svg)
 
+[![Java CI with Maven](https://github.com/purejava/keepassxc-cryptomator/workflows/Java%20CI%20with%20Maven/badge.svg)](https://github.com/purejava/keepassxc-cryptomator/actions?query=workflow%3A%22Java+CI+with+Maven%22)
+[![Maven Central](https://img.shields.io/maven-central/v/org.purejava/keepassxc-cryptomator.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22org.purejava%22%20AND%20a:%22keepassxc-cryptomator%22)
+[![License](https://img.shields.io/github/license/purejava/keepassxc-cryptomator.svg)](https://github.com/purejava/keepassxc-cryptomator/blob/master/LICENSE)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/donate?hosted_button_id=XVX9ZM7WE4ANL)
 
 Store Cryptomator vault passwords in KeePassXC

pom.xml

@@ -49,7 +49,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- runtime dependencies -->
-    <api.version>0.2.1-SNAPSHOT</api.version>
+    <api.version>1.0.0-beta3</api.version>
     <keepassxc-proxy.version>0.0.3</keepassxc-proxy.version>
     <guava.version>30.0-jre</guava.version>
     <slf4j.version>1.7.30</slf4j.version>

src/main/java/org/purejava/integrations/keychain/KeePassXCAccess.java

@@ -28,43 +28,47 @@ public KeePassXCAccess() {
 	@Override
 	public boolean isLocked() { return proxy.getDatabasehash().isEmpty(); }
 
-	@Override
-	public boolean needsAssociation() { return !proxy.connectionAvailable(); }
-
-	@Override
-	public boolean associate() { return proxy.associate(); }
+	private void ensureAssociation() throws KeychainAccessException {
+		if (!proxy.connectionAvailable()) { // Proxy needs association
+			if (!proxy.associate()) {
+				throw new KeychainAccessException("Association with KeePassXC database failed");
+			}
+		}
+	}
 
 	public String unlock() { return proxy.getDatabasehash(true); }
 
 	@Override
 	public void storePassphrase(String vault, CharSequence password) throws KeychainAccessException {
 		vault = URL_SCHEME + vault;
 		if (isLocked()) {
-			throw new KeychainAccessException("Storing of the passphrase failed");
+			throw new KeychainAccessException("Failed to store password. KeePassXC database is locked. Needs to be unlocked first");
 		}
+		ensureAssociation();
 		if (!proxy.loginExists(vault, null, false, List.of(proxy.exportConnection()), password.toString())
 		&& !proxy.setLogin(vault, null, null, "Vault", password.toString(), "default", "default", "default")) {
-			throw new KeychainAccessException("Storing of the passphrase failed");
+			throw new KeychainAccessException("Storing of the password failed");
 		}
 	}
 
 	@Override
 	public char[] loadPassphrase(String vault) throws KeychainAccessException {
 		if (isLocked()) {
-			throw new KeychainAccessException("Loading of the passphrase failed");
+			throw new KeychainAccessException("Failed to load password. KeePassXC database is locked. Needs to be unlocked first");
 		}
+		ensureAssociation();
 		vault = URL_SCHEME + vault;
-		Map<String, Object> answer = proxy.getLogins(vault, null, false, List.of(proxy.exportConnection()));
+		var answer = proxy.getLogins(vault, null, false, List.of(proxy.exportConnection()));
 		if (answer.isEmpty() || null == answer.get("entries")) {
-			throw new KeychainAccessException("Loading of the passphrase failed");
+			throw new KeychainAccessException("No password found for vault " + vault.substring(URL_SCHEME.length()));
 		}
-		List<Object> array = (ArrayList<Object>) answer.get("entries");
-		Map<String, Object> credentials = (HashMap<String, Object>) array.get(0);
+		var array = (ArrayList<Object>) answer.get("entries");
+		var credentials = (HashMap<String, Object>) array.get(0);
 		if (credentials.get("password") != null) {
-			String password = (String) credentials.get("password");
+			var password = (String) credentials.get("password");
 			return password.toCharArray();
 		} else {
-			throw new KeychainAccessException("Loading of the passphrase failed");
+			throw new KeychainAccessException("Loading of the password failed");
 		}
 	}