From d93ef2e90525f489093e2d18bf8245b41d3b8a93 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 11 Jan 2023 16:40:14 +0100 Subject: [PATCH] Reinitiate force lock --- src/main/java/org/cryptomator/common/vaults/Vault.java | 9 +++++---- .../org/cryptomator/ui/lock/LockForcedController.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/cryptomator/common/vaults/Vault.java b/src/main/java/org/cryptomator/common/vaults/Vault.java index 5a13141a8..547be30f5 100644 --- a/src/main/java/org/cryptomator/common/vaults/Vault.java +++ b/src/main/java/org/cryptomator/common/vaults/Vault.java @@ -409,13 +409,14 @@ public class Vault { } - /* TODO: reactivate/ needed at all? public boolean supportsForcedUnmount() { - return volume.supportsForcedUnmount(); + var mh = mountHandle.get(); + if(mh == null) { + throw new IllegalStateException("Vault is not mounted"); + }; + return mountHandle.get().supportsUnmountForced(); } - */ - private record MountHandle(Mount mount, boolean supportsUnmountForced) { } diff --git a/src/main/java/org/cryptomator/ui/lock/LockForcedController.java b/src/main/java/org/cryptomator/ui/lock/LockForcedController.java index 9b653816a..15cf119be 100644 --- a/src/main/java/org/cryptomator/ui/lock/LockForcedController.java +++ b/src/main/java/org/cryptomator/ui/lock/LockForcedController.java @@ -53,7 +53,7 @@ public class LockForcedController implements FxController { } public boolean isForceSupported() { - return false;//vault.supportsForcedUnmount(); TODO + return vault.supportsForcedUnmount(); } }