From 68445befeb17cee00c3b7d050edd0404ae3089d2 Mon Sep 17 00:00:00 2001 From: infeo Date: Thu, 22 Mar 2018 17:47:43 +0100 Subject: [PATCH] simplifying the state enum to prevent illegal states --- .../ui/controllers/UnlockController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java index 874ed8599..9d9afe5a5 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java @@ -412,22 +412,22 @@ public class UnlockController implements ViewController { /* state */ public enum State { - UNLOCKING(false), - INITIALIZED("unlock.successLabel.vaultCreated", true), - PASSWORD_CHANGED("unlock.successLabel.passwordChanged", true), - UPGRADED("unlock.successLabel.upgraded", true); + UNLOCKING(), + INITIALIZED("unlock.successLabel.vaultCreated"), + PASSWORD_CHANGED("unlock.successLabel.passwordChanged"), + UPGRADED("unlock.successLabel.upgraded"); private Optional successMessage; private boolean shouldShowStatusMessage; - State(boolean shouldShowStatusMessage) { + State() { this.successMessage = Optional.empty(); - this.shouldShowStatusMessage = shouldShowStatusMessage; + this.shouldShowStatusMessage = false; } - State(String successMessage, boolean shouldShowStatusMessage) { + State(String successMessage) { this.successMessage = Optional.of(successMessage); - this.shouldShowStatusMessage = shouldShowStatusMessage; + this.shouldShowStatusMessage = true; } public Optional successMessage() {