From a9444182bb58bf5ba0734f001350b0caa1209047 Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Fri, 4 Jul 2025 22:17:27 +0200 Subject: [PATCH] clean up --- .../common/vaults/VaultListManager.java | 10 ++-- .../ui/fxapp/FxApplicationTerminator.java | 2 +- .../ChooseMasterkeyFileController.java | 16 +++--- .../ui/mainwindow/VaultListController.java | 4 +- .../RecoveryKeyOnboardingController.java | 3 +- .../RecoveryKeyRecoverController.java | 16 +++--- .../resources/fxml/recoverykey_recover.fxml | 2 +- .../fxml/unlock_select_masterkeyfile.fxml | 2 +- .../fxml/vault_detail_missing_masterkey.fxml | 49 ------------------- src/main/resources/i18n/strings.properties | 1 - 10 files changed, 30 insertions(+), 75 deletions(-) delete mode 100644 src/main/resources/fxml/vault_detail_missing_masterkey.fxml diff --git a/src/main/java/org/cryptomator/common/vaults/VaultListManager.java b/src/main/java/org/cryptomator/common/vaults/VaultListManager.java index 551988828..9a0b7977e 100644 --- a/src/main/java/org/cryptomator/common/vaults/VaultListManager.java +++ b/src/main/java/org/cryptomator/common/vaults/VaultListManager.java @@ -158,13 +158,9 @@ public class VaultListManager { } private void initializeLastKnownKeyLoaderIfPossible(VaultSettings vaultSettings, VaultConfigCache wrapper) throws IOException { - try { - if (vaultSettings.lastKnownKeyLoader.get() == null) { - var keyIdScheme = wrapper.get().getKeyId().getScheme(); - vaultSettings.lastKnownKeyLoader.set(keyIdScheme); - } - } catch (NoSuchFileException e) { - LOG.warn("Vault config file not found."); + if (vaultSettings.lastKnownKeyLoader.get() == null) { + var keyIdScheme = wrapper.get().getKeyId().getScheme(); + vaultSettings.lastKnownKeyLoader.set(keyIdScheme); } } diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java index 74938bc64..28c6d986d 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationTerminator.java @@ -28,7 +28,7 @@ import static org.cryptomator.common.vaults.VaultState.Value.*; @FxApplicationScoped public class FxApplicationTerminator { - private static final Set STATES_ALLOWING_TERMINATION = EnumSet.of(LOCKED, NEEDS_MIGRATION, MISSING, ERROR); + private static final Set STATES_ALLOWING_TERMINATION = EnumSet.of(LOCKED, NEEDS_MIGRATION, MISSING, ERROR, VAULT_CONFIG_MISSING, ALL_MISSING); private static final Set STATES_PREVENT_TERMINATION = EnumSet.of(PROCESSING); private static final Logger LOG = LoggerFactory.getLogger(FxApplicationTerminator.class); diff --git a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/ChooseMasterkeyFileController.java b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/ChooseMasterkeyFileController.java index 4f6403e87..0ced00170 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/ChooseMasterkeyFileController.java +++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/ChooseMasterkeyFileController.java @@ -34,8 +34,10 @@ public class ChooseMasterkeyFileController implements FxController { private final RecoveryKeyComponent.Factory recoveryKeyWindow; private final ResourceBundle resourceBundle; - @FXML private CheckBox restoreInsteadCheckBox; - @FXML private Button chooseButton; + @FXML + private CheckBox restoreInsteadCheckBox; + @FXML + private Button forwardButton; @Inject public ChooseMasterkeyFileController(@KeyLoading Stage window, // @@ -55,11 +57,11 @@ public class ChooseMasterkeyFileController implements FxController { private void initialize() { restoreInsteadCheckBox.selectedProperty().addListener((_, _, newVal) -> { if (newVal) { - chooseButton.setText(resourceBundle.getString("addvaultwizard.existing.restore")); - chooseButton.setOnAction(_ -> restoreMasterkey()); + forwardButton.setText(resourceBundle.getString("addvaultwizard.existing.restore")); + forwardButton.setOnAction(_ -> restoreMasterkey()); } else { - chooseButton.setText(resourceBundle.getString("generic.button.choose")); - chooseButton.setOnAction(_ -> proceed()); + forwardButton.setText(resourceBundle.getString("generic.button.choose")); + forwardButton.setOnAction(_ -> proceed()); } }); } @@ -94,7 +96,7 @@ public class ChooseMasterkeyFileController implements FxController { //--- Setter & Getter --- - public String getDisplayName(){ + public String getDisplayName() { return vault.getDisplayName(); } diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java index d625d6662..fa3d96d0e 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java @@ -60,10 +60,12 @@ import java.util.stream.Collectors; import static org.cryptomator.common.Constants.CRYPTOMATOR_FILENAME_EXT; import static org.cryptomator.common.Constants.MASTERKEY_FILENAME; import static org.cryptomator.common.Constants.VAULTCONFIG_FILENAME; +import static org.cryptomator.common.vaults.VaultState.Value.ALL_MISSING; import static org.cryptomator.common.vaults.VaultState.Value.ERROR; import static org.cryptomator.common.vaults.VaultState.Value.LOCKED; import static org.cryptomator.common.vaults.VaultState.Value.MISSING; import static org.cryptomator.common.vaults.VaultState.Value.NEEDS_MIGRATION; +import static org.cryptomator.common.vaults.VaultState.Value.VAULT_CONFIG_MISSING; @MainWindowScoped public class VaultListController implements FxController { @@ -305,7 +307,7 @@ public class VaultListController implements FxController { private void pressedShortcutToRemoveVault() { final var vault = selectedVault.get(); - if (vault != null && EnumSet.of(LOCKED, MISSING, ERROR, NEEDS_MIGRATION).contains(vault.getState())) { + if (vault != null && EnumSet.of(LOCKED, MISSING, ERROR, NEEDS_MIGRATION, ALL_MISSING, VAULT_CONFIG_MISSING).contains(vault.getState())) { dialogs.prepareRemoveVaultDialog(mainWindow, vault, vaults).build().showAndWait(); } } diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java index da46a6741..aec2243ab 100644 --- a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java +++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyOnboardingController.java @@ -132,10 +132,11 @@ public class RecoveryKeyOnboardingController implements FxController { window.setScene(recoverykeyExpertSettingsScene.get()); } else { window.setScene(recoverykeyRecoverScene.get()); - window.centerOnScreen(); } } case RESTORE_MASTERKEY -> window.setScene(recoverykeyRecoverScene.get()); } + window.centerOnScreen(); } } + diff --git a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java index 1045e026a..15d32ccd9 100644 --- a/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java +++ b/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java @@ -13,6 +13,7 @@ import javafx.fxml.FXML; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.stage.Stage; +import java.util.Objects; import java.util.ResourceBundle; @RecoveryKeyScoped @@ -67,17 +68,20 @@ public class RecoveryKeyRecoverController implements FxController { @FXML public void initialize() { - switch (recoverType.get()) { - case RESTORE_ALL, RESTORE_VAULT_CONFIG -> cancelButton.setText(resourceBundle.getString("generic.button.back")); - case RESET_PASSWORD -> cancelButton.setText(resourceBundle.getString("generic.button.cancel")); + if (Objects.requireNonNull(recoverType.get()) == RecoveryActionType.RESET_PASSWORD) { + cancelButton.setText(resourceBundle.getString("generic.button.cancel")); + } else { + cancelButton.setText(resourceBundle.getString("generic.button.back")); } } @FXML public void close() { - switch (recoverType.get()) { - case RESTORE_ALL, RESTORE_VAULT_CONFIG -> window.setScene(onBoardingScene.get()); - case RESET_PASSWORD -> window.close(); + if (Objects.requireNonNull(recoverType.get()) == RecoveryActionType.RESET_PASSWORD) { + window.close(); + } else { + window.setScene(onBoardingScene.get()); + window.centerOnScreen(); } } diff --git a/src/main/resources/fxml/recoverykey_recover.fxml b/src/main/resources/fxml/recoverykey_recover.fxml index 6fad1a601..29264c797 100644 --- a/src/main/resources/fxml/recoverykey_recover.fxml +++ b/src/main/resources/fxml/recoverykey_recover.fxml @@ -25,7 +25,7 @@ - - - - - - - \ No newline at end of file diff --git a/src/main/resources/i18n/strings.properties b/src/main/resources/i18n/strings.properties index 008a6c945..6b4420ed5 100644 --- a/src/main/resources/i18n/strings.properties +++ b/src/main/resources/i18n/strings.properties @@ -581,7 +581,6 @@ passwordStrength.messageLabel.1=Weak passwordStrength.messageLabel.2=Fair passwordStrength.messageLabel.3=Strong passwordStrength.messageLabel.4=Very strong -password.promptText=Enter password # Quit quit.title=Quit Application