Merge branch 'develop' into release/1.1.0

Author: overheadhunter

src/main/java/org/cryptomator/integrations/keychain/KeychainAccessProvider.java

@@ -40,7 +40,9 @@ static Stream<KeychainAccessProvider> get() {
 	 */
 	@Deprecated
 	@ApiStatus.ScheduledForRemoval(inVersion = "1.2.0")
-	void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException;
+	default void storePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
+		storePassphrase(key, null, passphrase);
+	}
 
 	/**
 	 * Associates a passphrase with a given key and a name for that key.
@@ -53,9 +55,7 @@ static Stream<KeychainAccessProvider> get() {
 	 * @throws KeychainAccessException If storing the password failed
 	 */
 	@Blocking
-	default void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
-		storePassphrase(key, passphrase);
-	}
+	void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException;
 
 	/**
 	 * @param key Unique key previously used while {@link #storePassphrase(String, String, CharSequence)}  storing a passphrase}.
@@ -83,7 +83,9 @@ default void storePassphrase(String key, String displayName, CharSequence passph
 	 */
 	@Deprecated
 	@ApiStatus.ScheduledForRemoval(inVersion = "1.2.0")
-	void changePassphrase(String key, CharSequence passphrase) throws KeychainAccessException;
+	default void changePassphrase(String key, CharSequence passphrase) throws KeychainAccessException {
+		changePassphrase(key, null, passphrase);
+	}
 
 	/**
 	 * Updates a passphrase with a given key and stores a name for that key. Noop, if there is no item for the given key.
@@ -96,9 +98,7 @@ default void storePassphrase(String key, String displayName, CharSequence passph
 	 * @throws KeychainAccessException If changing the password failed
 	 */
 	@Blocking
-	default void changePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
-		changePassphrase(key, passphrase);
-	}
+	void changePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException;
 
 	/**
 	 * @return <code>true</code> if this KeychainAccessIntegration works on the current machine.

src/test/java/org/cryptomator/integrations/keychain/KeychainAccessProviderTest.java

@@ -0,0 +1,28 @@
+package org.cryptomator.integrations.keychain;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+public class KeychainAccessProviderTest {
+
+	@Test
+	public void testStorePassphrase() throws KeychainAccessException {
+		var provider = Mockito.mock(KeychainAccessProvider.class);
+		Mockito.doCallRealMethod().when(provider).storePassphrase(Mockito.anyString(), Mockito.anyString());
+
+		provider.storePassphrase("key", "pass");
+
+		Mockito.verify(provider).storePassphrase("key", null, "pass");
+	}
+
+	@Test
+	public void testChangePassphrase() throws KeychainAccessException {
+		var provider = Mockito.mock(KeychainAccessProvider.class);
+		Mockito.doCallRealMethod().when(provider).changePassphrase(Mockito.anyString(), Mockito.anyString());
+
+		provider.changePassphrase("key", "pass");
+
+		Mockito.verify(provider).changePassphrase("key", null, "pass");
+	}
+
+}