diff --git a/pom.xml b/pom.xml index 98994551d..c216885d7 100644 --- a/pom.xml +++ b/pom.xml @@ -28,10 +28,10 @@ 2.4.0 - 1.1.0-beta3 - 1.1.0-beta1 - 1.1.0-beta1 - 1.1.0-beta1 + 1.1.0-rc1 + 1.1.0-beta2 + 1.1.0-beta2 + 1.1.0-beta2 1.3.3 1.3.3 1.2.7 diff --git a/src/main/java/org/cryptomator/common/keychain/KeychainManager.java b/src/main/java/org/cryptomator/common/keychain/KeychainManager.java index e0269348a..48b0a0ed5 100644 --- a/src/main/java/org/cryptomator/common/keychain/KeychainManager.java +++ b/src/main/java/org/cryptomator/common/keychain/KeychainManager.java @@ -43,12 +43,6 @@ public class KeychainManager implements KeychainAccessProvider { return getClass().getName(); } - @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 { getKeychainOrFail().storePassphrase(key, displayName, passphrase); @@ -68,12 +62,6 @@ public class KeychainManager implements KeychainAccessProvider { setPassphraseStored(key, false); } - @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 { if (isPassphraseStored(key)) { diff --git a/src/test/java/org/cryptomator/common/keychain/KeychainManagerTest.java b/src/test/java/org/cryptomator/common/keychain/KeychainManagerTest.java index 8c05609ce..abf803e1e 100644 --- a/src/test/java/org/cryptomator/common/keychain/KeychainManagerTest.java +++ b/src/test/java/org/cryptomator/common/keychain/KeychainManagerTest.java @@ -2,11 +2,9 @@ package org.cryptomator.common.keychain; import org.cryptomator.integrations.keychain.KeychainAccessException; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assumptions; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -45,7 +43,7 @@ public class KeychainManagerTest { ReadOnlyBooleanProperty property = keychainManager.getPassphraseStoredProperty("test"); Assertions.assertFalse(property.get()); - keychainManager.storePassphrase("test", "bar"); + keychainManager.storePassphrase("test", null,"bar"); AtomicBoolean result = new AtomicBoolean(false); CountDownLatch latch = new CountDownLatch(1); diff --git a/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java b/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java index af5b4a9cc..c4baa96fa 100644 --- a/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java +++ b/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java @@ -5,7 +5,6 @@ *******************************************************************************/ package org.cryptomator.common.keychain; -import org.cryptomator.integrations.keychain.KeychainAccessException; import org.cryptomator.integrations.keychain.KeychainAccessProvider; import java.util.HashMap; @@ -20,12 +19,6 @@ class MapKeychainAccess implements KeychainAccessProvider { return getClass().getName(); } - @Override - @Deprecated - public void storePassphrase(String key, CharSequence passphrase) { - throw new NoSuchMethodError("not implemented"); - } - @Override public void storePassphrase(String key, String displayName,CharSequence passphrase) { char[] pw = new char[passphrase.length()]; @@ -45,16 +38,10 @@ class MapKeychainAccess implements KeychainAccessProvider { map.remove(key); } - @Override - @Deprecated - public void changePassphrase(String key, CharSequence passphrase) throws KeychainAccessException { - throw new NoSuchMethodError("not implemented"); - } - @Override public void changePassphrase(String key, String displayName, CharSequence passphrase) { map.get(key); - storePassphrase(key, passphrase); + storePassphrase(key, displayName, passphrase); } @Override