From f25afb720f1e05d1b40be04e76c5644264d1d56a Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Mon, 10 Jul 2023 13:14:58 +0200 Subject: [PATCH] optimized isValidShorteningThreshold method and renamed DEFAULT_SHORTENING_THRESHOLD to MAX_SHORTENING_THRESHOLD --- .../ui/addvaultwizard/AddVaultModule.java | 2 +- .../CreateNewVaultExpertSettingsController.java | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java b/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java index b8049c448..4a9dba7ad 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java @@ -71,7 +71,7 @@ public abstract class AddVaultModule { @Named("shorteningThreshold") @AddVaultWizardScoped static IntegerProperty provideShorteningThreshold() { - return new SimpleIntegerProperty(CreateNewVaultExpertSettingsController.DEFAULT_SHORTENING_THRESHOLD); + return new SimpleIntegerProperty(CreateNewVaultExpertSettingsController.MAX_SHORTENING_THRESHOLD); } @Provides diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultExpertSettingsController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultExpertSettingsController.java index 38dff93f2..a9168deb6 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultExpertSettingsController.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultExpertSettingsController.java @@ -24,7 +24,7 @@ import java.nio.file.Path; @AddVaultWizardScoped public class CreateNewVaultExpertSettingsController implements FxController { - public static final int DEFAULT_SHORTENING_THRESHOLD = 220; + public static final int MAX_SHORTENING_THRESHOLD = 220; public static final int MIN_SHORTENING_THRESHOLD = 36; private static final String DOCS_NAME_SHORTENING_URL = "https://docs.cryptomator.org/en/1.7/security/architecture/#name-shortening"; @@ -66,8 +66,8 @@ public class CreateNewVaultExpertSettingsController implements FxController { public void initialize() { vaultNameLabel.textProperty().bind(vaultNameProperty); vaultPathLabel.textProperty().bind(vaultPathProperty.asString()); - shorteningThresholdTextField.setPromptText(MIN_SHORTENING_THRESHOLD + "-" + DEFAULT_SHORTENING_THRESHOLD); - shorteningThresholdTextField.setText(Integer.toString(DEFAULT_SHORTENING_THRESHOLD)); + shorteningThresholdTextField.setPromptText(MIN_SHORTENING_THRESHOLD + "-" + MAX_SHORTENING_THRESHOLD); + shorteningThresholdTextField.setText(Integer.toString(MAX_SHORTENING_THRESHOLD)); shorteningThresholdTextField.textProperty().addListener((observable, oldValue, newValue) -> { try { int intValue = Integer.parseInt(newValue); @@ -81,7 +81,7 @@ public class CreateNewVaultExpertSettingsController implements FxController { @FXML public void toggleUseExpertSettings() { if (!expertSettingsCheckBox.isSelected()) { - shorteningThresholdTextField.setText(Integer.toString(DEFAULT_SHORTENING_THRESHOLD)); + shorteningThresholdTextField.setText(Integer.toString(MAX_SHORTENING_THRESHOLD)); } } @@ -101,11 +101,7 @@ public class CreateNewVaultExpertSettingsController implements FxController { public boolean isValidShorteningThreshold() { var value = shorteningThreshold.get(); - if (value < MIN_SHORTENING_THRESHOLD || value > DEFAULT_SHORTENING_THRESHOLD) { - return false; - } else { - return true; - } + return value >= MIN_SHORTENING_THRESHOLD && value <= MAX_SHORTENING_THRESHOLD; } public void openDocs() {