update to new keychain api (#75)

Author: infeo

pom.xml

@@ -32,7 +32,7 @@
 		<project.jdk.version>24</project.jdk.version>
 
 		<!-- runtime dependencies -->
-		<api.version>1.5.1</api.version>
+		<api.version>1.6.0</api.version>
 		<slf4j.version>2.0.17</slf4j.version>
 
 		<!-- test dependencies -->

src/main/java/org/cryptomator/macos/keychain/MacSystemKeychainAccess.java

@@ -1,10 +1,10 @@
 package org.cryptomator.macos.keychain;
 
+import org.cryptomator.integrations.common.LocalizedDisplayName;
 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.cryptomator.macos.common.Localization;
 
 /**
  * Stores passwords in the macOS system keychain.
@@ -14,6 +14,7 @@
  */
 @Priority(1000)
 @OperatingSystem(OperatingSystem.Value.MAC)
+@LocalizedDisplayName(bundle = "MacIntegrationsBundle", key = "org.cryptomator.macos.keychain.displayName")
 public class MacSystemKeychainAccess implements KeychainAccessProvider {
 
 	private static final String SERVICE_NAME = System.getProperty("cryptomator.integrationsMac.keychainServiceName", "Cryptomator");
@@ -29,21 +30,11 @@ public MacSystemKeychainAccess() {
 		this.keychain = keychain;
 	}
 
-	@Override
-	public String displayName() {
-		return Localization.get().getString("org.cryptomator.macos.keychain.displayName");
-	}
-
 	@Override
 	public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
 		keychain.storePassword(SERVICE_NAME, key, passphrase, false);
 	}
 
-	@Override
-	public void storePassphrase(String key, String displayName, CharSequence passphrase, boolean requireOsAuthentication) throws KeychainAccessException {
-		keychain.storePassword(SERVICE_NAME, key, passphrase, requireOsAuthentication);
-	}
-
 	@Override
 	public char[] loadPassphrase(String key) {
 		return keychain.loadPassword(SERVICE_NAME, key);

src/main/java/org/cryptomator/macos/keychain/TouchIdKeychainAccess.java

@@ -1,10 +1,10 @@
 package org.cryptomator.macos.keychain;
 
+import org.cryptomator.integrations.common.LocalizedDisplayName;
 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.cryptomator.macos.common.Localization;
 
 /**
  * Stores passwords in the macOS system keychain. Requires an authenticated user to do so.
@@ -15,6 +15,7 @@
  */
 @Priority(1010)
 @OperatingSystem(OperatingSystem.Value.MAC)
+@LocalizedDisplayName(bundle = "MacIntegrationsBundle", key = "org.cryptomator.macos.keychain.touchIdDisplayName")
 public class TouchIdKeychainAccess implements KeychainAccessProvider {
 
 	private static final String SERVICE_NAME = System.getProperty("cryptomator.integrationsMac.keychainServiceName", "Cryptomator");
@@ -30,21 +31,11 @@ public TouchIdKeychainAccess() {
 		this.keychain = keychain;
 	}
 
-	@Override
-	public String displayName() {
-		return Localization.get().getString("org.cryptomator.macos.keychain.touchIdDisplayName");
-	}
-
 	@Override
 	public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
 		keychain.storePassword(SERVICE_NAME, key, passphrase, true);
 	}
 
-	@Override
-	public void storePassphrase(String key, String displayName, CharSequence passphrase, boolean requireOsAuthentication) throws KeychainAccessException {
-		keychain.storePassword(SERVICE_NAME, key, passphrase, requireOsAuthentication);
-	}
-
 	@Override
 	public char[] loadPassphrase(String key) {
 		return keychain.loadPassword(SERVICE_NAME, key);

src/test/java/org/cryptomator/macos/keychain/MacSystemKeychainAccessTest.java

@@ -21,15 +21,15 @@ public void setup() {
 	@Test
 	@DisplayName("displayName() does not return default name")
 	public void testDisplayName() {
-		var displayName = keychainAccess.displayName();
+		var displayName = keychainAccess.getName();
 
 		Assertions.assertNotEquals(keychainAccess.getClass().getSimpleName(), displayName);
 	}
 
 	@Test
 	@DisplayName("storePassphrase() succeeds")
 	public void testStoreSuccess() throws KeychainAccessException {
-		keychainAccess.storePassphrase("key", "pass");
+		keychainAccess.storePassphrase("key", "name", "pass");
 
 		Mockito.verify(keychain).storePassword("Cryptomator", "key", "pass", false);
 	}
@@ -41,7 +41,7 @@ public void testStoreError() throws KeychainAccessException {
 		Mockito.doThrow(e).when(keychain).storePassword(Mockito.eq("Cryptomator"), Mockito.any(), Mockito.any(), Mockito.eq(false));
 
 		KeychainAccessException thrown = Assertions.assertThrows(KeychainAccessException.class, () -> {
-			keychainAccess.storePassphrase("key", "", "pass", false);
+			keychainAccess.storePassphrase("key", "", "pass");
 		});
 		Assertions.assertSame(thrown, e);
 	}
@@ -91,7 +91,7 @@ public void testDeleteError() throws KeychainAccessException {
 	public void testChangeSuccess() throws KeychainAccessException {
 		Mockito.when(keychain.deletePassword("Cryptomator", "key")).thenReturn(true);
 
-		keychainAccess.changePassphrase("key", "newpass");
+		keychainAccess.changePassphrase("key", "name", "newpass");
 
 		Mockito.verify(keychain).storePassword("Cryptomator", "key", "newpass", false);
 	}
@@ -101,7 +101,7 @@ public void testChangeSuccess() throws KeychainAccessException {
 	public void testChangeNotFound() throws KeychainAccessException {
 		Mockito.when(keychain.deletePassword("Cryptomator", "key")).thenReturn(false);
 
-		keychainAccess.changePassphrase("key", "newpass");
+		keychainAccess.changePassphrase("key", "name", "newpass");
 
 		Mockito.verify(keychain, Mockito.never()).storePassword("Cryptomator", "key", "newpass", false);
 	}
@@ -113,7 +113,7 @@ public void testChangeError() throws KeychainAccessException {
 		Mockito.doThrow(e).when(keychain).deletePassword(Mockito.eq("Cryptomator"), Mockito.any());
 
 		KeychainAccessException thrown = Assertions.assertThrows(KeychainAccessException.class, () -> {
-			keychainAccess.changePassphrase("key", "newpass");
+			keychainAccess.changePassphrase("key", "name", "newpass");
 		});
 		Assertions.assertSame(thrown, e);
 	}