mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-20 03:31:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wire disable all keyrings setting checkbox to the KeychainManager

Browse Source
This commit is contained in:
Ralph Plawetzki
2022-09-13 14:01:02 +02:00
parent e6c7fed662
commit 17d3d7307d
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ package org.cryptomator.common.keychain;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import org.cryptomator.common.settings.Settings;
import org.cryptomator.integrations.keychain.KeychainAccessException;
import org.cryptomator.integrations.keychain.KeychainAccessProvider;
@@ -20,10 +21,12 @@ public class KeychainManager implements KeychainAccessProvider {
private final ObjectExpression<KeychainAccessProvider> keychain;
private final LoadingCache<String, BooleanProperty> passphraseStoredProperties;
private final Settings settings;
@Inject
KeychainManager(ObjectExpression<KeychainAccessProvider> selectedKeychain) {
KeychainManager(ObjectExpression<KeychainAccessProvider> selectedKeychain, Settings settings) {
this.keychain = selectedKeychain;
this.settings = settings;
this.passphraseStoredProperties = CacheBuilder.newBuilder() //
.weakValues() //
.build(CacheLoader.from(this::createStoredPassphraseProperty));
@@ -72,7 +75,7 @@ public class KeychainManager implements KeychainAccessProvider {
@Override
public boolean isSupported() {
return keychain.getValue() != null;
return keychain.getValue() != null && !settings.disableAllKeyrings().get();
}
@Override

1
src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
View File

@@ -66,6 +66,7 @@ public class GeneralPreferencesController implements FxController {
keychainBackendChoiceBox.setConverter(new KeychainProviderDisplayNameConverter());
Bindings.bindBidirectional(settings.keychainProvider(), keychainBackendChoiceBox.valueProperty(), keychainSettingsConverter);
disableAllKeyringsCheckbox.selectedProperty().bindBidirectional(settings.disableAllKeyrings());
keychainBackendChoiceBox.disableProperty().bindBidirectional(settings.disableAllKeyrings());
}
public boolean isAutoStartSupported() {