diff --git a/pom.xml b/pom.xml
index c6f78b6..a76dfe3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
- 1.5.1
+ 1.6.0
2.0.1-alpha
1.4.0
2.0.17
diff --git a/src/main/java/org/cryptomator/linux/keychain/GnomeKeyringKeychainAccess.java b/src/main/java/org/cryptomator/linux/keychain/GnomeKeyringKeychainAccess.java
index 210a71f..a7a2a91 100644
--- a/src/main/java/org/cryptomator/linux/keychain/GnomeKeyringKeychainAccess.java
+++ b/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 list = keyring.getItems(createAttributes(key));
if (list == null || list.isEmpty()) {
diff --git a/src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java b/src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java
index 3b3fd98..5db6fa8 100644
--- a/src/main/java/org/cryptomator/linux/keychain/KDEWalletKeychainAccess.java
+++ b/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);
}