Kaynağa Gözat

bumped API to 1.1.0-rc1

Sebastian Stenzel 3 yıl önce
ebeveyn
işleme
9ece1f66a1

+ 4 - 4
pom.xml

@@ -28,10 +28,10 @@
 
 		<!-- cryptomator dependencies -->
 		<cryptomator.cryptofs.version>2.4.0</cryptomator.cryptofs.version>
-		<cryptomator.integrations.version>1.1.0-beta3</cryptomator.integrations.version>
-		<cryptomator.integrations.win.version>1.1.0-beta1</cryptomator.integrations.win.version>
-		<cryptomator.integrations.mac.version>1.1.0-beta1</cryptomator.integrations.mac.version>
-		<cryptomator.integrations.linux.version>1.1.0-beta1</cryptomator.integrations.linux.version>
+		<cryptomator.integrations.version>1.1.0-rc1</cryptomator.integrations.version>
+		<cryptomator.integrations.win.version>1.1.0-beta2</cryptomator.integrations.win.version>
+		<cryptomator.integrations.mac.version>1.1.0-beta2</cryptomator.integrations.mac.version>
+		<cryptomator.integrations.linux.version>1.1.0-beta2</cryptomator.integrations.linux.version>
 		<cryptomator.fuse.version>1.3.3</cryptomator.fuse.version>
 		<cryptomator.dokany.version>1.3.3</cryptomator.dokany.version>
 		<cryptomator.webdav.version>1.2.7</cryptomator.webdav.version>

+ 0 - 12
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)) {

+ 1 - 3
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);

+ 1 - 14
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