mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-17 08:06:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Grab new API"

Browse Source 
This reverts commit 9516928529.
This commit is contained in:
Ralph Plawetzki
2024-12-02 08:12:02 +01:00
parent b38a350c48
commit 6cb409eeaf
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/cryptomator/common/keychain/KeychainManager.java
View File

@@ -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);

5
src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java
View File

@@ -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);