From 1f0c12ef7a01e1cdd807a319058676486e2b96f5 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 24 Mar 2022 12:27:38 +0100 Subject: [PATCH 01/14] Fix wrong debug message --- .../masterkeyfile/PassphraseEntryController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java index 35b1b1903..24afab78a 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java +++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java @@ -129,8 +129,11 @@ public class PassphraseEntryController implements FxController { } private void windowClosed(WindowEvent windowEvent) { - LOG.debug("Unlock canceled by user."); - result.cancel(true); + if(!result.isDone()) { + result.cancel(true); + LOG.debug("Unlock canceled by user."); + } + } @FXML From 983c35eb379975cc616823755d26f269ffaee833 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 24 Mar 2022 17:35:36 +0100 Subject: [PATCH 02/14] Remove Codacy badge and ci action --- .github/workflows/build.yml | 7 ------- README.md | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 97d46ae9e..f56e590c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,13 +43,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - - name: Upload code coverage report - id: codacyCoverageReporter - if: "github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'pr:safe')" - run: bash <(curl -Ls https://coverage.codacy.com/get.sh) - env: - CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }} - continue-on-error: true - name: Draft a release if: startsWith(github.ref, 'refs/tags/') uses: softprops/action-gh-release@v1 diff --git a/README.md b/README.md index 7ffb1fba1..ded200883 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Build](https://github.com/cryptomator/cryptomator/workflows/Build/badge.svg)](https://github.com/cryptomator/cryptomator/actions?query=workflow%3ABuild) [![Known Vulnerabilities](https://snyk.io/test/github/cryptomator/cryptomator/badge.svg)](https://snyk.io/test/github/cryptomator/cryptomator) -[![Codacy Badge](https://app.codacy.com/project/badge/Grade/2a0adf3cec6a4143b91035d3924178f1)](https://www.codacy.com/gh/cryptomator/cryptomator/dashboard) +[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=cryptomator_cryptomator&metric=alert_status)](https://sonarcloud.io/dashboard?id=cryptomator_cryptomator) [![Twitter](https://img.shields.io/badge/twitter-@Cryptomator-blue.svg?style=flat)](http://twitter.com/Cryptomator) [![Crowdin](https://badges.crowdin.net/cryptomator/localized.svg)](https://translate.cryptomator.org/) [![Latest Release](https://img.shields.io/github/release/cryptomator/cryptomator.svg)](https://github.com/cryptomator/cryptomator/releases/latest) From 49e90515a1c5467e9e525531d819b5748f9f5b6e Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 24 Mar 2022 17:49:12 +0100 Subject: [PATCH 03/14] Fixes #2125 --- .github/workflows/win-exe.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 25a0575fb..61b5c9809 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -80,6 +80,7 @@ jobs: --app-version "${{ steps.versions.outputs.semVerNum }}.${{ steps.versions.outputs.revNum }}" --java-options "-Xss5m" --java-options "-Xmx256m" + --java-options "-Dcryptomator.appVersion=\"${{ steps.versions.outputs.semVerStr }}\"" --java-options "-Dfile.encoding=\"utf-8\"" --java-options "-Dcryptomator.logDir=\"~/AppData/Roaming/Cryptomator\"" --java-options "-Dcryptomator.pluginDir=\"~/AppData/Roaming/Cryptomator/Plugins\"" From 6da8fc1f704a01808f27e60071a8581d7dd14d4f Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 25 Mar 2022 08:20:18 +0100 Subject: [PATCH 04/14] optionally specify version in manually dispatched builds --- .github/workflows/appimage.yml | 7 +++++++ .github/workflows/debian.yml | 6 ++++++ .github/workflows/mac-dmg.yml | 7 +++++++ .github/workflows/win-exe.yml | 7 +++++++ 4 files changed, 27 insertions(+) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index aab954476..ce23bac60 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -4,6 +4,10 @@ on: release: types: [published] workflow_dispatch: + inputs: + version: + description: 'Version' + required: false env: JAVA_VERSION: 17 @@ -28,6 +32,9 @@ jobs: if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then SEM_VER_STR=${GITHUB_REF##*/} mvn versions:set -DnewVersion=${SEM_VER_STR} + elif [[ "${{ github.event.inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then + SEM_VER_STR="${{ github.event.inputs.version }}" + mvn versions:set -DnewVersion=${SEM_VER_STR} else SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout` fi diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index f7893bbaa..fb8b3a423 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -10,6 +10,9 @@ on: required: true default: false type: boolean + version: + description: 'Version' + required: false env: JAVA_VERSION: 17 @@ -38,6 +41,9 @@ jobs: if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then SEM_VER_STR=${GITHUB_REF##*/} mvn versions:set -DnewVersion=${SEM_VER_STR} + elif [[ "${{ github.event.inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then + SEM_VER_STR="${{ github.event.inputs.version }}" + mvn versions:set -DnewVersion=${SEM_VER_STR} else SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout` fi diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 66af92d6d..3e1e6ceac 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -4,6 +4,10 @@ on: release: types: [published] workflow_dispatch: + inputs: + version: + description: 'Version' + required: false env: JAVA_VERSION: 17 @@ -28,6 +32,9 @@ jobs: if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then SEM_VER_STR=${GITHUB_REF##*/} mvn versions:set -DnewVersion=${SEM_VER_STR} + elif [[ "${{ github.event.inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then + SEM_VER_STR="${{ github.event.inputs.version }}" + mvn versions:set -DnewVersion=${SEM_VER_STR} else SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout` fi diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 61b5c9809..ec5b60ed4 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -4,6 +4,10 @@ on: release: types: [published] workflow_dispatch: + inputs: + version: + description: 'Version' + required: false env: JAVA_VERSION: 17 @@ -33,6 +37,9 @@ jobs: if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then SEM_VER_STR=${GITHUB_REF##*/} mvn versions:set -DnewVersion=${SEM_VER_STR} + elif [[ "${{ github.event.inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then + SEM_VER_STR="${{ github.event.inputs.version }}" + mvn versions:set -DnewVersion=${SEM_VER_STR} else SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout` fi From ef6f87bb1922ba99edeb4f82f0a8a1087db0d4b0 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 29 Mar 2022 12:34:01 +0200 Subject: [PATCH 05/14] Fixes #2126 Remove deprecated env variable --- .idea/runConfigurations/Cryptomator_Windows_Dev.xml | 2 +- src/main/java/org/cryptomator/common/Environment.java | 5 ----- .../common/mountpoint/CustomMountPointChooser.java | 7 +++---- .../common/mountpoint/CustomMountPointChooserTest.java | 2 +- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/.idea/runConfigurations/Cryptomator_Windows_Dev.xml b/.idea/runConfigurations/Cryptomator_Windows_Dev.xml index 62ab38666..b4b844cae 100644 --- a/.idea/runConfigurations/Cryptomator_Windows_Dev.xml +++ b/.idea/runConfigurations/Cryptomator_Windows_Dev.xml @@ -2,7 +2,7 @@