Merge branch 'develop' into release/1.3.0

# Conflicts: # pom.xml
cryptomator · Jun 19, 2023 · 7e8ae30 · 7e8ae30
2 parents 8de5733 + 24db1e9
commit 7e8ae30
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -42,7 +42,7 @@
 
 		<api.version>1.3.0-beta1</api.version>
 		<secret-service.version>1.8.1-jdk17</secret-service.version>
-		<kdewallet.version>1.3.0</kdewallet.version>
+		<kdewallet.version>1.3.1</kdewallet.version>
 		<appindicator.version>1.3.2</appindicator.version>
 		<guava.version>32.0.0-jre</guava.version>
 		<slf4j.version>1.7.36</slf4j.version>

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -1,6 +1,7 @@
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
 import org.cryptomator.integrations.revealpath.RevealPathService;
 import org.cryptomator.integrations.tray.TrayMenuController;
+import org.cryptomator.linux.keychain.KDEWalletKeychainAccess;
 import org.cryptomator.linux.keychain.SecretServiceKeychainAccess;
 import org.cryptomator.linux.revealpath.DBusSendRevealPathService;
 import org.cryptomator.linux.tray.AppindicatorTrayMenuController;
@@ -15,7 +16,7 @@
 	requires org.purejava.kwallet;
 	requires secret.service;
 
-	provides KeychainAccessProvider with SecretServiceKeychainAccess;
+	provides KeychainAccessProvider with SecretServiceKeychainAccess, KDEWalletKeychainAccess;
 	provides RevealPathService with DBusSendRevealPathService;
 	provides TrayMenuController with AppindicatorTrayMenuController;
 

diff --git a/src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java b/src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java
@@ -10,7 +10,7 @@
 import org.freedesktop.dbus.exceptions.DBusConnectionException;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
-import org.kde.KWallet;
+import org.purejava.kwallet.KWallet;
 import org.purejava.kwallet.KDEWallet;
 import org.purejava.kwallet.Static;
 import org.slf4j.Logger;