From 81091d4bdffce9f2ff3ac1e4d7f369df392104e4 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 24 Feb 2021 12:13:41 +0100 Subject: [PATCH 1/4] bump integrations-* repos and implement new interface methods --- .../org/cryptomator/common/keychain/KeychainManager.java | 5 +++++ .../cryptomator/common/keychain/MapKeychainAccess.java | 5 +++++ main/pom.xml | 8 ++++---- 3 files changed, 14 insertions(+), 4 deletions(-) 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 @@ 1.9.14 - 0.1.6 - 0.2.1 - 0.1.0 - 0.1.1 + 1.0.0-beta2 + 1.0.0-beta2 + 1.0.0-beta2 + 1.0.0-beta1 1.2.9 1.2.4 1.1.3 From 0898158c5aa797338f4cef7200eb94e6d1ad8c1b Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 24 Feb 2021 12:18:38 +0100 Subject: [PATCH 2/4] remove bintray as source repository in pom --- main/pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/main/pom.xml b/main/pom.xml index f8238b6df..631b9ec2b 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -50,13 +50,6 @@ 2.2 - - - jcenter - https://jcenter.bintray.com - - - From 3dcdeb1033fd40d865cae4a1ac657823a970e06c Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 24 Feb 2021 12:19:12 +0100 Subject: [PATCH 3/4] refactor pom to store targeted jdk build version in variable --- main/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/pom.xml b/main/pom.xml index 631b9ec2b..47ea800da 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -22,6 +22,7 @@ UTF-8 + 14 1.9.14 @@ -430,7 +431,7 @@ maven-compiler-plugin - 14 + ${project.jdk.version} com.google.dagger From fe3d67d937371dee9af56253e7c243caffbfc71d Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 24 Feb 2021 12:21:13 +0100 Subject: [PATCH 4/4] update build workflow --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) 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