diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d7b93c2e3..9c75e475f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,6 +86,11 @@ jobs: release_name: ${{ github.ref }} body: | :construction: Work in Progress + + TODO: + * [ ] add Linux appimage, zsync file and signature file + * [ ] add Windows installer and signature file + * [ ] add MacOs disk image and signature file draft: true prerelease: false - name: Upload buildkit-linux.zip to GitHub Releases 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 6a427b908..47ea800da 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -22,13 +22,14 @@ UTF-8 + 14 1.9.14 1.0.0-beta2 1.0.0-beta2 - 0.1.0 - 0.1.1 + 1.0.0-beta2 + 1.0.0-beta1 1.2.9 1.2.4 1.1.3 @@ -50,13 +51,6 @@ 2.2 - - - jcenter - https://jcenter.bintray.com - - - @@ -437,7 +431,7 @@ maven-compiler-plugin - 14 + ${project.jdk.version} com.google.dagger