diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java index ce49a564e..8a3735b65 100644 --- a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java +++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java @@ -56,7 +56,7 @@ public class Vault { private final ObjectProperty state; private final ObjectProperty lastKnownException; private final VaultStats stats; - private final StringBinding displayableName; + private final StringBinding displayName; private final StringBinding displayablePath; private final BooleanBinding locked; private final BooleanBinding processing; @@ -78,7 +78,7 @@ public class Vault { this.state = state; this.lastKnownException = lastKnownException; this.stats = stats; - this.displayableName = Bindings.createStringBinding(this::getDisplayableName, vaultSettings.displayName()); + this.displayName = Bindings.createStringBinding(this::getDisplayName, vaultSettings.displayName()); this.displayablePath = Bindings.createStringBinding(this::getDisplayablePath, vaultSettings.path()); this.locked = Bindings.createBooleanBinding(this::isLocked, state); this.processing = Bindings.createBooleanBinding(this::isProcessing, state); @@ -225,11 +225,11 @@ public class Vault { return state.get() == VaultState.ERROR; } - public StringBinding displayableNameProperty() { - return displayableName; + public StringBinding displayNameProperty() { + return displayName; } - public String getDisplayableName() { + public String getDisplayName() { return vaultSettings.displayName().get(); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java index 7a641b1e7..39be745fd 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java @@ -67,7 +67,7 @@ public class ChangePasswordController implements FxController { public void finish() { try { CryptoFileSystemProvider.changePassphrase(vault.getPath(), MASTERKEY_FILENAME, oldPasswordField.getCharacters(), newPassword.get()); - LOG.info("Successfully changed password for {}", vault.getDisplayableName()); + LOG.info("Successfully changed password for {}", vault.getDisplayName()); window.close(); updatePasswordInSystemkeychain(); } catch (IOException e) { @@ -84,7 +84,7 @@ public class ChangePasswordController implements FxController { if (keychain.isPresent()) { try { keychain.get().changePassphrase(vault.getId(), CharBuffer.wrap(newPassword.get())); - LOG.info("Successfully updated password in system keychain for {}", vault.getDisplayableName()); + LOG.info("Successfully updated password in system keychain for {}", vault.getDisplayName()); } catch (KeychainAccessException e) { LOG.error("Failed to update password in system keychain.", e); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java index 3e09e1fad..8aadd8c98 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java +++ b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java @@ -44,8 +44,8 @@ public class VaultService { */ public Task createRevealTask(Vault vault) { Task task = new RevealVaultTask(vault); - task.setOnSucceeded(evt -> LOG.info("Revealed {}", vault.getDisplayableName())); - task.setOnFailed(evt -> LOG.error("Failed to reveal " + vault.getDisplayableName(), evt.getSource().getException())); + task.setOnSucceeded(evt -> LOG.info("Revealed {}", vault.getDisplayName())); + task.setOnFailed(evt -> LOG.error("Failed to reveal " + vault.getDisplayName(), evt.getSource().getException())); return task; } @@ -68,8 +68,8 @@ public class VaultService { */ public Task createLockTask(Vault vault, boolean forced) { Task task = new LockVaultTask(vault, forced); - task.setOnSucceeded(evt -> LOG.info("Locked {}", vault.getDisplayableName())); - task.setOnFailed(evt -> LOG.error("Failed to lock " + vault.getDisplayableName(), evt.getSource().getException())); + task.setOnSucceeded(evt -> LOG.info("Locked {}", vault.getDisplayName())); + task.setOnFailed(evt -> LOG.error("Failed to lock " + vault.getDisplayName(), evt.getSource().getException())); return task; } @@ -94,7 +94,7 @@ public class VaultService { List> lockTasks = vaults.stream().map(v -> new LockVaultTask(v, forced)).collect(Collectors.toUnmodifiableList()); lockTasks.forEach(executorService::execute); Task> task = new WaitForTasksTask(lockTasks); - String vaultNames = vaults.stream().map(Vault::getDisplayableName).collect(Collectors.joining(", ")); + String vaultNames = vaults.stream().map(Vault::getDisplayName).collect(Collectors.joining(", ")); task.setOnSucceeded(evt -> LOG.info("Locked {}", vaultNames)); task.setOnFailed(evt -> LOG.error("Failed to lock vaults " + vaultNames, evt.getSource().getException())); return task; diff --git a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java index ea1e0530e..008668126 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/forgetPassword/ForgetPasswordController.java @@ -41,7 +41,7 @@ public class ForgetPasswordController implements FxController { if (keychain.isPresent()) { try { keychain.get().deletePassphrase(vault.getId()); - LOG.debug("Forgot password for vault {}.", vault.getDisplayableName()); + LOG.debug("Forgot password for vault {}.", vault.getDisplayName()); confirmedResult.setValue(true); } catch (KeychainAccessException e) { LOG.error("Failed to remove entry from system keychain.", e); diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java index 3172b6288..70f31e67b 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java +++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java @@ -6,7 +6,6 @@ import javafx.application.Platform; import javafx.beans.binding.Bindings; import javafx.beans.binding.BooleanBinding; import javafx.beans.value.ObservableValue; -import javafx.collections.FXCollections; import javafx.collections.ObservableSet; import javafx.stage.Stage; import org.cryptomator.common.LicenseHolder; @@ -99,7 +98,7 @@ public class FxApplication extends Application { public void startUnlockWorkflow(Vault vault, Optional owner) { Platform.runLater(() -> { unlockWindowBuilderProvider.get().vault(vault).owner(owner).build().startUnlockWorkflow(); - LOG.debug("Showing UnlockWindow for {}", vault.getDisplayableName()); + LOG.debug("Showing UnlockWindow for {}", vault.getDisplayName()); }); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java index 3123d4cb2..5233d979b 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java @@ -116,10 +116,10 @@ public class MigrationRunController implements FxController { return migrators.needsMigration(vault.getPath(), MASTERKEY_FILENAME); }).onSuccess(needsAnotherMigration -> { if (needsAnotherMigration) { - LOG.info("Migration of '{}' succeeded, but another migration is required.", vault.getDisplayableName()); + LOG.info("Migration of '{}' succeeded, but another migration is required.", vault.getDisplayName()); vault.setState(VaultState.NEEDS_MIGRATION); } else { - LOG.info("Migration of '{}' succeeded.", vault.getDisplayableName()); + LOG.info("Migration of '{}' succeeded.", vault.getDisplayName()); vault.setState(VaultState.LOCKED); passwordField.wipe(); window.setScene(successScene.get()); diff --git a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java index 66dd13ade..7255115ea 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/quit/QuitController.java @@ -53,7 +53,7 @@ public class QuitController implements FxController { Task> lockAllTask = vaultService.createLockAllTask(unlockedVaults, false); lockAllTask.setOnSucceeded(evt -> { - LOG.info("Locked {}", lockAllTask.getValue().stream().map(Vault::getDisplayableName).collect(Collectors.joining(", "))); + LOG.info("Locked {}", lockAllTask.getValue().stream().map(Vault::getDisplayName).collect(Collectors.joining(", "))); if (unlockedVaults.isEmpty()) { window.close(); response.performQuit(); diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java index 48e81f3a5..9ad3d73ad 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyModule.java @@ -9,7 +9,6 @@ import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; import javafx.scene.Scene; -import javafx.scene.image.Image; import javafx.stage.Modality; import javafx.stage.Stage; import org.cryptomator.common.vaults.Vault; @@ -25,7 +24,6 @@ import org.cryptomator.ui.common.StageFactory; import javax.inject.Named; import javax.inject.Provider; -import java.util.List; import java.util.Map; import java.util.ResourceBundle; @@ -107,7 +105,7 @@ abstract class RecoveryKeyModule { @IntoMap @FxControllerKey(RecoveryKeyDisplayController.class) static FxController provideRecoveryKeyDisplayController(@RecoveryKeyWindow Stage window, @RecoveryKeyWindow Vault vault, @RecoveryKeyWindow StringProperty recoveryKey, ResourceBundle localization) { - return new RecoveryKeyDisplayController(window, vault.getDisplayableName(), recoveryKey.get(), localization); + return new RecoveryKeyDisplayController(window, vault.getDisplayName(), recoveryKey.get(), localization); } @Binds diff --git a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java index e2d5ec024..836ed519f 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/removevault/RemoveVaultController.java @@ -34,7 +34,7 @@ public class RemoveVaultController implements FxController { @FXML public void finish() { vaults.remove(vault); - LOG.debug("Removing vault {}.", vault.getDisplayableName()); + LOG.debug("Removing vault {}.", vault.getDisplayName()); window.close(); } } diff --git a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java index af12beebe..1610c6862 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java @@ -80,7 +80,7 @@ class TrayMenuController { } private Menu buildSubmenu(Vault vault) { - Menu submenu = new Menu(vault.getDisplayableName()); + Menu submenu = new Menu(vault.getDisplayName()); if (vault.isLocked()) { MenuItem unlockItem = new MenuItem(resourceBundle.getString("traymenu.vault.unlock")); diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java index 7310a369c..537eba9a8 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java @@ -77,7 +77,7 @@ public class UnlockController implements FxController { this.unlockButtonContentDisplay = Bindings.createObjectBinding(this::getUnlockButtonContentDisplay, passwordEntryLock.awaitingInteraction()); this.userInteractionDisabled = passwordEntryLock.awaitingInteraction().not(); this.unlockButtonDisabled = new SimpleBooleanProperty(); - this.vaultName = WeakBindings.bindString(vault.displayableNameProperty()); + this.vaultName = WeakBindings.bindString(vault.displayNameProperty()); this.window.setOnCloseRequest(windowEvent -> cancel()); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java index e07583c84..bef612dc1 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java @@ -82,7 +82,7 @@ abstract class UnlockModule { @UnlockScoped static Stage provideStage(StageFactory factory, @UnlockWindow Vault vault, @Named("unlockWindowOwner") Optional owner) { Stage stage = factory.create(); - stage.setTitle(vault.getDisplayableName()); + stage.setTitle(vault.getDisplayName()); stage.setResizable(false); if (owner.isPresent()) { stage.initOwner(owner.get()); diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java index 08b8adf71..e0a2a4f0b 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java +++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java @@ -128,7 +128,7 @@ public class UnlockWorkflow extends Task { } private void handleSuccess() { - LOG.info("Unlock of '{}' succeeded.", vault.getDisplayableName()); + LOG.info("Unlock of '{}' succeeded.", vault.getDisplayName()); if (savePassword.get()) { savePasswordToSystemkeychain(); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java index d0aa49281..f39af7e34 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/vaultoptions/VaultOptionsModule.java @@ -5,7 +5,6 @@ import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; import javafx.scene.Scene; -import javafx.scene.image.Image; import javafx.stage.Modality; import javafx.stage.Stage; import org.cryptomator.common.vaults.Vault; @@ -20,9 +19,7 @@ import org.cryptomator.ui.common.StageFactory; import org.cryptomator.ui.mainwindow.MainWindow; import org.cryptomator.ui.recoverykey.RecoveryKeyComponent; -import javax.inject.Named; import javax.inject.Provider; -import java.util.List; import java.util.Map; import java.util.ResourceBundle; @@ -41,7 +38,7 @@ abstract class VaultOptionsModule { @VaultOptionsScoped static Stage provideStage(StageFactory factory, @MainWindow Stage owner, @VaultOptionsWindow Vault vault) { Stage stage = factory.create(); - stage.setTitle(vault.getDisplayableName()); + stage.setTitle(vault.getDisplayName()); stage.setResizable(true); stage.setMinWidth(400); stage.setMinHeight(300); diff --git a/main/ui/src/main/resources/fxml/addvault_success.fxml b/main/ui/src/main/resources/fxml/addvault_success.fxml index 6bb4808c5..fd0309450 100644 --- a/main/ui/src/main/resources/fxml/addvault_success.fxml +++ b/main/ui/src/main/resources/fxml/addvault_success.fxml @@ -30,7 +30,7 @@ - + diff --git a/main/ui/src/main/resources/fxml/changepassword.fxml b/main/ui/src/main/resources/fxml/changepassword.fxml index 07fe7cbc4..18c1b9383 100644 --- a/main/ui/src/main/resources/fxml/changepassword.fxml +++ b/main/ui/src/main/resources/fxml/changepassword.fxml @@ -19,7 +19,7 @@ - + diff --git a/main/ui/src/main/resources/fxml/migration_run.fxml b/main/ui/src/main/resources/fxml/migration_run.fxml index 03be9a140..f70f27ce3 100644 --- a/main/ui/src/main/resources/fxml/migration_run.fxml +++ b/main/ui/src/main/resources/fxml/migration_run.fxml @@ -21,7 +21,7 @@ - + diff --git a/main/ui/src/main/resources/fxml/migration_start.fxml b/main/ui/src/main/resources/fxml/migration_start.fxml index c568ae9cb..c836a9393 100644 --- a/main/ui/src/main/resources/fxml/migration_start.fxml +++ b/main/ui/src/main/resources/fxml/migration_start.fxml @@ -28,7 +28,7 @@ - + diff --git a/main/ui/src/main/resources/fxml/migration_success.fxml b/main/ui/src/main/resources/fxml/migration_success.fxml index 59e997550..9fd081757 100644 --- a/main/ui/src/main/resources/fxml/migration_success.fxml +++ b/main/ui/src/main/resources/fxml/migration_success.fxml @@ -25,7 +25,7 @@ - + diff --git a/main/ui/src/main/resources/fxml/recoverykey_create.fxml b/main/ui/src/main/resources/fxml/recoverykey_create.fxml index c1c7299a1..73775237f 100644 --- a/main/ui/src/main/resources/fxml/recoverykey_create.fxml +++ b/main/ui/src/main/resources/fxml/recoverykey_create.fxml @@ -20,7 +20,7 @@ - + diff --git a/main/ui/src/main/resources/fxml/recoverykey_recover.fxml b/main/ui/src/main/resources/fxml/recoverykey_recover.fxml index c1c161a0d..c12a5e83e 100644 --- a/main/ui/src/main/resources/fxml/recoverykey_recover.fxml +++ b/main/ui/src/main/resources/fxml/recoverykey_recover.fxml @@ -21,7 +21,7 @@ - +