From fb30be0e2845f1b85d5e721f6cababa742d47ede Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Fri, 22 Mar 2024 15:32:07 +0100
Subject: [PATCH] Prepare release 1.2.5

---
 pom.xml                                                     | 4 ++--
 .../org/purejava/integrations/keychain/KeePassXCAccess.java | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index ca856f7..52e6a8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.purejava</groupId>
   <artifactId>keepassxc-cryptomator</artifactId>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.2.5</version>
 
   <name>keepassxc-cryptomator</name>
   <description>Plug-in for Cryptomator to store vault passwords in KeePassXC</description>
@@ -50,7 +50,7 @@
 
     <!-- runtime dependencies -->
     <api.version>1.3.1</api.version>
-    <keepassxc-proxy.version>1.2.4</keepassxc-proxy.version>
+    <keepassxc-proxy.version>1.2.5</keepassxc-proxy.version>
     <guava.version>33.1.0-jre</guava.version>
     <slf4j.version>2.0.12</slf4j.version>
     <junit.version>5.10.2</junit.version>
diff --git a/src/main/java/org/purejava/integrations/keychain/KeePassXCAccess.java b/src/main/java/org/purejava/integrations/keychain/KeePassXCAccess.java
index 79ba1b6..a24fc6c 100644
--- a/src/main/java/org/purejava/integrations/keychain/KeePassXCAccess.java
+++ b/src/main/java/org/purejava/integrations/keychain/KeePassXCAccess.java
@@ -30,7 +30,7 @@ public KeePassXCAccess() {
 	public boolean isSupported() { return proxy.connect(); }
 
 	@Override
-	public boolean isLocked() { return proxy.getDatabasehash().isEmpty(); }
+	public boolean isLocked() { return proxy.isDatabaseLocked(); }
 
 	/**
 	 * Called on every request sent to the KeePassXC back end to associate Cryptomator and KeePassXC,
@@ -52,7 +52,9 @@ private void ensureAssociation() throws KeychainAccessException {
 	 *
 	 * @return The database hash of the current active KeePassXC database.
 	 */
-	public String unlock() { return proxy.getDatabasehash(true); }
+	public String unlock() {
+		return proxy.getDatabasehash(true).orElse("");
+	}
 
 	@Override
 	public void storePassphrase(String vault, CharSequence password) throws KeychainAccessException {