update to API 1.1.0-beta2

Author: overheadhunter

pom.xml

@@ -38,14 +38,14 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
 		<!-- runtime dependencies -->
-		<api.version>1.0.0</api.version>
+		<api.version>1.1.0-beta2</api.version>
 		<secret-service.version>1.7.0</secret-service.version>
-		<kdewallet.version>1.2.3</kdewallet.version>
-		<guava.version>31.0-jre</guava.version>
-		<slf4j.version>1.7.32</slf4j.version>
+		<kdewallet.version>1.2.6</kdewallet.version>
+		<guava.version>31.0.1-jre</guava.version>
+		<slf4j.version>1.7.36</slf4j.version>
 
 		<!-- test dependencies -->
-		<junit.version>5.8.1</junit.version>
+		<junit.version>5.8.2</junit.version>
 	</properties>
 
 	<dependencies>
@@ -83,7 +83,6 @@
 	</dependencies>
 
 	<build>
-
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

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

@@ -1,6 +1,8 @@
 package org.cryptomator.linux.keychain;
 
 import com.google.common.base.Preconditions;
+import org.cryptomator.integrations.common.OperatingSystem;
+import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
@@ -14,6 +16,8 @@
 
 import java.util.Optional;
 
+@Priority(900)
+@OperatingSystem(OperatingSystem.Value.LINUX)
 public class KDEWalletKeychainAccess implements KeychainAccessProvider {
 
 	private static final Logger LOG = LoggerFactory.getLogger(KDEWalletKeychainAccess.class);
@@ -42,7 +46,13 @@ public boolean isLocked() {
 	}
 
 	@Override
+	@Deprecated
 	public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
+		storePassphrase(key, null, passphrase);
+	}
+
+	@Override
+	public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
 		Preconditions.checkState(wallet.isPresent(), "Keychain not supported.");
 		wallet.get().storePassphrase(key, passphrase);
 	}
@@ -60,7 +70,13 @@ public void deletePassphrase(String key) throws KeychainAccessException {
 	}
 
 	@Override
+	@Deprecated
 	public void changePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
+		changePassphrase(key, null, passphrase);
+	}
+
+	@Override
+	public void changePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
 		Preconditions.checkState(wallet.isPresent(), "Keychain not supported.");
 		wallet.get().changePassphrase(key, passphrase);
 	}

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

@@ -1,14 +1,17 @@
 package org.cryptomator.linux.keychain;
 
+import org.cryptomator.integrations.common.OperatingSystem;
+import org.cryptomator.integrations.common.Priority;
 import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
 import org.freedesktop.secret.simple.SimpleCollection;
 
 import java.io.IOException;
-import java.security.AccessControlException;
 import java.util.List;
 import java.util.Map;
 
+@Priority(900)
+@OperatingSystem(OperatingSystem.Value.LINUX)
 public class SecretServiceKeychainAccess implements KeychainAccessProvider {
 
 	private final String LABEL_FOR_SECRET_IN_KEYRING = "Cryptomator";
@@ -33,15 +36,21 @@ public boolean isLocked() {
 	}
 
 	@Override
+	@Deprecated
 	public void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
+		storePassphrase(key, null, passphrase);
+	}
+
+	@Override
+	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()) {
 				keyring.createItem(LABEL_FOR_SECRET_IN_KEYRING, passphrase, createAttributes(key));
 			} else {
 				changePassphrase(key, passphrase);
 			}
-		} catch (IOException | AccessControlException e) {
+		} catch (IOException | SecurityException e) {
 			throw new KeychainAccessException("Storing password failed.", e);
 		}
 	}
@@ -55,7 +64,7 @@ public char[] loadPassphrase(String key) throws KeychainAccessException {
 			} else {
 				return null;
 			}
-		} catch (IOException | AccessControlException e) {
+		} catch (IOException | SecurityException e) {
 			throw new KeychainAccessException("Loading password failed.", e);
 		}
 	}
@@ -67,19 +76,25 @@ public void deletePassphrase(String key) throws KeychainAccessException {
 			if (list != null && !list.isEmpty()) {
 				keyring.deleteItem(list.get(0));
 			}
-		} catch (IOException | AccessControlException e) {
+		} catch (IOException | SecurityException e) {
 			throw new KeychainAccessException("Deleting password failed.", e);
 		}
 	}
 
 	@Override
+	@Deprecated
 	public void changePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
+		changePassphrase(key, null, passphrase);
+	}
+
+	@Override
+	public void changePassphrase(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()) {
 				keyring.updateItem(list.get(0), LABEL_FOR_SECRET_IN_KEYRING, passphrase, createAttributes(key));
 			}
-		} catch (IOException | AccessControlException e) {
+		} catch (IOException | SecurityException e) {
 			throw new KeychainAccessException("Changing password failed.", e);
 		}
 	}