From 6cb409eeafa070bc26c5f6c19a32a904f3cd0f27 Mon Sep 17 00:00:00 2001
From: Ralph Plawetzki <ralph@purejava.org>
Date: Mon, 2 Dec 2024 08:12:02 +0100
Subject: [PATCH] Revert "Grab new API"

This reverts commit 9516928529855cf53b3e7b8928e8d3ea3c5ea920.
---
 .../org/cryptomator/common/keychain/KeychainManager.java | 9 +++++++--
 .../cryptomator/common/keychain/MapKeychainAccess.java   | 5 -----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/cryptomator/common/keychain/KeychainManager.java b/src/main/java/org/cryptomator/common/keychain/KeychainManager.java
index 734594345..8904b294a 100644
--- a/src/main/java/org/cryptomator/common/keychain/KeychainManager.java
+++ b/src/main/java/org/cryptomator/common/keychain/KeychainManager.java
@@ -49,9 +49,8 @@ public class KeychainManager implements KeychainAccessProvider {
 		setPassphraseStored(key, true);
 	}
 
-	@Override
 	public void storePassphraseForAuthenticatedUser(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
-		getKeychainOrFail().storePassphraseForAuthenticatedUser(key, displayName, passphrase);
+		getKeychainOrFail().storePassphrase(key, displayName, passphrase);
 		setPassphraseStored(key, true);
 	}
 
@@ -62,6 +61,12 @@ public class KeychainManager implements KeychainAccessProvider {
 		return passphrase;
 	}
 
+	public char[] loadPassphraseForAuthenticatedUser(String key) throws KeychainAccessException {
+		char[] passphrase = getKeychainOrFail().loadPassphrase(key);
+		setPassphraseStored(key, passphrase != null);
+		return passphrase;
+	}
+
 	@Override
 	public void deletePassphrase(String key) throws KeychainAccessException {
 		getKeychainOrFail().deletePassphrase(key);
diff --git a/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java b/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java
index d81fee25e..73c8da522 100644
--- a/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java
+++ b/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java
@@ -29,11 +29,6 @@ class MapKeychainAccess implements KeychainAccessProvider {
 		map.put(key, pw);
 	}
 
-	@Override
-	public void storePassphraseForAuthenticatedUser(String key, String displayName,CharSequence passphrase) {
-		storePassphrase(key, displayName, passphrase);
-	}
-
 	@Override
 	public char[] loadPassphrase(String key) {
 		return map.get(key);