From 0598681a23f62cbcab75eedaeabfb1353e46ba4b Mon Sep 17 00:00:00 2001 From: Ralph Plawetzki Date: Mon, 2 Dec 2024 08:12:03 +0100 Subject: [PATCH] Revert "Decide on Touch ID setting whether user needs" This reverts commit 2194360c8a3e4ba7d79c3932baaabd42bebbed67. --- .../cryptomator/common/keychain/KeychainManager.java | 11 ----------- .../masterkeyfile/MasterkeyFileLoadingModule.java | 2 +- .../masterkeyfile/MasterkeyFileLoadingStrategy.java | 7 +------ 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/cryptomator/common/keychain/KeychainManager.java b/src/main/java/org/cryptomator/common/keychain/KeychainManager.java index 8904b294a..b2af2725f 100644 --- a/src/main/java/org/cryptomator/common/keychain/KeychainManager.java +++ b/src/main/java/org/cryptomator/common/keychain/KeychainManager.java @@ -49,11 +49,6 @@ public class KeychainManager implements KeychainAccessProvider { setPassphraseStored(key, true); } - public void storePassphraseForAuthenticatedUser(String key, String displayName, CharSequence passphrase) throws KeychainAccessException { - getKeychainOrFail().storePassphrase(key, displayName, passphrase); - setPassphraseStored(key, true); - } - @Override public char[] loadPassphrase(String key) throws KeychainAccessException { char[] passphrase = getKeychainOrFail().loadPassphrase(key); @@ -61,12 +56,6 @@ 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/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java index 6e501bb71..5e4d148cb 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java +++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java @@ -28,7 +28,7 @@ public interface MasterkeyFileLoadingModule { return Optional.empty(); } else { try { - return vault.getVaultSettings().useTouchID.get() ? Optional.ofNullable(keychain.loadPassphraseForAuthenticatedUser(vault.getId())) : Optional.ofNullable(keychain.loadPassphrase(vault.getId())); + return Optional.ofNullable(keychain.loadPassphrase(vault.getId())); } catch (KeychainAccessException e) { LoggerFactory.getLogger(MasterkeyFileLoadingModule.class).error("Failed to load entry from system keychain.", e); return Optional.empty(); diff --git a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java index 61acb7106..68877430a 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java +++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java @@ -113,13 +113,8 @@ public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy { private void savePasswordToSystemkeychain(Passphrase passphrase) { if (keychain.isSupported()) { - LOG.info(vault.getVaultSettings().useTouchID.get() ? "Using store WITH fingerprint" : "Using store WITH OUT fingerprint"); try { - if (vault.getVaultSettings().useTouchID.get()) { - keychain.storePassphraseForAuthenticatedUser(vault.getId(), vault.getDisplayName(), passphrase); - } else { - keychain.storePassphrase(vault.getId(), vault.getDisplayName(), passphrase); - } + keychain.storePassphrase(vault.getId(), vault.getDisplayName(), passphrase); } catch (KeychainAccessException e) { LOG.error("Failed to store passphrase in system keychain.", e); }