adjust keychainAccess impls to refactored keychain api (#112)

Author: infeo

pom.xml

@@ -40,7 +40,7 @@
 
 		<!-- runtime dependencies -->
 
-		<api.version>1.5.1</api.version>
+		<api.version>1.6.0</api.version>
 		<secret-service.version>2.0.1-alpha</secret-service.version>
 		<kdewallet.version>1.4.0</kdewallet.version>
 		<slf4j.version>2.0.17</slf4j.version>

src/main/java/org/cryptomator/linux/keychain/GnomeKeyringKeychainAccess.java

@@ -1,6 +1,7 @@
 package org.cryptomator.linux.keychain;
 
 import de.swiesend.secretservice.simple.SimpleCollection;
+import org.cryptomator.integrations.common.DisplayName;
 import org.cryptomator.integrations.common.OperatingSystem;
 import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.keychain.KeychainAccessException;
@@ -14,17 +15,13 @@
 
 @Priority(900)
 @OperatingSystem(OperatingSystem.Value.LINUX)
+@DisplayName("GNOME Keyring")
 public class GnomeKeyringKeychainAccess implements KeychainAccessProvider {
 
 	private static final Logger LOG = LoggerFactory.getLogger(GnomeKeyringKeychainAccess.class);
 
 	private final String LABEL_FOR_SECRET_IN_KEYRING = "Cryptomator";
 
-	@Override
-	public String displayName() {
-		return "GNOME Keyring";
-	}
-
 	@Override
 	public boolean isSupported() {
 		try {
@@ -48,7 +45,7 @@ public boolean isLocked() {
 	}
 
 	@Override
-	public void storePassphrase(String key, String displayName, CharSequence passphrase, boolean ignored) throws KeychainAccessException {
+	public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
 		try (SimpleCollection keyring = new SimpleCollection()) {
 			List<String> list = keyring.getItems(createAttributes(key));
 			if (list == null || list.isEmpty()) {

src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java

@@ -1,5 +1,6 @@
 package org.cryptomator.linux.keychain;
 
+import org.cryptomator.integrations.common.DisplayName;
 import org.cryptomator.integrations.common.OperatingSystem;
 import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.keychain.KeychainAccessException;
@@ -20,6 +21,7 @@
 
 @Priority(900)
 @OperatingSystem(OperatingSystem.Value.LINUX)
+@DisplayName("KDE Wallet")
 public class KDEWalletKeychainAccess implements KeychainAccessProvider {
 
 	private static final Logger LOG = LoggerFactory.getLogger(KDEWalletKeychainAccess.class);
@@ -32,11 +34,6 @@ public KDEWalletKeychainAccess() {
 		this.wallet = ConnectedWallet.connect();
 	}
 
-	@Override
-	public String displayName() {
-		return "KDE Wallet";
-	}
-
 	@Override
 	public boolean isSupported() {
 		return wallet.map(ConnectedWallet::isSupported).orElse(false);
@@ -48,7 +45,7 @@ public boolean isLocked() {
 	}
 
 	@Override
-	public void storePassphrase(String key, String displayName, CharSequence passphrase, boolean ignored) throws KeychainAccessException {
+	public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
 		CheckUtil.checkState(wallet.isPresent(), "Keychain not supported.");
 		wallet.get().storePassphrase(key, passphrase);
 	}