Browse Source

Revert "Decide on Touch ID setting whether user needs"

This reverts commit 2194360c8a3e4ba7d79c3932baaabd42bebbed67.
Ralph Plawetzki 9 months ago
parent
commit
0598681a23

+ 0 - 11
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);

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

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