diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index f16bbefde..26d455b8f 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -10,43 +10,28 @@ on: required: false env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 jobs: + get-version: + uses: ./.github/workflows/get-version.yml + with: + version: ${{ github.event.inputs.version }} + build: name: Build AppImage runs-on: ubuntu-latest + needs: [get-version] steps: - uses: actions/checkout@v3 - with: - fetch-depth: 0 - name: Setup Java uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - - id: versions - name: Apply version information - run: | - 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 - SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'` - REVCOUNT=`git rev-list --count HEAD` - echo "::set-output name=semVerStr::${SEM_VER_STR}" - echo "::set-output name=semVerNum::${SEM_VER_NUM}" - echo "::set-output name=revNum::${REVCOUNT}" - - name: Validate Version - uses: skymatic/semver-validation-action@v1 - with: - version: ${{ steps.versions.outputs.semVerStr }} + - name: Set version + run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }} - name: Run maven run: mvn -B clean package -Pdependency-check,linux -DskipTests - name: Patch target dir @@ -69,8 +54,8 @@ jobs: - name: Prepare additional launcher run: envsubst '${SEMVER_STR} ${REVISION_NUM}' < dist/linux/launcher-gtk2.properties > launcher-gtk2.properties env: - SEMVER_STR: ${{ steps.versions.outputs.semVerStr }} - REVISION_NUM: ${{ steps.versions.outputs.revNum }} + SEMVER_STR: ${{ needs.get-version.outputs.semVerStr }} + REVISION_NUM: ${{ needs.get-version.outputs.revNum }} - name: Run jpackage run: > ${JAVA_HOME}/bin/jpackage @@ -84,10 +69,10 @@ jobs: --name Cryptomator --vendor "Skymatic GmbH" --copyright "(C) 2016 - 2022 Skymatic GmbH" - --app-version "${{ steps.versions.outputs.semVerNum }}.${{ steps.versions.outputs.revNum }}" + --app-version "${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}" --java-options "-Xss5m" --java-options "-Xmx256m" - --java-options "-Dcryptomator.appVersion=\"${{ steps.versions.outputs.semVerStr }}\"" + --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\"" --java-options "-Dfile.encoding=\"utf-8\"" --java-options "-Dcryptomator.logDir=\"~/.local/share/Cryptomator/logs\"" --java-options "-Dcryptomator.pluginDir=\"~/.local/share/Cryptomator/plugins\"" @@ -96,7 +81,7 @@ jobs: --java-options "-Dcryptomator.ipcSocketPath=\"~/.config/Cryptomator/ipc.socket\"" --java-options "-Dcryptomator.mountPointsDir=\"~/.local/share/Cryptomator/mnt\"" --java-options "-Dcryptomator.showTrayIcon=false" - --java-options "-Dcryptomator.buildNumber=\"appimage-${{ steps.versions.outputs.revNum }}\"" + --java-options "-Dcryptomator.buildNumber=\"appimage-${{ needs.get-version.outputs.revNum }}\"" --add-launcher Cryptomator-gtk2=launcher-gtk2.properties --resource-dir dist/linux/resources - name: Patch Cryptomator.AppDir @@ -134,7 +119,7 @@ jobs: GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }} - name: Build AppImage run: > - ./squashfs-root/AppRun Cryptomator.AppDir cryptomator-${{ steps.versions.outputs.semVerStr }}-x86_64.AppImage + ./squashfs-root/AppRun Cryptomator.AppDir cryptomator-${{ needs.get-version.outputs.semVerStr }}-x86_64.AppImage -u 'gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-x86_64.AppImage.zsync' --sign --sign-key=615D449FE6E6A235 --sign-args="--batch --pinentry-mode loopback" - name: Create detached GPG signatures diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 77a49ad1a..d94048ee9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,56 +6,21 @@ on: types: [labeled] env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 defaults: run: shell: bash jobs: - release-check-precondition: - name: Validate pushed commit to release/hotfix branch or pushed tag - runs-on: ubuntu-latest - if: "(startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/hotfix/') || startsWith(github.ref, 'refs/heads/release/')) - && !(contains(github.event.head_commit.message, '[ci skip]') || contains(github.event.head_commit.message, '[skip ci]'))" - steps: - - uses: actions/checkout@v2 - - id: validate-pom-version - name: Validate POM version - run: | - if [[ $GITHUB_REF =~ refs/heads/(hotfix|release)/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then - SEM_VER_STR=${GITHUB_REF##*/} - elif [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then - SEM_VER_STR=${GITHUB_REF##*/} - else - echo "Failed to parse version" - exit 1 - fi - - if [[ ${SEM_VER_STR} == `mvn help:evaluate -Dexpression=project.version -q -DforceStdout` ]]; then - echo "::set-output name=semVerStr::${SEM_VER_STR}" - else - echo "Version not set in POM" - exit 1 - fi - - name: Validate release in org.cryptomator.Cryptomator.metainfo.xml file - run: | - if ! grep -q "" dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml; then - echo "Release not set in dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml" - exit 1 - fi test: name: Compile and Test - needs: release-check-precondition runs-on: ubuntu-latest - if: "always() - && (needs.release-check-precondition.result=='success' || needs.release-check-precondition.result=='skipped') - && !(contains(github.event.head_commit.message, '[ci skip]') || contains(github.event.head_commit.message, '[skip ci]'))" steps: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - name: Cache SonarCloud packages diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 687dd0834..a194d4ad1 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -15,48 +15,37 @@ on: required: false env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 jobs: + get-version: + uses: ./.github/workflows/get-version.yml + with: + version: ${{ github.event.inputs.version }} + build: name: Build Debian Package - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 + needs: [get-version] steps: - uses: actions/checkout@v3 - with: - fetch-depth: 0 - name: Install build tools run: | + sudo add-apt-repository ppa:coffeelibs/openjdk sudo apt-get update - sudo apt-get install debhelper devscripts dput + sudo apt-get install debhelper devscripts dput coffeelibs-jdk-19 - name: Setup Java uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - - id: versions - name: Apply version information - run: | - 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 - SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'` - REVCOUNT=`git rev-list --count HEAD` - echo "::set-output name=semVerStr::${SEM_VER_STR}" - echo "::set-output name=semVerNum::${SEM_VER_NUM}" - echo "::set-output name=revNum::${REVCOUNT}" - echo "::set-output name=ppaVerStr::${SEM_VER_STR/-/\~}-${REVCOUNT}" - - name: Validate Version - uses: skymatic/semver-validation-action@v1 - with: - version: ${{ steps.versions.outputs.semVerStr }} + - id: versions + name: Create PPA version string + run: echo "ppaVerStr=${SEM_VER_STR/-/\~}-${REVCOUNT}" >> $GITHUB_OUTPUT + env: + SEM_VER_STR: ${{ needs.get-version.outputs.semVerStr }} + REVCOUNT: ${{ needs.get-version.outputs.revNum }} - name: Run maven run: mvn -B clean package -Pdependency-check,linux -DskipTests - name: Create orig.tar.gz with common/ libs/ mods/ @@ -76,9 +65,9 @@ jobs: find . -name "*.jar" >> pkgdir/debian/source/include-binaries mv pkgdir cryptomator_${{ steps.versions.outputs.ppaVerStr }} env: - SEMVER_STR: ${{ steps.versions.outputs.semVerStr }} - VERSION_NUM: ${{ steps.versions.outputs.semVerNum }} - REVISION_NUM: ${{ steps.versions.outputs.revNum }} + SEMVER_STR: ${{ needs.get-version.outputs.semVerStr }} + VERSION_NUM: ${{ needs.get-version.outputs.semVerNum }} + REVISION_NUM: ${{ needs.get-version.outputs.revNum }} PPA_VERSION: ${{ steps.versions.outputs.ppaVerStr }}-0ppa1 - name: Prepare GPG-Agent for signing with key 615D449FE6E6A235 run: | diff --git a/.github/workflows/dl-stats.yml b/.github/workflows/dl-stats.yml index 0d9ca5dd7..dc87a2bbd 100644 --- a/.github/workflows/dl-stats.yml +++ b/.github/workflows/dl-stats.yml @@ -48,7 +48,7 @@ jobs: jq -c 'select(.filename|endswith(".dmg")) | select(.filename|endswith("-arm64.dmg")|not) | {name: "github.releases.downloads", tags: ["file=dmg", "version=\(.release)", "arch=amd64"], value: .downloads, interval: .interval, time: .time}' input.json >> output.json RESULT=$(jq -s -c "." output.json) - echo "::set-output name=result::${RESULT}" + echo "result=${RESULT}" >> $GITHUB_OUTPUT env: INTERVAL: 900 JSON_DATA: ${{ steps.get-stats.outputs.result }} diff --git a/.github/workflows/get-version.yml b/.github/workflows/get-version.yml new file mode 100644 index 000000000..e6131b835 --- /dev/null +++ b/.github/workflows/get-version.yml @@ -0,0 +1,77 @@ +name: Parse and Validate a version string or tag + +on: + workflow_call: + inputs: + version: + description: "A specific version to use" + required: false + type: string + outputs: + semVerStr: + description: "The full version string." + value: ${{ jobs.determine-version.outputs.semVerStr}} + semVerNum: + description: "The numerical part of the version string" + value: ${{ jobs.determine-version.outputs.semVerNum}} + revNum: + description: "The revision number" + value: ${{ jobs.determine-version.outputs.revNum}} + versionType: + description: "Type of the version. Values are [stable, alpha, beta, rc, unknown]" + value: ${{ jobs.determine-version.outputs.type }} + +env: + JAVA_VERSION: 19 + JAVA_DIST: 'temurin' + JAVA_CACHE: 'maven' + +jobs: + determine-version: + name: 'Determines the version following semver' + runs-on: ubuntu-latest + outputs: + semVerNum: ${{ steps.versions.outputs.semVerNum }} + semVerStr: ${{ steps.versions.outputs.semVerStr }} + revNum: ${{ steps.versions.outputs.revNum }} + type: ${{ steps.versions.outputs.type}} + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Setup Java + uses: actions/setup-java@v3 + with: + distribution: ${{ env.JAVA_DIST }} + java-version: ${{ env.JAVA_VERSION }} + cache: ${{ env.JAVA_CACHE }} + - id: versions + name: Get version information + run: | + if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then + SEM_VER_STR=${GITHUB_REF##*/} + elif [[ "${{ inputs.version }}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then + SEM_VER_STR="${{ github.event.inputs.version }}" + else + SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout` + fi + SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'` + REVCOUNT=`git rev-list --count HEAD` + TYPE="unknown" + if [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then + TYPE="stable" + elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-alpha[1-9] ]]; then + TYPE="alpha" + elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-beta[1-9] ]]; then + TYPE="beta" + elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-rc[1-9] ]]; then + TYPE="rc" + fi + echo "semVerStr=${SEM_VER_STR}" >> $GITHUB_OUTPUT + echo "semVerNum=${SEM_VER_NUM}" >> $GITHUB_OUTPUT + echo "revNum=${REVCOUNT}" >> $GITHUB_OUTPUT + echo "type=${TYPE}" >> $GITHUB_OUTPUT + - name: Validate Version + uses: skymatic/semver-validation-action@v2 + with: + version: ${{ steps.versions.outputs.semVerStr }} \ No newline at end of file diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index c617b1adb..d52441a0e 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -10,12 +10,18 @@ on: required: false env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 jobs: + get-version: + uses: ./.github/workflows/get-version.yml + with: + version: ${{ github.event.inputs.version }} + build: name: Build Cryptomator.app for ${{ matrix.output-suffix }} runs-on: ${{ matrix.os }} + needs: [get-version] strategy: fail-fast: false matrix: @@ -30,36 +36,15 @@ jobs: xcode-path: '/Applications/Xcode_13.2.1.app' steps: - uses: actions/checkout@v3 - with: - fetch-depth: 0 - name: Setup Java uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} architecture: ${{ matrix.architecture }} cache: 'maven' - - id: versions - name: Apply version information - run: | - 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 - SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'` - REVCOUNT=`git rev-list --count HEAD` - echo "::set-output name=semVerStr::${SEM_VER_STR}" - echo "::set-output name=semVerNum::${SEM_VER_NUM}" - echo "::set-output name=revNum::${REVCOUNT}" - - name: Validate Version - uses: skymatic/semver-validation-action@v1 - with: - version: ${{ steps.versions.outputs.semVerStr }} + - name: Set version + run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }} - name: Run maven run: mvn -B clean package -Pdependency-check,mac -DskipTests - name: Patch target dir @@ -92,13 +77,13 @@ jobs: --name Cryptomator --vendor "Skymatic GmbH" --copyright "(C) 2016 - 2022 Skymatic GmbH" - --app-version "${{ steps.versions.outputs.semVerNum }}" + --app-version "${{ needs.get-version.outputs.semVerNum }}" --java-options "-Xss5m" --java-options "-Xmx256m" --java-options "-Dfile.encoding=\"utf-8\"" --java-options "-Dapple.awt.enableTemplateImages=true" --java-options "-Dsun.java2d.metal=true" - --java-options "-Dcryptomator.appVersion=\"${{ steps.versions.outputs.semVerStr }}\"" + --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\"" --java-options "-Dcryptomator.logDir=\"~/Library/Logs/Cryptomator\"" --java-options "-Dcryptomator.pluginDir=\"~/Library/Application Support/Cryptomator/Plugins\"" --java-options "-Dcryptomator.settingsPath=\"~/Library/Application Support/Cryptomator/settings.json\"" @@ -106,7 +91,7 @@ jobs: --java-options "-Dcryptomator.ipcSocketPath=\"~/Library/Application Support/Cryptomator/ipc.socket\"" --java-options "-Dcryptomator.integrationsMac.keychainServiceName=\"Cryptomator\"" --java-options "-Dcryptomator.showTrayIcon=true" - --java-options "-Dcryptomator.buildNumber=\"dmg-${{ steps.versions.outputs.revNum }}\"" + --java-options "-Dcryptomator.buildNumber=\"dmg-${{ needs.get-version.outputs.revNum }}\"" --mac-package-identifier org.cryptomator --resource-dir dist/mac/resources - name: Patch Cryptomator.app @@ -116,8 +101,8 @@ jobs: sed -i '' "s|###BUNDLE_SHORT_VERSION_STRING###|${VERSION_NO}|g" Cryptomator.app/Contents/Info.plist sed -i '' "s|###BUNDLE_VERSION###|${REVISION_NO}|g" Cryptomator.app/Contents/Info.plist env: - VERSION_NO: ${{ steps.versions.outputs.semVerNum }} - REVISION_NO: ${{ steps.versions.outputs.revNum }} + VERSION_NO: ${{ needs.get-version.outputs.semVerNum }} + REVISION_NO: ${{ needs.get-version.outputs.revNum }} - name: Generate license for dmg run: > mvn -B license:add-third-party @@ -201,7 +186,7 @@ jobs: --icon ".VolumeIcon.icns" 512 758 Cryptomator-${VERSION_NO}-${{ matrix.output-suffix }}.dmg dmg env: - VERSION_NO: ${{ steps.versions.outputs.semVerNum }} + VERSION_NO: ${{ needs.get-version.outputs.semVerNum }} - name: Notarize .dmg if: startsWith(github.ref, 'refs/tags/') uses: cocoalibs/xcode-notarization-action@v1 @@ -212,7 +197,7 @@ jobs: team-id: ${{ secrets.MACOS_NOTARIZATION_TEAM_ID }} xcode-path: ${{ matrix.xcode-path }} - name: Add possible alpha/beta tags to installer name - run: mv Cryptomator-*.dmg Cryptomator-${{ steps.versions.outputs.semVerStr }}-${{ matrix.output-suffix }}.dmg + run: mv Cryptomator-*.dmg Cryptomator-${{ needs.get-version.outputs.semVerStr }}-${{ matrix.output-suffix }}.dmg - name: Create detached GPG signature with key 615D449FE6E6A235 run: | echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 383fe9df7..48f7bd185 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -4,7 +4,7 @@ on: pull_request: env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 defaults: run: @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: 'zulu' java-version: ${{ env.JAVA_VERSION }} cache: 'maven' - name: Build and Test diff --git a/.github/workflows/release-check.yml b/.github/workflows/release-check.yml new file mode 100644 index 000000000..7309cb852 --- /dev/null +++ b/.github/workflows/release-check.yml @@ -0,0 +1,43 @@ +name: Release Check + +on: + push: + branches: + - 'release/**' + - 'hotfix/**' + +env: + JAVA_VERSION: 19 + +defaults: + run: + shell: bash + +jobs: + release-check-precondition: + name: Validate commits pushed to release/hotfix branch to fulfill release requirements + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - id: validate-pom-version + name: Validate POM version + run: | + if [[ $GITHUB_REF =~ refs/heads/(hotfix|release)/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then + SEM_VER_STR=${GITHUB_REF##*/} + else + echo "Failed to parse version" + exit 1 + fi + + if [[ ${SEM_VER_STR} == `mvn help:evaluate -Dexpression=project.version -q -DforceStdout` ]]; then + echo "semVerStr=${SEM_VER_STR}" >> $GITHUB_OUTPUT + else + echo "Version not set in POM" + exit 1 + fi + - name: Validate release in org.cryptomator.Cryptomator.metainfo.xml file + run: | + if ! grep -q "" dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml; then + echo "Release not set in dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml" + exit 1 + fi \ No newline at end of file diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 2e35b3902..0725c0329 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -10,47 +10,36 @@ on: required: false env: - JAVA_VERSION: 17 + JAVA_VERSION: 19 + JAVA_DIST: 'zulu' + JAVA_CACHE: 'maven' defaults: run: shell: bash jobs: + get-version: + uses: ./.github/workflows/get-version.yml + with: + version: ${{ github.event.inputs.version }} + build-msi: name: Build .msi Installer runs-on: windows-latest + needs: [get-version] + env: + LOOPBACK_ALIAS: 'cryptomator-vault' steps: - uses: actions/checkout@v3 - with: - fetch-depth: 0 - name: Setup Java uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: ${{ env.JAVA_DIST }} java-version: ${{ env.JAVA_VERSION }} - cache: 'maven' - - id: versions - name: Apply version information - run: | - 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 - SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'` - REVCOUNT=`git rev-list --count HEAD` - echo "::set-output name=semVerStr::${SEM_VER_STR}" - echo "::set-output name=semVerNum::${SEM_VER_NUM}" - echo "::set-output name=revNum::${REVCOUNT}" - - name: Validate Version - uses: skymatic/semver-validation-action@v1 - with: - version: ${{ steps.versions.outputs.semVerStr }} + cache: ${{ env.JAVA_CACHE }} + - name: Set version + run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }} - name: Run maven run: mvn -B clean package -Pdependency-check,win -DskipTests - name: Patch target dir @@ -83,10 +72,10 @@ jobs: --name Cryptomator --vendor "Skymatic GmbH" --copyright "(C) 2016 - 2022 Skymatic GmbH" - --app-version "${{ steps.versions.outputs.semVerNum }}.${{ steps.versions.outputs.revNum }}" + --app-version "${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}" --java-options "-Xss5m" --java-options "-Xmx256m" - --java-options "-Dcryptomator.appVersion=\"${{ steps.versions.outputs.semVerStr }}\"" + --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\"" --java-options "-Dfile.encoding=\"utf-8\"" --java-options "-Dcryptomator.logDir=\"~/AppData/Roaming/Cryptomator\"" --java-options "-Dcryptomator.pluginDir=\"~/AppData/Roaming/Cryptomator/Plugins\"" @@ -94,8 +83,9 @@ jobs: --java-options "-Dcryptomator.p12Path=\"~/AppData/Roaming/Cryptomator/key.p12\"" --java-options "-Dcryptomator.ipcSocketPath=\"~/AppData/Roaming/Cryptomator/ipc.socket\"" --java-options "-Dcryptomator.mountPointsDir=\"~/Cryptomator\"" + --java-options "-Dcryptomator.loopbackAlias=\"${{ env.LOOPBACK_ALIAS }}\"" --java-options "-Dcryptomator.showTrayIcon=true" - --java-options "-Dcryptomator.buildNumber=\"msi-${{ steps.versions.outputs.revNum }}\"" + --java-options "-Dcryptomator.buildNumber=\"msi-${{ needs.get-version.outputs.revNum }}\"" --java-options "-Dcryptomator.integrationsWin.autoStartShellLinkName=\"Cryptomator\"" --java-options "-Dcryptomator.integrationsWin.keychainPaths=\"~/AppData/Roaming/Cryptomator/keychain.json\"" --resource-dir dist/win/resources @@ -103,11 +93,21 @@ jobs: - name: Patch Application Directory run: | cp dist/win/contrib/* appdir/Cryptomator + - name: Set LOOPBACK_ALIAS in patchWebDAV.bat + shell: pwsh + run: | + $patchScript = "appdir\Cryptomator\patchWebDAV.bat" + try { + (Get-Content $patchScript ) -replace '::REPLACE ME', "SET LOOPBACK_ALIAS=`"${{ env.LOOPBACK_ALIAS}}`"" | Set-Content $patchScript + } catch { + Write-Host "Failed to set LOOPBACK_ALIAS for patchWebDAV.bat" + exit 1 + } - name: Fix permissions run: attrib -r appdir/Cryptomator/Cryptomator.exe shell: pwsh - name: Codesign - uses: skymatic/code-sign-action@v1 + uses: skymatic/code-sign-action@v2 with: certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }} password: ${{ secrets.WIN_CODESIGN_P12_PW }} @@ -138,7 +138,7 @@ jobs: --name Cryptomator --vendor "Skymatic GmbH" --copyright "(C) 2016 - 2022 Skymatic GmbH" - --app-version "${{ steps.versions.outputs.semVerNum }}" + --app-version "${{ needs.get-version.outputs.semVerNum }}" --win-menu --win-dir-chooser --win-shortcut-prompt @@ -150,7 +150,7 @@ jobs: env: JP_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources # requires abs path, used in resources/main.wxs - name: Codesign MSI - uses: skymatic/code-sign-action@v1 + uses: skymatic/code-sign-action@v2 with: certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }} password: ${{ secrets.WIN_CODESIGN_P12_PW }} @@ -159,7 +159,7 @@ jobs: timestampUrl: 'http://timestamp.digicert.com' folder: installer - name: Add possible alpha/beta tags to installer name - run: mv installer/Cryptomator-*.msi Cryptomator-${{ steps.versions.outputs.semVerStr }}-x64.msi + run: mv installer/Cryptomator-*.msi Cryptomator-${{ needs.get-version.outputs.semVerStr }}-x64.msi - name: Create detached GPG signature with key 615D449FE6E6A235 run: | echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import @@ -184,23 +184,20 @@ jobs: files: | *.msi *.asc - outputs: - semVerNum: ${{ steps.versions.outputs.semVerNum }} - semVerStr: ${{ steps.versions.outputs.semVerStr }} - revNum: ${{ steps.versions.outputs.revNum }} call-winget-flow: - needs: [build-msi] - if: github.event.action == 'published' + needs: [get-version, build-msi] + if: github.event.action == 'published' && needs.get-version.outputs.type == 'stable' uses: ./.github/workflows/winget.yml with: releaseTag: ${{ github.event.release.tag_name }} + secrets: inherit build-exe: name: Build .exe installer runs-on: windows-latest - needs: [build-msi] + needs: [get-version, build-msi] steps: - uses: actions/checkout@v3 - name: Download .msi @@ -212,9 +209,9 @@ jobs: run: mv dist/win/bundle/resources/Cryptomator*.msi dist/win/bundle/resources/Cryptomator.msi - uses: actions/setup-java@v3 with: - distribution: 'temurin' + distribution: ${{ env.JAVA_DIST }} java-version: ${{ env.JAVA_VERSION }} - cache: 'maven' + cache: ${{ env.JAVA_CACHE }} - name: Generate license for exe run: > mvn -B license:add-third-party @@ -236,7 +233,7 @@ jobs: "${WIX}/bin/candle.exe" dist/win/bundle/bundleWithWinfsp.wxs -ext WixBalExtension -out dist/win/bundle/ - -dBundleVersion="${{ needs.build-msi.outputs.semVerNum }}.${{ needs.build-msi.outputs.revNum }}" + -dBundleVersion="${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}" -dBundleVendor="Skymatic GmbH" -dBundleCopyright="(C) 2016 - 2022 Skymatic GmbH" -dAboutUrl="https://cryptomator.org" @@ -253,7 +250,7 @@ jobs: -ib installer/unsigned/Cryptomator-Installer.exe -o tmp/engine.exe - name: Codesign burn engine - uses: skymatic/code-sign-action@v1 + uses: skymatic/code-sign-action@v2 with: certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }} password: ${{ secrets.WIN_CODESIGN_P12_PW }} @@ -267,7 +264,7 @@ jobs: -ab tmp/engine.exe installer/unsigned/Cryptomator-Installer.exe -o installer/Cryptomator-Installer.exe - name: Codesign EXE - uses: skymatic/code-sign-action@v1 + uses: skymatic/code-sign-action@v2 with: certificate: ${{ secrets.WIN_CODESIGN_P12_BASE64 }} password: ${{ secrets.WIN_CODESIGN_P12_PW }} @@ -276,7 +273,7 @@ jobs: timestampUrl: 'http://timestamp.digicert.com' folder: installer - name: Add possible alpha/beta tags to installer name - run: mv installer/Cryptomator-Installer.exe Cryptomator-${{ needs.build-msi.outputs.semVerStr }}-x64.exe + run: mv installer/Cryptomator-Installer.exe Cryptomator-${{ needs.get-version.outputs.semVerStr }}-x64.exe - name: Create detached GPG signature with key 615D449FE6E6A235 run: | echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import diff --git a/.idea/misc.xml b/.idea/misc.xml index 4731638fd..e5d629592 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/dist/linux/debian/changelog b/dist/linux/debian/changelog index 2c7606733..84a9756f9 100644 --- a/dist/linux/debian/changelog +++ b/dist/linux/debian/changelog @@ -1,4 +1,4 @@ -cryptomator (${PPA_VERSION}) bionic; urgency=low +cryptomator (${PPA_VERSION}) focal; urgency=low * Full changelog can be found on https://github.com/cryptomator/cryptomator/releases diff --git a/dist/linux/debian/control b/dist/linux/debian/control index ef06120b3..77aba901c 100644 --- a/dist/linux/debian/control +++ b/dist/linux/debian/control @@ -2,7 +2,7 @@ Source: cryptomator Maintainer: Cryptobot Section: utils Priority: optional -Build-Depends: debhelper (>=10), openjdk-17-jdk +Build-Depends: debhelper (>=10), coffeelibs-jdk-19 Standards-Version: 4.5.0 Homepage: https://cryptomator.org Vcs-Git: https://github.com/cryptomator/cryptomator.git diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index b77e6f8f2..04c256f60 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -4,6 +4,8 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +JAVA_HOME = /usr/lib/jvm/java-19-coffeelibs + %: dh $@ @@ -16,7 +18,7 @@ override_dh_auto_clean: override_dh_auto_build: mkdir resources ln -s ../common/org.cryptomator.Cryptomator512.png resources/cryptomator.png - jlink \ + $(JAVA_HOME)/bin/jlink \ --output runtime \ --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.crypto.ec,jdk.accessibility,jdk.management.jfr \ --strip-native-commands \ @@ -24,7 +26,7 @@ override_dh_auto_build: --no-man-pages \ --strip-debug \ --compress=2 - jpackage \ + $(JAVA_HOME)/bin/jpackage \ --type app-image \ --runtime-image runtime \ --input libs \ diff --git a/dist/win/build.bat b/dist/win/build.bat index c97ebbb35..997d94328 100644 --- a/dist/win/build.bat +++ b/dist/win/build.bat @@ -9,8 +9,9 @@ SET ABOUT_URL="https://cryptomator.org" SET UPDATE_URL="https://cryptomator.org/downloads/" SET HELP_URL="https://cryptomator.org/contact/" SET MODULE_AND_MAIN_CLASS="org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator" +SET LOOPBACK_ALIAS="cryptomator-vault" -powershell -NoLogo -NoExit -ExecutionPolicy Unrestricted -Command .\build.ps1^ +powershell -NoLogo -ExecutionPolicy Unrestricted -Command .\build.ps1^ -AppName %APPNAME%^ -MainJarGlob "%MAIN_JAR_GLOB%"^ -ModuleAndMainClass "%MODULE_AND_MAIN_CLASS%"^ @@ -20,4 +21,5 @@ powershell -NoLogo -NoExit -ExecutionPolicy Unrestricted -Command .\build.ps1^ -AboutUrl "%ABOUT_URL%"^ -HelpUrl "%HELP_URL%"^ -UpdateUrl "%UPDATE_URL%"^ + -LoopbackAlias "%LOOPBACK_ALIAS%"^ -Clean 1 \ No newline at end of file diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index 50cdbd011..1e316d5f2 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -8,6 +8,7 @@ Param( [Parameter(Mandatory, HelpMessage="Please provide a help url")][string] $HelpUrl, [Parameter(Mandatory, HelpMessage="Please provide an update url")][string] $UpdateUrl, [Parameter(Mandatory, HelpMessage="Please provide an about url")][string] $AboutUrl, + [Parameter(Mandatory, HelpMessage="Please provide an alias for localhost")][string] $LoopbackAlias, [bool] $clean ) @@ -85,6 +86,7 @@ if ($clean -and (Test-Path -Path $appPath)) { --java-options "-Dcryptomator.ipcSocketPath=`"~/AppData/Roaming/$AppName/ipc.socket`"" ` --java-options "-Dcryptomator.p12Path=`"~/AppData/Roaming/$AppName/key.p12`"" ` --java-options "-Dcryptomator.mountPointsDir=`"~/$AppName`"" ` + --java-options "-Dcryptomator.loopbackAlias=`"$LoopbackAlias`"" ` --java-options "-Dcryptomator.integrationsWin.autoStartShellLinkName=`"$AppName`"" ` --java-options "-Dcryptomator.integrationsWin.keychainPaths=`"~/AppData/Roaming/$AppName/keychain.json`"" ` --java-options "-Dcryptomator.showTrayIcon=true" ` @@ -105,6 +107,14 @@ if ($clean -and (Test-Path -Path $appPath)) { # patch app dir Copy-Item "contrib\*" -Destination "$AppName" attrib -r "$AppName\$AppName.exe" +# patch batch script to set hostfile +$webDAVPatcher = "$AppName\patchWebDAV.bat" +try { + (Get-Content $webDAVPatcher ) -replace '::REPLACE ME', "SET LOOPBACK_ALIAS=`"$LoopbackAlias`"" | Set-Content $webDAVPatcher +} catch { + Write-Host "Failed to set LOOPBACK_ALIAS for patchWebDAV.bat" + exit 1 +} # create .msi $Env:JP_WIXWIZARD_RESOURCES = "$buildDir\resources" diff --git a/dist/win/bundle/resources/winfsp-download.url b/dist/win/bundle/resources/winfsp-download.url index 35472c1ba..6bb0c7daf 100644 --- a/dist/win/bundle/resources/winfsp-download.url +++ b/dist/win/bundle/resources/winfsp-download.url @@ -1,2 +1,2 @@ [InternetShortcut] -URL=https://github.com/winfsp/winfsp/releases/download/v1.11/winfsp-1.11.22176.msi \ No newline at end of file +URL=https://github.com/winfsp/winfsp/releases/download/v1.12/winfsp-1.12.22301.msi \ No newline at end of file diff --git a/dist/win/contrib/patchWebDAV.bat b/dist/win/contrib/patchWebDAV.bat index 1726147d2..aad226881 100644 --- a/dist/win/contrib/patchWebDAV.bat +++ b/dist/win/contrib/patchWebDAV.bat @@ -1,6 +1,6 @@ @echo off :: Default values for Cryptomator builds -SET LOOPBACK_ALIAS="cryptomator-vault" +::REPLACE ME cd %~dp0 powershell -NoLogo -NonInteractive -ExecutionPolicy Unrestricted -Command .\patchWebDAV.ps1^ diff --git a/dist/win/resources/main.wxs b/dist/win/resources/main.wxs index b8703a14d..d6247bf05 100644 --- a/dist/win/resources/main.wxs +++ b/dist/win/resources/main.wxs @@ -23,6 +23,11 @@ + + + + + - - - - - - - - - - + + + + + + + + + + @@ -86,7 +91,7 @@ - + diff --git a/dist/win/resources/overrides.wxi b/dist/win/resources/overrides.wxi index 60133a35b..c4c946868 100644 --- a/dist/win/resources/overrides.wxi +++ b/dist/win/resources/overrides.wxi @@ -1,7 +1,7 @@ - - - - + - +Non-opening ProgID settings: +- IconFileEncryptedData +Full file name of icon file used for encrypted data files. Default is "Cryptomator-Vault.ico" + +- ProgIdContentType +Media Type of the encrypted data files. Default is "application/vnd.cryptomator.encrypted" + +Close Application settings: +- CloseApplicationTarget +Full name of executable to be checkd in the close application util. Default is "cryptomator.exe" + +Legacy Installation settings: +- SkipCryptomatorLegacyCheck +Should be defined to disable checking for the inno setup installation of Cryptomator and undefined, to enable it. + --> diff --git a/pom.xml b/pom.xml index 39ede10a8..52cee0e48 100644 --- a/pom.xml +++ b/pom.xml @@ -21,14 +21,14 @@ UTF-8 - 17 + 19 com.github.serceman,com.github.jnr,org.ow2.asm,net.java.dev.jna,org.apache.jackrabbit,org.apache.httpcomponents,de.swiesend,org.purejava,com.github.hypfvieh 2.1.0-rc1 - 2.4.4 + 2.4.5 1.2.0-beta1 1.1.2 1.1.2 @@ -43,8 +43,8 @@ 2.2 31.1-jre 2.9.1 - 18.0.2 - 4.0.0 + 19 + 4.2.1 9.25.4 1.4.4 2.0.3 diff --git a/src/main/java/org/cryptomator/common/CommonsModule.java b/src/main/java/org/cryptomator/common/CommonsModule.java index 101dc1e28..8d9155d8b 100644 --- a/src/main/java/org/cryptomator/common/CommonsModule.java +++ b/src/main/java/org/cryptomator/common/CommonsModule.java @@ -23,6 +23,7 @@ import javax.inject.Named; import javax.inject.Singleton; import javafx.beans.binding.Binding; import javafx.beans.binding.Bindings; +import javafx.beans.value.ObservableValue; import java.net.InetSocketAddress; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; @@ -130,16 +131,16 @@ public abstract class CommonsModule { @Provides @Singleton - static Binding provideServerSocketAddressBinding(Settings settings) { - return Bindings.createObjectBinding(() -> { + static ObservableValue provideServerSocketAddressBinding(Settings settings) { + return settings.port().map(port -> { String host = SystemUtils.IS_OS_WINDOWS ? "127.0.0.1" : "localhost"; return InetSocketAddress.createUnresolved(host, settings.port().intValue()); - }, settings.port()); + }); } @Provides @Singleton - static WebDavServer provideWebDavServer(Binding serverSocketAddressBinding) { + static WebDavServer provideWebDavServer(ObservableValue serverSocketAddressBinding) { WebDavServer server = WebDavServer.create(); // no need to unsubscribe eventually, because server is a singleton EasyBind.subscribe(serverSocketAddressBinding, server::bind); diff --git a/src/main/java/org/cryptomator/common/Environment.java b/src/main/java/org/cryptomator/common/Environment.java index 261750ad1..383261119 100644 --- a/src/main/java/org/cryptomator/common/Environment.java +++ b/src/main/java/org/cryptomator/common/Environment.java @@ -26,6 +26,7 @@ public class Environment { private static final String KEYCHAIN_PATHS_PROP_NAME = "cryptomator.integrationsWin.keychainPaths"; private static final String P12_PATH_PROP_NAME = "cryptomator.p12Path"; private static final String LOG_DIR_PROP_NAME = "cryptomator.logDir"; + private static final String LOOPBACK_ALIAS_PROP_NAME = "cryptomator.loopbackAlias"; private static final String MOUNTPOINT_DIR_PROP_NAME = "cryptomator.mountPointsDir"; private static final String MIN_PW_LENGTH_PROP_NAME = "cryptomator.minPwLength"; private static final String APP_VERSION_PROP_NAME = "cryptomator.appVersion"; @@ -45,6 +46,7 @@ public class Environment { logCryptomatorSystemProperty(IPC_SOCKET_PATH_PROP_NAME); logCryptomatorSystemProperty(KEYCHAIN_PATHS_PROP_NAME); logCryptomatorSystemProperty(LOG_DIR_PROP_NAME); + logCryptomatorSystemProperty(LOOPBACK_ALIAS_PROP_NAME); logCryptomatorSystemProperty(PLUGIN_DIR_PROP_NAME); logCryptomatorSystemProperty(MOUNTPOINT_DIR_PROP_NAME); logCryptomatorSystemProperty(MIN_PW_LENGTH_PROP_NAME); @@ -90,6 +92,10 @@ public class Environment { return getPath(LOG_DIR_PROP_NAME).map(this::replaceHomeDir); } + public Optional getLoopbackAlias() { + return Optional.ofNullable(System.getProperty(LOOPBACK_ALIAS_PROP_NAME)); + } + public Optional getPluginDir() { return getPath(PLUGIN_DIR_PROP_NAME).map(this::replaceHomeDir); } @@ -112,22 +118,13 @@ public class Environment { } public int getMinPwLength() { - return getInt(MIN_PW_LENGTH_PROP_NAME, DEFAULT_MIN_PW_LENGTH); + return Integer.getInteger(MIN_PW_LENGTH_PROP_NAME, DEFAULT_MIN_PW_LENGTH); } public boolean showTrayIcon() { return Boolean.getBoolean(TRAY_ICON_PROP_NAME); } - private int getInt(String propertyName, int defaultValue) { - String value = System.getProperty(propertyName); - try { - return Integer.parseInt(value); - } catch (NumberFormatException e) { // includes "null" values - return defaultValue; - } - } - private Optional getPath(String propertyName) { String value = System.getProperty(propertyName); return Optional.ofNullable(value).map(Paths::get); diff --git a/src/main/java/org/cryptomator/common/LicenseHolder.java b/src/main/java/org/cryptomator/common/LicenseHolder.java index a31807a8d..be36e6968 100644 --- a/src/main/java/org/cryptomator/common/LicenseHolder.java +++ b/src/main/java/org/cryptomator/common/LicenseHolder.java @@ -10,6 +10,7 @@ import javafx.beans.binding.BooleanBinding; import javafx.beans.binding.StringBinding; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; +import javafx.beans.value.ObservableValue; import java.util.Optional; @Singleton @@ -18,7 +19,7 @@ public class LicenseHolder { private final Settings settings; private final LicenseChecker licenseChecker; private final ObjectProperty validJwtClaims; - private final StringBinding licenseSubject; + private final ObservableValue licenseSubject; private final BooleanBinding validLicenseProperty; @Inject @@ -26,7 +27,7 @@ public class LicenseHolder { this.settings = settings; this.licenseChecker = licenseChecker; this.validJwtClaims = new SimpleObjectProperty<>(); - this.licenseSubject = Bindings.createStringBinding(this::getLicenseSubject, validJwtClaims); + this.licenseSubject = validJwtClaims.map(DecodedJWT::getSubject); this.validLicenseProperty = validJwtClaims.isNotNull(); Optional claims = licenseChecker.check(settings.licenseKey().get()); @@ -55,17 +56,12 @@ public class LicenseHolder { } } - public StringBinding licenseSubjectProperty() { + public ObservableValue licenseSubjectProperty() { return licenseSubject; } public String getLicenseSubject() { - DecodedJWT claims = validJwtClaims.get(); - if (claims != null) { - return claims.getSubject(); - } else { - return null; - } + return licenseSubject.getValue(); } public BooleanBinding validLicenseProperty() { diff --git a/src/main/java/org/cryptomator/common/settings/VaultSettings.java b/src/main/java/org/cryptomator/common/settings/VaultSettings.java index 8ae20406c..742a4d1b4 100644 --- a/src/main/java/org/cryptomator/common/settings/VaultSettings.java +++ b/src/main/java/org/cryptomator/common/settings/VaultSettings.java @@ -12,6 +12,7 @@ import com.google.common.io.BaseEncoding; import javafx.beans.Observable; import javafx.beans.binding.Bindings; import javafx.beans.binding.StringBinding; +import javafx.beans.binding.StringExpression; import javafx.beans.property.BooleanProperty; import javafx.beans.property.IntegerProperty; import javafx.beans.property.ObjectProperty; @@ -20,6 +21,7 @@ import javafx.beans.property.SimpleIntegerProperty; import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleStringProperty; import javafx.beans.property.StringProperty; +import javafx.beans.value.ObservableValue; import java.nio.file.Path; import java.util.Objects; import java.util.Optional; @@ -56,11 +58,11 @@ public class VaultSettings { private final ObjectProperty actionAfterUnlock = new SimpleObjectProperty<>(DEFAULT_ACTION_AFTER_UNLOCK); private final BooleanProperty autoLockWhenIdle = new SimpleBooleanProperty(DEFAULT_AUTOLOCK_WHEN_IDLE); private final IntegerProperty autoLockIdleSeconds = new SimpleIntegerProperty(DEFAULT_AUTOLOCK_IDLE_SECONDS); - private final StringBinding mountName; + private final StringExpression mountName; public VaultSettings(String id) { this.id = Objects.requireNonNull(id); - this.mountName = Bindings.createStringBinding(this::normalizeDisplayName, displayName); + this.mountName = StringExpression.stringExpression(displayName.map(VaultSettings::normalizeDisplayName).orElse("")); } Observable[] observables() { @@ -78,8 +80,7 @@ public class VaultSettings { } //visible for testing - String normalizeDisplayName() { - var original = displayName.getValueSafe(); + static String normalizeDisplayName(String original) { if (original.isBlank() || ".".equals(original) || "..".equals(original)) { return "_"; } @@ -105,7 +106,7 @@ public class VaultSettings { return displayName; } - public StringBinding mountName() { + public StringExpression mountName() { return mountName; } diff --git a/src/main/java/org/cryptomator/common/vaults/Vault.java b/src/main/java/org/cryptomator/common/vaults/Vault.java index 5bba0b79b..54d37d5e3 100644 --- a/src/main/java/org/cryptomator/common/vaults/Vault.java +++ b/src/main/java/org/cryptomator/common/vaults/Vault.java @@ -34,6 +34,7 @@ import javafx.beans.binding.BooleanBinding; import javafx.beans.binding.StringBinding; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; +import javafx.beans.property.ReadOnlyStringProperty; import javafx.beans.property.SimpleBooleanProperty; import java.io.IOException; import java.nio.file.Path; @@ -60,7 +61,6 @@ public class Vault { private final ObjectProperty lastKnownException; private final VaultConfigCache configCache; private final VaultStats stats; - private final StringBinding displayName; private final StringBinding displayablePath; private final BooleanBinding locked; private final BooleanBinding processing; @@ -84,7 +84,6 @@ public class Vault { this.state = state; this.lastKnownException = lastKnownException; this.stats = stats; - this.displayName = Bindings.createStringBinding(this::getDisplayName, vaultSettings.displayName()); this.displayablePath = Bindings.createStringBinding(this::getDisplayablePath, vaultSettings.path()); this.locked = Bindings.createBooleanBinding(this::isLocked, state); this.processing = Bindings.createBooleanBinding(this::isProcessing, state); @@ -266,8 +265,8 @@ public class Vault { return state.get() == VaultState.Value.ERROR; } - public StringBinding displayNameProperty() { - return displayName; + public ReadOnlyStringProperty displayNameProperty() { + return vaultSettings.displayName(); } public String getDisplayName() { diff --git a/src/main/java/org/cryptomator/common/vaults/VaultModule.java b/src/main/java/org/cryptomator/common/vaults/VaultModule.java index cc38e6933..902b2d872 100644 --- a/src/main/java/org/cryptomator/common/vaults/VaultModule.java +++ b/src/main/java/org/cryptomator/common/vaults/VaultModule.java @@ -19,6 +19,7 @@ import org.slf4j.LoggerFactory; import javax.inject.Named; import javafx.beans.binding.Bindings; import javafx.beans.binding.StringBinding; +import javafx.beans.binding.StringExpression; import javafx.beans.property.BooleanProperty; import javafx.beans.property.ObjectProperty; import javafx.beans.property.ReadOnlyBooleanProperty; @@ -68,7 +69,7 @@ public class VaultModule { @DefaultMountFlags public StringBinding provideDefaultMountFlags(Settings settings, VaultSettings vaultSettings) { ObjectProperty preferredVolumeImpl = settings.preferredVolumeImpl(); - StringBinding mountName = vaultSettings.mountName(); + StringExpression mountName = vaultSettings.mountName(); BooleanProperty readOnly = vaultSettings.usesReadOnlyMode(); return Bindings.createStringBinding(() -> { @@ -88,7 +89,7 @@ public class VaultModule { } // see: https://github.com/osxfuse/osxfuse/wiki/Mount-options - private String getMacFuseDefaultMountFlags(StringBinding mountName, ReadOnlyBooleanProperty readOnly) { + private String getMacFuseDefaultMountFlags(StringExpression mountName, ReadOnlyBooleanProperty readOnly) { assert SystemUtils.IS_OS_MAC_OSX; StringBuilder flags = new StringBuilder(); if (readOnly.get()) { @@ -139,7 +140,7 @@ public class VaultModule { // see https://github.com/billziss-gh/winfsp/blob/5d0b10d0b643652c00ebb4704dc2bb28e7244973/src/dll/fuse/fuse_main.c#L53-L62 for syntax guide // see https://github.com/billziss-gh/winfsp/blob/5d0b10d0b643652c00ebb4704dc2bb28e7244973/src/dll/fuse/fuse.c#L295-L319 for options (-o <...>) // see https://github.com/billziss-gh/winfsp/wiki/Frequently-Asked-Questions/5ba00e4be4f5e938eaae6ef1500b331de12dee77 (FUSE 4.) on why the given defaults were chosen - private String getWindowsFuseDefaultMountFlags(StringBinding mountName, ReadOnlyBooleanProperty readOnly) { + private String getWindowsFuseDefaultMountFlags(StringExpression mountName, ReadOnlyBooleanProperty readOnly) { assert SystemUtils.IS_OS_WINDOWS; StringBuilder flags = new StringBuilder(); diff --git a/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java b/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java index 3ac1820d4..af7ca10f2 100644 --- a/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java +++ b/src/main/java/org/cryptomator/common/vaults/WebDavVolume.java @@ -2,6 +2,7 @@ package org.cryptomator.common.vaults; import com.google.common.base.CharMatcher; +import org.cryptomator.common.Environment; import org.cryptomator.common.settings.Settings; import org.cryptomator.common.settings.VaultSettings; import org.cryptomator.common.settings.VolumeImpl; @@ -22,12 +23,11 @@ import java.util.function.Supplier; public class WebDavVolume implements Volume { - private static final String LOCALHOST_ALIAS = "cryptomator-vault"; - private final Provider serverProvider; private final VaultSettings vaultSettings; private final Settings settings; private final WindowsDriveLetters windowsDriveLetters; + private final Environment environment; private WebDavServer server; private WebDavServletController servlet; @@ -35,11 +35,12 @@ public class WebDavVolume implements Volume { private Consumer onExitAction; @Inject - public WebDavVolume(Provider serverProvider, VaultSettings vaultSettings, Settings settings, WindowsDriveLetters windowsDriveLetters) { + public WebDavVolume(Provider serverProvider, VaultSettings vaultSettings, Settings settings, WindowsDriveLetters windowsDriveLetters, Environment environment) { this.serverProvider = serverProvider; this.vaultSettings = vaultSettings; this.settings = settings; this.windowsDriveLetters = windowsDriveLetters; + this.environment = environment; } @Override @@ -129,16 +130,17 @@ public class WebDavVolume implements Volume { } private String getLocalhostAliasOrNull() { - try { - InetAddress alias = InetAddress.getByName(LOCALHOST_ALIAS); - if (alias.getHostAddress().equals("127.0.0.1")) { - return LOCALHOST_ALIAS; - } else { - return null; + return environment.getLoopbackAlias().map(alias -> { + try { + var address = InetAddress.getByName(alias); + if (address.getHostAddress().equals("127.0.0.1")) { + return alias; + } + } catch (UnknownHostException e) { + //no-op } - } catch (UnknownHostException e) { return null; - } + }).orElse(null); } private void cleanup() { diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java index 432007c99..fe4ac3bd1 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java @@ -2,19 +2,20 @@ package org.cryptomator.ui.addvaultwizard; import dagger.Lazy; import org.apache.commons.lang3.SystemUtils; -import org.cryptomator.common.settings.Settings; -import org.cryptomator.common.settings.UiTheme; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultListManager; +import org.cryptomator.integrations.uiappearance.Theme; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; +import org.cryptomator.ui.fxapp.FxApplicationStyle; import org.cryptomator.ui.fxapp.FxApplicationWindows; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.inject.Inject; import javafx.beans.property.ObjectProperty; +import javafx.beans.value.ObservableValue; import javafx.fxml.FXML; import javafx.scene.Scene; import javafx.scene.image.Image; @@ -23,6 +24,7 @@ import javafx.stage.Stage; import java.io.File; import java.io.IOException; import java.nio.file.Path; +import java.util.Objects; import java.util.ResourceBundle; import static org.cryptomator.common.Constants.CRYPTOMATOR_FILENAME_GLOB; @@ -40,12 +42,10 @@ public class ChooseExistingVaultController implements FxController { private final ObjectProperty vault; private final VaultListManager vaultListManager; private final ResourceBundle resourceBundle; - private final Settings settings; - - private Image screenshot; + private final ObservableValue screenshot; @Inject - ChooseExistingVaultController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy successScene, FxApplicationWindows appWindows, ObjectProperty vaultPath, @AddVaultWizardWindow ObjectProperty vault, VaultListManager vaultListManager, ResourceBundle resourceBundle, Settings settings) { + ChooseExistingVaultController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy successScene, FxApplicationWindows appWindows, ObjectProperty vaultPath, @AddVaultWizardWindow ObjectProperty vault, VaultListManager vaultListManager, ResourceBundle resourceBundle, FxApplicationStyle applicationStyle) { this.window = window; this.welcomeScene = welcomeScene; this.successScene = successScene; @@ -54,16 +54,20 @@ public class ChooseExistingVaultController implements FxController { this.vault = vault; this.vaultListManager = vaultListManager; this.resourceBundle = resourceBundle; - this.settings = settings; + this.screenshot = applicationStyle.appliedThemeProperty().map(this::selectScreenshot); } - @FXML - public void initialize() { + private Image selectScreenshot(Theme theme) { + String imageResourcePath; if (SystemUtils.IS_OS_MAC) { - this.screenshot = new Image(getClass().getResource("/img/select-masterkey-mac"+(UiTheme.LIGHT == settings.theme().get()? "":"-dark")+".png").toString()); + imageResourcePath = switch (theme) { + case LIGHT -> "/img/select-masterkey-mac.png"; + case DARK -> "/img/select-masterkey-mac-dark.png"; + }; } else { - this.screenshot = new Image(getClass().getResource("/img/select-masterkey-win.png").toString()); + imageResourcePath = "/img/select-masterkey-win.png"; } + return new Image((Objects.requireNonNull(getClass().getResource(imageResourcePath)).toString())); } @FXML @@ -92,8 +96,13 @@ public class ChooseExistingVaultController implements FxController { /* Getter */ - public Image getScreenshot() { + public ObservableValue screenshotProperty() { return screenshot; } + public Image getScreenshot() { + return screenshot.getValue(); + } + + } diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java index c6bfb3f0e..db35b5a11 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java @@ -102,7 +102,7 @@ public class CreateNewVaultPasswordController implements FxController { this.masterkeyFileAccess = masterkeyFileAccess; this.processing = new SimpleBooleanProperty(); this.readyToCreateVault = new SimpleBooleanProperty(); - this.createVaultButtonState = Bindings.createObjectBinding(this::getCreateVaultButtonState, processing); + this.createVaultButtonState = Bindings.when(processing).then(ContentDisplay.LEFT).otherwise(ContentDisplay.TEXT_ONLY); } @FXML @@ -231,6 +231,6 @@ public class CreateNewVaultPasswordController implements FxController { } public ContentDisplay getCreateVaultButtonState() { - return processing.get() ? ContentDisplay.LEFT : ContentDisplay.TEXT_ONLY; + return createVaultButtonState.get(); } } diff --git a/src/main/java/org/cryptomator/ui/common/NewPasswordController.java b/src/main/java/org/cryptomator/ui/common/NewPasswordController.java index caa0962f8..6f029efe1 100644 --- a/src/main/java/org/cryptomator/ui/common/NewPasswordController.java +++ b/src/main/java/org/cryptomator/ui/common/NewPasswordController.java @@ -1,6 +1,5 @@ package org.cryptomator.ui.common; -import com.tobiasdiez.easybind.EasyBind; import org.cryptomator.ui.controls.FontAwesome5IconView; import org.cryptomator.ui.controls.NiceSecurePasswordField; @@ -42,7 +41,7 @@ public class NewPasswordController implements FxController { passwordStrength.bind(Bindings.createIntegerBinding(() -> strengthRater.computeRate(passwordField.getCharacters()), passwordField.textProperty())); passwordStrengthLabel.graphicProperty().bind(Bindings.createObjectBinding(this::getIconViewForPasswordStrengthLabel, passwordField.textProperty(), passwordStrength)); - passwordStrengthLabel.textProperty().bind(EasyBind.map(passwordStrength, strengthRater::getStrengthDescription)); + passwordStrengthLabel.textProperty().bind(passwordStrength.map(strengthRater::getStrengthDescription)); BooleanBinding passwordsMatch = Bindings.createBooleanBinding(this::passwordFieldsMatch, passwordField.textProperty(), reenterField.textProperty()); BooleanBinding reenterFieldNotEmpty = reenterField.textProperty().isNotEmpty(); diff --git a/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java b/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java index 4d09707b9..e16c3ff21 100644 --- a/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java +++ b/src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java @@ -46,7 +46,7 @@ public class NiceSecurePasswordField extends StackPane { nonPrintableCharsIcon.managedProperty().bind(passwordField.containingNonPrintableCharsProperty()); revealPasswordIcon.setGlyph(FontAwesome5Icon.EYE); - revealPasswordIcon.glyphProperty().bind(Bindings.createObjectBinding(this::getRevealPasswordGlyph, revealPasswordButton.selectedProperty())); + revealPasswordIcon.glyphProperty().bind(Bindings.when(revealPasswordButton.selectedProperty()).then(FontAwesome5Icon.EYE_SLASH).otherwise(FontAwesome5Icon.EYE)); revealPasswordIcon.setGlyphSize(ICON_SIZE); revealPasswordButton.setContentDisplay(ContentDisplay.LEFT); @@ -61,10 +61,6 @@ public class NiceSecurePasswordField extends StackPane { disabledProperty().addListener(this::disabledChanged); } - private FontAwesome5Icon getRevealPasswordGlyph() { - return revealPasswordButton.isSelected() ? FontAwesome5Icon.EYE_SLASH : FontAwesome5Icon.EYE; - } - private void disabledChanged(@SuppressWarnings("unused") Observable observable) { revealPasswordButton.setSelected(false); } diff --git a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java index 711da7948..b6681f728 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java +++ b/src/main/java/org/cryptomator/ui/fxapp/FxApplicationStyle.java @@ -12,6 +12,8 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; import javafx.application.Application; +import javafx.beans.property.ObjectProperty; +import javafx.beans.property.SimpleObjectProperty; import javafx.beans.value.ObservableValue; import java.util.Optional; @@ -24,9 +26,10 @@ public class FxApplicationStyle { private final Optional appearanceProvider; private final LicenseHolder licenseHolder; private final UiAppearanceListener systemInterfaceThemeListener = this::systemInterfaceThemeChanged; + private final ObjectProperty appliedTheme = new SimpleObjectProperty<>(Theme.LIGHT); @Inject - public FxApplicationStyle(Settings settings, Optional appearanceProvider, LicenseHolder licenseHolder){ + public FxApplicationStyle(Settings settings, Optional appearanceProvider, LicenseHolder licenseHolder) { this.settings = settings; this.appearanceProvider = appearanceProvider; this.licenseHolder = licenseHolder; @@ -91,6 +94,7 @@ public class FxApplicationStyle { } else { Application.setUserAgentStylesheet(stylesheet.toString()); appearanceProvider.ifPresent(provider -> provider.adjustToTheme(Theme.LIGHT)); + appliedTheme.set(Theme.LIGHT); } } @@ -103,6 +107,11 @@ public class FxApplicationStyle { } else { Application.setUserAgentStylesheet(stylesheet.toString()); appearanceProvider.ifPresent(provider -> provider.adjustToTheme(Theme.DARK)); + appliedTheme.set(Theme.DARK); } } + + public ObjectProperty appliedThemeProperty() { + return appliedTheme; + } } diff --git a/src/main/java/org/cryptomator/ui/health/CheckDetailController.java b/src/main/java/org/cryptomator/ui/health/CheckDetailController.java index 66f2e9bf5..c467a5328 100644 --- a/src/main/java/org/cryptomator/ui/health/CheckDetailController.java +++ b/src/main/java/org/cryptomator/ui/health/CheckDetailController.java @@ -3,12 +3,12 @@ package org.cryptomator.ui.health; import com.tobiasdiez.easybind.EasyBind; import com.tobiasdiez.easybind.EasyObservableList; import com.tobiasdiez.easybind.Subscription; -import com.tobiasdiez.easybind.optional.OptionalBinding; import org.cryptomator.cryptofs.health.api.DiagnosticResult; import org.cryptomator.ui.common.FxController; import javax.inject.Inject; import javafx.beans.binding.Binding; +import javafx.beans.binding.BooleanExpression; import javafx.beans.property.ObjectProperty; import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; @@ -22,15 +22,15 @@ public class CheckDetailController implements FxController { private final EasyObservableList results; private final ObjectProperty check; - private final OptionalBinding checkState; - private final Binding checkName; - private final Binding checkRunning; - private final Binding checkScheduled; - private final Binding checkFinished; - private final Binding checkSkipped; - private final Binding checkSucceeded; - private final Binding checkFailed; - private final Binding checkCancelled; + private final ObservableValue checkState; + private final ObservableValue checkName; + private final BooleanExpression checkRunning; + private final BooleanExpression checkScheduled; + private final BooleanExpression checkFinished; + private final BooleanExpression checkSkipped; + private final BooleanExpression checkSucceeded; + private final BooleanExpression checkFailed; + private final BooleanExpression checkCancelled; private final Binding countOfWarnSeverity; private final Binding countOfCritSeverity; private final Binding warnOrCritsExist; @@ -44,15 +44,15 @@ public class CheckDetailController implements FxController { this.resultListCellFactory = resultListCellFactory; this.results = EasyBind.wrapList(FXCollections.observableArrayList()); this.check = selectedTask; - this.checkState = EasyBind.wrapNullable(selectedTask).mapObservable(Check::stateProperty); - this.checkName = EasyBind.wrapNullable(selectedTask).map(Check::getName).orElse(""); - this.checkRunning = checkState.map(Check.CheckState.RUNNING::equals).orElse(false); - this.checkScheduled = checkState.map(Check.CheckState.SCHEDULED::equals).orElse(false); - this.checkSkipped = checkState.map(Check.CheckState.SKIPPED::equals).orElse(false); - this.checkSucceeded = checkState.map(Check.CheckState.SUCCEEDED::equals).orElse(false); - this.checkFailed = checkState.map(Check.CheckState.ERROR::equals).orElse(false); - this.checkCancelled = checkState.map(Check.CheckState.CANCELLED::equals).orElse(false); - this.checkFinished = EasyBind.combine(checkSucceeded, checkFailed, checkCancelled, (a, b, c) -> a || b || c); + this.checkState = selectedTask.flatMap(Check::stateProperty); + this.checkName = selectedTask.map(Check::getName).orElse(""); + this.checkRunning = BooleanExpression.booleanExpression(checkState.map(Check.CheckState.RUNNING::equals).orElse(false)); + this.checkScheduled = BooleanExpression.booleanExpression(checkState.map(Check.CheckState.SCHEDULED::equals).orElse(false)); + this.checkSkipped =BooleanExpression.booleanExpression(checkState.map(Check.CheckState.SKIPPED::equals).orElse(false)); + this.checkSucceeded = BooleanExpression.booleanExpression(checkState.map(Check.CheckState.SUCCEEDED::equals).orElse(false)); + this.checkFailed = BooleanExpression.booleanExpression(checkState.map(Check.CheckState.ERROR::equals).orElse(false)); + this.checkCancelled = BooleanExpression.booleanExpression(checkState.map(Check.CheckState.CANCELLED::equals).orElse(false)); + this.checkFinished = checkSucceeded.or(checkFailed).or(checkCancelled); this.countOfWarnSeverity = results.reduce(countSeverity(DiagnosticResult.Severity.WARN)); this.countOfCritSeverity = results.reduce(countSeverity(DiagnosticResult.Severity.CRITICAL)); this.warnOrCritsExist = EasyBind.combine(checkSucceeded, countOfWarnSeverity, countOfCritSeverity, (suceeded, warns, crits) -> suceeded && (warns.longValue() > 0 || crits.longValue() > 0) ); @@ -84,7 +84,7 @@ public class CheckDetailController implements FxController { return checkName.getValue(); } - public Binding checkNameProperty() { + public ObservableValue checkNameProperty() { return checkName; } @@ -108,7 +108,7 @@ public class CheckDetailController implements FxController { return checkRunning.getValue(); } - public Binding checkRunningProperty() { + public BooleanExpression checkRunningProperty() { return checkRunning; } @@ -116,7 +116,7 @@ public class CheckDetailController implements FxController { return checkFinished.getValue(); } - public Binding checkFinishedProperty() { + public BooleanExpression checkFinishedProperty() { return checkFinished; } @@ -124,7 +124,7 @@ public class CheckDetailController implements FxController { return checkScheduled.getValue(); } - public Binding checkScheduledProperty() { + public BooleanExpression checkScheduledProperty() { return checkScheduled; } @@ -132,7 +132,7 @@ public class CheckDetailController implements FxController { return checkSkipped.getValue(); } - public Binding checkSkippedProperty() { + public BooleanExpression checkSkippedProperty() { return checkSkipped; } @@ -140,7 +140,7 @@ public class CheckDetailController implements FxController { return checkSucceeded.getValue(); } - public Binding checkSucceededProperty() { + public BooleanExpression checkSucceededProperty() { return checkSucceeded; } @@ -148,7 +148,7 @@ public class CheckDetailController implements FxController { return checkFailed.getValue(); } - public Binding checkFailedProperty() { + public BooleanExpression checkFailedProperty() { return checkFailed; } @@ -164,7 +164,7 @@ public class CheckDetailController implements FxController { return warnOrCritsExist.getValue(); } - public Binding checkCancelledProperty() { + public BooleanExpression checkCancelledProperty() { return checkCancelled; } diff --git a/src/main/java/org/cryptomator/ui/health/CheckListCellController.java b/src/main/java/org/cryptomator/ui/health/CheckListCellController.java index 5ef2926ef..6357be558 100644 --- a/src/main/java/org/cryptomator/ui/health/CheckListCellController.java +++ b/src/main/java/org/cryptomator/ui/health/CheckListCellController.java @@ -1,21 +1,20 @@ package org.cryptomator.ui.health; -import com.tobiasdiez.easybind.EasyBind; import org.cryptomator.ui.common.FxController; import javax.inject.Inject; -import javafx.beans.binding.Binding; import javafx.beans.binding.Bindings; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; +import javafx.beans.value.ObservableValue; import javafx.scene.control.CheckBox; public class CheckListCellController implements FxController { private final ObjectProperty check; - private final Binding checkName; - private final Binding checkRunnable; + private final ObservableValue checkRunnable; + private final ObservableValue checkName; /* FXML */ public CheckBox checkbox; @@ -23,8 +22,8 @@ public class CheckListCellController implements FxController { @Inject public CheckListCellController() { check = new SimpleObjectProperty<>(); - checkRunnable = EasyBind.wrapNullable(check).mapObservable(Check::stateProperty).map(Check.CheckState.RUNNABLE::equals).orElse(false); - checkName = EasyBind.wrapNullable(check).map(Check::getName).orElse(""); + checkRunnable = check.flatMap(Check::stateProperty).map(Check.CheckState.RUNNABLE::equals).orElse(false); + checkName = check.map(Check::getName).orElse(""); } public void initialize() { @@ -50,7 +49,7 @@ public class CheckListCellController implements FxController { check.set(c); } - public Binding checkNameProperty() { + public ObservableValue checkNameProperty() { return checkName; } @@ -58,7 +57,7 @@ public class CheckListCellController implements FxController { return checkName.getValue(); } - public Binding checkRunnableProperty() { + public ObservableValue checkRunnableProperty() { return checkRunnable; } diff --git a/src/main/java/org/cryptomator/ui/health/ResultListCellController.java b/src/main/java/org/cryptomator/ui/health/ResultListCellController.java index 59ee2fa67..d655d0058 100644 --- a/src/main/java/org/cryptomator/ui/health/ResultListCellController.java +++ b/src/main/java/org/cryptomator/ui/health/ResultListCellController.java @@ -13,13 +13,12 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; import javafx.application.Platform; -import javafx.beans.binding.Binding; import javafx.beans.binding.Bindings; import javafx.beans.binding.BooleanBinding; import javafx.beans.binding.ObjectBinding; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; -import javafx.beans.value.ObservableObjectValue; +import javafx.beans.value.ObservableValue; import javafx.fxml.FXML; import javafx.scene.control.Tooltip; import javafx.util.Duration; @@ -38,10 +37,10 @@ public class ResultListCellController implements FxController { private final Logger LOG = LoggerFactory.getLogger(ResultListCellController.class); private final ObjectProperty result; - private final ObservableObjectValue severity; - private final Binding description; + private final ObservableValue severity; + private final ObservableValue description; private final ResultFixApplier fixApplier; - private final ObservableObjectValue fixState; + private final ObservableValue fixState; private final ObjectBinding severityGlyph; private final ObjectBinding fixGlyph; private final BooleanBinding fixable; @@ -62,10 +61,10 @@ public class ResultListCellController implements FxController { @Inject public ResultListCellController(ResultFixApplier fixApplier, ResourceBundle resourceBundle) { this.result = new SimpleObjectProperty<>(null); - this.severity = EasyBind.wrapNullable(result).map(r -> r.diagnosis().getSeverity()).asOrdinary(); - this.description = EasyBind.wrapNullable(result).map(Result::getDescription).orElse(""); + this.severity = result.map(Result::diagnosis).map(DiagnosticResult::getSeverity); + this.description = result.map(Result::getDescription).orElse(""); this.fixApplier = fixApplier; - this.fixState = EasyBind.wrapNullable(result).mapObservable(Result::fixState).asOrdinary(); + this.fixState = result.flatMap(Result::fixState); this.severityGlyph = Bindings.createObjectBinding(this::getSeverityGlyph, result); this.fixGlyph = Bindings.createObjectBinding(this::getFixGlyph, fixState); this.fixable = Bindings.createBooleanBinding(this::isFixable, fixState); @@ -83,14 +82,15 @@ public class ResultListCellController implements FxController { @FXML public void initialize() { // see getGlyph() for relevant glyphs: - subscriptions.addAll(List.of(EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-muted", Bindings.equal(severity, DiagnosticResult.Severity.INFO)), // - EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-primary", Bindings.equal(severity, DiagnosticResult.Severity.GOOD)), // - EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-orange", Bindings.equal(severity, DiagnosticResult.Severity.WARN)), // - EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-red", Bindings.equal(severity, DiagnosticResult.Severity.CRITICAL)) // + subscriptions.addAll(List.of(EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-muted", severity.map(DiagnosticResult.Severity.INFO::equals).orElse(false)), // + EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-primary", severity.map(DiagnosticResult.Severity.GOOD::equals).orElse(false)), // + EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-orange", severity.map(DiagnosticResult.Severity.WARN::equals).orElse(false)), // + EasyBind.includeWhen(severityView.getStyleClass(), "glyph-icon-red", severity.map(DiagnosticResult.Severity.CRITICAL::equals).orElse(false)) // )); + var animation = Animations.createDiscrete360Rotation(fixView); this.fixRunningRotator = AutoAnimator.animate(animation) // - .onCondition(Bindings.equal(fixState, Result.FixState.FIXING)) // + .onCondition(fixing) // .afterStop(() -> fixView.setRotate(0)) // .build(); } @@ -127,7 +127,7 @@ public class ResultListCellController implements FxController { return result; } - public Binding descriptionProperty() { + public ObservableValue descriptionProperty() { return description; } @@ -173,7 +173,7 @@ public class ResultListCellController implements FxController { } public boolean isFixable() { - return Result.FixState.FIXABLE.equals(fixState.get()); + return Result.FixState.FIXABLE.equals(fixState.getValue()); } public BooleanBinding fixingProperty() { @@ -181,7 +181,7 @@ public class ResultListCellController implements FxController { } public boolean isFixing() { - return Result.FixState.FIXING.equals(fixState.get()); + return Result.FixState.FIXING.equals(fixState.getValue()); } public BooleanBinding fixedProperty() { @@ -189,7 +189,7 @@ public class ResultListCellController implements FxController { } public boolean isFixed() { - return Result.FixState.FIXED.equals(fixState.get()); + return Result.FixState.FIXED.equals(fixState.getValue()); } public BooleanBinding fixFailedProperty() { @@ -197,7 +197,7 @@ public class ResultListCellController implements FxController { } public Boolean isFixFailed() { - return Result.FixState.FIX_FAILED.equals(fixState.get()); + return Result.FixState.FIX_FAILED.equals(fixState.getValue()); } public BooleanBinding fixRunningOrDoneProperty() { diff --git a/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingModule.java b/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingModule.java index 6e28b8796..a23a5f1b3 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingModule.java +++ b/src/main/java/org/cryptomator/ui/keyloading/hub/HubKeyLoadingModule.java @@ -56,8 +56,10 @@ public abstract class HubKeyLoadingModule { @Named("deviceId") static String provideDeviceId(DeviceKey deviceKey) { var publicKey = Objects.requireNonNull(deviceKey.get()).getPublic().getEncoded(); - var hashedKey = MessageDigestSupplier.SHA256.get().digest(publicKey); - return BaseEncoding.base16().encode(hashedKey); + try (var instance = MessageDigestSupplier.SHA256.instance()) { + var hashedKey = instance.get().digest(publicKey); + return BaseEncoding.base16().encode(hashedKey); + } } @Provides 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 5d2b9b52a..baadb9a12 100644 --- a/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java +++ b/src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java @@ -50,7 +50,7 @@ public class PassphraseEntryController implements FxController { private final KeychainManager keychain; private final StringBinding vaultName; private final BooleanProperty unlockInProgress = new SimpleBooleanProperty(); - private final ObjectBinding unlockButtonContentDisplay = Bindings.createObjectBinding(this::getUnlockButtonContentDisplay, unlockInProgress); + private final ObjectBinding unlockButtonContentDisplay = Bindings.when(unlockInProgress).then(ContentDisplay.LEFT).otherwise(ContentDisplay.TEXT_ONLY); private final BooleanProperty unlockButtonDisabled = new SimpleBooleanProperty(); /* FXML */ @@ -186,7 +186,7 @@ public class PassphraseEntryController implements FxController { } public ContentDisplay getUnlockButtonContentDisplay() { - return unlockInProgress.get() ? ContentDisplay.LEFT : ContentDisplay.TEXT_ONLY; + return unlockButtonContentDisplay.get(); } public ReadOnlyBooleanProperty userInteractionDisabledProperty() { diff --git a/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java b/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java index 448d54d91..11f035124 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java @@ -46,7 +46,7 @@ public class ResizeController implements FxController { ResizeController(@MainWindow Stage window, Settings settings) { this.window = window; this.settings = settings; - this.showResizingArrows = Bindings.createBooleanBinding(this::isShowResizingArrows, window.fullScreenProperty()); + this.showResizingArrows = window.fullScreenProperty().not(); } @FXML @@ -181,8 +181,7 @@ public class ResizeController implements FxController { } public boolean isShowResizingArrows() { - //If in fullscreen resizing is not be possible; - return !window.isFullScreen(); + return showResizingArrows.get(); } } \ No newline at end of file diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java index b38710023..7e309fdaf 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailController.java @@ -1,6 +1,5 @@ package org.cryptomator.ui.mainwindow; -import com.tobiasdiez.easybind.EasyBind; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultState; import org.cryptomator.ui.common.Animations; @@ -11,10 +10,10 @@ import org.cryptomator.ui.controls.FontAwesome5IconView; import javax.inject.Inject; import javafx.application.Application; -import javafx.beans.binding.Binding; import javafx.beans.binding.BooleanBinding; import javafx.beans.property.ObjectProperty; import javafx.beans.property.ReadOnlyObjectProperty; +import javafx.beans.value.ObservableValue; import javafx.fxml.FXML; @MainWindowScoped @@ -22,7 +21,7 @@ public class VaultDetailController implements FxController { private final ReadOnlyObjectProperty vault; private final Application application; - private final Binding glyph; + private final ObservableValue glyph; private final BooleanBinding anyVaultSelected; private AutoAnimator spinAnimation; @@ -35,15 +34,13 @@ public class VaultDetailController implements FxController { VaultDetailController(ObjectProperty vault, Application application) { this.vault = vault; this.application = application; - this.glyph = EasyBind.select(vault) // - .selectObject(Vault::stateProperty) // - .map(this::getGlyphForVaultState); + this.glyph = vault.flatMap(Vault::stateProperty).map(this::getGlyphForVaultState); this.anyVaultSelected = vault.isNotNull(); } public void initialize() { this.spinAnimation = AutoAnimator.animate(Animations.createDiscrete360Rotation(vaultStateView)) // - .onCondition(EasyBind.select(vault).selectObject(Vault::stateProperty).map(VaultState.Value.PROCESSING::equals)) // + .onCondition(vault.flatMap(Vault::stateProperty).map(VaultState.Value.PROCESSING::equals).orElse(false)) // .afterStop(() -> vaultStateView.setRotate(0)) // .build(); } @@ -77,7 +74,7 @@ public class VaultDetailController implements FxController { return vault.get(); } - public Binding glyphProperty() { + public ObservableValue glyphProperty() { return glyph; } diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java index cf1009ea9..f90ad61c2 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java @@ -1,6 +1,5 @@ package org.cryptomator.ui.mainwindow; -import com.tobiasdiez.easybind.EasyBind; import org.cryptomator.common.keychain.KeychainManager; import org.cryptomator.common.vaults.Vault; import org.cryptomator.ui.common.FxController; @@ -9,10 +8,10 @@ import org.cryptomator.ui.vaultoptions.SelectedVaultOptionsTab; import org.cryptomator.ui.vaultoptions.VaultOptionsComponent; import javax.inject.Inject; -import javafx.beans.binding.BooleanExpression; import javafx.beans.property.ObjectProperty; import javafx.beans.property.ReadOnlyObjectProperty; import javafx.beans.property.SimpleBooleanProperty; +import javafx.beans.value.ObservableValue; import javafx.fxml.FXML; import javafx.stage.Stage; @@ -24,7 +23,7 @@ public class VaultDetailLockedController implements FxController { private final VaultOptionsComponent.Factory vaultOptionsWindow; private final KeychainManager keychain; private final Stage mainWindow; - private final BooleanExpression passwordSaved; + private final ObservableValue passwordSaved; @Inject VaultDetailLockedController(ObjectProperty vault, FxApplicationWindows appWindows, VaultOptionsComponent.Factory vaultOptionsWindow, KeychainManager keychain, @MainWindow Stage mainWindow) { @@ -34,7 +33,7 @@ public class VaultDetailLockedController implements FxController { this.keychain = keychain; this.mainWindow = mainWindow; if (keychain.isSupported() && !keychain.isLocked()) { - this.passwordSaved = BooleanExpression.booleanExpression(EasyBind.select(vault).selectObject(v -> keychain.getPassphraseStoredProperty(v.getId()))); + this.passwordSaved = vault.flatMap(v -> keychain.getPassphraseStoredProperty(v.getId())).orElse(false); } else { this.passwordSaved = new SimpleBooleanProperty(false); } @@ -65,13 +64,11 @@ public class VaultDetailLockedController implements FxController { return vault.get(); } - public BooleanExpression passwordSavedProperty() { + public ObservableValue passwordSavedProperty() { return passwordSaved; } public boolean isPasswordSaved() { - if (keychain.isSupported() && vault.get() != null) { - return keychain.getPassphraseStoredProperty(vault.get().getId()).get(); - } else return false; + return passwordSaved.getValue(); } } diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java index ef1ef1973..6374d7ae3 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListCellController.java @@ -1,6 +1,5 @@ package org.cryptomator.ui.mainwindow; -import com.tobiasdiez.easybind.EasyBind; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultState; import org.cryptomator.ui.common.Animations; @@ -10,15 +9,15 @@ import org.cryptomator.ui.controls.FontAwesome5Icon; import org.cryptomator.ui.controls.FontAwesome5IconView; import javax.inject.Inject; -import javafx.beans.binding.Binding; import javafx.beans.property.ObjectProperty; import javafx.beans.property.SimpleObjectProperty; +import javafx.beans.value.ObservableValue; // unscoped because each cell needs its own controller public class VaultListCellController implements FxController { private final ObjectProperty vault = new SimpleObjectProperty<>(); - private final Binding glyph; + private final ObservableValue glyph; private AutoAnimator spinAnimation; @@ -27,14 +26,12 @@ public class VaultListCellController implements FxController { @Inject VaultListCellController() { - this.glyph = EasyBind.select(vault) // - .selectObject(Vault::stateProperty) // - .map(this::getGlyphForVaultState); + this.glyph = vault.flatMap(Vault::stateProperty).map(this::getGlyphForVaultState); } public void initialize() { this.spinAnimation = AutoAnimator.animate(Animations.createDiscrete360Rotation(vaultStateView)) // - .onCondition(EasyBind.select(vault).selectObject(Vault::stateProperty).map(VaultState.Value.PROCESSING::equals)) // + .onCondition(vault.flatMap(Vault::stateProperty).map(VaultState.Value.PROCESSING::equals).orElse(false)) // .afterStop(() -> vaultStateView.setRotate(0)) // .build(); } @@ -55,7 +52,7 @@ public class VaultListCellController implements FxController { /* Getter/Setter */ - public Binding glyphProperty() { + public ObservableValue glyphProperty() { return glyph; } diff --git a/src/main/java/org/cryptomator/ui/mainwindow/VaultListContextMenuController.java b/src/main/java/org/cryptomator/ui/mainwindow/VaultListContextMenuController.java index 23f8e889d..a6baa0baf 100644 --- a/src/main/java/org/cryptomator/ui/mainwindow/VaultListContextMenuController.java +++ b/src/main/java/org/cryptomator/ui/mainwindow/VaultListContextMenuController.java @@ -1,8 +1,5 @@ package org.cryptomator.ui.mainwindow; -import com.tobiasdiez.easybind.EasyBind; -import com.tobiasdiez.easybind.optional.ObservableOptionalValue; -import com.tobiasdiez.easybind.optional.OptionalBinding; import org.cryptomator.common.keychain.KeychainManager; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultState; @@ -14,33 +11,39 @@ import org.cryptomator.ui.vaultoptions.SelectedVaultOptionsTab; import org.cryptomator.ui.vaultoptions.VaultOptionsComponent; import javax.inject.Inject; -import javafx.beans.binding.Binding; import javafx.beans.property.ObjectProperty; +import javafx.beans.property.ReadOnlyObjectProperty; +import javafx.beans.value.ObservableValue; import javafx.fxml.FXML; import javafx.stage.Stage; import java.util.EnumSet; +import java.util.Objects; -import static org.cryptomator.common.vaults.VaultState.Value.*; +import static org.cryptomator.common.vaults.VaultState.Value.ERROR; +import static org.cryptomator.common.vaults.VaultState.Value.LOCKED; +import static org.cryptomator.common.vaults.VaultState.Value.MISSING; +import static org.cryptomator.common.vaults.VaultState.Value.NEEDS_MIGRATION; +import static org.cryptomator.common.vaults.VaultState.Value.UNLOCKED; @MainWindowScoped public class VaultListContextMenuController implements FxController { - private final ObservableOptionalValue selectedVault; + private final ReadOnlyObjectProperty selectedVault; private final Stage mainWindow; private final FxApplicationWindows appWindows; private final VaultService vaultService; private final KeychainManager keychain; private final RemoveVaultComponent.Builder removeVault; private final VaultOptionsComponent.Factory vaultOptionsWindow; - private final OptionalBinding selectedVaultState; - private final Binding selectedVaultPassphraseStored; - private final Binding selectedVaultRemovable; - private final Binding selectedVaultUnlockable; - private final Binding selectedVaultLockable; + private final ObservableValue selectedVaultState; + private final ObservableValue selectedVaultPassphraseStored; + private final ObservableValue selectedVaultRemovable; + private final ObservableValue selectedVaultUnlockable; + private final ObservableValue selectedVaultLockable; @Inject VaultListContextMenuController(ObjectProperty selectedVault, @MainWindow Stage mainWindow, FxApplicationWindows appWindows, VaultService vaultService, KeychainManager keychain, RemoveVaultComponent.Builder removeVault, VaultOptionsComponent.Factory vaultOptionsWindow) { - this.selectedVault = EasyBind.wrapNullable(selectedVault); + this.selectedVault = selectedVault; this.mainWindow = mainWindow; this.appWindows = appWindows; this.vaultService = vaultService; @@ -48,8 +51,8 @@ public class VaultListContextMenuController implements FxController { this.removeVault = removeVault; this.vaultOptionsWindow = vaultOptionsWindow; - this.selectedVaultState = this.selectedVault.mapObservable(Vault::stateProperty); - this.selectedVaultPassphraseStored = this.selectedVault.map(this::isPasswordStored).orElse(false); + this.selectedVaultState = selectedVault.flatMap(Vault::stateProperty).orElse(null); + this.selectedVaultPassphraseStored = selectedVault.map(this::isPasswordStored).orElse(false); this.selectedVaultRemovable = selectedVaultState.map(EnumSet.of(LOCKED, MISSING, ERROR, NEEDS_MIGRATION)::contains).orElse(false); this.selectedVaultUnlockable = selectedVaultState.map(LOCKED::equals).orElse(false); this.selectedVaultLockable = selectedVaultState.map(UNLOCKED::equals).orElse(false); @@ -61,40 +64,37 @@ public class VaultListContextMenuController implements FxController { @FXML public void didClickRemoveVault() { - selectedVault.ifValuePresent(v -> { - removeVault.vault(v).build().showRemoveVault(); - }); + var vault = Objects.requireNonNull(selectedVault.get()); + removeVault.vault(vault).build().showRemoveVault(); } @FXML public void didClickShowVaultOptions() { - selectedVault.ifValuePresent(v -> { - vaultOptionsWindow.create(v).showVaultOptionsWindow(SelectedVaultOptionsTab.ANY); - }); + var vault = Objects.requireNonNull(selectedVault.get()); + vaultOptionsWindow.create(vault).showVaultOptionsWindow(SelectedVaultOptionsTab.ANY); } @FXML public void didClickUnlockVault() { - selectedVault.ifValuePresent(v -> { - appWindows.startUnlockWorkflow(v, mainWindow); - }); + var vault = Objects.requireNonNull(selectedVault.get()); + appWindows.startUnlockWorkflow(vault, mainWindow); } @FXML public void didClickLockVault() { - selectedVault.ifValuePresent(v -> { - appWindows.startLockWorkflow(v, mainWindow); - }); + var vault = Objects.requireNonNull(selectedVault.get()); + appWindows.startLockWorkflow(vault, mainWindow); } @FXML public void didClickRevealVault() { - selectedVault.ifValuePresent(vaultService::reveal); + var vault = Objects.requireNonNull(selectedVault.get()); + vaultService.reveal(vault); } // Getter and Setter - public Binding selectedVaultUnlockableProperty() { + public ObservableValue selectedVaultUnlockableProperty() { return selectedVaultUnlockable; } @@ -102,7 +102,7 @@ public class VaultListContextMenuController implements FxController { return selectedVaultUnlockable.getValue(); } - public Binding selectedVaultLockableProperty() { + public ObservableValue selectedVaultLockableProperty() { return selectedVaultLockable; } @@ -110,7 +110,7 @@ public class VaultListContextMenuController implements FxController { return selectedVaultLockable.getValue(); } - public Binding selectedVaultRemovableProperty() { + public ObservableValue selectedVaultRemovableProperty() { return selectedVaultRemovable; } @@ -118,7 +118,7 @@ public class VaultListContextMenuController implements FxController { return selectedVaultRemovable.getValue(); } - public Binding selectedVaultPassphraseStoredProperty() { + public ObservableValue selectedVaultPassphraseStoredProperty() { return selectedVaultPassphraseStored; } diff --git a/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java b/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java index c68456523..9b2c74c1e 100644 --- a/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java +++ b/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java @@ -83,7 +83,7 @@ public class MigrationRunController implements FxController { this.appWindows = appWindows; this.startScene = startScene; this.successScene = successScene; - this.migrateButtonContentDisplay = Bindings.createObjectBinding(this::getMigrateButtonContentDisplay, vault.stateProperty()); + this.migrateButtonContentDisplay = Bindings.when(vault.processingProperty()).then(ContentDisplay.LEFT).otherwise(ContentDisplay.TEXT_ONLY); this.capabilityErrorScene = capabilityErrorScene; this.migrationButtonDisabled = new SimpleBooleanProperty(); this.migrationProgress = new SimpleDoubleProperty(volatileMigrationProgress); @@ -211,10 +211,7 @@ public class MigrationRunController implements FxController { } public ContentDisplay getMigrateButtonContentDisplay() { - return switch (vault.getState()) { - case PROCESSING -> ContentDisplay.LEFT; - default -> ContentDisplay.TEXT_ONLY; - }; + return migrateButtonContentDisplay.get(); } public ReadOnlyDoubleProperty migrationProgressProperty() { diff --git a/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java b/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java index a9bc88cf7..4978335c7 100644 --- a/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java +++ b/src/main/java/org/cryptomator/ui/vaultoptions/MasterkeyOptionsController.java @@ -2,7 +2,6 @@ package org.cryptomator.ui.vaultoptions; import org.cryptomator.common.keychain.KeychainManager; import org.cryptomator.common.vaults.Vault; -import org.cryptomator.integrations.keychain.KeychainAccessException; import org.cryptomator.ui.changepassword.ChangePasswordComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.forgetPassword.ForgetPasswordComponent; @@ -11,9 +10,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.inject.Inject; -import javafx.beans.binding.Bindings; -import javafx.beans.binding.BooleanExpression; import javafx.beans.property.SimpleBooleanProperty; +import javafx.beans.value.ObservableValue; import javafx.fxml.FXML; import javafx.stage.Stage; @@ -28,7 +26,7 @@ public class MasterkeyOptionsController implements FxController { private final RecoveryKeyComponent.Builder recoveryKeyWindow; private final ForgetPasswordComponent.Builder forgetPasswordWindow; private final KeychainManager keychain; - private final BooleanExpression passwordSaved; + private final ObservableValue passwordSaved; @Inject @@ -40,7 +38,7 @@ public class MasterkeyOptionsController implements FxController { this.forgetPasswordWindow = forgetPasswordWindow; this.keychain = keychain; if (keychain.isSupported() && !keychain.isLocked()) { - this.passwordSaved = Bindings.createBooleanBinding(this::isPasswordSaved, keychain.getPassphraseStoredProperty(vault.getId())); + this.passwordSaved = keychain.getPassphraseStoredProperty(vault.getId()).orElse(false); } else { this.passwordSaved = new SimpleBooleanProperty(false); } @@ -67,13 +65,11 @@ public class MasterkeyOptionsController implements FxController { forgetPasswordWindow.vault(vault).owner(window).build().showForgetPassword(); } - public BooleanExpression passwordSavedProperty() { + public ObservableValue passwordSavedProperty() { return passwordSaved; } public boolean isPasswordSaved() { - if (keychain.isSupported() && !keychain.isLocked() && vault != null) { - return keychain.getPassphraseStoredProperty(vault.getId()).get(); - } else return false; + return passwordSaved.getValue(); } } diff --git a/src/test/java/org/cryptomator/common/settings/VaultSettingsTest.java b/src/test/java/org/cryptomator/common/settings/VaultSettingsTest.java index 198e2937c..b555542c7 100644 --- a/src/test/java/org/cryptomator/common/settings/VaultSettingsTest.java +++ b/src/test/java/org/cryptomator/common/settings/VaultSettingsTest.java @@ -15,12 +15,17 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class VaultSettingsTest { - @ParameterizedTest - @CsvSource({"a\u000Fa,a_a", ": \\,_ _", "汉语,汉语", "..,_", "a\ta,a\u0020a", "\t\n\r,_"}) + @ParameterizedTest(name = "VaultSettings.normalizeDisplayName({0}) = {1}") + @CsvSource(value = { + "a\u000Fa,a_a", + ": \\,_ _", + "汉语,汉语", + "..,_", + "a\ta,a\u0020a", + "'\t\n\r',_" + }) public void testNormalize(String test, String expected) { - VaultSettings settings = new VaultSettings("id"); - settings.displayName().setValue(test); - assertEquals(expected, settings.normalizeDisplayName()); + assertEquals(expected, VaultSettings.normalizeDisplayName(test)); } } diff --git a/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java b/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java index 5a9f1bc07..7d76409e8 100644 --- a/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java +++ b/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java @@ -18,7 +18,7 @@ public class SupportedLanguagesTest { var locale = Locale.forLanguageTag(tag); Assertions.assertNotEquals("und", locale.toLanguageTag(), "Undefined language tag"); - var bundle = Assertions.assertDoesNotThrow(() -> ResourceBundle.getBundle("/i18n/strings", locale)); + var bundle = Assertions.assertDoesNotThrow(() -> ResourceBundle.getBundle("i18n.strings", locale)); Assertions.assertEquals(locale, bundle.getLocale()); Assertions.assertFalse(bundle.keySet().isEmpty());