diff --git a/src/main/java/org/cryptomator/common/keychain/KeychainManager.java b/src/main/java/org/cryptomator/common/keychain/KeychainManager.java index 97c0a5de8..f907465f1 100644 --- a/src/main/java/org/cryptomator/common/keychain/KeychainManager.java +++ b/src/main/java/org/cryptomator/common/keychain/KeychainManager.java @@ -75,7 +75,7 @@ public class KeychainManager implements KeychainAccessProvider { @Override public boolean isSupported() { - return keychain.getValue() != null && settings.allowAllKeyrings().get(); + return keychain.getValue() != null && settings.useKeychain().get(); } @Override @@ -94,7 +94,7 @@ public class KeychainManager implements KeychainAccessProvider { */ public boolean isPassphraseStored(String key) throws KeychainAccessException { // check if keyrings are disabled; in this case we don't need to ask the backend - if ( !settings.allowAllKeyrings().get() ) return false; + if ( !settings.useKeychain().get() ) return false; char[] storedPw = null; try { storedPw = getKeychainOrFail().loadPassphrase(key); diff --git a/src/main/java/org/cryptomator/common/settings/Settings.java b/src/main/java/org/cryptomator/common/settings/Settings.java index 97e5e6794..94debddc2 100644 --- a/src/main/java/org/cryptomator/common/settings/Settings.java +++ b/src/main/java/org/cryptomator/common/settings/Settings.java @@ -33,7 +33,7 @@ public class Settings { public static final boolean DEFAULT_CHECK_FOR_UPDATES = false; public static final boolean DEFAULT_START_HIDDEN = false; public static final boolean DEFAULT_AUTO_CLOSE_VAULTS = false; - public static final boolean DEFAULT_ALLOW_ALL_KEYRINGS = true; + public static final boolean DEFAULT_USE_KEYCHAIN = true; public static final int DEFAULT_PORT = 42427; public static final int DEFAULT_NUM_TRAY_NOTIFICATIONS = 3; public static final WebDavUrlScheme DEFAULT_GVFS_SCHEME = WebDavUrlScheme.DAV; @@ -54,7 +54,7 @@ public class Settings { private final BooleanProperty checkForUpdates = new SimpleBooleanProperty(DEFAULT_CHECK_FOR_UPDATES); private final BooleanProperty startHidden = new SimpleBooleanProperty(DEFAULT_START_HIDDEN); private final BooleanProperty autoCloseVaults = new SimpleBooleanProperty(DEFAULT_AUTO_CLOSE_VAULTS); - private final BooleanProperty allowAllKeyrings = new SimpleBooleanProperty(DEFAULT_ALLOW_ALL_KEYRINGS); + private final BooleanProperty useKeychain = new SimpleBooleanProperty(DEFAULT_USE_KEYCHAIN); private final IntegerProperty port = new SimpleIntegerProperty(DEFAULT_PORT); private final IntegerProperty numTrayNotifications = new SimpleIntegerProperty(DEFAULT_NUM_TRAY_NOTIFICATIONS); private final ObjectProperty preferredGvfsScheme = new SimpleObjectProperty<>(DEFAULT_GVFS_SCHEME); @@ -87,7 +87,7 @@ public class Settings { checkForUpdates.addListener(this::somethingChanged); startHidden.addListener(this::somethingChanged); autoCloseVaults.addListener(this::somethingChanged); - allowAllKeyrings.addListener(this::somethingChanged); + useKeychain.addListener(this::somethingChanged); port.addListener(this::somethingChanged); numTrayNotifications.addListener(this::somethingChanged); preferredGvfsScheme.addListener(this::somethingChanged); @@ -143,7 +143,7 @@ public class Settings { return autoCloseVaults; } - public BooleanProperty allowAllKeyrings() { return allowAllKeyrings; } + public BooleanProperty useKeychain() { return useKeychain; } public IntegerProperty port() { return port; diff --git a/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java b/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java index 3f1e4aabe..03682b60c 100644 --- a/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java +++ b/src/main/java/org/cryptomator/common/settings/SettingsJsonAdapter.java @@ -50,7 +50,7 @@ public class SettingsJsonAdapter extends TypeAdapter { out.name("theme").value(value.theme().get().name()); out.name("uiOrientation").value(value.userInterfaceOrientation().get().name()); out.name("keychainProvider").value(value.keychainProvider().get()); - out.name("allowAllKeyrings").value(value.allowAllKeyrings().get()); + out.name("useKeychain").value(value.useKeychain().get()); out.name("licenseKey").value(value.licenseKey().get()); out.name("showMinimizeButton").value(value.showMinimizeButton().get()); out.name("showTrayIcon").value(value.showTrayIcon().get()); @@ -93,7 +93,7 @@ public class SettingsJsonAdapter extends TypeAdapter { case "theme" -> settings.theme().set(parseUiTheme(in.nextString())); case "uiOrientation" -> settings.userInterfaceOrientation().set(parseUiOrientation(in.nextString())); case "keychainProvider" -> settings.keychainProvider().set(in.nextString()); - case "allowAllKeyrings" -> settings.allowAllKeyrings().set(in.nextBoolean()); + case "useKeychain" -> settings.useKeychain().set(in.nextBoolean()); case "licenseKey" -> settings.licenseKey().set(in.nextString()); case "showMinimizeButton" -> settings.showMinimizeButton().set(in.nextBoolean()); case "showTrayIcon" -> settings.showTrayIcon().set(in.nextBoolean()); diff --git a/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java index cf023fc82..6223dcfc3 100644 --- a/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java +++ b/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java @@ -33,7 +33,7 @@ public class GeneralPreferencesController implements FxController { private final Application application; private final Environment environment; private final List keychainAccessProviders; - public CheckBox allowAllKeyringsCheckbox; + public CheckBox useKeychainCheckbox; private final FxApplicationWindows appWindows; public ChoiceBox keychainBackendChoiceBox; public CheckBox startHiddenCheckbox; @@ -65,8 +65,8 @@ public class GeneralPreferencesController implements FxController { keychainBackendChoiceBox.setValue(keychainSettingsConverter.fromString(settings.keychainProvider().get())); keychainBackendChoiceBox.setConverter(new KeychainProviderDisplayNameConverter()); Bindings.bindBidirectional(settings.keychainProvider(), keychainBackendChoiceBox.valueProperty(), keychainSettingsConverter); - allowAllKeyringsCheckbox.selectedProperty().bindBidirectional(settings.allowAllKeyrings()); - keychainBackendChoiceBox.disableProperty().bind(allowAllKeyringsCheckbox.selectedProperty().not()); + useKeychainCheckbox.selectedProperty().bindBidirectional(settings.useKeychain()); + keychainBackendChoiceBox.disableProperty().bind(useKeychainCheckbox.selectedProperty().not()); } public boolean isAutoStartSupported() { diff --git a/src/main/resources/fxml/preferences_general.fxml b/src/main/resources/fxml/preferences_general.fxml index 4f358ed55..7f7954fc8 100644 --- a/src/main/resources/fxml/preferences_general.fxml +++ b/src/main/resources/fxml/preferences_general.fxml @@ -26,7 +26,7 @@ - +