diff --git a/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java b/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java index 537b83577..64db08018 100644 --- a/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java +++ b/main/commons/src/main/java/org/cryptomator/common/keychain/KeychainManager.java @@ -68,6 +68,11 @@ public class KeychainManager implements KeychainAccessProvider { return keychain.getValue() != null; } + @Override + public boolean isLocked() { + return keychain.getValue() == null || keychain.get().isLocked(); + } + /** * Checks if the keychain knows a passphrase for the given key. *
diff --git a/main/commons/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java b/main/commons/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java
index c571ad716..1b2bedfce 100644
--- a/main/commons/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java
+++ b/main/commons/src/test/java/org/cryptomator/common/keychain/MapKeychainAccess.java
@@ -44,4 +44,9 @@ class MapKeychainAccess implements KeychainAccessProvider {
return true;
}
+ @Override
+ public boolean isLocked() {
+ return false;
+ }
+
}
diff --git a/main/pom.xml b/main/pom.xml
index 6b4500bc6..f8238b6df 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -25,10 +25,10 @@