From 0acc8ddb0a667930a98caacac4ecac8426a83c53 Mon Sep 17 00:00:00 2001 From: JaniruTEC Date: Wed, 28 Oct 2020 15:48:20 +0100 Subject: [PATCH] Fixed UnlockWorkflow Partly reverted 253abd493036ef940ced24942f2c84fd64695972 --- .../cryptomator/ui/unlock/UnlockWorkflow.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) 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 4db0836a4..12633452a 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 @@ -74,12 +74,7 @@ public class UnlockWorkflow extends Task { this.invalidMountPointScene = invalidMountPointScene; this.errorComponent = errorComponent; - setOnScheduled(event -> vault.setState(VaultState.PROCESSING)); - setOnSucceeded(event -> vault.setState(VaultState.UNLOCKED)); - setOnCancelled(event -> vault.setState(VaultState.LOCKED)); - setOnFailed(event -> { - vault.setState(VaultState.LOCKED); Throwable throwable = event.getSource().getException(); if (throwable instanceof InvalidMountPointException) { handleInvalidMountPoint((InvalidMountPointException) throwable); @@ -224,4 +219,25 @@ public class UnlockWorkflow extends Task { Arrays.fill(pw, ' '); } } + + @Override + protected void scheduled() { + vault.setState(VaultState.PROCESSING); + } + + @Override + protected void succeeded() { + vault.setState(VaultState.UNLOCKED); + } + + @Override + protected void failed() { + vault.setState(VaultState.LOCKED); + } + + @Override + protected void cancelled() { + vault.setState(VaultState.LOCKED); + } + }