correct typos

* renamed to VaultEventsMap
* split between boilerplate and buissness logic (ObservableMapDecorator)
* add LRU cache
* fixed VaultEvent compareTo method

.github/CONTRIBUTING.md

@@ -16,10 +16,6 @@
 
 - Suggest your change by [submitting a new issue](https://github.com/cryptomator/cryptomator/issues/new/choose) and start writing code.
 
-## Do you intend to add a new translation or change an existing one?
-
-Translations are not managed directly in this repository. Instead, we use [Crowdin](https://translate.cryptomator.org/), which automatically synchronizes translations with this repository. If you want to help us with translations, please visit our translation project on Crowdin.
-
 ## Code of Conduct
 
 Help us keep Cryptomator open and inclusive. Please read and follow our [Code of Conduct](https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md).

.github/dependabot.yml

@@ -53,4 +53,6 @@ updates:
     groups:
       github-actions:
         patterns:
-          - "*"
+          - "*"
+    labels:
+      - "misc:ci"

.github/workflows/appimage.yml

@@ -8,24 +8,16 @@ on:
       version:
         description: 'Version'
         required: false
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-    paths:
-      - '.github/workflows/appimage.yml'
-      - 'dist/linux/appimage/**'
-      - 'dist/linux/common/**'
-      - 'dist/linux/resources/**'
 
 env:
   JAVA_DIST: 'temurin'
-  JAVA_VERSION: '24.0.1+9'
+  JAVA_VERSION: '23.0.1+11'
 
 jobs:
   get-version:
     uses: ./.github/workflows/get-version.yml
     with:
-      version: ${{ inputs.version }} #okay if not defined
+      version: ${{ inputs.version }}
 
   build:
     name: Build AppImage
@@ -37,12 +29,12 @@ jobs:
         include:
           - os: ubuntu-latest
             appimage-suffix: x86_64
-            openjfx-url: 'https://download2.gluonhq.com/openjfx/24.0.1/openjfx-24.0.1_linux-x64_bin-jmods.zip'
+            openjfx-url: 'https://download2.gluonhq.com/openjfx/23.0.1/openjfx-23.0.1_linux-x64_bin-jmods.zip'
-            openjfx-sha: '425fac742b9fbd095b2ce868cff82d1024620f747c94a7144d0a4879e756146c'
+            openjfx-sha: '2164bca470bf70a5e2764645e2078ba7f787b274e5be3d7df30d87c5bb62bba6'
           - os: ubuntu-24.04-arm
             appimage-suffix: aarch64
-            openjfx-url: 'https://download2.gluonhq.com/openjfx/24.0.1/openjfx-24.0.1_linux-aarch64_bin-jmods.zip'
+            openjfx-url: 'https://download2.gluonhq.com/openjfx/23.0.1/openjfx-23.0.1_linux-aarch64_bin-jmods.zip'
-            openjfx-sha: '7e02edd0f4ee5527a27c94b0bbba66fcaaff41009119e45d0eca0f96ddfb6e7b'
+            openjfx-sha: '09c92fa9fa0b82adefd88640a14ebb2a49e5f3f733a57d1542f5590d060ffe1b'
     steps:
       - uses: actions/checkout@v4
       - name: Setup Java
@@ -69,7 +61,7 @@ jobs:
           POM_JFX_VERSION=${POM_JFX_VERSION#*@}
           POM_JFX_VERSION=${POM_JFX_VERSION%%.*}
 
-          if [ $POM_JFX_VERSION -ne $JMOD_VERSION ]; then
+          if [ $POM_JFX_VERSION -ne $JMOD_VERSION_AMD64 ]; then
             >&2 echo "Major JavaFX version in pom.xml (${POM_JFX_VERSION}) != amd64 jmod version (${JMOD_VERSION})"
             exit 1
           fi
@@ -81,21 +73,13 @@ jobs:
         run: |
           cp LICENSE.txt target
           cp target/cryptomator-*.jar target/mods
-      - name: Run jlink with help option
-        id: jep-493-check
-        run: |
-          JMOD_PATHS="openjfx-jmods"
-          if ! ${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"; then
-            JMOD_PATHS="${JAVA_HOME}/jmods:${JMOD_PATHS}"
-          fi
-          echo "jmod_paths=${JMOD_PATHS}" >> "$GITHUB_OUTPUT"
       - name: Run jlink
         #Remark: no compression is applied for improved build compression later (here appimage)
         run: >
           ${JAVA_HOME}/bin/jlink
           --verbose
           --output runtime
-          --module-path "${{ steps.jep-493-check.outputs.jmod_paths }}"
+          --module-path "${JAVA_HOME}/jmods:openjfx-jmods"
           --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.security.auth,jdk.accessibility,jdk.management.jfr,jdk.net,java.compiler
           --strip-native-commands
           --no-header-files
@@ -117,8 +101,7 @@ jobs:
           --copyright "(C) 2016 - 2025 Skymatic GmbH"
           --app-version "${{  needs.get-version.outputs.semVerNum }}.${{  needs.get-version.outputs.revNum }}"
           --java-options "--enable-preview"
-          --java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator"
+          --java-options "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator"
-          --java-options "--sun-misc-unsafe-memory-access=allow"
           --java-options "-Xss5m"
           --java-options "-Xmx256m"
           --java-options "-Dcryptomator.appVersion=\"${{  needs.get-version.outputs.semVerStr }}\""
@@ -169,7 +152,7 @@ jobs:
       - name: Build AppImage
         run: >
           ./squashfs-root/AppRun Cryptomator.AppDir cryptomator-${{  needs.get-version.outputs.semVerStr }}-${{ matrix.appimage-suffix }}.AppImage
-          -u "gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-${{ matrix.appimage-suffix }}.AppImage.zsync"
+          -u 'gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-${{ matrix.appimage-suffix }}.AppImage.zsync'
           --sign --sign-key=615D449FE6E6A235
       - name: Create detached GPG signatures
         run: |

.github/workflows/av-whitelist.yml

@@ -13,48 +13,15 @@ on:
         description: "Url to the file to upload"
         required: true
         type: string
-      avast:
-        description: "Upload to Avast"
-        required: false
-        type: boolean
-        default: false
-      kaspersky:
-        description: "Upload to Kaspersky"
-        required: false
-        type: boolean
-        default: false
 
 jobs:
-  download-file:
+  allowlist:
-    name: Downloads the file into the VM
+    name: Anti Virus Allowlisting
     runs-on: ubuntu-latest
-    outputs:
-      fileName: ${{ steps.extractName.outputs.fileName}}
     steps:
-      - name: Extract file name
-        id: extractName
-        run: |
-          url="${{ inputs.url }}"
-          echo "fileName=${url##*/}" >> $GITHUB_OUTPUT
       - name: Download file
-        run: curl --remote-name ${{ inputs.url }} -L -o ${{steps.extractName.outputs.fileName}}
+        run: |
-      - name: Upload artifact
+          curl --remote-name ${{ inputs.url }} -L
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ steps.extractName.outputs.fileName }}
-          path: ${{ steps.extractName.outputs.fileName }}
-          if-no-files-found: error
-  allowlist-kaspersky:
-    name: Anti Virus Allowlisting Kaspersky
-    runs-on: ubuntu-latest
-    needs: download-file
-    if: github.event_name == 'workflow_call' || inputs.kaspersky
-    steps:
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ needs.download-file.outputs.fileName }}
-          path: upload
       - name: Upload to Kaspersky
         uses: SamKirkland/FTP-Deploy-Action@v4.3.5
         with:
@@ -63,26 +30,11 @@ jobs:
           port: 990
           username: ${{ secrets.ALLOWLIST_KASPERSKY_USERNAME }}
           password: ${{ secrets.ALLOWLIST_KASPERSKY_PASSWORD }}
-          local-dir: ./upload/
+      - name: Upload to Avast
-  allowlist-avast:
+        uses: SamKirkland/FTP-Deploy-Action@v4.3.5
-    name: Anti Virus Allowlisting Avast
-    runs-on: ubuntu-latest
-    needs: download-file
-    if: github.event_name == 'workflow_call'  || inputs.avast
-    steps:
-      - name: Download artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ needs.download-file.outputs.fileName }}
-          path: upload
-      - name: Upload to Avast 
-        uses: wlixcc/SFTP-Deploy-Action@v1.2.6
         with:
+          protocol: ftp
           server: whitelisting.avast.com
-          port: 22
+          port: 21
           username: ${{ secrets.ALLOWLIST_AVAST_USERNAME }}
-          password: ${{ secrets.ALLOWLIST_AVAST_PASSWORD }}
+          password: ${{ secrets.ALLOWLIST_AVAST_PASSWORD }}
-          ssh_private_key: ''
-          sftp_only: true
-          local_path: './upload/*'
-          remote_path: '/data'

.github/workflows/build.yml

@@ -2,16 +2,12 @@ name: Build
 
 on:
   push:
-    paths:
-      - '.github/workflows/build.yml'
-      - 'pom.xml'
-      - 'src/**'
   pull_request_target:
     types: [labeled]
 
 env:
   JAVA_DIST: 'temurin'
-  JAVA_VERSION: 24
+  JAVA_VERSION: 23
 
 defaults:
   run:

.github/workflows/check-jdk-updates.yml

@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  JDK_VERSION: '24.0.1+9'
+  JDK_VERSION: '23.0.1+11'
   JDK_VENDOR: temurin
   RUNTIME_VERSION_HELPER: >
     public class Test {

.github/workflows/debian.yml

@@ -5,52 +5,41 @@ on:
     inputs:
       semver:
         description: 'SemVer String (e.g. 1.7.0-beta1)'
+        required: true
       ppaver:
         description: 'Base PPA Version String (e.g. 1.6.16+1.7.0~beta1) without -0ppa1'
+        required: true
       dput:
         description: 'Upload to PPA'
         required: true
         default: false
         type: boolean
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-    paths:
-      - '.github/workflows/debian.yml'
-      - 'dist/linux/debian/**'
-      - 'dist/linux/common/**'
-      - 'dist/linux/resources/**'
 
 env:
   JAVA_DIST: 'temurin'
-  JAVA_VERSION: '24.0.1+9'
+  JAVA_VERSION: '23.0.1+11'
-  COFFEELIBS_JDK: 24
+  COFFEELIBS_JDK: 23
-  COFFEELIBS_JDK_VERSION: '24.0.1+9-0ppa3'
+  COFFEELIBS_JDK_VERSION: '23.0.1+11-0ppa1'
-  OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/24.0.1/openjfx-24.0.1_linux-x64_bin-jmods.zip'
+  OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/23.0.1/openjfx-23.0.1_linux-x64_bin-jmods.zip'
-  OPENJFX_JMODS_AMD64_HASH: '425fac742b9fbd095b2ce868cff82d1024620f747c94a7144d0a4879e756146c'
+  OPENJFX_JMODS_AMD64_HASH: '2164bca470bf70a5e2764645e2078ba7f787b274e5be3d7df30d87c5bb62bba6'
-  OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/24.0.1/openjfx-24.0.1_linux-aarch64_bin-jmods.zip'
+  OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/23.0.1/openjfx-23.0.1_linux-aarch64_bin-jmods.zip'
-  OPENJFX_JMODS_AARCH64_HASH: '7e02edd0f4ee5527a27c94b0bbba66fcaaff41009119e45d0eca0f96ddfb6e7b'
+  OPENJFX_JMODS_AARCH64_HASH: '09c92fa9fa0b82adefd88640a14ebb2a49e5f3f733a57d1542f5590d060ffe1b'
 
 jobs:
-  get-version:
-    uses: ./.github/workflows/get-version.yml
-    with:
-      version: ${{ inputs.semver }} #okay if not defined
-
   build:
     name: Build Debian Package
     runs-on: ubuntu-22.04
-    needs: [get-version]
     steps:
       - uses: actions/checkout@v4
-      - id: deb-version
+      - id: versions
-        name: Determine deb-version
+        name: Get version information
         run: |
-          if [ -n "${{inputs.ppaver}}" ]; then
+          SEM_VER_STR="${{ inputs.semver }}"
-            echo "debVersion=${{inputs.ppaver }}" >> "$GITHUB_OUTPUT"
+          SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'`
-          else
+          REVCOUNT=`git rev-list --count HEAD`
-            echo "debVersion=${{needs.get-version.outputs.semVerStr}}" >> "$GITHUB_OUTPUT"
+          echo "semVerStr=${SEM_VER_STR}" >> $GITHUB_OUTPUT
-          fi
+          echo "semVerNum=${SEM_VER_NUM}" >> $GITHUB_OUTPUT
+          echo "revNum=${REVCOUNT}" >> $GITHUB_OUTPUT
       - name: Install build tools
         run: |
           sudo add-apt-repository ppa:coffeelibs/openjdk
@@ -105,7 +94,7 @@ jobs:
           cp -r jmods pkgdir
           cp -r dist/linux/common/ pkgdir
           cp target/cryptomator-*.jar pkgdir/mods
-          tar -cJf cryptomator_${{ steps.deb-version.outputs.debVersion }}.orig.tar.xz -C pkgdir .
+          tar -cJf cryptomator_${{ inputs.ppaver }}.orig.tar.xz -C pkgdir .
       - name: Patch and rename pkgdir
         run: |
           cp -r dist/linux/debian/ pkgdir
@@ -114,12 +103,12 @@ jobs:
           envsubst '${SEMVER_STR} ${VERSION_NUM} ${REVISION_NUM} ${DISABLE_UPDATE_CHECK}' < dist/linux/debian/rules > pkgdir/debian/rules
           envsubst '${PPA_VERSION} ${RFC2822_TIMESTAMP}' < dist/linux/debian/changelog > pkgdir/debian/changelog
           find . -name "*.jar" >> pkgdir/debian/source/include-binaries
-          mv pkgdir cryptomator_${{ steps.deb-version.outputs.debVersion }}
+          mv pkgdir cryptomator_${{ inputs.ppaver }}
         env:
-          SEMVER_STR: ${{ needs.get-version.outputs.semVerStr }}
+          SEMVER_STR: ${{ steps.versions.outputs.semVerStr }}
-          VERSION_NUM: ${{ needs.get-version.outputs.semVerNum }}
+          VERSION_NUM: ${{ steps.versions.outputs.semVerNum }}
-          REVISION_NUM: ${{ needs.get-version.outputs.revNum }}
+          REVISION_NUM: ${{ steps.versions.outputs.revNum }}
-          PPA_VERSION: ${{ steps.deb-version.outputs.debVersion }}-0ppa1
+          PPA_VERSION: ${{ inputs.ppaver }}-0ppa1
       - name: Prepare GPG-Agent for signing with key 615D449FE6E6A235
         run: |
           echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
@@ -129,13 +118,12 @@ jobs:
           GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
       - name: debuild
         run: |
-          (sleep 8m; gpg --batch --quiet --pinentry-mode loopback -u 615D449FE6E6A235 --dry-run --sign README.md) &
           debuild -S -sa -d
           debuild -b -sa -d
         env:
           DEBSIGN_PROGRAM: gpg --batch --pinentry-mode loopback
           DEBSIGN_KEYID: 615D449FE6E6A235
-        working-directory: cryptomator_${{ steps.deb-version.outputs.debVersion }}
+        working-directory: cryptomator_${{ inputs.ppaver }}
       - name: Create detached GPG signatures
         run: |
           gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a cryptomator_*_amd64.deb
@@ -152,7 +140,7 @@ jobs:
             cryptomator_*_amd64.deb
             cryptomator_*.asc
       - name: Publish on PPA
-        if: inputs.dput && inputs.ppaver != ''
+        if: inputs.dput
         run: dput ppa:sebastian-stenzel/cryptomator-beta cryptomator_*_source.changes
       # If ref is a tag, also upload to GitHub Releases:
       - name: Publish Debian package on GitHub Releases

.github/workflows/dependency-check.yml

@@ -11,7 +11,7 @@ jobs:
     with:
       runner-os: 'ubuntu-latest'
       java-distribution: 'temurin'
-      java-version: 24
+      java-version: 23
       check-command: 'mvn -B validate -Pdependency-check -Djavafx.platform=linux'
     secrets:
       nvd-api-key: ${{ secrets.NVD_API_KEY }}

.github/workflows/get-version.yml

@@ -23,7 +23,7 @@ on:
 
 env:
   JAVA_DIST: 'temurin'
-  JAVA_VERSION: 24
+  JAVA_VERSION: 23
 
 jobs:
   determine-version:

.github/workflows/mac-dmg-x64.yml

@@ -2,29 +2,20 @@ name: Build macOS .dmg for x64
 
 #######################################
 # STOP! DO NOT EDIT THIS FILE!
-#
+# 
 # It is a copy of mac-dmg.yml with tiny adjustements (mainly lines 42 to 47)
 # It was made necessary, since Github does not offer free macos intel runners for macos 15 and above.
-#
+# This workflow can only be triggered by a release.
+# 
 #######################################
 
 on:
   release:
     types: [published]
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version'
-        required: false
-      notarize:
-        description: 'Notarize'
-        required: true
-        default: false
-        type: boolean
 
 env:
   JAVA_DIST: 'temurin'
-  JAVA_VERSION: '24.0.1+9'
+  JAVA_VERSION: '23.0.1+11'
 
 jobs:
   get-version:
@@ -44,8 +35,8 @@ jobs:
           architecture: x64
           output-suffix: x64
           fuse-lib: macFUSE
-          openjfx-url: 'https://download2.gluonhq.com/openjfx/24.0.1/openjfx-24.0.1_osx-x64_bin-jmods.zip'
+          openjfx-url: 'https://download2.gluonhq.com/openjfx/23.0.1/openjfx-23.0.1_osx-x64_bin-jmods.zip'
-          openjfx-sha: '6e62a426d43c168a488521f904a523f3dd6ee2cf103e08136f2fd465c828a105'
+          openjfx-sha: '8857965975c464a0e5d57709292ce357d0ebb39f6168c41d5ca38301e42c3c8e'
     steps:
       - uses: actions/checkout@v4
       - name: Setup Java
@@ -84,21 +75,13 @@ jobs:
         run: |
           cp LICENSE.txt target
           cp target/cryptomator-*.jar target/mods
-      - name: Run jlink with help option
-        id: jep-493-check
-        run: |
-          JMOD_PATHS="openjfx-jmods"
-          if ! ${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"; then
-            JMOD_PATHS="${JAVA_HOME}/jmods:${JMOD_PATHS}"
-          fi
-          echo "jmod_paths=${JMOD_PATHS}" >> "$GITHUB_OUTPUT"
       - name: Run jlink
         #Remark: no compression is applied for improved build compression later (here dmg)
         run: >
           ${JAVA_HOME}/bin/jlink
           --verbose
           --output runtime
-          --module-path "${{ steps.jep-493-check.outputs.jmod_paths }}"
+          --module-path "${JAVA_HOME}/jmods:openjfx-jmods"
           --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.accessibility,jdk.management.jfr,java.compiler
           --strip-native-commands
           --no-header-files
@@ -120,8 +103,7 @@ jobs:
           --copyright "(C) 2016 - 2025 Skymatic GmbH"
           --app-version "${{ needs.get-version.outputs.semVerNum }}"
           --java-options "--enable-preview"
-          --java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.mac"
+          --java-options "--enable-native-access=org.cryptomator.jfuse.mac"
-          --java-options "--sun-misc-unsafe-memory-access=allow"
           --java-options "-Xss5m"
           --java-options "-Xmx256m"
           --java-options "-Dfile.encoding=\"utf-8\""
@@ -241,11 +223,6 @@ jobs:
           Cryptomator-${VERSION_NO}-${{ matrix.output-suffix }}.dmg dmg
         env:
           VERSION_NO: ${{ needs.get-version.outputs.semVerNum }}
-      - name: Codesign .dmg
-        run: |
-          codesign -s ${CODESIGN_IDENTITY} --timestamp Cryptomator-*.dmg
-        env:
-          CODESIGN_IDENTITY: ${{ secrets.MACOS_CODESIGN_IDENTITY }}
       - name: Notarize .dmg
         if: startsWith(github.ref, 'refs/tags/') || inputs.notarize
         uses: cocoalibs/xcode-notarization-action@v1

.github/workflows/mac-dmg.yml

@@ -13,16 +13,10 @@ on:
         required: true
         default: false
         type: boolean
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-    paths:
-      - '.github/workflows/mac-dmg.yml'
-      - 'dist/mac/**'
 
 env:
   JAVA_DIST: 'temurin'
-  JAVA_VERSION: '24.0.1+9'
+  JAVA_VERSION: '23.0.1+11'
 
 jobs:
   get-version:
@@ -42,8 +36,8 @@ jobs:
           architecture: aarch64
           output-suffix: arm64
           fuse-lib: FUSE-T
-          openjfx-url: 'https://download2.gluonhq.com/openjfx/24.0.1/openjfx-24.0.1_osx-aarch64_bin-jmods.zip'
+          openjfx-url: 'https://download2.gluonhq.com/openjfx/23.0.1/openjfx-23.0.1_osx-aarch64_bin-jmods.zip'
-          openjfx-sha: 'b5a94a13077507003fa852512bfa33f4fb680bc8076d8002e4227a84c85171d4'
+          openjfx-sha: 'a800724a1f3e6757ecfa0bd5bf7ed64d2e6a7a3f5b3522650a70b8cfc7782fb6'
     steps:
       - uses: actions/checkout@v4
       - name: Setup Java
@@ -82,21 +76,13 @@ jobs:
         run: |
           cp LICENSE.txt target
           cp target/cryptomator-*.jar target/mods
-      - name: Run jlink with help option
-        id: jep-493-check
-        run: |
-          JMOD_PATHS="openjfx-jmods"
-          if ! ${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"; then
-            JMOD_PATHS="${JAVA_HOME}/jmods:${JMOD_PATHS}"
-          fi
-          echo "jmod_paths=${JMOD_PATHS}" >> "$GITHUB_OUTPUT"
       - name: Run jlink
         #Remark: no compression is applied for improved build compression later (here dmg)
         run: >
           ${JAVA_HOME}/bin/jlink
           --verbose
           --output runtime
-          --module-path "${{ steps.jep-493-check.outputs.jmod_paths }}"
+          --module-path "${JAVA_HOME}/jmods:openjfx-jmods"
           --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.accessibility,jdk.management.jfr,java.compiler
           --strip-native-commands
           --no-header-files
@@ -118,8 +104,7 @@ jobs:
           --copyright "(C) 2016 - 2025 Skymatic GmbH"
           --app-version "${{ needs.get-version.outputs.semVerNum }}"
           --java-options "--enable-preview"
-          --java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.mac"
+          --java-options "--enable-native-access=org.cryptomator.jfuse.mac"
-          --java-options "--sun-misc-unsafe-memory-access=allow"
           --java-options "-Xss5m"
           --java-options "-Xmx256m"
           --java-options "-Dfile.encoding=\"utf-8\""
@@ -239,11 +224,6 @@ jobs:
           Cryptomator-${VERSION_NO}-${{ matrix.output-suffix }}.dmg dmg
         env:
           VERSION_NO: ${{ needs.get-version.outputs.semVerNum }}
-      - name: Codesign .dmg
-        run: |
-          codesign -s ${CODESIGN_IDENTITY} --timestamp Cryptomator-*.dmg
-        env:
-          CODESIGN_IDENTITY: ${{ secrets.MACOS_CODESIGN_IDENTITY }}
       - name: Notarize .dmg
         if: startsWith(github.ref, 'refs/tags/') || inputs.notarize
         uses: cocoalibs/xcode-notarization-action@v1

.github/workflows/pullrequest.yml

@@ -5,7 +5,7 @@ on:
 
 env:
   JAVA_DIST: 'temurin'
-  JAVA_VERSION: 24
+  JAVA_VERSION: 23
 
 defaults:
   run:
@@ -15,6 +15,7 @@ jobs:
   test:
     name: Compile and Test
     runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4

.github/workflows/win-exe.yml

@@ -12,19 +12,14 @@ on:
         description: 'Build debug version with console output'
         type: boolean
         default: false
-  push:
-    branches-ignore:
-      - 'dependabot/**'
-    paths:
-      - '.github/workflows/win-exe.yml'
-      - 'dist/win/**'
 
 
 env:
-  OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/24.0.1/openjfx-24.0.1_windows-x64_bin-jmods.zip'
+  JAVA_DIST: 'zulu'
-  OPENJFX_JMODS_AMD64_HASH: 'f13d17c7caf88654fc835f1b4e75a9b0f34a888eb8abef381796c0002e63b03f'
+  JAVA_VERSION: '23.0.1+11'
-  WINFSP_MSI: 'https://github.com/winfsp/winfsp/releases/download/v2.1/winfsp-2.1.25156.msi'
+  OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/23.0.1/openjfx-23.0.1_windows-x64_bin-jmods.zip'
-  WINFSP_MSI_HASH: '073a70e00f77423e34bed98b86e600def93393ba5822204fac57a29324db9f7a'
+  OPENJFX_JMODS_AMD64_HASH: 'ee176dcee3bd78bde7910735bd67f67c792882f5b89626796ae06f7a1c0119d3'
+  WINFSP_MSI: 'https://github.com/winfsp/winfsp/releases/download/v2.0/winfsp-2.0.23075.msi'
   WINFSP_UNINSTALLER: 'https://github.com/cryptomator/winfsp-uninstaller/releases/latest/download/winfsp-uninstaller.exe'
 
 defaults:
@@ -39,54 +34,36 @@ jobs:
 
   build-msi:
     name: Build .msi Installer
-    runs-on: ${{ matrix.os }}
+    runs-on: windows-latest
-    needs: [ get-version ]
+    needs: [get-version]
-    strategy:
-      matrix:
-        include:
-          - arch: x64
-            os: windows-latest
-            java-dist: 'zulu'
-            java-version: '24.0.1+9'
-            java-package: 'jdk'
-          - arch: arm64
-            os: windows-11-arm
-            java-dist: 'liberica'
-            java-version: '24.0.1+11'
-            java-package: 'jdk+fx' #This is needed, as liberica contains JFX 24 Jmods for Windows ARM64
     env:
       LOOPBACK_ALIAS: 'cryptomator-vault'
       WIN_CONSOLE_FLAG: ''
     steps:
+      - name: Upgrade WIX to latest version
+        run: choco install wixtoolset --version 3.14.1
+        shell: pwsh
       - uses: actions/checkout@v4
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: ${{ matrix.java-dist }}
+          distribution: ${{ env.JAVA_DIST }}
-          java-version: ${{ matrix.java-version }}
+          java-version: ${{ env.JAVA_VERSION }}
-          java-package: ${{ matrix.java-package }}
           check-latest: true
           cache: 'maven'
-      - name: Install wix and extensions
-        run: |
-          dotnet tool install --global wix --version 6.0.0
-          wix.exe extension add WixToolset.UI.wixext/6.0.0 --global
-          wix.exe extension add WixToolset.Util.wixext/6.0.0 --global
       - name: Download and extract JavaFX jmods from Gluon
-        if: matrix.arch == 'x64'
         #In the last step we move all jmods files a dir level up because jmods are placed inside a directory in the zip
         run: |
-          curl --output openjfx-jmods.zip -L "${{ env.OPENJFX_JMODS_AMD64 }}"
+          curl --output jfxjmods.zip -L "${{ env.OPENJFX_JMODS_AMD64 }}"
-          if(!(Get-FileHash -Path openjfx-jmods.zip -Algorithm SHA256).Hash.ToLower().equals("${{ env.OPENJFX_JMODS_AMD64_HASH }}")) {
+          if(!(Get-FileHash -Path jfxjmods.zip -Algorithm SHA256).Hash.ToLower().equals("${{ env.OPENJFX_JMODS_AMD64_HASH }}")) {
             throw "Wrong checksum of JMOD archive downloaded from ${{ env.OPENJFX_JMODS_AMD64 }}.";
           }
-          Expand-Archive -Path openjfx-jmods.zip -DestinationPath openjfx-jmods
+          Expand-Archive -Path jfxjmods.zip -DestinationPath jfxjmods
-          Get-ChildItem -Path openjfx-jmods -Recurse -Filter "*.jmod" | ForEach-Object { Move-Item -Path $_ -Destination $_.Directory.Parent}
+          Get-ChildItem -Path jfxjmods -Recurse -Filter "*.jmod" | ForEach-Object { Move-Item -Path $_ -Destination $_.Directory.Parent}
         shell: pwsh
       - name: Ensure major jfx version in pom and in jmods is the same
-        if: matrix.arch == 'x64'
         run: |
-          JMOD_VERSION_AMD64=$(jmod describe openjfx-jmods/javafx.base.jmod | head -1)
+          JMOD_VERSION_AMD64=$(jmod describe jfxjmods/javafx.base.jmod | head -1)
           JMOD_VERSION_AMD64=${JMOD_VERSION_AMD64#*@}
           JMOD_VERSION_AMD64=${JMOD_VERSION_AMD64%%.*}
           POM_JFX_VERSION=$(mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout)
@@ -98,28 +75,20 @@ jobs:
             exit 1
           fi
       - name: Set version
-        run: mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }}
+        run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }}
       - name: Run maven
         run: mvn -B clean package -Pwin -DskipTests -Djavafx.platform=win
       - name: Patch target dir
         run: |
           cp LICENSE.txt target
           cp target/cryptomator-*.jar target/mods
-      - name: Run jlink with help option
-        id: jep-493-check
-        run: |
-          JMOD_PATHS="openjfx-jmods"
-          if ! $(${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"); then
-            JMOD_PATHS="${JAVA_HOME}/jmods;${JMOD_PATHS}"
-          fi
-          echo "jmod_paths=${JMOD_PATHS}" >> "$GITHUB_OUTPUT"
       - name: Run jlink
-        # Remark: no compression is applied for improved build compression later (here msi)
+        #Remark: no compression is applied for improved build compression later (here msi)
         run: >
           ${JAVA_HOME}/bin/jlink
           --verbose
           --output runtime
-          --module-path "${{ steps.jep-493-check.outputs.jmod_paths }}"
+          --module-path "jfxjmods;${JAVA_HOME}/jmods"
           --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.crypto.mscapi,jdk.unsupported,jdk.accessibility,jdk.management.jfr,java.compiler
           --strip-native-commands
           --no-header-files
@@ -144,8 +113,7 @@ jobs:
           --copyright "(C) 2016 - 2025 Skymatic GmbH"
           --app-version "${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}"
           --java-options "--enable-preview"
-          --java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.win,org.cryptomator.integrations.win"
+          --java-options "--enable-native-access=org.cryptomator.jfuse.win,org.cryptomator.integrations.win"
-          --java-options "--sun-misc-unsafe-memory-access=allow"
           --java-options "-Xss5m"
           --java-options "-Xmx256m"
           --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\""
@@ -162,7 +130,6 @@ jobs:
           --java-options "-Dcryptomator.buildNumber=\"msi-${{ needs.get-version.outputs.revNum }}\""
           --java-options "-Dcryptomator.integrationsWin.autoStartShellLinkName=\"Cryptomator\""
           --java-options "-Dcryptomator.integrationsWin.keychainPaths=\"@{appdata}/Cryptomator/keychain.json;@{userhome}/AppData/Roaming/Cryptomator/keychain.json\""
-          --java-options "-Dcryptomator.integrationsWin.windowsHelloKeychainPaths=\"@{appdata}/Cryptomator/windowsHelloKeychain.json\""
           --java-options "-Djavafx.verbose=${{ inputs.isDebug }}"
           --resource-dir dist/win/resources
           --icon dist/win/resources/Cryptomator.ico
@@ -273,8 +240,8 @@ jobs:
           description: Cryptomator Installer
           timestampUrl: 'http://timestamp.digicert.com'
           folder: installer
-      - name: Add possible alpha/beta tags and architecture to installer name
+      - name: Add possible alpha/beta tags to installer name
-        run: mv installer/Cryptomator-*.msi Cryptomator-${{ needs.get-version.outputs.semVerStr }}-${{ matrix.arch }}.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
@@ -285,7 +252,7 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: msi-${{ matrix.arch }}
+          name: msi
           path: |
             Cryptomator-*.msi
             Cryptomator-*.asc
@@ -293,43 +260,21 @@ jobs:
 
   build-exe:
     name: Build .exe installer
-    runs-on: ${{ matrix.os }}
+    runs-on: windows-latest
-    needs: [ get-version, build-msi ]
+    needs: [get-version, build-msi]
-    strategy:
-      matrix:
-        include:
-          - arch: x64
-            os: windows-latest
-            executable-suffix: x64
-            java-dist: 'zulu'
-            java-version: '24.0.1+9'
-            java-package: 'jdk'
-          - arch: arm64
-            os: windows-11-arm
-            executable-suffix: arm64
-            java-dist: 'liberica'
-            java-version: '24.0.1+11'
-            java-package: 'jdk+fx' #This is needed, as liberica contains JFX 24 Jmods for Windows ARM64
     steps:
       - uses: actions/checkout@v4
-      - name: Install wix and extensions
-        run: |
-          dotnet tool install --global wix --version 6.0.0
-          wix.exe extension add WixToolset.BootstrapperApplications.wixext/6.0.0 --global
-          wix.exe extension add WixToolset.Util.wixext/6.0.0 --global
       - name: Download .msi
         uses: actions/download-artifact@v4
         with:
-          name: msi-${{ matrix.arch }}
+          name: msi
           path: dist/win/bundle/resources
       - name: Strip version info from msi file name
         run: mv dist/win/bundle/resources/Cryptomator*.msi dist/win/bundle/resources/Cryptomator.msi
-      - name: Setup Java
+      - uses: actions/setup-java@v4
-        uses: actions/setup-java@v4
         with:
-          distribution: ${{ matrix.java-dist }}
+          distribution: ${{ env.JAVA_DIST }}
-          java-version: ${{ matrix.java-version }}
+          java-version: ${{ env.JAVA_VERSION }}
-          java-package: ${{ matrix.java-package }}
           check-latest: true
           cache: 'maven'
       - name: Generate license for exe
@@ -345,36 +290,35 @@ jobs:
         shell: pwsh
       - name: Download WinFsp
         run: |
-          curl --output $env:WINFSP_PATH -L ${{ env.WINFSP_MSI }}
+          curl --output dist/win/bundle/resources/winfsp.msi -L ${{ env.WINFSP_MSI }}
-          $computedHash = (Get-FileHash -Path $env:WINFSP_PATH -Algorithm SHA256).Hash.ToLower()
-          if ($computedHash -ne "${{ env.WINFSP_MSI_HASH }}") {
-            throw "Checksum mismatch for $env:WINFSP_PATH (expected ${{ env.WINFSP_MSI_HASH }}, got $computedHash)."
-          }
-        env:
-          WINFSP_PATH: 'dist/win/bundle/resources/winfsp.msi'
         shell: pwsh
       - name: Download Legacy-WinFsp uninstaller
         run: |
           curl --output dist/win/bundle/resources/winfsp-uninstaller.exe -L ${{ env.WINFSP_UNINSTALLER }}
         shell: pwsh
-      - name: Create Wix Burn bundle
+      - name: Compile to wixObj file
-        working-directory: dist/win
         run: >
-          wix build
+          "${WIX}/bin/candle.exe" dist/win/bundle/bundleWithWinfsp.wxs
-          -define BundleName="Cryptomator"
+          -ext WixBalExtension
-          -define BundleVersion="${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum}}"
+          -ext WixUtilExtension
-          -define BundleVendor="Skymatic GmbH"
+          -out dist/win/bundle/
-          -define BundleCopyright="(C) 2016 - 2025 Skymatic GmbH"
+          -dBundleVersion="${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}"
-          -define AboutUrl="https://cryptomator.org"
+          -dBundleVendor="Skymatic GmbH"
-          -define HelpUrl="https://cryptomator.org/contact"
+          -dBundleCopyright="(C) 2016 - 2025 Skymatic GmbH"
-          -define UpdateUrl="https://cryptomator.org/downloads/"
+          -dAboutUrl="https://cryptomator.org"
-          -ext "WixToolset.Util.wixext"
+          -dHelpUrl="https://cryptomator.org/contact"
-          -ext "WixToolset.BootstrapperApplications.wixext"
+          -dUpdateUrl="https://cryptomator.org/downloads/"
-          ./bundle/bundleWithWinfsp.wxs
+      - name: Create executable with linker
-          -out "../../installer/unsigned/Cryptomator-Installer.exe"
+        run: >
+          "${WIX}/bin/light.exe" -b dist/win/ dist/win/bundle/bundleWithWinfsp.wixobj
+          -ext WixBalExtension
+          -ext WixUtilExtension
+          -out installer/unsigned/Cryptomator-Installer.exe
       - name: Detach burn engine in preparation to sign
         run: >
-          wix burn detach installer/unsigned/Cryptomator-Installer.exe -engine tmp/engine.exe
+          "${WIX}/bin/insignia.exe"
+          -ib installer/unsigned/Cryptomator-Installer.exe
+          -o tmp/engine.exe
       - name: Codesign burn engine
         uses: skymatic/code-sign-action@v3
         with:
@@ -385,8 +329,10 @@ jobs:
           timestampUrl: 'http://timestamp.digicert.com'
           folder: tmp
       - name: Reattach signed burn engine to installer
-        run: >
+        run : >
-          wix burn reattach installer/unsigned/Cryptomator-Installer.exe -engine tmp/engine.exe -o installer/Cryptomator-Installer.exe
+          "${WIX}/bin/insignia.exe"
+          -ab tmp/engine.exe installer/unsigned/Cryptomator-Installer.exe
+          -o installer/Cryptomator-Installer.exe
       - name: Codesign EXE
         uses: skymatic/code-sign-action@v3
         with:
@@ -397,7 +343,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.get-version.outputs.semVerStr }}-${{ matrix.executable-suffix }}.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
@@ -408,7 +354,7 @@ jobs:
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: exe-${{ matrix.executable-suffix }}
+          name: exe
           path: |
             Cryptomator-*.exe
             Cryptomator-*.asc
@@ -418,18 +364,16 @@ jobs:
     name: Publish installers to the github release
     if: startsWith(github.ref, 'refs/tags/') && github.event.action == 'published'
     runs-on: ubuntu-latest
-    needs: [ build-msi, build-exe ]
+    needs: [build-msi, build-exe]
     outputs:
-      download-url-msi-x64: ${{ fromJSON(steps.publish.outputs.assets)[0].browser_download_url }}
+      download-url-msi: ${{ fromJSON(steps.publish.outputs.assets)[0].browser_download_url }}
-      download-url-msi-arm64: ${{ fromJSON(steps.publish.outputs.assets)[1].browser_download_url }}
+      download-url-exe: ${{ fromJSON(steps.publish.outputs.assets)[1].browser_download_url }}
-      download-url-exe-x64: ${{ fromJSON(steps.publish.outputs.assets)[2].browser_download_url }}
-      download-url-exe-arm64: ${{ fromJSON(steps.publish.outputs.assets)[3].browser_download_url }}
     steps:
       - name: Download installers
         uses: actions/download-artifact@v4
         with:
           merge-multiple: true
-      - name: Publish installers on GitHub Releases
+      - name: Publish .msi on GitHub Releases
         id: publish
         uses: softprops/action-gh-release@v2
         with:
@@ -437,38 +381,22 @@ jobs:
           token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
           # do not change ordering of filelist, required for correct job output
           files: |
-            *x64.msi
+            *.msi
-            *arm64.msi
+            *.exe
-            *x64.exe
-            *arm64.exe
             *.asc
 
-  allowlist-msi-x64:
+  allowlist-msi:
     uses: ./.github/workflows/av-whitelist.yml
-    needs: [ publish ]
+    needs: [publish]
     with:
-      url: ${{ needs.publish.outputs.download-url-msi-x64 }}
+      url: ${{ needs.publish.outputs.download-url-msi }}
     secrets: inherit
 
-  allowlist-msi-arm64:
+  allowlist-exe:
     uses: ./.github/workflows/av-whitelist.yml
-    needs: [ publish ]
+    needs: [publish]
     with:
-      url: ${{ needs.publish.outputs.download-url-msi-arm64 }}
+      url: ${{ needs.publish.outputs.download-url-exe }}
-    secrets: inherit
-
-  allowlist-exe-x64:
-    uses: ./.github/workflows/av-whitelist.yml
-    needs: [ publish, allowlist-msi-x64 ]
-    with:
-      url: ${{ needs.publish.outputs.download-url-exe-x64 }}
-    secrets: inherit
-
-  allowlist-exe-arm64:
-    uses: ./.github/workflows/av-whitelist.yml
-    needs: [ publish, allowlist-msi-arm64 ]
-    with:
-      url: ${{ needs.publish.outputs.download-url-exe-arm64 }}
     secrets: inherit
 
   notify-winget:
@@ -485,7 +413,7 @@ jobs:
           SLACK_ICON: false
           SLACK_ICON_EMOJI: ':bot:'
           SLACK_CHANNEL: 'cryptomator-desktop'
-          SLACK_TITLE: "MSI packages of ${{ github.event.repository.name }} ${{ github.event.release.tag_name }} published."
+          SLACK_TITLE: "MSI of ${{ github.event.repository.name }} ${{ github.event.release.tag_name }} published."
-          SLACK_MESSAGE: "Ready to <https://github.com/${{ github.repository }}/actions/workflows/winget.yml| release them to winget>."
+          SLACK_MESSAGE: "Ready to <https://github.com/${{ github.repository }}/actions/workflows/winget.yml| release to winget>."
           SLACK_FOOTER: false
-          MSG_MINIMAL: true
+          MSG_MINIMAL: true

.github/workflows/winget.yml

@@ -23,5 +23,5 @@ jobs:
           identifier: Cryptomator.Cryptomator
           version: ${{ inputs.tag }}
           release-tag: ${{ inputs.tag }}
-          installers-regex: '-x64\.msi$'
+          installers-regex: '\.msi$'
           token: ${{ secrets.CRYPTOBOT_WINGET_TOKEN }}

.idea/misc.xml

@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_24" project-jdk-name="24" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_23" project-jdk-name="23" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

.idea/runConfigurations/Cryptomator_Linux.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="Cryptomator Linux" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{userhome}/.config/Cryptomator/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/.config/Cryptomator/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/.config/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/.local/share/Cryptomator/logs&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/.local/share/Cryptomator/plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/.local/share/Cryptomator/mnt&quot; -Dcryptomator.showTrayIcon=true -Xss20m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator,javafx.graphics" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{userhome}/.config/Cryptomator/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/.config/Cryptomator/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/.config/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/.local/share/Cryptomator/logs&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/.local/share/Cryptomator/plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/.local/share/Cryptomator/mnt&quot; -Dcryptomator.showTrayIcon=true -Xss20m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>

.idea/runConfigurations/Cryptomator_Linux_Dev.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="Cryptomator Linux Dev" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{userhome}/.config/Cryptomator-Dev/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/.config/Cryptomator-Dev/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/.config/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/.local/share/Cryptomator-Dev/logs&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/.local/share/Cryptomator-Dev/plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/.local/share/Cryptomator-Dev/mnt&quot; -Dcryptomator.showTrayIcon=true -Dfuse.experimental=&quot;true&quot; -Xss20m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator,javafx.graphics" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{userhome}/.config/Cryptomator-Dev/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/.config/Cryptomator-Dev/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/.config/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/.local/share/Cryptomator-Dev/logs&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/.local/share/Cryptomator-Dev/plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/.local/share/Cryptomator-Dev/mnt&quot; -Dcryptomator.showTrayIcon=true -Dfuse.experimental=&quot;true&quot; -Xss20m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>

.idea/runConfigurations/Cryptomator_Windows.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="Cryptomator Windows" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator/settings.json;@{userhome}/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator/keychain.json;@{userhome}/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.integrationsWin.windowsHelloKeychainPaths=&quot;@{appdata}/Cryptomator/windowsHelloKeychain.json;@{userhome}/AppData/Roaming/Cryptomator/windowsHelloKeychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator/key.p12;@{userhome}/AppData/Roaming/Cryptomator/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win,org.cryptomator.integrations.win,javafx.graphics" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator/settings.json;@{userhome}/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator/keychain.json;@{userhome}/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator/key.p12;@{userhome}/AppData/Roaming/Cryptomator/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win,org.cryptomator.integrations.win" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>

.idea/runConfigurations/Cryptomator_Windows_Dev.xml

@@ -2,7 +2,7 @@
   <configuration default="false" name="Cryptomator Windows Dev" type="Application" factoryName="Application">
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator-Dev/settings.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator-Dev/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator-Dev/keychain.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/keychain.json&quot; -Dcryptomator.integrationsWin.windowsHelloKeychainPaths=&quot;@{appdata}/Cryptomator-Dev/windowsHelloKeychain.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/windowsHelloKeychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator-Dev/key.p12;@{userhome}/AppData/Roaming/Cryptomator-Dev/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator-Dev&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win,org.cryptomator.integrations.win,javafx.graphics" />
+    <option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator-Dev/settings.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator-Dev/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator-Dev/keychain.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/keychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator-Dev/key.p12;@{userhome}/AppData/Roaming/Cryptomator-Dev/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator-Dev&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win,org.cryptomator.integrations.win" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>

.idea/runConfigurations/Cryptomator_macOS.xml

@@ -5,7 +5,7 @@
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;@{userhome}/Library/Application Support/Cryptomator/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/Library/Application Support/Cryptomator/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/Library/Application Support/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/Library/Logs/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/Library/Application Support/Cryptomator/Plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Dcryptomator.integrationsMac.keychainServiceName=Cryptomator -Xss2m -Xmx512m -ea --enable-preview --enable-native-access=org.cryptomator.jfuse.mac,javafx.graphics" />
+    <option name="VM_PARAMETERS" value="-Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;@{userhome}/Library/Application Support/Cryptomator/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/Library/Application Support/Cryptomator/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/Library/Application Support/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/Library/Logs/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/Library/Application Support/Cryptomator/Plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Dcryptomator.integrationsMac.keychainServiceName=Cryptomator -Xss2m -Xmx512m -ea --enable-preview --enable-native-access=org.cryptomator.jfuse.mac" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>

.idea/runConfigurations/Cryptomator_macOS_Dev.xml

@@ -5,7 +5,7 @@
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
     <module name="cryptomator" />
-    <option name="VM_PARAMETERS" value="-Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/Library/Logs/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/Plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/mnt&quot; -Dcryptomator.showTrayIcon=true -Dcryptomator.integrationsMac.keychainServiceName=Cryptomator -Xss2m -Xmx512m -ea --enable-preview --enable-native-access=org.cryptomator.jfuse.mac,javafx.graphics" />
+    <option name="VM_PARAMETERS" value="-Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/Library/Logs/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/Plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/mnt&quot; -Dcryptomator.showTrayIcon=true -Dcryptomator.integrationsMac.keychainServiceName=Cryptomator -Xss2m -Xmx512m -ea --enable-preview --enable-native-access=org.cryptomator.jfuse.mac" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>

README.md

@@ -78,7 +78,7 @@ For more information on the security details visit [cryptomator.org](https://doc
 
 ### Dependencies
 
-* JDK 24 (e.g. temurin, zulu)
+* JDK 23 (e.g. temurin, zulu)
 * Maven 3
 
 ### Run Maven

dist/linux/appimage/build.sh

@@ -12,7 +12,7 @@ command -v unzip >/dev/null 2>&1 || { echo >&2 "unzip not found."; exit 1; }
 
 VERSION=$(mvn -f ../../../pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout)
 SEMVER_STR=${VERSION}
-CPU_ARCH=$(uname -m)
+CPU_ARCH=$(uname -p)
 
 if [[ ! "${CPU_ARCH}" =~ x86_64|aarch64 ]]; then echo "Platform ${CPU_ARCH} not supported"; exit 1; fi
 
@@ -23,12 +23,12 @@ mvn -B -f ../../../pom.xml clean package -Plinux -DskipTests -Djavafx.platform=l
 cp ../../../LICENSE.txt ../../../target
 cp ../../../target/cryptomator-*.jar ../../../target/mods
 
-JAVAFX_VERSION=24.0.1
+JAVAFX_VERSION=22.0.2
 JAVAFX_ARCH="x64"
-JAVAFX_JMODS_SHA256='425fac742b9fbd095b2ce868cff82d1024620f747c94a7144d0a4879e756146c'
+JAVAFX_JMODS_SHA256='2164bca470bf70a5e2764645e2078ba7f787b274e5be3d7df30d87c5bb62bba6'
 if [ "${CPU_ARCH}" = "aarch64" ]; then
     JAVAFX_ARCH="aarch64"
-    JAVAFX_JMODS_SHA256='7e02edd0f4ee5527a27c94b0bbba66fcaaff41009119e45d0eca0f96ddfb6e7b'
+    JAVAFX_JMODS_SHA256='09c92fa9fa0b82adefd88640a14ebb2a49e5f3f733a57d1542f5590d060ffe1b'
 fi
 
 # download javaFX jmods
@@ -51,17 +51,11 @@ if [ $POM_JFX_VERSION -ne $JMOD_VERSION ]; then
 fi
 
 
-# create runtime
+# add runtime
-## check for JEP 493
-JMOD_PATHS="openjfx-jmods"
-if ! ${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"; then
-    JMOD_PATHS="${JAVA_HOME}/jmods:${JMOD_PATHS}"
-fi
-## create runtime image
 ${JAVA_HOME}/bin/jlink \
     --verbose \
     --output runtime \
-    --module-path "${JMOD_PATHS}" \
+    --module-path "${JAVA_HOME}/jmods:openjfx-jmods" \
     --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.security.auth,jdk.accessibility,jdk.management.jfr,jdk.net,java.compiler \
     --strip-native-commands \
     --no-header-files \
@@ -81,7 +75,7 @@ ${JAVA_HOME}/bin/jpackage \
     --name Cryptomator \
     --vendor "Skymatic GmbH" \
     --java-options "--enable-preview" \
-    --java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator" \
+    --java-options "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator" \
     --copyright "(C) 2016 - 2025 Skymatic GmbH" \
     --java-options "-Xss5m" \
     --java-options "-Xmx256m" \
@@ -128,7 +122,7 @@ chmod +x /tmp/appimagetool.AppImage
 /tmp/appimagetool.AppImage \
     Cryptomator.AppDir \
     cryptomator-${SEMVER_STR}-${CPU_ARCH}.AppImage  \
-    -u "gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-${CPU_ARCH}.AppImage.zsync"
+    -u 'gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-${CPU_ARCH}.AppImage.zsync'
 
 echo ""
 echo "Done. AppImage successfully created: cryptomator-${SEMVER_STR}-${CPU_ARCH}.AppImage"

dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml

@@ -83,24 +83,6 @@
 	</content_rating>
 
 	<releases>
-		<release date="2025-06-24" version="1.17.0">
-			<url type="details">https://github.com/cryptomator/cryptomator/releases/1.17.0</url>
-		</release>
-		<release date="2025-05-15" version="1.16.2">
-			<url type="details">https://github.com/cryptomator/cryptomator/releases/1.16.2</url>
-		</release>
-		<release date="2025-04-30" version="1.16.1">
-			<url type="details">https://github.com/cryptomator/cryptomator/releases/1.16.1</url>
-		</release>
-		<release date="2025-04-29" version="1.16.0">
-			<url type="details">https://github.com/cryptomator/cryptomator/releases/1.16.0</url>
-		</release>
-		<release date="2025-04-09" version="1.15.3">
-			<url type="details">https://github.com/cryptomator/cryptomator/releases/1.15.3</url>
-		</release>
-		<release date="2025-04-04" version="1.15.2">
-			<url type="details">https://github.com/cryptomator/cryptomator/releases/1.15.2</url>
-		</release>
 		<release date="2025-02-05" version="1.15.1">
 			<url type="details">https://github.com/cryptomator/cryptomator/releases/1.15.1</url>
 		</release>

dist/linux/common/org.cryptomator.Cryptomator.tray-unlocked.svg

@@ -1,16 +1,12 @@
 <svg height="16" viewBox="0 0 42 42" width="16" xmlns="http://www.w3.org/2000/svg">
-	<defs>
+	<style
-		<style id="current-color-scheme" type="text/css">
+			id="current-color-scheme" type="text/css">
-			.ColorScheme-Text {
+		.ColorScheme-Text {
-			color:#222222;
+		color:#232629;
-			}
+		}
-			.ColorScheme-Highlight {
+	</style>
-			color:#49B04A;
+	<g fill-rule="evenodd" style="fill:#f2f2f2;fill-opacity:1" class="ColorScheme-Text" fill="currentColor">
-			}
+		<path d="m15.591 35.824c-.019.009-.936.775-1.458 1.208a.418.418 0 0 1 -.627-.111 9.322 9.322 0 0 1 -.3-5.974 15.843 15.843 0 0 0 2.894 2.043c.051 1.03-.161 2.644-.509 2.834zm6.409-6.824h-2l.5-5a2 2 0 1 1 1 0zm-14.544-3.241.744-1.366a1.579 1.579 0 0 0 -.019-1.557l.653-1.2c.2.014-.03-.113.165-.14.051-.217-.051-.336 0-.5a3.269 3.269 0 0 0 0-1.5 7.151 7.151 0 0 1 0-3 2.366 2.366 0 0 0 -2.378 1.448 2.409 2.409 0 0 0 .229 2.661l-.7 1.278a1.779 1.779 0 0 0 -1.317.891l-.741 1.372a1.577 1.577 0 0 0 -.019 1.487 3.028 3.028 0 0 0 -2.746 1.525 2.648 2.648 0 0 0 .044 2.631.748.748 0 0 0 .981.266.656.656 0 0 0 .284-.92 1.37 1.37 0 0 1 -.023-1.361 1.6 1.6 0 0 1 2.079-.63 1.408 1.408 0 0 1 .672 1.95 1.546 1.546 0 0 1 -1.2.78.688.688 0 0 0 -.636.749.707.707 0 0 0 .717.6.789.789 0 0 0 .082 0 2.989 2.989 0 0 0 2.322-1.513 2.669 2.669 0 0 0 -.377-3.084 1.767 1.767 0 0 0 1.184-.867zm13.544-10.759a13.013 13.013 0 0 1 5-1 21.6 21.6 0 0 1 4.5.5 9.312 9.312 0 0 0 -9.5-8.5c-5.794 0-9.176 4-9.5 8.5a21.858 21.858 0 0 1 4.5-.5 12.819 12.819 0 0 1 5 1zm3.5-5c1.209 0 2.5.866 2.5 2h-5c0-1.134 1.291-2 2.5-2zm-7 0c1.209 0 2.5.866 2.5 2h-5c0-1.134 1.291-2 2.5-2zm14.473 6a8.067 8.067 0 0 0 -8.08 8v2.141a3.891 3.891 0 0 0 -2.893 3.734v5.125a23.166 23.166 0 0 1 -4.174-1.623 7.857 7.857 0 0 1 -.027.878 3.263 3.263 0 0 1 -.729 2.074l-1.794 1.483a.379.379 0 0 1 -.276.188h-4c-1.324 0-2.346-1.336-2.653-3.343a7.058 7.058 0 0 1 .234-3.18 3.477 3.477 0 0 1 1.636-2.157 1.868 1.868 0 0 1 .783-.32h1.5a8.035 8.035 0 0 1 -1.5-5 11.1 11.1 0 0 1 .5-3 2.519 2.519 0 0 0 0-1.5 13.272 13.272 0 0 1 -.5-3.5c6.687-1.936 11 0 11 0s4.319-1.955 11 0"/>
-		</style>
+		<path d="m39 28h-10v-4a3.13 3.13 0 0 1 3-3 3.087 3.087 0 0 1 3 3v1a1.034 1.034 0 0 0 1 1h1a1.034 1.034 0 0 0 1-1v-1a6 6 0 0 0 -12 0v4h-1a2.073 2.073 0 0 0 -2 2v6a2.073 2.073 0 0 0 2 2h14a2.073 2.073 0 0 0 2-2v-6a2.073 2.073 0 0 0 -2-2zm-5.391 5.94a1.609 1.609 0 0 1 -3.217 0v-1.876a1.609 1.609 0 0 1 3.217 0z"/>
-	</defs>
-	<g fill-rule="evenodd">
-		<path d="m15.591 35.824c-.019.009-.936.775-1.458 1.208a.418.418 0 0 1 -.627-.111 9.322 9.322 0 0 1 -.3-5.974 15.843 15.843 0 0 0 2.894 2.043c.051 1.03-.161 2.644-.509 2.834zm6.409-6.824h-2l.5-5a2 2 0 1 1 1 0zm-14.544-3.241.744-1.366a1.579 1.579 0 0 0 -.019-1.557l.653-1.2c.2.014-.03-.113.165-.14.051-.217-.051-.336 0-.5a3.269 3.269 0 0 0 0-1.5 7.151 7.151 0 0 1 0-3 2.366 2.366 0 0 0 -2.378 1.448 2.409 2.409 0 0 0 .229 2.661l-.7 1.278a1.779 1.779 0 0 0 -1.317.891l-.741 1.372a1.577 1.577 0 0 0 -.019 1.487 3.028 3.028 0 0 0 -2.746 1.525 2.648 2.648 0 0 0 .044 2.631.748.748 0 0 0 .981.266.656.656 0 0 0 .284-.92 1.37 1.37 0 0 1 -.023-1.361 1.6 1.6 0 0 1 2.079-.63 1.408 1.408 0 0 1 .672 1.95 1.546 1.546 0 0 1 -1.2.78.688.688 0 0 0 -.636.749.707.707 0 0 0 .717.6.789.789 0 0 0 .082 0 2.989 2.989 0 0 0 2.322-1.513 2.669 2.669 0 0 0 -.377-3.084 1.767 1.767 0 0 0 1.184-.867zm13.544-10.759a13.013 13.013 0 0 1 5-1 21.6 21.6 0 0 1 4.5.5 9.312 9.312 0 0 0 -9.5-8.5c-5.794 0-9.176 4-9.5 8.5a21.858 21.858 0 0 1 4.5-.5 12.819 12.819 0 0 1 5 1zm3.5-5c1.209 0 2.5.866 2.5 2h-5c0-1.134 1.291-2 2.5-2zm-7 0c1.209 0 2.5.866 2.5 2h-5c0-1.134 1.291-2 2.5-2zm14.473 6a8.067 8.067 0 0 0 -8.08 8v2.141a3.891 3.891 0 0 0 -2.893 3.734v5.125a23.166 23.166 0 0 1 -4.174-1.623 7.857 7.857 0 0 1 -.027.878 3.263 3.263 0 0 1 -.729 2.074l-1.794 1.483a.379.379 0 0 1 -.276.188h-4c-1.324 0-2.346-1.336-2.653-3.343a7.058 7.058 0 0 1 .234-3.18 3.477 3.477 0 0 1 1.636-2.157 1.868 1.868 0 0 1 .783-.32h1.5a8.035 8.035 0 0 1 -1.5-5 11.1 11.1 0 0 1 .5-3 2.519 2.519 0 0 0 0-1.5 13.272 13.272 0 0 1 -.5-3.5c6.687-1.936 11 0 11 0s4.319-1.955 11 0" class="ColorScheme-Text" fill="currentColor"/>
-		<path d="m39 28h-10v-4a3.13 3.13 0 0 1 3-3 3.087 3.087 0 0 1 3 3v1a1.034 1.034 0 0 0 1 1h1a1.034 1.034 0 0 0 1-1v-1a6 6 0 0 0 -12 0v4h-1a2.073 2.073 0 0 0 -2 2v6a2.073 2.073 0 0 0 2 2h14a2.073 2.073 0 0 0 2-2v-6a2.073 2.073 0 0 0 -2-2zm-5.391 5.94a1.609 1.609 0 0 1 -3.217 0v-1.876a1.609 1.609 0 0 1 3.217 0z" class="ColorScheme-Highlight" fill="currentColor"/>
 	</g>
 </svg>

dist/linux/common/org.cryptomator.Cryptomator.tray.svg

@@ -1,10 +1,8 @@
 <svg height="16" viewBox="0 0 42 42" width="16" xmlns="http://www.w3.org/2000/svg">
-	<defs>
+	<style id="current-color-scheme" type="text/css">
-		<style id="current-color-scheme" type="text/css">
+		.ColorScheme-Text {
-			.ColorScheme-Text {
+		color:#232629;
-			color:#222222;
+		}
-			}
+	</style>
-		</style>
+	<path d="m32.66 29.319a1.432 1.432 0 0 0 -.66-.319h-1.5a8.125 8.125 0 0 0 1.5-5 11.027 11.027 0 0 0 -.5-3 2.519 2.519 0 0 1 0-1.5 12.987 12.987 0 0 0 .5-3.5c-6.681-1.955-11 0-11 0s-4.313-1.936-11 0a13.272 13.272 0 0 0 .5 3.5 2.519 2.519 0 0 1 0 1.5 11.1 11.1 0 0 0 -.5 3 8.035 8.035 0 0 0 1.5 5h-1.5a1.868 1.868 0 0 0 -.783.319 3.477 3.477 0 0 0 -1.636 2.157 7.058 7.058 0 0 0 -.234 3.18c.307 2.008 1.329 3.344 2.653 3.344h4a.379.379 0 0 0 .277-.187l1.793-1.483a3.263 3.263 0 0 0 .729-2.074 7.857 7.857 0 0 0 .027-.878 23.166 23.166 0 0 0 4.174 1.622 24.4 24.4 0 0 0 4.051-1.614 7.848 7.848 0 0 0 .027.869 3.263 3.263 0 0 0 .729 2.074l1.793 1.484a.61.61 0 0 0 .4.187h4c1.324 0 2.223-1.336 2.529-3.343a7.057 7.057 0 0 0 -.234-3.18 3.477 3.477 0 0 0 -1.635-2.158zm-17.069 6.5c-.019.009-.936.775-1.458 1.208a.418.418 0 0 1 -.627-.111 9.322 9.322 0 0 1 -.3-5.974 15.843 15.843 0 0 0 2.894 2.048c.051 1.03-.161 2.644-.509 2.834zm6.409-6.819h-2l.5-5a2 2 0 1 1 1 0zm6.38 7.921a.418.418 0 0 1 -.627.111c-.522-.433-1.439-1.2-1.458-1.208-.348-.189-.56-1.8-.505-2.828a15.84 15.84 0 0 0 2.9-2.037 9.322 9.322 0 0 1 -.31 5.962zm-20.924-11.162.744-1.366a1.579 1.579 0 0 0 -.019-1.557l.653-1.2c.2.014-.03-.113.165-.14.051-.217-.051-.336 0-.5a3.269 3.269 0 0 0 0-1.5 7.151 7.151 0 0 1 0-3 2.366 2.366 0 0 0 -2.378 1.448 2.409 2.409 0 0 0 .229 2.661l-.7 1.278a1.779 1.779 0 0 0 -1.317.891l-.741 1.372a1.577 1.577 0 0 0 -.019 1.487 3.028 3.028 0 0 0 -2.746 1.525 2.648 2.648 0 0 0 .044 2.631.748.748 0 0 0 .981.266.656.656 0 0 0 .284-.92 1.37 1.37 0 0 1 -.023-1.361 1.6 1.6 0 0 1 2.079-.63 1.408 1.408 0 0 1 .672 1.95 1.546 1.546 0 0 1 -1.2.78.688.688 0 0 0 -.636.749.707.707 0 0 0 .717.6.789.789 0 0 0 .082 0 2.989 2.989 0 0 0 2.322-1.513 2.669 2.669 0 0 0 -.377-3.084 1.767 1.767 0 0 0 1.184-.867zm33.217 1.2a3.021 3.021 0 0 0 -2.658-1.525 1.574 1.574 0 0 0 -.107-1.283l-.745-1.367a1.779 1.779 0 0 0 -1.317-.891l-.7-1.278a2.409 2.409 0 0 0 .229-2.661 2.283 2.283 0 0 0 -2.375-1.454 7.039 7.039 0 0 1 0 3 3.272 3.272 0 0 0 0 1.5c.047.152-.047.3 0 .5.227.04-.069.156.165.14l.653 1.2a1.579 1.579 0 0 0 -.019 1.557l.745 1.367a1.753 1.753 0 0 0 1.045.832 2.66 2.66 0 0 0 -.238 2.916 2.989 2.989 0 0 0 2.326 1.509.79.79 0 0 0 .082 0 .707.707 0 0 0 .717-.6.688.688 0 0 0 -.636-.749 1.546 1.546 0 0 1 -1.2-.78 1.408 1.408 0 0 1 .672-1.95 1.628 1.628 0 0 1 1.179-.089 1.512 1.512 0 0 1 .9.719 1.37 1.37 0 0 1 -.023 1.361.656.656 0 0 0 .284.92.748.748 0 0 0 .981-.266 2.648 2.648 0 0 0 .04-2.633zm-19.673-11.959a13.013 13.013 0 0 1 5-1 21.6 21.6 0 0 1 4.5.5 9.312 9.312 0 0 0 -9.5-8.5c-5.794 0-9.176 4-9.5 8.5a21.858 21.858 0 0 1 4.5-.5 12.819 12.819 0 0 1 5 1zm3.5-5c1.209 0 2.5.866 2.5 2h-5c0-1.134 1.291-2 2.5-2zm-7 0c1.209 0 2.5.866 2.5 2h-5c0-1.134 1.291-2 2.5-2z" fill-rule="evenodd" style="fill:#f2f2f2;fill-opacity:1" class="ColorScheme-Text" fill="currentColor"/>
-	</defs>
-	<path d="m32.66 29.319a1.432 1.432 0 0 0 -.66-.319h-1.5a8.125 8.125 0 0 0 1.5-5 11.027 11.027 0 0 0 -.5-3 2.519 2.519 0 0 1 0-1.5 12.987 12.987 0 0 0 .5-3.5c-6.681-1.955-11 0-11 0s-4.313-1.936-11 0a13.272 13.272 0 0 0 .5 3.5 2.519 2.519 0 0 1 0 1.5 11.1 11.1 0 0 0 -.5 3 8.035 8.035 0 0 0 1.5 5h-1.5a1.868 1.868 0 0 0 -.783.319 3.477 3.477 0 0 0 -1.636 2.157 7.058 7.058 0 0 0 -.234 3.18c.307 2.008 1.329 3.344 2.653 3.344h4a.379.379 0 0 0 .277-.187l1.793-1.483a3.263 3.263 0 0 0 .729-2.074 7.857 7.857 0 0 0 .027-.878 23.166 23.166 0 0 0 4.174 1.622 24.4 24.4 0 0 0 4.051-1.614 7.848 7.848 0 0 0 .027.869 3.263 3.263 0 0 0 .729 2.074l1.793 1.484a.61.61 0 0 0 .4.187h4c1.324 0 2.223-1.336 2.529-3.343a7.057 7.057 0 0 0 -.234-3.18 3.477 3.477 0 0 0 -1.635-2.158zm-17.069 6.5c-.019.009-.936.775-1.458 1.208a.418.418 0 0 1 -.627-.111 9.322 9.322 0 0 1 -.3-5.974 15.843 15.843 0 0 0 2.894 2.048c.051 1.03-.161 2.644-.509 2.834zm6.409-6.819h-2l.5-5a2 2 0 1 1 1 0zm6.38 7.921a.418.418 0 0 1 -.627.111c-.522-.433-1.439-1.2-1.458-1.208-.348-.189-.56-1.8-.505-2.828a15.84 15.84 0 0 0 2.9-2.037 9.322 9.322 0 0 1 -.31 5.962zm-20.924-11.162.744-1.366a1.579 1.579 0 0 0 -.019-1.557l.653-1.2c.2.014-.03-.113.165-.14.051-.217-.051-.336 0-.5a3.269 3.269 0 0 0 0-1.5 7.151 7.151 0 0 1 0-3 2.366 2.366 0 0 0 -2.378 1.448 2.409 2.409 0 0 0 .229 2.661l-.7 1.278a1.779 1.779 0 0 0 -1.317.891l-.741 1.372a1.577 1.577 0 0 0 -.019 1.487 3.028 3.028 0 0 0 -2.746 1.525 2.648 2.648 0 0 0 .044 2.631.748.748 0 0 0 .981.266.656.656 0 0 0 .284-.92 1.37 1.37 0 0 1 -.023-1.361 1.6 1.6 0 0 1 2.079-.63 1.408 1.408 0 0 1 .672 1.95 1.546 1.546 0 0 1 -1.2.78.688.688 0 0 0 -.636.749.707.707 0 0 0 .717.6.789.789 0 0 0 .082 0 2.989 2.989 0 0 0 2.322-1.513 2.669 2.669 0 0 0 -.377-3.084 1.767 1.767 0 0 0 1.184-.867zm33.217 1.2a3.021 3.021 0 0 0 -2.658-1.525 1.574 1.574 0 0 0 -.107-1.283l-.745-1.367a1.779 1.779 0 0 0 -1.317-.891l-.7-1.278a2.409 2.409 0 0 0 .229-2.661 2.283 2.283 0 0 0 -2.375-1.454 7.039 7.039 0 0 1 0 3 3.272 3.272 0 0 0 0 1.5c.047.152-.047.3 0 .5.227.04-.069.156.165.14l.653 1.2a1.579 1.579 0 0 0 -.019 1.557l.745 1.367a1.753 1.753 0 0 0 1.045.832 2.66 2.66 0 0 0 -.238 2.916 2.989 2.989 0 0 0 2.326 1.509.79.79 0 0 0 .082 0 .707.707 0 0 0 .717-.6.688.688 0 0 0 -.636-.749 1.546 1.546 0 0 1 -1.2-.78 1.408 1.408 0 0 1 .672-1.95 1.628 1.628 0 0 1 1.179-.089 1.512 1.512 0 0 1 .9.719 1.37 1.37 0 0 1 -.023 1.361.656.656 0 0 0 .284.92.748.748 0 0 0 .981-.266 2.648 2.648 0 0 0 .04-2.633zm-19.673-11.959a13.013 13.013 0 0 1 5-1 21.6 21.6 0 0 1 4.5.5 9.312 9.312 0 0 0 -9.5-8.5c-5.794 0-9.176 4-9.5 8.5a21.858 21.858 0 0 1 4.5-.5 12.819 12.819 0 0 1 5 1zm3.5-5c1.209 0 2.5.866 2.5 2h-5c0-1.134 1.291-2 2.5-2zm-7 0c1.209 0 2.5.866 2.5 2h-5c0-1.134 1.291-2 2.5-2z" fill-rule="evenodd" class="ColorScheme-Text" fill="currentColor"/>
 </svg>

dist/linux/debian/changelog

@@ -1,4 +1,4 @@
-cryptomator (${PPA_VERSION}) jammy; urgency=low
+cryptomator (${PPA_VERSION}) focal; urgency=low
 
   * Full changelog can be found on https://github.com/cryptomator/cryptomator/releases
 

dist/linux/debian/control

@@ -2,7 +2,7 @@ Source: cryptomator
 Maintainer: Cryptobot <releases@cryptomator.org>
 Section: utils
 Priority: optional
-Build-Depends: debhelper (>=10), coffeelibs-jdk-24 (>= 24.0.1+9-0ppa3), libgtk-3-0,  libxxf86vm1, libgl1
+Build-Depends: debhelper (>=10), coffeelibs-jdk-23 (>= 23.0.1+11-0ppa1), libgtk-3-0,  libxxf86vm1, libgl1
 Standards-Version: 4.5.0
 Homepage: https://cryptomator.org
 Vcs-Git: https://github.com/cryptomator/cryptomator.git

dist/linux/debian/rules

@@ -4,7 +4,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-JAVA_HOME = /usr/lib/jvm/java-24-coffeelibs
+JAVA_HOME = /usr/lib/jvm/java-23-coffeelibs
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 ifeq ($(DEB_BUILD_ARCH),amd64)
 JMODS_PATH = jmods/amd64:${JAVA_HOME}/jmods
@@ -44,8 +44,7 @@ override_dh_auto_build:
 		--name cryptomator \
 		--vendor "Skymatic GmbH" \
 		--java-options "--enable-preview" \
-		--java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator" \
+		--java-options "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator" \
-		--java-options "--sun-misc-unsafe-memory-access=allow" \
 		--copyright "(C) 2016 - 2025 Skymatic GmbH" \
 		--java-options "-Xss5m" \
 		--java-options "-Xmx256m" \

dist/mac/dmg/build.sh

@@ -32,15 +32,15 @@ REVISION_NO=`git rev-list --count HEAD`
 VERSION_NO=`mvn -f../../../pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout | sed -rn 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/p'`
 FUSE_LIB="FUSE-T"
 
-JAVAFX_VERSION=24.0.1
+JAVAFX_VERSION=23.0.1
 JAVAFX_ARCH="undefined"
 JAVAFX_JMODS_SHA256="undefined"
 if [ "$(machine)" = "arm64e" ]; then
     JAVAFX_ARCH="aarch64"
-    JAVAFX_JMODS_SHA256="b5a94a13077507003fa852512bfa33f4fb680bc8076d8002e4227a84c85171d4"
+    JAVAFX_JMODS_SHA256="a800724a1f3e6757ecfa0bd5bf7ed64d2e6a7a3f5b3522650a70b8cfc7782fb6"
 else
     JAVAFX_ARCH="x64"
-    JAVAFX_JMODS_SHA256="6e62a426d43c168a488521f904a523f3dd6ee2cf103e08136f2fd465c828a105"
+    JAVAFX_JMODS_SHA256="8857965975c464a0e5d57709292ce357d0ebb39f6168c41d5ca38301e42c3c8e"
 fi
 JAVAFX_JMODS_URL="https://download2.gluonhq.com/openjfx/${JAVAFX_VERSION}/openjfx-${JAVAFX_VERSION}_osx-${JAVAFX_ARCH}_bin-jmods.zip"
 
@@ -75,16 +75,10 @@ mvn -B -Djavafx.platform=mac -f../../../pom.xml clean package -DskipTests -Pmac
 cp ../../../LICENSE.txt ../../../target
 cp ../../../target/${MAIN_JAR_GLOB} ../../../target/mods
 
-# create runtime
+# add runtime
-## check for JEP 493
-JMOD_PATHS="openjfx-jmods"
-if ! ${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"; then
-    JMOD_PATHS="${JAVA_HOME}/jmods:${JMOD_PATHS}"
-fi
-## create custom runtime
 ${JAVA_HOME}/bin/jlink \
     --output runtime \
-    --module-path "${JMOD_PATHS}" \
+    --module-path "${JAVA_HOME}/jmods:openjfx-jmods" \
     --add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.unsupported,jdk.security.auth,jdk.accessibility,jdk.management.jfr,java.compiler \
     --strip-native-commands \
     --no-header-files \
@@ -106,7 +100,7 @@ ${JAVA_HOME}/bin/jpackage \
     --copyright "(C) ${COPYRIGHT_YEARS} ${VENDOR}" \
     --app-version "${VERSION_NO}" \
     --java-options "--enable-preview" \
-    --java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.mac" \
+    --java-options "--enable-native-access=org.cryptomator.jfuse.mac" \
     --java-options "-Xss5m" \
     --java-options "-Xmx256m" \
     --java-options "-Dfile.encoding=\"utf-8\"" \

dist/win/build.ps1

@@ -18,32 +18,14 @@ $ProgressPreference = 'SilentlyContinue' # disables Invoke-WebRequest's progress
 # check preconditions
 if ((Get-Command "git" -ErrorAction SilentlyContinue) -eq $null)
 {
-   Write-Error "Unable to find git.exe in your PATH (try: choco install git)"
+   Write-Host "Unable to find git.exe in your PATH (try: choco install git)"
    exit 1
 }
 if ((Get-Command "mvn" -ErrorAction SilentlyContinue) -eq $null)
 {
-   Write-Error "Unable to find mvn.cmd in your PATH (try: choco install maven)"
+   Write-Host "Unable to find mvn.cmd in your PATH (try: choco install maven)"
    exit 1
 }
-if ((Get-Command 'wix' -ErrorAction SilentlyContinue) -eq $null)
-{
-   Write-Error 'Unable to find wix in your PATH (try: dotnet tool install --global wix --version 6.0.0)'
-   exit 1
-}
-$wixExtensions = & wix.exe extension list --global | Out-String
-if ($wixExtensions -notmatch 'WixToolset.UI.wixext') {
-    Write-Error 'Wix UI extension missing. Please install it with: wix.exe extension add WixToolset.UI.wixext/6.0.0 --global)'
-    exit 1
-}
-if ($wixExtensions -notmatch 'WixToolset.Util.wixext') {
-    Write-Error 'Wix Util extension missing. Please install it with: wix.exe extension add WixToolset.Util.wixext/6.0.0 --global)'
-    exit 1
-}
-if ($wixExtensions -notmatch 'WixToolset.BootstrapperApplications.wixext') {
-    Write-Error 'Wix Bootstrapper extension missing. Please install it with: wix.exe extension add WixToolset.BootstrapperApplications.wixext/6.0.0 --global)'
-    exit 1
-}
 
 $buildDir = Split-Path -Parent $PSCommandPath
 $version = $(mvn -f $buildDir/../../pom.xml help:evaluate -Dexpression="project.version" -q -DforceStdout)
@@ -68,71 +50,37 @@ if ($clean -and (Test-Path -Path $runtimeImagePath)) {
 	Remove-Item -Path $runtimeImagePath -Force -Recurse
 }
 
-## download jfx jmods for X64, while they are part of the Arm64 JDK
+## download jfx jmods
-$archCode = (Get-CimInstance Win32_Processor).Architecture
+$javaFxVersion='23.0.1'
-$archName = switch ($archCode) {
+$javaFxJmodsUrl = "https://download2.gluonhq.com/openjfx/${javaFxVersion}/openjfx-${javaFxVersion}_windows-x64_bin-jmods.zip"
-    9  { "x64 (AMD64)" }
+$javaFxJmodsSHA256 = 'ee176dcee3bd78bde7910735bd67f67c792882f5b89626796ae06f7a1c0119d3'
-    12 { "ARM64" }
+$javaFxJmods = '.\resources\jfxJmods.zip'
-    default { "WMI Win32_Processor.Architecture code ($archCode)" }
+if( !(Test-Path -Path $javaFxJmods) ) {
+	Write-Output "Downloading ${javaFxJmodsUrl}..."
+	Invoke-WebRequest $javaFxJmodsUrl -OutFile $javaFxJmods # redirects are followed by default
 }
 
-switch ($archName) {
+$jmodsChecksumActual = $(Get-FileHash -Path $javaFxJmods -Algorithm SHA256).Hash.ToLower()
-    'ARM64' {
+if( $jmodsChecksumActual -ne $javaFxJmodsSHA256 ) {
-		$javafxBaseJmod = Join-Path $Env:JAVA_HOME "jmods\javafx.base.jmod"
+	Write-Error "Checksum mismatch for jfxJmods.zip. Expected: $javaFxJmodsSHA256
-		if (!(Test-Path $javafxBaseJmod)) {
+, actual: $jmodsChecksumActual"
-			Write-Error "JavaFX module not found in JDK. Please ensure full JDK (including jmods) is installed."
+	exit 1;
-			exit 1
-		}
-
-        $jmodPaths = "$Env:JAVA_HOME/jmods"
-    }
-    'x64 (AMD64)' {
-		$javaFxVersion='24.0.1'
-		$javaFxJmodsUrl = "https://download2.gluonhq.com/openjfx/${javaFxVersion}/openjfx-${javaFxVersion}_windows-x64_bin-jmods.zip"
-		$javaFxJmodsSHA256 = 'f13d17c7caf88654fc835f1b4e75a9b0f34a888eb8abef381796c0002e63b03f'
-		$javaFxJmods = '.\resources\jfxJmods.zip'
-
-		if( !(Test-Path -Path $javaFxJmods) ) {
-			Write-Output "Downloading ${javaFxJmodsUrl}..."
-			Invoke-WebRequest $javaFxJmodsUrl -OutFile $javaFxJmods # redirects are followed by default
-		}
-
-		$jmodsChecksumActual = $(Get-FileHash -Path $javaFxJmods -Algorithm SHA256).Hash.ToLower()
-		if( $jmodsChecksumActual -ne $javaFxJmodsSHA256 ) {
-			Write-Error "Checksum mismatch for jfxJmods.zip. Expected: $javaFxJmodsSHA256
-		, actual: $jmodsChecksumActual"
-			exit 1;
-		}
-
-		Expand-Archive -Path $javaFxJmods -Force -DestinationPath ".\resources\"
-		Remove-Item -Recurse -Force -Path ".\resources\javafx-jmods" -ErrorAction Ignore
-		Move-Item -Force -Path ".\resources\javafx-jmods-*" -Destination ".\resources\javafx-jmods" -ErrorAction Stop
-
-		$jmodPaths="$buildDir/resources/javafx-jmods";
-    }
-    default {
-        Write-Error "Unsupported architecture: $arch"
-        exit 1
-    }
 }
+Expand-Archive -Path $javaFxJmods -Force -DestinationPath ".\resources\"
+Remove-Item -Recurse -Force -Path ".\resources\javafx-jmods" -ErrorAction Ignore
+Move-Item -Force -Path ".\resources\javafx-jmods-*" -Destination ".\resources\javafx-jmods" -ErrorAction Stop
 
 ## create custom runtime
-### check for JEP 493
-if ((& "$Env:JAVA_HOME\bin\jlink" --help | Select-String -Pattern "Linking from run-time image enabled" -SimpleMatch | Measure-Object).Count -eq 0 ) {
-	$jmodPaths="$Env:JAVA_HOME/jmods;" + $jmodPaths;
-}
-
-### create runtime
 & "$Env:JAVA_HOME\bin\jlink" `
 	--verbose `
 	--output runtime `
-	--module-path $jmodPaths `
+	--module-path "$Env:JAVA_HOME/jmods;$buildDir/resources/javafx-jmods" `
 	--add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,jdk.unsupported,jdk.accessibility,jdk.management.jfr,jdk.crypto.mscapi,java.compiler,javafx.base,javafx.graphics,javafx.controls,javafx.fxml `
 	--strip-native-commands `
 	--no-header-files `
 	--no-man-pages `
 	--strip-debug `
-	--compress "zip-0" #do not compress and use msi compression
+	--compress "zip-0" #do not compress to have improved msi compression
 
 $appPath = ".\$AppName"
 if ($clean -and (Test-Path -Path $appPath)) {
@@ -152,7 +100,7 @@ if ($clean -and (Test-Path -Path $appPath)) {
 	--vendor $Vendor `
 	--copyright $copyright `
 	--java-options "--enable-preview" `
-	--java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.win,org.cryptomator.integrations.win" `
+	--java-options "--enable-native-access=org.cryptomator.jfuse.win,org.cryptomator.integrations.win" `
 	--java-options "-Xss5m" `
 	--java-options "-Xmx256m" `
 	--java-options "-Dcryptomator.appVersion=`"$semVerNo`"" `
@@ -168,7 +116,6 @@ if ($clean -and (Test-Path -Path $appPath)) {
 	--java-options "-Dcryptomator.loopbackAlias=`"$LoopbackAlias`"" `
 	--java-options "-Dcryptomator.integrationsWin.autoStartShellLinkName=`"$AppName`"" `
 	--java-options "-Dcryptomator.integrationsWin.keychainPaths=`"@{appdata}/$AppName/keychain.json;@{userhome}/AppData/Roaming/$AppName/keychain.json`"" `
-	--java-options "-Dcryptomator.integrationsWin.windowsHelloKeychainPaths=`"@{appdata}/$AppName/windowsHelloKeychain.json`"" `
 	--java-options "-Dcryptomator.showTrayIcon=true" `
 	--java-options "-Dcryptomator.buildNumber=`"msi-$revisionNo`"" `
 	--resource-dir resources `
@@ -219,11 +166,6 @@ $Env:JP_WIXHELPER_DIR = "."
 	--about-url $AboutUrl `
 	--file-associations resources/FAvaultFile.properties
 
-if ($LASTEXITCODE -ne 0) {
-    Write-Error "jpackage MSI failed with exit code $LASTEXITCODE"
-	return 1;
-}
-
 #Create RTF license for bundle
 &mvn -B -f $buildDir/../../pom.xml license:add-third-party "-Djavafx.platform=win" `
  "-Dlicense.thirdPartyFilename=license.rtf" `
@@ -235,19 +177,9 @@ if ($LASTEXITCODE -ne 0) {
  "-Dlicense.licenseMergesUrl=file:///$buildDir/../../license/merges"
 
 # download Winfsp
-$winfspMsiUrl= 'https://github.com/winfsp/winfsp/releases/download/v2.1/winfsp-2.1.25156.msi'
+$winfspMsiUrl= 'https://github.com/winfsp/winfsp/releases/download/v2.0/winfsp-2.0.23075.msi'
-$winfspMsiHash = '073A70E00F77423E34BED98B86E600DEF93393BA5822204FAC57A29324DB9F7A'
 Write-Output "Downloading ${winfspMsiUrl}..."
 Invoke-WebRequest $winfspMsiUrl -OutFile ".\bundle\resources\winfsp.msi" # redirects are followed by default
-$computedHash = $(Get-FileHash -Path '.\bundle\resources\winfsp.msi' -Algorithm SHA256).Hash
-if (! $computedHash.Equals($winfspMsiHash)) {
-	Write-Error -Category InvalidData -CategoryActivity "Data integrity check failed" -Message @"
-	Downloaded Winfsp Installer does not match stored SHA256 checksum.
-	Expected: $winfspMsiHash
-	Actual:   $computedHash
-"@
-	exit 1
-}
 
 # download legacy-winfsp uninstaller
 $winfspUninstaller= 'https://github.com/cryptomator/winfsp-uninstaller/releases/latest/download/winfsp-uninstaller.exe'
@@ -255,20 +187,14 @@ Write-Output "Downloading ${winfspUninstaller}..."
 Invoke-WebRequest $winfspUninstaller -OutFile ".\bundle\resources\winfsp-uninstaller.exe" # redirects are followed by default
 
 # copy MSI to bundle resources
-Copy-Item ".\installer\$AppName-*.msi" -Destination ".\bundle\resources\$AppName.msi" -Force
+Copy-Item ".\installer\$AppName-*.msi" -Destination ".\bundle\resources\$AppName.msi"
 
 # create bundle including winfsp
-& wix build `
+& "$env:WIX\bin\candle.exe" .\bundle\bundleWithWinfsp.wxs -ext WixBalExtension -ext WixUtilextension -out bundle\ `
-	-define BundleName="$AppName" `
+	-dBundleVersion="$semVerNo.$revisionNo" `
-	-define BundleVersion="$semVerNo.$revisionNo" `
+	-dBundleVendor="$Vendor" `
-	-define BundleVendor="$Vendor" `
+	-dBundleCopyright="$copyright" `
-	-define BundleCopyright="$copyright" `
+	-dAboutUrl="$AboutUrl" `
-	-define AboutUrl="$AboutUrl" `
+	-dHelpUrl="$HelpUrl" `
-	-define HelpUrl="$HelpUrl" `
+	-dUpdateUrl="$UpdateUrl"
-	-define UpdateUrl="$UpdateUrl" `
+& "$env:WIX\bin\light.exe" -b . .\bundle\BundlewithWinfsp.wixobj -ext WixBalExtension -ext WixUtilextension -out installer\$AppName-Installer.exe
-	-ext "WixToolset.Util.wixext" `
-	-ext "WixToolset.BootstrapperApplications.wixext" `
-    .\bundle\bundleWithWinfsp.wxs `
-    -out "installer\$AppName-Installer.exe"
-
-Write-Output "Created EXE installer .\installer\$AppName-Installer.exe"

dist/win/bundle/bundleWithWinfsp.wxs

@@ -1,48 +1,66 @@
-<!-- For Built in variables, see https://wixtoolset.org/docs/tools/burn/builtin-variables/-->
+<?xml version="1.0"?>
-<ns0:Wix xmlns:ns0="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
+
-    <ns0:Bundle Name="$(var.BundleName)"
+<!-- For Built in variables, see https://wixtoolset.org/docs/tools/burn/builtin-variables/-->
-     UpgradeCode="29eea626-2e5b-4449-b5f8-4602925ddf7b"
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-     Version="$(var.BundleVersion)"
+    <!-- see https://wixtoolset.org/documentation/manual/v3/xsd/wix/bundle.html-->
-     Manufacturer="$(var.BundleVendor)"
+    <!-- Attributes explicitly not used:
-     AboutUrl="$(var.AboutUrl)"
+        Condition - the single msi files have their own install conditions, no need to copy them here
-     HelpUrl="$(var.HelpUrl)"
+    -->
-     UpdateUrl="$(var.UpdateUrl)"
+
-     Copyright="$(var.BundleCopyright)"
+    <Bundle Name="Cryptomator" UpgradeCode="29eea626-2e5b-4449-b5f8-4602925ddf7b" Version="$(var.BundleVersion)" Manufacturer="$(var.BundleVendor)"
-     IconSourceFile="bundle\resources\Cryptomator.ico">
+     AboutUrl="$(var.AboutUrl)" HelpUrl="$(var.HelpUrl)" UpdateUrl="$(var.UpdateUrl)" Copyright="$(var.BundleCopyright)" IconSourceFile="bundle\resources\Cryptomator.ico">
 
         <!-- detect outdated WinFsp installations -->
-        <util:ProductSearch Variable="InstalledLegacyWinFspVersion" Result="version" UpgradeCode="82F812D9-4083-4EF1-8BC8-0F1EDA05B46B" />
+        <util:ProductSearch
+            Variable="InstalledLegacyWinFspVersion"
+            Result="version"
+            UpgradeCode="82F812D9-4083-4EF1-8BC8-0F1EDA05B46B"/>
 
-        <ns0:BootstrapperApplication>
+        <!-- for definition of the standard themes, see https://github.com/wixtoolset/wix3/blob/master/src/ext/BalExtension/wixstdba/Resources/-->
-            <bal:WixStandardBootstrapperApplication LicenseFile="bundle\resources\license.rtf" ShowVersion="yes"
+        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLargeLicense">
-              SuppressOptionsUI="yes"
+            <!-- see https://wixtoolset.org/documentation/manual/v3/xsd/bal/wixstandardbootstrapperapplication.html -->
-              Theme="rtfLargeLicense"
+            <!-- Possible Attributes: LaunchTarget -->
-              ThemeFile="bundle\resources\customBootstrapperTheme.xml"
+            <bal:WixStandardBootstrapperApplication
-              LocalizationFile="bundle\resources\customBootstrapperTheme.wxl"
+                LicenseFile="bundle\resources\license.rtf"
-              LogoSideFile="bundle\resources\logoSide.png"
+                ShowVersion="yes"
-              LogoFile="bundle\resources\logo.png"
+                SuppressOptionsUI="yes"
-              LaunchTarget="[ProgramFiles64Folder]\$(var.BundleName)\$(var.BundleName).exe" />
+                ThemeFile="bundle\customBootstrapperTheme.xml"
-            <ns0:Payload SourceFile="bundle\resources\logoSide.png"/>
+                LocalizationFile="bundle\customBootstrapperTheme.wxl"
-            <!-- Required due to https://github.com/wixtoolset/issues/issues/8104 -->
+                LogoFile="bundle\resources\logo.png"/>
-            <ns0:Payload Name="Cryptobot.ico" SourceFile="bundle\resources\Cryptomator.ico"/>
+            <Payload SourceFile="bundle\resources\logoSide.png" />
-        </ns0:BootstrapperApplication>
+        </BootstrapperApplicationRef>
 
-        <ns0:Chain>
+        <Chain>
-            <ns0:ExePackage Cache="keep" PerMachine="yes" Permanent="no" SourceFile="bundle\resources\winfsp-uninstaller.exe" DisplayName="Removing outdated WinFsp Driver" Description="Executable to remove old winfsp" DetectCondition="false" InstallCondition="(InstalledLegacyWinFspVersion &lt;&gt; v0.0.0.0) AND ((WixBundleAction = 7) OR (WixBundleAction = 5))" UninstallArguments="">
+            <ExePackage Cache="yes" PerMachine="yes" Permanent="no"
-                <ns0:CommandLine Condition="WixBundleUILevel &lt;= 3" InstallArgument="-q -l &quot;[WixBundleLog].winfsp-uninstaller.log&quot;" RepairArgument="-q" UninstallArgument="-s" />
+              SourceFile="resources\winfsp-uninstaller.exe"
+              DisplayName="Removing outdated WinFsp Driver"
+              Description="Executable to remove old winfsp"
+              DetectCondition="false"
+              InstallCondition="(InstalledLegacyWinFspVersion &lt;&gt; v0.0.0.0) AND ((WixBundleAction = 7) OR (WixBundleAction = 5))">
+                <CommandLine Condition="WixBundleUILevel &lt;= 3" InstallArgument="-q -l &quot;[WixBundleLog].winfsp-uninstaller.log&quot;" RepairArgument="-q" UninstallArgument="-s" />
                 <!-- XML allows line breaks in attributes, hence keep the line breaks here -->
-                <ns0:CommandLine Condition="WixBundleUILevel &gt; 3" InstallArgument="-l &quot;[WixBundleLog].winfsp-uninstaller.log&quot; -t &quot;Cryptomator Installer&quot; -m &quot;Cryptomator requires a newer version of the WinFsp driver. The installer will now uninstall WinFsp, possibly reboot, and afterwards proceed with the installation.
+                <CommandLine Condition="WixBundleUILevel &gt; 3" InstallArgument="-l &quot;[WixBundleLog].winfsp-uninstaller.log&quot; -t &quot;Cryptomator Installer&quot; -m &quot;Cryptomator requires a newer version of the WinFsp driver. The installer will now uninstall WinFsp, possibly reboot, and afterwards proceed with the installation.
 
 Do you want to continue?&quot;" RepairArgument="-q" UninstallArgument="-s" />
-                <ns0:ExitCode Behavior="success" Value="0" />
+                <ExitCode Behavior="success" Value="0"/>
-                <ns0:ExitCode Behavior="success" Value="1" />
+                <ExitCode Behavior="success" Value="1"/>
-                <ns0:ExitCode Behavior="error" Value="2" />
+                <ExitCode Behavior="error" Value="2"/>
-                <ns0:ExitCode Behavior="error" Value="3" />
+                <ExitCode Behavior="error" Value="3"/>
-                <ns0:ExitCode Behavior="forceReboot" Value="4" />
+                <ExitCode Behavior="forceReboot" Value="4"/>
-                <ns0:ExitCode Behavior="success" Value="5" />
+                <ExitCode Behavior="success" Value="5"/>
-            </ns0:ExePackage>
+            </ExePackage>
-            <ns0:MsiPackage SourceFile="bundle\resources\Cryptomator.msi" CacheId="cryptomator-bundle-cryptomator" Visible="no" />
+            <!-- see https://wixtoolset.org/documentation/manual/v3/xsd/wix/msipackage.html-->
-            <ns0:MsiPackage SourceFile="bundle\resources\winfsp.msi" CacheId="cryptomator-bundle-winfsp" Visible="yes" Permanent="yes" />
+            <MsiPackage
-        </ns0:Chain>
+                SourceFile="resources\Cryptomator.msi"
-    </ns0:Bundle>
+                CacheId="cryptomator-bundle-cryptomator"
-</ns0:Wix>
+                DisplayInternalUI="no"
+                Visible="no"/>
+            <MsiPackage
+                SourceFile="resources\winfsp.msi"
+                CacheId="cryptomator-bundle-winfsp"
+                Visible="yes"
+                DisplayInternalUI="no"
+                Permanent="yes"/>
+        </Chain>
+    </Bundle>
+</Wix>

dist/win/bundle/customBootstrapperTheme.wxl

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="Caption">[WixBundleName] Setup</String>
+  <String Id="Title">[WixBundleName]</String>
+  <String Id="InstallHeader">Welcome</String>
+  <String Id="InstallMessage">This Setup will install [WixBundleName] and additional dependencies on your computer.</String>
+  <String Id="InstallVersion">Version [WixBundleVersion]</String>
+  <String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
+  <String Id="ExecuteUpgradeRelatedBundleMessage">Previous version</String>
+  <String Id="HelpHeader">Setup Help</String>
+  <String Id="HelpText">/install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or
+   creates a complete local copy of the bundle in directory. Install is the default.
+
+/passive | /quiet -  displays minimal UI with no prompts or displays no UI and
+   no prompts. By default UI and all prompts are displayed.
+
+/norestart   - suppress any attempts to restart. By default UI will prompt before restart.
+/log log.txt - logs to a specific file. By default a log file is created in %TEMP%.</String>
+  <String Id="HelpCloseButton">&amp;Close</String>
+  <String Id="InstallLicenseLinkText">[WixBundleName] &lt;a href="#"&gt;license terms&lt;/a&gt;.</String>
+  <String Id="InstallAcceptCheckbox">I &amp;agree to the license terms and conditions</String>
+  <String Id="InstallOptionsButton">&amp;Options</String>
+  <String Id="InstallInstallButton">&amp;Install</String>
+  <String Id="InstallCloseButton">&amp;Close</String>
+  <String Id="OptionsHeader">Setup Options</String>
+  <String Id="OptionsLocationLabel">Install location:</String>
+  <String Id="OptionsBrowseButton">&amp;Browse</String>
+  <String Id="OptionsOkButton">&amp;OK</String>
+  <String Id="OptionsCancelButton">&amp;Cancel</String>
+  <String Id="ProgressHeader">Setup Progress</String>
+  <String Id="ProgressLabel">Processing:</String>
+  <String Id="OverallProgressPackageText">Initializing...</String>
+  <String Id="ProgressCancelButton">&amp;Cancel</String>
+  <String Id="ModifyHeader">Modify Setup</String>
+  <String Id="ModifyRepairButton">&amp;Repair</String>
+  <String Id="ModifyUninstallButton">&amp;Uninstall</String>
+  <String Id="ModifyCloseButton">&amp;Close</String>
+  <String Id="SuccessRepairHeader">Repair Successfully Completed</String>
+  <String Id="SuccessUninstallHeader">Uninstall Successfully Completed</String>
+  <String Id="SuccessInstallHeader">Installation Successfully Completed</String> 
+  <String Id="SuccessHeader">Setup Successful</String>	
+  <String Id="SuccessLaunchButton">&amp;Launch</String>
+  <String Id="SuccessRestartText">You must restart your computer before you can use the software.</String>
+  <String Id="SuccessRestartButton">&amp;Restart</String>
+  <String Id="SuccessCloseButton">&amp;Close</String>
+  <String Id="FailureHeader">Setup Failed</String>
+  <String Id="FailureInstallHeader">Setup Failed</String>
+  <String Id="FailureUninstallHeader">Uninstall Failed</String>
+  <String Id="FailureRepairHeader">Repair Failed</String> 
+  <String Id="FailureHyperlinkLogText">One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the &lt;a href="#"&gt;log file&lt;/a&gt;.</String>
+  <String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String>
+  <String Id="FailureRestartButton">&amp;Restart</String>
+  <String Id="FailureCloseButton">&amp;Close</String>
+  <String Id="FilesInUseHeader">Files In Use</String>
+  <String Id="FilesInUseLabel">The following applications are using files that need to be updated:</String>
+  <String Id="FilesInUseCloseRadioButton">Close the &amp;applications and attempt to restart them.</String>
+  <String Id="FilesInUseDontCloseRadioButton">&amp;Do not close applications. A reboot will be required.</String>
+  <String Id="FilesInUseOkButton">&amp;OK</String>
+  <String Id="FilesInUseCancelButton">&amp;Cancel</String>
+  <String Id="ErrorFailNoActionReboot">No action was taken as a system reboot is required.</String>
+</WixLocalization>

dist/win/bundle/customBootstrapperTheme.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- adjusted theme based on https://github.com/wixtoolset/wix3/blob/master/src/ext/BalExtension/wixstdba/Resources/HyperlinkSidebarTheme.xml -->
+
+
+<Theme xmlns="http://wixtoolset.org/schemas/thmutil/2010">
+    <Window Width="600" Height="450" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
+    <Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
+    <Font Id="1" Height="-24" Weight="500" Foreground="000000">Segoe UI</Font>
+    <Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
+    <Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
+    <Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font>
+    <Font Id="5" Height="-12" Weight="700" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
+
+    <Image X="11" Y="11" Width="64" Height="64" ImageFile="logo.png" />
+    <Text X="80" Y="11" Width="-11" Height="64" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
+
+    <Page Name="Help">
+        <Image X="11" Y="11" Width="64" Height="64" ImageFile="logo.png" />
+        <Text X="80" Y="11" Width="-11" Height="64" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
+        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Text>
+        <Text X="11" Y="112" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Text>
+        <Button Name="HelpCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.HelpCloseButton)</Button>
+    </Page>
+    <Page Name="Install">
+        <Text X="185" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
+        <Image X="11" Y="11" Width="165" Height="400" ImageFile="logoside.png"/>
+        <Text X="185" Y="50" Width="-11" Height="32" FontId="2" DisablePrefix="yes">#(loc.InstallHeader)</Text>
+        <Text X="185" Y="91" Width="-11" Height="64" FontId="3" DisablePrefix="yes">#(loc.InstallMessage)</Text>
+        <Richedit Name="EulaRichedit" X="185" Y="131" Width="-12" Height="-65" HexStyle="0x00800000" TabStop="yes" FontId="0" />
+        <Checkbox Name="EulaAcceptCheckbox" X="185" Y="-46" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
+        <Text Name="InstallVersion" X="185" Y="-11" Width="-11" Height="17" FontId="3" DisablePrefix="yes" HideWhenDisabled="yes">#(loc.InstallVersion)</Text>
+        <Button Name="InstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
+        <Button Name="WelcomeCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallCloseButton)</Button>
+    </Page>
+    <Page Name="FilesInUse">
+        <Image X="11" Y="11" Width="64" Height="64" ImageFile="logo.png" />
+        <Text X="80" Y="11" Width="-11" Height="64" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
+        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.FilesInUseHeader)</Text>
+        <Text X="11" Y="121" Width="-11" Height="34" FontId="3" DisablePrefix="yes">#(loc.FilesInUseLabel)</Text>
+        <Text Name="FilesInUseText" X="11" Y="150" Width="-11" Height="-86" FontId="3" DisablePrefix="yes" HexStyle="0x0000000C">A</Text>
+
+        <Button Name="FilesInUseCloseRadioButton" X="11" Y="-60" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseCloseRadioButton)</Button>
+        <Button Name="FilesInUseDontCloseRadioButton" X="11" Y="-40" Width="-11" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes" HexStyle="0x000009">#(loc.FilesInUseDontCloseRadioButton)</Button>
+
+        <Button Name="FilesInUseOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FilesInUseOkButton)</Button>
+        <Button Name="FilesInUseCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FilesInUseCancelButton)</Button>
+    </Page>
+    <Page Name="Progress">
+        <Text X="80" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
+        <Image X="11" Y="11" Width="64" Height="64" ImageFile="logo.png"/>
+        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Text>
+        <Text X="11" Y="141" Width="70" Height="17" FontId="3" DisablePrefix="yes">#(loc.ProgressLabel)</Text>
+        <Text Name="OverallProgressPackageText" X="85" Y="141" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Text>
+        <Progressbar Name="OverallCalculatedProgressbar" X="11" Y="163" Width="-11" Height="20" />
+        <Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
+    </Page>
+    <Page Name="Modify">
+        <Image X="11" Y="11" Width="64" Height="64" ImageFile="logo.png" />
+        <Text X="80" Y="11" Width="-11" Height="64" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
+        <Text X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Text>
+        <Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
+        <Button Name="UninstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyUninstallButton)</Button>
+        <Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyCloseButton)</Button>
+    </Page>
+    <Page Name="Success">
+        <Text X="185" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
+        <Image X="11" Y="11" Width="165" Height="400" ImageFile="logoside.png"/>
+        <Text Name="SuccessHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessHeader)</Text>
+        <Text Name="SuccessInstallHeader" X="185" Y="50" Width="-11" Height="100" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessInstallHeader)</Text>
+        <Text Name="SuccessRepairHeader" X="185" Y="50" Width="-11" Height="100" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRepairHeader)</Text>
+        <Text Name="SuccessUninstallHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessUninstallHeader)</Text>
+        <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
+        <Text Name="SuccessRestartText" X="185" Y="-51" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.SuccessRestartText)</Text>
+        <Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
+        <Button Name="SuccessCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.SuccessCloseButton)</Button>
+    </Page>
+    <Page Name="Failure">
+        <Text X="185" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Text>
+        <Image X="11" Y="11" Width="165" Height="400" ImageFile="logoside.png"/>
+        <Text Name="FailureHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureHeader)</Text>
+        <Text Name="FailureInstallHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureInstallHeader)</Text>
+        <Text Name="FailureUninstallHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureUninstallHeader)</Text>
+        <Text Name="FailureRepairHeader" X="185" Y="50" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>
+        <Hypertext Name="FailureLogFileLink" X="185" Y="121" Width="-11" Height="68" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
+        <Hypertext Name="FailureMessageText" X="185" Y="-80" Width="-11" Height="140" FontId="5" TabStop="yes" HideWhenDisabled="yes" />
+        <Text Name="FailureRestartText" X="185" Y="-57" Width="-11" Height="80" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
+        <Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
+        <Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
+    </Page>
+</Theme>

dist/win/bundle/resources/customBootstrapperTheme.wxl

@@ -1,68 +0,0 @@
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-
-<WixLocalization Culture="en-us" Language="1033" xmlns="http://wixtoolset.org/schemas/v4/wxl">
-  <String Id="Caption" Value="[WixBundleName] Setup" />
-  <String Id="Title" Value="[WixBundleName]" />
-  <String Id="InstallHeader" Value="Welcome" />
-  <String Id="InstallMessage" Value="Setup will install [WixBundleName] on your computer." />
-  <String Id="InstallVersion" Value="Version [WixBundleVersion]" />
-  <String Id="CheckingForUpdatesLabel" Value="Checking for updates" />
-  <String Id="UpdateButton" Value="&amp;Update to version [WixStdBAUpdateAvailable]" />
-  <String Id="InstallVersion" Value="Version [WixBundleVersion]" />
-  <String Id="ConfirmCancelMessage" Value="Are you sure you want to cancel?" />
-  <String Id="ExecuteUpgradeRelatedBundleMessage" Value="Previous version" />
-  <String Id="HelpHeader" Value="Setup Help" />
-  <String Id="HelpText" Value="/install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or&#xA;   creates a complete local copy of the bundle in directory. Install is the default.&#xA;&#xA;/passive | /quiet -  displays minimal UI with no prompts or displays no UI and&#xA;   no prompts. By default UI and all prompts are displayed.&#xA;&#xA;/norestart   - suppress any attempts to restart. By default UI will prompt before restart.&#xA;/log log.txt - logs to a specific file. By default a log file is created in %TEMP%." />
-  <String Id="HelpCloseButton" Value="&amp;Close" />
-  <String Id="InstallAcceptCheckbox" Value="I &amp;agree to the license terms and conditions" />
-  <String Id="InstallOptionsButton" Value="&amp;Options" />
-  <String Id="InstallInstallButton" Value="&amp;Install" />
-  <String Id="InstallCancelButton" Value="&amp;Cancel" />
-  <String Id="OptionsHeader" Value="Setup Options" />
-  <String Id="OptionsLocationLabel" Value="Install location:" />
-  <String Id="OptionsBrowseButton" Value="&amp;Browse" />
-  <String Id="OptionsOkButton" Value="&amp;OK" />
-  <String Id="OptionsCancelButton" Value="&amp;Cancel" />
-  <String Id="ProgressHeader" Value="Setup Progress" />
-  <String Id="ProgressLabel" Value="Processing:" />
-  <String Id="OverallProgressPackageText" Value="Initializing..." />
-  <String Id="ProgressCancelButton" Value="&amp;Cancel" />
-  <String Id="ModifyHeader" Value="Modify Setup" />
-  <String Id="ModifyRepairButton" Value="&amp;Repair" />
-  <String Id="ModifyUninstallButton" Value="&amp;Uninstall" />
-  <String Id="ModifyCancelButton" Value="&amp;Cancel" />
-  <String Id="SuccessHeader" Value="Setup Successful" />
-  <String Id="SuccessCacheHeader" Value="Cache Successfully Completed" />
-  <String Id="SuccessInstallHeader" Value="Installation Successfully Completed" />
-  <String Id="SuccessLayoutHeader" Value="Layout Successfully Completed" />
-  <String Id="SuccessModifyHeader" Value="Modify Successfully Completed" />
-  <String Id="SuccessRepairHeader" Value="Repair Successfully Completed" />
-  <String Id="SuccessUninstallHeader" Value="Uninstall Successfully Completed" />
-  <String Id="SuccessUnsafeUninstallHeader" Value="Uninstall Successfully Completed" />
-  <String Id="SuccessLaunchButton" Value="&amp;Launch" />
-  <String Id="SuccessRestartText" Value="You must restart your computer before you can use the software." />
-  <String Id="SuccessUninstallRestartText" Value="You must restart your computer to complete the removal of the software." />
-  <String Id="SuccessRestartButton" Value="&amp;Restart" />
-  <String Id="SuccessCloseButton" Value="&amp;Close" />
-  <String Id="FailureHeader" Value="Setup Failed" />
-  <String Id="FailureCacheHeader" Value="Cache Failed" />
-  <String Id="FailureInstallHeader" Value="Setup Failed" />
-  <String Id="FailureLayoutHeader" Value="Layout Failed" />
-  <String Id="FailureModifyHeader" Value="Modify Failed" />
-  <String Id="FailureRepairHeader" Value="Repair Failed" />
-  <String Id="FailureUninstallHeader" Value="Uninstall Failed" />
-  <String Id="FailureUnsafeUninstallHeader" Value="Uninstall Failed" />
-  <String Id="FailureHyperlinkLogText" Value="One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the &lt;a href=&quot;#&quot;&gt;log file&lt;/a&gt;." />
-  <String Id="FailureRestartText" Value="You must restart your computer to complete the rollback of the software." />
-  <String Id="FailureRestartButton" Value="&amp;Restart" />
-  <String Id="FailureCloseButton" Value="&amp;Close" />
-  <String Id="FilesInUseTitle" Value="Files In Use" />
-  <String Id="FilesInUseLabel" Value="The following applications are using files that need to be updated:" />
-  <String Id="FilesInUseNetfxCloseRadioButton" Value="Close the &amp;applications." />
-  <String Id="FilesInUseCloseRadioButton" Value="Close the &amp;applications and attempt to restart them." />
-  <String Id="FilesInUseDontCloseRadioButton" Value="&amp;Do not close applications. A reboot will be required." />
-  <String Id="FilesInUseRetryButton" Value="&amp;Retry" />
-  <String Id="FilesInUseIgnoreButton" Value="&amp;Ignore" />
-  <String Id="FilesInUseExitButton" Value="E&amp;xit" />
-</WixLocalization>

dist/win/bundle/resources/customBootstrapperTheme.xml

@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
-
-
-<Theme xmlns="http://wixtoolset.org/schemas/v4/thmutil">
-    <Font Id="0" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
-    <Font Id="1" Height="-24" Weight="500" Foreground="windowtext">Segoe UI</Font>
-    <Font Id="2" Height="-22" Weight="500" Foreground="graytext">Segoe UI</Font>
-    <Font Id="3" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
-
-    <Window Width="600" Height="450" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)" IconFile="Cryptobot.ico">
-        <Page Name="Help">
-            <Label X="80" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Label>
-            <ImageControl X="11" Y="11" Width="64" Height="64" ImageFile="logo.png"/>
-            <Label X="11" Y="80" Width="-11" Height="32" FontId="2" DisablePrefix="yes">#(loc.HelpHeader)</Label>
-            <Label X="11" Y="121" Width="-11" Height="-35" FontId="3" DisablePrefix="yes">#(loc.HelpText)</Label>
-            <Button Name="HelpCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
-                <Text>#(loc.HelpCloseButton)</Text>
-                <CloseWindowAction />
-            </Button>
-        </Page>
-        <Page Name="Loading">
-            <Label X="185" Y="50" Width="-11" Height="30" FontId="2" DisablePrefix="yes" Visible="no" Name="CheckingForUpdatesLabel" />
-        </Page>
-        <Page Name="Install">
-            <ImageControl X="11" Y="11" Width="165" Height="400" ImageFile="logoside.png"/>
-            <Label X="185" Y="11" Width="-11" Height="32" FontId="2" DisablePrefix="yes">#(loc.InstallHeader)</Label>
-            <Label X="185" Y="50" Width="-11" Height="64" FontId="3" DisablePrefix="yes">
-                <Text Condition="WixStdBASuppressOptionsUI">#(loc.InstallMessage)</Text>
-                <Text Condition="NOT WixStdBASuppressOptionsUI">#(loc.InstallMessageOptions)</Text>
-            </Label>
-            <Richedit Name="EulaRichedit" X="185" Y="91" Width="-12" Height="-64" HexStyle="0x00800000" TabStop="yes" FontId="0" />
-            <Checkbox Name="EulaAcceptCheckbox" X="185" Y="-39" Width="-11" Height="17" TabStop="yes" FontId="3" HideWhenDisabled="yes">#(loc.InstallAcceptCheckbox)</Checkbox>
-            <Label Name="InstallVersion" X="11" Y="-11" Width="165" Height="17" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBAShowVersion">#(loc.InstallVersion)</Label>
-            <Button Name="InstallUpdateButton" X="11" Y="-11" Width="200" Height="23" TabStop="yes" FontId="0" EnableCondition="WixStdBAUpdateAvailable" HideWhenDisabled="yes">#(loc.UpdateButton)</Button>
-            <Button Name="OptionsButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" VisibleCondition="NOT WixStdBASuppressOptionsUI">
-                <Text>#(loc.InstallOptionsButton)</Text>
-                <ChangePageAction Page="Options" />
-            </Button>
-            <Button Name="InstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.InstallInstallButton)</Button>
-            <Button Name="InstallCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
-                <Text>#(loc.InstallCancelButton)</Text>
-                <CloseWindowAction />
-            </Button>
-        </Page>
-        <Page Name="Options">
-            <Label X="80" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Label>
-            <ImageControl X="11" Y="11" Width="64" Height="64" ImageFile="logo.png"/>
-            <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.OptionsHeader)</Label>
-            <Label X="11" Y="121" Width="-11" Height="17" FontId="3">#(loc.OptionsLocationLabel)</Label>
-            <Editbox Name="InstallFolder" X="11" Y="143" Width="-91" Height="21" TabStop="yes" FontId="3" FileSystemAutoComplete="yes" />
-            <Button Name="BrowseButton" X="-11" Y="142" Width="75" Height="23" TabStop="yes" FontId="3">
-                <Text>#(loc.OptionsBrowseButton)</Text>
-                <BrowseDirectoryAction VariableName="InstallFolder" />
-            </Button>
-            <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
-                <Text>#(loc.OptionsOkButton)</Text>
-                <ChangePageAction Page="Install" />
-            </Button>
-            <Button Name="OptionsCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
-                <Text>#(loc.OptionsCancelButton)</Text>
-                <ChangePageAction Page="Install" Cancel="yes" />
-            </Button>
-        </Page>
-        <Page Name="Progress">
-            <Label X="80" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Label>
-            <ImageControl X="11" Y="11" Width="64" Height="64" ImageFile="logo.png"/>
-            <Label X="11" Y="80" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.ProgressHeader)</Label>
-            <Label X="11" Y="141" Width="70" Height="17" FontId="3" DisablePrefix="yes">#(loc.ProgressLabel)</Label>
-            <Label Name="OverallProgressPackageText" X="85" Y="141" Width="-11" Height="17" FontId="3" DisablePrefix="yes">#(loc.OverallProgressPackageText)</Label>
-            <Progressbar Name="OverallCalculatedProgressbar" X="11" Y="163" Width="-11" Height="20" />
-            <Button Name="ProgressCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ProgressCancelButton)</Button>
-        </Page>
-        <Page Name="Modify">
-            <ImageControl X="11" Y="11" Width="165" Height="400" ImageFile="logoside.png"/>
-            <Label X="185" Y="11" Width="-11" Height="32" FontId="2" DisablePrefix="yes">#(loc.ModifyHeader)</Label>
-            <Label Name="InstallVersion" X="11" Y="-11" Width="-11" Height="17" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBAShowVersion">#(loc.InstallVersion)</Label>
-            <Button Name="ModifyUpdateButton" X="11" Y="-11" Width="200" Height="23" TabStop="yes" FontId="0" EnableCondition="WixStdBAUpdateAvailable" HideWhenDisabled="yes">#(loc.UpdateButton)</Button>
-            <Button Name="RepairButton" X="-171" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.ModifyRepairButton)</Button>
-            <Button Name="UninstallButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">#(loc.ModifyUninstallButton)</Button>
-            <Button Name="ModifyCancelButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
-                <Text>#(loc.ModifyCancelButton)</Text>
-                <CloseWindowAction />
-            </Button>
-        </Page>
-        <Page Name="Success">
-            <ImageControl X="11" Y="11" Width="165" Height="400" ImageFile="logoside.png"/>
-            <Label X="185" Y="11" Width="-11" Height="32" FontId="2" DisablePrefix="yes">
-                <Text>#(loc.SuccessHeader)</Text>
-                <Text Condition="WixBundleAction = 2">#(loc.SuccessLayoutHeader)</Text>
-                <Text Condition="WixBundleAction = 3">#(loc.SuccessUnsafeUninstallHeader)</Text>
-                <Text Condition="WixBundleAction = 4">#(loc.SuccessUninstallHeader)</Text>
-                <Text Condition="WixBundleAction = 5">#(loc.SuccessCacheHeader)</Text>
-                <Text Condition="WixBundleAction = 6">#(loc.SuccessInstallHeader)</Text>
-                <Text Condition="WixBundleAction = 7">#(loc.SuccessModifyHeader)</Text>
-                <Text Condition="WixBundleAction = 8">#(loc.SuccessRepairHeader)</Text>
-            </Label>
-            <Button Name="LaunchButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessLaunchButton)</Button>
-            <Label X="185" Y="-51" Width="400" Height="34" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">
-                <Text>#(loc.SuccessRestartText)</Text>
-                <Text Condition="WixBundleAction = 3">#(loc.SuccessUninstallRestartText)</Text>
-            </Label>
-            <Label Name="InstallVersion" X="11" Y="-11" Width="165" Height="17" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBAShowVersion">#(loc.InstallVersion)</Label>
-            <Button Name="SuccessRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.SuccessRestartButton)</Button>
-            <Button Name="SuccessCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
-                <Text>#(loc.SuccessCloseButton)</Text>
-                <CloseWindowAction />
-            </Button>
-        </Page>
-        <Page Name="Failure">
-            <ImageControl X="11" Y="11" Width="165" Height="400" ImageFile="logoside.png"/>
-            <Label X="185" Y="11" Width="-11" Height="32" FontId="2" DisablePrefix="yes">
-                <Text>#(loc.FailureHeader)</Text>
-                <Text Condition="WixBundleAction = 2">#(loc.FailureLayoutHeader)</Text>
-                <Text Condition="WixBundleAction = 3">#(loc.FailureUnsafeUninstallHeader)</Text>
-                <Text Condition="WixBundleAction = 4">#(loc.FailureUninstallHeader)</Text>
-                <Text Condition="WixBundleAction = 5">#(loc.FailureCacheHeader)</Text>
-                <Text Condition="WixBundleAction = 6">#(loc.FailureInstallHeader)</Text>
-                <Text Condition="WixBundleAction = 7">#(loc.FailureModifyHeader)</Text>
-                <Text Condition="WixBundleAction = 8">#(loc.FailureRepairHeader)</Text>
-            </Label>
-            <Hypertext Name="FailureLogFileLink" X="185" Y="121" Width="-11" Height="68" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
-            <Hypertext Name="FailureMessageText" X="185" Y="-115" Width="-11" Height="80" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
-            <Label Name="InstallVersion" X="11" Y="-11" Width="165" Height="17" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBAShowVersion">#(loc.InstallVersion)</Label>
-            <Label X="185" Y="-57" Width="-11" Height="80" FontId="3" DisablePrefix="yes" VisibleCondition="WixStdBARestartRequired">#(loc.FailureRestartText)</Label>
-            <Button Name="FailureRestartButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
-            <Button Name="FailureCloseButton" X="-11" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
-                <Text>#(loc.FailureCloseButton)</Text>
-                <CloseWindowAction />
-            </Button>
-        </Page>
-    </Window>
-</Theme>

dist/win/launcher.bat

@@ -6,10 +6,9 @@ java ^
 	-Dcryptomator.ipcSocketPath="~/AppData/Roaming/Cryptomator/ipc.socket" ^
 	-Dcryptomator.logDir="~/AppData/Roaming/Cryptomator" ^
 	-Dcryptomator.mountPointsDir="~/Cryptomator" ^
-	-Dcryptomator.integrationsWin.keychainPaths="~/AppData/Roaming/Cryptomator/keychain.json" ^
+	-Dcryptomator.keychainPath="~/AppData/Roaming/Cryptomator/keychain.json" ^
-	-Dcryptomator.integrationsWin.windowsHelloKeychainPaths="~/AppData/Roaming/Cryptomator/windowsHelloKeychain.json" ^
 	-Xss20m ^
 	-Xmx512m ^
 	--enable-preview `
 	--enable-native-access=org.cryptomator.jfuse.win `
-	-m org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator
+	-m org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator

dist/win/resources/customWizard.wxi

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+	<Fragment>
+		<!-- copy pasta from https://github.com/wixtoolset/wix3/blob/develop/src/ext/UIExtension/wixlib/WixUI_InstallDir.wxs with custom exit dialog-->
+		<UI Id="CustomWizard">
+			<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+			<TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+			<TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+			<Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+			<Property Id="WixUI_Mode" Value="InstallDir" />
+
+			<DialogRef Id="BrowseDlg" />
+			<DialogRef Id="DiskCostDlg" />
+			<DialogRef Id="ErrorDlg" />
+			<DialogRef Id="FilesInUse" />
+			<DialogRef Id="MsiRMFilesInUse" />
+			<DialogRef Id="PrepareDlg" />
+			<DialogRef Id="ProgressDlg" />
+			<DialogRef Id="ResumeDlg" />
+			<DialogRef Id="UserExit" />
+
+			<Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
+			<Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+
+			<!-- custom end dialogs -->
+			<Publish Dialog="MyExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+			<Publish Dialog="MyFatalErrorDlg" Control="Finish" Event="EndDialog" Value="Return" Order="998">1</Publish>
+
+			<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish>
+			<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+
+			<Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+			<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">LicenseAccepted = "1"</Publish>
+
+			<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+			<Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+			<Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+			<Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+			<Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+			<Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+			<Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+
+			<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">NOT Installed</Publish>
+			<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
+			<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
+
+			<Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+			<Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+			<Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+			<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+
+			<Property Id="ARPNOMODIFY" Value="1" />
+
+			<!-- copy pasta from https://github.com/wixtoolset/wix3/blob/develop/src/ext/UIExtension/wixlib/ExitDialog.wxs with adjustments-->
+			<Dialog Id="MyExitDialog" Width="370" Height="270" Title="!(loc.ExitDialog_Title)">
+				<Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)" />
+				<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
+				<Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.ExitDialogBitmap)" />
+				<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
+				<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+				<Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" />
+
+				<Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" />
+				<!-- TODO: localize? -->
+				<Control Id="Suggestion" Type="Text" X="135" Y="100" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
+					<Text>We recommend for the best user experience to download and install the following third party Windows driver:</Text>
+				</Control>
+				<Control Id="WinFsp" Type="Hyperlink" X="140" Y="125" Width="220" Height="60" Transparent="yes">
+					<Text><![CDATA[WinFsp (<a href="https://winfsp.dev/">Homepage</a>)]]></Text>
+				</Control>
+			</Dialog>
+
+			<!-- copy pasta from https://github.com/wixtoolset/wix3/blob/develop/src/ext/UIExtension/wixlib/FatalError.wxs with adjustments-->
+			<Dialog Id="MyFatalErrorDlg" Width="370" Height="270" Title="!(loc.FatalError_Title)">
+                <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.WixUIFinish)">
+                    <Publish Event="EndDialog" Value="Exit">1</Publish>
+                </Control>
+                <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUICancel)" />
+                <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.FatalErrorBitmap)" />
+                <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.WixUIBack)" />
+                <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+                <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.FatalErrorTitle)" />
+                <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="80" Transparent="yes" NoPrefix="yes" Text="!(loc.FatalErrorDescription1) !(loc.FatalErrorDescription2)" />
+                <Control Id="DescriptionReason1" Type="Text" X="135" Y="160" Width="220" Height="20" Transparent="yes" NoPrefix="yes" Hidden="yes" >
+					<Text>Reason:</Text>
+                    <Condition Action="show">FOUNDRUNNINGAPP</Condition>
+                </Control>
+                <Control Id="DescriptionReason2" Type="Text" X="135" Y="170" Width="220" Height="40" Transparent="yes" NoPrefix="yes" Hidden="yes" >
+					<Text>Application to update was still running during installation.</Text>
+                    <Condition Action="show">FOUNDRUNNINGAPP</Condition>
+                </Control>
+            </Dialog>
+
+			<InstallUISequence>
+				<Show Dialog="MyExitDialog" Overridable="yes" OnExit="success"/>
+				<Show Dialog="MyFatalErrorDlg" Overridable="yes" OnExit="error"/>
+			</InstallUISequence>
+			<AdminUISequence>
+				<Show Dialog="MyExitDialog" Overridable="yes" OnExit="success"/>
+				<Show Dialog="MyFatalErrorDlg" Overridable="yes" OnExit="error"/>
+			</AdminUISequence>
+
+		</UI>
+
+		<UIRef Id="WixUI_Common" />
+	</Fragment>
+</Include>

dist/win/resources/main.wxs

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ns0:Wix xmlns:ns0="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util" >
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
   <?ifdef JpIsSystemWide ?>
     <?define JpInstallScope="perMachine"?>
@@ -29,165 +30,174 @@
 
   <?include $(var.JpConfigDir)/overrides.wxi ?>
 
-  <ns0:Package
+  <Product
-   Name="$(var.JpAppName)"
+    Id="$(var.JpProductCode)"
-   Language="$(var.JpProductLanguage)"
+    Name="$(var.JpAppName)"
-   Version="$(var.JpAppVersion)"
+    Language="$(var.JpProductLanguage)"
-   Manufacturer="$(var.JpAppVendor)"
+    Version="$(var.JpAppVersion)"
-   UpgradeCode="$(var.JpProductUpgradeCode)"
+    Manufacturer="$(var.JpAppVendor)"
-   InstallerVersion="$(var.JpInstallerVersion)"
+    UpgradeCode="$(var.JpProductUpgradeCode)">
-   Compressed="$(var.JpCompressedMsi)"
-   ProductCode="$(var.JpProductCode)"
-   Scope="$(var.JpInstallScope)">
 
-    <ns0:SummaryInformation Manufacturer="$(var.JpAppVendor)" Description="$(var.JpAppDescription)"/>
+    <Package
-    <ns0:Media Id="1" Cabinet="Data.cab" EmbedCab="yes" />
+      Description="$(var.JpAppDescription)"
+      Manufacturer="$(var.JpAppVendor)"
+      InstallerVersion="$(var.JpInstallerVersion)"
+      Compressed="$(var.JpCompressedMsi)"
+      InstallScope="$(var.JpInstallScope)" Platform="x64"
+    />
 
+    <Media Id="1" Cabinet="Data.cab" EmbedCab="yes" />
 
-    <ns0:Upgrade Id="$(var.JpProductUpgradeCode)">
+    <Upgrade Id="$(var.JpProductUpgradeCode)">
-      <ns0:UpgradeVersion
+      <UpgradeVersion
-       OnlyDetect="$(var.JpUpgradeVersionOnlyDetectUpgrade)"
+        OnlyDetect="$(var.JpUpgradeVersionOnlyDetectUpgrade)"
-       Property="JP_UPGRADABLE_FOUND"
+        Property="JP_UPGRADABLE_FOUND"
-       Maximum="$(var.JpAppVersion)"
+        Maximum="$(var.JpAppVersion)"
-       MigrateFeatures="yes"
+        MigrateFeatures="yes"
-       IncludeMaximum="$(var.JpUpgradeVersionOnlyDetectUpgrade)"/> <!-- TODO in earlier versions, this was set to yes-->
+        IncludeMaximum="yes" />  <!-- TODO: check if this needs to be set to yes-->
-      <ns0:UpgradeVersion
+      <UpgradeVersion
-       OnlyDetect="$(var.JpUpgradeVersionOnlyDetectDowngrade)"
+        OnlyDetect="$(var.JpUpgradeVersionOnlyDetectDowngrade)"
-       Property="JP_DOWNGRADABLE_FOUND"
+        Property="JP_DOWNGRADABLE_FOUND"
-       Minimum="$(var.JpAppVersion)"
+        Minimum="$(var.JpAppVersion)"
-       MigrateFeatures="yes"
+        MigrateFeatures="yes"
-       IncludeMinimum="$(var.JpUpgradeVersionOnlyDetectDowngrade)" />
+        IncludeMinimum="$(var.JpUpgradeVersionOnlyDetectDowngrade)" />
-    </ns0:Upgrade>
+    </Upgrade>
 
     <?ifndef JpAllowUpgrades ?>
-    <ns0:CustomAction Id="JpDisallowUpgrade" Error="!(loc.DisallowUpgradeErrorMessage)" />
+    <CustomAction Id="JpDisallowUpgrade" Error="!(loc.DisallowUpgradeErrorMessage)" />
     <?endif?>
     <?ifndef JpAllowDowngrades ?>
-    <ns0:CustomAction Id="JpDisallowDowngrade" Error="!(loc.DowngradeErrorMessage)" />
+    <CustomAction Id="JpDisallowDowngrade" Error="!(loc.DowngradeErrorMessage)" />
     <?endif?>
 
-    <!-- TODO: how does this work again? -->
+    <Binary Id="JpCaDll" SourceFile="$(env.JP_WIXHELPER_DIR)\wixhelper.dll"/>
-    <ns0:Binary Id="JpCaDll" SourceFile="$(env.JP_WIXHELPER_DIR)\wixhelper.dll" />
+    <CustomAction Id="JpFindRelatedProducts" BinaryKey="JpCaDll" DllEntry="FindRelatedProductsEx" />
-    <ns0:CustomAction Id="JpFindRelatedProducts" BinaryRef="JpCaDll" DllEntry="FindRelatedProductsEx" />
 
     <?ifndef SkipCryptomatorLegacyCheck ?>
       <!-- Block installation if innosetup entry of Cryptomator is found -->
-      <ns0:Property Id="OLDEXEINSTALLER">
+      <Property Id="OLDEXEINSTALLER">
-        <ns0:RegistrySearch Id="InnoSetupInstallation" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Cryptomator_is1" Type="raw" Name="DisplayName" />
+        <RegistrySearch Id="InnoSetupInstallation" Root="HKLM" Key="Software\Microsoft\Windows\CurrentVersion\Uninstall\Cryptomator_is1" Type="raw" Name="DisplayName" />
-      </ns0:Property>
+      </Property>
       <!-- TODO: localize -->
-      <ns0:Launch Message="A lower version of [ProductName] is already installed. Uninstall it first and then start the setup again. Setup will now exit." Condition="Installed OR NOT OLDEXEINSTALLER" />
+      <Condition Message="A lower version of [ProductName] is already installed. Uninstall it first and then start the setup again. Setup will now exit.">
+          <![CDATA[Installed OR NOT OLDEXEINSTALLER]]>
+      </Condition>
     <?endif?>
     <!-- Cryptomator uses UNIX Sockets, which are supported starting with Windows 10 v1803-->
-    <ns0:Property Id="WINDOWSBUILDNUMBER" Secure="yes">
+    <Property Id="WINDOWSBUILDNUMBER" Secure="yes">
-      <ns0:RegistrySearch Id="BuildNumberSearch" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuildNumber" Type="raw" />
+      <RegistrySearch Id="BuildNumberSearch" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuildNumber" Type="raw" />
-    </ns0:Property>
+    </Property>
-    <ns0:Launch Message="This application requires Windows 10 version 1803 (build 17134) or newer." Condition="Installed OR (WINDOWSBUILDNUMBER >= 17134)" />
+    <Condition Message="This application requires Windows 10 version 1803 (build 17134) or newer.">
+      <![CDATA[Installed OR (WINDOWSBUILDNUMBER >= 17134)]]>
+    </Condition>
 
     <!-- Non-Opening ProgID -->
-    <ns0:DirectoryRef Id="INSTALLDIR">
+    <DirectoryRef Id="INSTALLDIR">
-        <ns0:Component Bitness="always64" Id="nonStartingProgID" >
+        <Component Win64="yes" Id="nonStartingProgID" >
-          <ns0:File Id="IconFileForEncryptedData" KeyPath="yes" Source="$(env.JP_WIXWIZARD_RESOURCES)\$(var.IconFileEncryptedData)" Name="$(var.IconFileEncryptedData)"/>
+          <File Id="IconFileForEncryptedData" KeyPath="yes" Source="$(env.JP_WIXWIZARD_RESOURCES)\$(var.IconFileEncryptedData)" Name="$(var.IconFileEncryptedData)"></File>
-          <ns0:ProgId Id="$(var.JpAppName).Encrypted.1" Description="$(var.JpAppName) Encrypted Data" Icon="IconFileForEncryptedData" IconIndex="0">
+          <ProgId Id="$(var.JpAppName).Encrypted.1" Description="$(var.JpAppName) Encrypted Data" Icon="IconFileForEncryptedData" IconIndex="0">
-            <ns0:Extension Id="c9r" Advertise="no" ContentType="$(var.ProgIdContentType)">
+            <Extension Id="c9r" Advertise="no" ContentType="$(var.ProgIdContentType)">
-              <ns0:MIME ContentType="$(var.ProgIdContentType)" Default="yes"/>
+              <MIME ContentType="$(var.ProgIdContentType)" Default="yes"></MIME>
-            </ns0:Extension>
+            </Extension>
-            <ns0:Extension Id="c9s" Advertise="no" ContentType="$(var.ProgIdContentType)"/>
+            <Extension Id="c9s" Advertise="no" ContentType="$(var.ProgIdContentType)"/>
-          </ns0:ProgId>
+          </ProgId>
-        </ns0:Component>
+        </Component>
-    </ns0:DirectoryRef>
+    </DirectoryRef>
 
     <!-- Standard required root -->
+    <Directory Id="TARGETDIR" Name="SourceDir"/>
 
-    <ns0:Feature Id="DefaultFeature" Title="!(loc.MainFeatureTitle)" Level="1">
+    <Feature Id="DefaultFeature" Title="!(loc.MainFeatureTitle)" Level="1">
-      <ns0:ComponentGroupRef Id="Shortcuts"/>
+      <ComponentGroupRef Id="Shortcuts"/>
-      <ns0:ComponentGroupRef Id="Files"/>
+      <ComponentGroupRef Id="Files"/>
-      <ns0:ComponentGroupRef Id="FileAssociations"/>
+      <ComponentGroupRef Id="FileAssociations"/>
       <!-- Ref to additional ProgIDs -->
-      <ns0:ComponentRef Id="nonStartingProgID" />
+      <ComponentRef Id="nonStartingProgID" />
-    </ns0:Feature>
+    </Feature>
 
-    <ns0:CustomAction Id="JpSetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
+    <CustomAction Id="JpSetARPINSTALLLOCATION" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
-    <ns0:CustomAction Id="JpSetARPCOMMENTS" Property="ARPCOMMENTS" Value="$(var.JpAppDescription)" />
+    <CustomAction Id="JpSetARPCOMMENTS" Property="ARPCOMMENTS" Value="$(var.JpAppDescription)" />
-    <ns0:CustomAction Id="JpSetARPCONTACT" Property="ARPCONTACT" Value="$(var.JpAppVendor)" />
+    <CustomAction Id="JpSetARPCONTACT" Property="ARPCONTACT" Value="$(var.JpAppVendor)" />
-    <ns0:CustomAction Id="JpSetARPSIZE" Property="ARPSIZE" Value="$(var.JpAppSizeKb)" />
+    <CustomAction Id="JpSetARPSIZE" Property="ARPSIZE" Value="$(var.JpAppSizeKb)" />
 
     <?ifdef JpHelpURL ?>
-      <ns0:CustomAction Id="JpSetARPHELPLINK" Property="ARPHELPLINK" Value="$(var.JpHelpURL)" />
+      <CustomAction Id="JpSetARPHELPLINK" Property="ARPHELPLINK" Value="$(var.JpHelpURL)" />
     <?endif?>
 
     <?ifdef JpAboutURL ?>
-      <ns0:CustomAction Id="JpSetARPURLINFOABOUT" Property="ARPURLINFOABOUT" Value="$(var.JpAboutURL)" />
+      <CustomAction Id="JpSetARPURLINFOABOUT" Property="ARPURLINFOABOUT" Value="$(var.JpAboutURL)" />
     <?endif?>
 
     <?ifdef JpUpdateURL ?>
-      <ns0:CustomAction Id="JpSetARPURLUPDATEINFO" Property="ARPURLUPDATEINFO" Value="$(var.JpUpdateURL)" />
+      <CustomAction Id="JpSetARPURLUPDATEINFO" Property="ARPURLUPDATEINFO" Value="$(var.JpUpdateURL)" />
     <?endif?>
 
-    <ns0:Property Id="WixQuietExec64CmdTimeout" Value="20" />
+    <Property Id="WixQuietExec64CmdTimeout" Value="20" />
     <!-- Note for custom actions: Immediate CAs run BEFORE the files are installed, hence if you depend on installed files, the CAs must be deferred.-->
     <!-- WebDAV patches -->
-    <ns0:SetProperty Id="PatchWebDAV" Value="&quot;[INSTALLDIR]patchWebDAV.bat&quot;" Sequence="execute" Before="PatchWebDAV" />
+    <SetProperty Id="PatchWebDAV" Value="&quot;[INSTALLDIR]patchWebDAV.bat&quot;"
-    <ns0:CustomAction Id="PatchWebDAV" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" DllEntry="WixQuietExec" Execute="deferred" Return="ignore" Impersonate="no"/>
+            Sequence="execute" Before="PatchWebDAV" />
+    <CustomAction Id="PatchWebDAV" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Return="ignore" Impersonate="no"/>
 
     <!-- Running App detection and exit -->
-    <ns0:Property Id="FOUNDRUNNINGAPP" Admin="yes"/>
+    <Property Id="FOUNDRUNNINGAPP" Admin="yes"/>
     <util:CloseApplication
-     Target="$(var.CloseApplicationTarget)"
+      Target="$(var.CloseApplicationTarget)"
-     Id="Close$(var.JpAppName)"
+      Id="Close$(var.JpAppName)"
-     CloseMessage="no"
+      CloseMessage="no"
-     RebootPrompt="no"
+      RebootPrompt="no"
-     PromptToContinue="yes"
+      PromptToContinue="yes"
-     Description="A running instance of $(var.JpAppName) is found, using files marked for update. Please close it to continue."
+      Description="A running instance of $(var.JpAppName) is found, using files marked for update. Please close it to continue."
-     Property="FOUNDRUNNINGAPP"
+      Property="FOUNDRUNNINGAPP"
-     />
+      >
-    <ns0:CustomAction Id="FailOnRunningApp" Error="Installation aborted, because files marked for update are used by a running instance of $(var.JpAppName)."/>
+    </util:CloseApplication>
+    <CustomAction Id="FailOnRunningApp" Error="Installation aborted, because files marked for update are used by a running instance of $(var.JpAppName)."/>
 
     <?ifdef JpIcon ?>
-    <ns0:Property Id="ARPPRODUCTICON" Value="JpARPPRODUCTICON"/>
+    <Property Id="ARPPRODUCTICON" Value="JpARPPRODUCTICON"/>
-    <ns0:Icon Id="JpARPPRODUCTICON" SourceFile="$(var.JpIcon)"/>
+    <Icon Id="JpARPPRODUCTICON" SourceFile="$(var.JpIcon)"/>
     <?endif?>
 
-    <ns0:UIRef Id="JpUI"/>
+    <UIRef Id="JpUI"/>
 
-    <ns0:InstallExecuteSequence>
+    <InstallExecuteSequence>
-      <ns0:Custom Action="JpSetARPINSTALLLOCATION" After="CostFinalize" Condition="Not Installed" />
+      <Custom Action="JpSetARPINSTALLLOCATION" After="CostFinalize">Not Installed</Custom>
-      <ns0:Custom Action="JpSetARPCOMMENTS" After="CostFinalize" Condition="Not Installed" />
+      <Custom Action="JpSetARPCOMMENTS" After="CostFinalize">Not Installed</Custom>
-      <ns0:Custom Action="JpSetARPCONTACT" After="CostFinalize" Condition="Not Installed" />
+      <Custom Action="JpSetARPCONTACT" After="CostFinalize">Not Installed</Custom>
-      <ns0:Custom Action="JpSetARPSIZE" After="CostFinalize" Condition="Not Installed" />
+      <Custom Action="JpSetARPSIZE" After="CostFinalize">Not Installed</Custom>
       <?ifdef JpHelpURL ?>
-        <ns0:Custom Action="JpSetARPHELPLINK" After="CostFinalize" Condition="Not Installed" />
+        <Custom Action="JpSetARPHELPLINK" After="CostFinalize">Not Installed</Custom>
       <?endif?>
       <?ifdef JpAboutURL ?>
-        <ns0:Custom Action="JpSetARPURLINFOABOUT" After="CostFinalize" Condition="Not Installed" />
+        <Custom Action="JpSetARPURLINFOABOUT" After="CostFinalize">Not Installed</Custom>
       <?endif?>
       <?ifdef JpUpdateURL ?>
-        <ns0:Custom Action="JpSetARPURLUPDATEINFO" After="CostFinalize" Condition="Not Installed" />
+        <Custom Action="JpSetARPURLUPDATEINFO" After="CostFinalize">Not Installed</Custom>
       <?endif?>
 
       <?ifndef JpAllowUpgrades ?>
-      <ns0:Custom Action="JpDisallowUpgrade" After="JpFindRelatedProducts" Condition="JP_UPGRADABLE_FOUND"/>
+      <Custom Action="JpDisallowUpgrade" After="JpFindRelatedProducts">JP_UPGRADABLE_FOUND</Custom>
       <?endif?>
       <?ifndef JpAllowDowngrades ?>
-      <ns0:Custom Action="JpDisallowDowngrade" After="JpFindRelatedProducts" Condition="JP_DOWNGRADABLE_FOUND" />
+      <Custom Action="JpDisallowDowngrade" After="JpFindRelatedProducts">JP_DOWNGRADABLE_FOUND</Custom>
       <?endif?>
-      <ns0:Custom Action="JpFindRelatedProducts" After="FindRelatedProducts"/>
+      <Custom Action="JpFindRelatedProducts" After="FindRelatedProducts"/>
 
       <!-- Check and fail if Cryptomator is running -->
-      <ns0:Custom Action="override Wix4CloseApplications_$(sys.BUILDARCHSHORT)" Before="InstallValidate" />
+      <Custom Action="WixCloseApplications" Before="InstallValidate"></Custom>
-      <ns0:Custom Action="FailOnRunningApp" After="Wix4CloseApplications_$(sys.BUILDARCHSHORT)" Condition="FOUNDRUNNINGAPP" />
+      <Custom Action="FailOnRunningApp" After="WixCloseApplications" >FOUNDRUNNINGAPP</Custom>
 
-      <ns0:RemoveExistingProducts After="InstallValidate"/> <!-- Moved from CostInitialize, due to Wix4CloseApplications_* -->
+      <RemoveExistingProducts After="InstallValidate"/> <!-- Moved from CostInitialize, due to WixCloseApplications -->
-      <!-- Skip action on uninstall -->
-      <!-- TODO: don't skip action, but remove cryptomator alias from hosts file -->
-      <ns0:Custom Action="PatchWebDAV" After="InstallFiles" Condition="NOT (Installed AND (NOT REINSTALL) AND (NOT UPGRADINGPRODUCTCODE) AND REMOVE)"/>
-    </ns0:InstallExecuteSequence>
 
-    <ns0:InstallUISequence>
+      <Custom Action="PatchWebDAV" After="InstallFiles">NOT Installed OR REINSTALL</Custom>
-      <ns0:Custom Action="JpFindRelatedProducts" After="FindRelatedProducts"/>
+    </InstallExecuteSequence>
-    </ns0:InstallUISequence>
 
-    <ns0:WixVariable Id="WixUIBannerBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)\banner.bmp" />
+    <InstallUISequence>
-    <ns0:WixVariable Id="WixUIDialogBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)\background.bmp" />
+      <Custom Action="JpFindRelatedProducts" After="FindRelatedProducts"/>
-  </ns0:Package>
+    </InstallUISequence>
-</ns0:Wix>
+
+    <WixVariable Id="WixUIBannerBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)\banner.bmp" />
+    <WixVariable Id="WixUIDialogBmp" Value="$(env.JP_WIXWIZARD_RESOURCES)\background.bmp" />
+  </Product>
+
+</Wix>

dist/win/resources/overrides.wxi

@@ -47,4 +47,4 @@ Legacy Installation settings:
 - SkipCryptomatorLegacyCheck
 Should be defined to disable checking for the inno setup installation of Cryptomator and undefined, to enable it.
  -->
-<ns0:Include xmlns:ns0="http://wixtoolset.org/schemas/v4/wxs"></ns0:Include>
+<Include/>

dist/win/resources/ui.wxf

@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+  <Fragment>
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
+    <WixVariable Id="WixUILicenseRtf" Value="$(var.JpLicenseRtf)"></WixVariable>
+    <UI Id="JpUI">
+      <UIRef Id="CustomWizard" />
+      <DialogRef Id="InstallDirNotEmptyDlg"></DialogRef>
+      <Publish Dialog="ShortcutPromptDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg">1</Publish>
+      <Publish Dialog="ShortcutPromptDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="ShortcutPromptDlg" Order="6">NOT Installed</Publish>
+      <UIRef Id="CustomWizard" />
+    </UI>
+  </Fragment>
+  <?include $(env.JP_WIXWIZARD_RESOURCES)\customWizard.wxi ?>
+</Wix>

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.cryptomator</groupId>
 	<artifactId>cryptomator</artifactId>
-	<version>1.17.0</version>
+	<version>1.16.0-SNAPSHOT</version>
 	<name>Cryptomator Desktop App</name>
 
 	<organization>
@@ -26,72 +26,61 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.jdk.version>24</project.jdk.version>
+		<project.jdk.version>23</project.jdk.version>
 
 		<!-- Group IDs of jars that need to stay on the class path for now -->
 		<!-- remove them, as soon they got modularized or support is dropped (i.e., WebDAV) -->
 		<nonModularGroupIds>org.ow2.asm,org.apache.jackrabbit,org.apache.httpcomponents</nonModularGroupIds>
 
 		<!-- cryptomator dependencies -->
-		<cryptomator.cryptofs.version>2.9.0</cryptomator.cryptofs.version>
+		<cryptomator.cryptofs.version>2.9.0-beta2</cryptomator.cryptofs.version>
-		<cryptomator.integrations.version>1.6.0</cryptomator.integrations.version>
+		<cryptomator.integrations.version>1.5.0</cryptomator.integrations.version>
-		<cryptomator.integrations.win.version>1.5.0</cryptomator.integrations.win.version>
+		<cryptomator.integrations.win.version>1.3.0</cryptomator.integrations.win.version>
-		<cryptomator.integrations.mac.version>1.4.0</cryptomator.integrations.mac.version>
+		<cryptomator.integrations.mac.version>1.2.4</cryptomator.integrations.mac.version>
-		<cryptomator.integrations.linux.version>1.6.0</cryptomator.integrations.linux.version>
+		<cryptomator.integrations.linux.version>1.5.2</cryptomator.integrations.linux.version>
-		<cryptomator.fuse.version>5.0.5</cryptomator.fuse.version>
+		<cryptomator.fuse.version>5.0.2</cryptomator.fuse.version>
-		<cryptomator.webdav.version>2.0.10</cryptomator.webdav.version>
+		<cryptomator.webdav.version>2.0.7</cryptomator.webdav.version>
 
 		<!-- 3rd party dependencies -->
 		<commons-lang3.version>3.17.0</commons-lang3.version>
-		<dagger.version>2.56.2</dagger.version>
+		<dagger.version>2.55</dagger.version>
 		<easybind.version>2.2</easybind.version>
-		<jackson.version>2.19.1</jackson.version>
+		<jackson.version>2.18.2</jackson.version>
-		<javafx.version>24.0.1</javafx.version>
+		<javafx.version>23.0.1</javafx.version>
-		<jwt.version>4.5.0</jwt.version>
+		<jwt.version>4.4.0</jwt.version>
 		<nimbus-jose.version>9.37.3</nimbus-jose.version>
-		<logback.version>1.5.18</logback.version>
+		<logback.version>1.5.16</logback.version>
-		<slf4j.version>2.0.17</slf4j.version>
+		<slf4j.version>2.0.16</slf4j.version>
-		<tinyoauth2.version>0.8.1</tinyoauth2.version>
+		<tinyoauth2.version>0.8.0</tinyoauth2.version>
 		<zxcvbn.version>1.9.0</zxcvbn.version>
 
 		<!-- test dependencies -->
-		<junit.jupiter.version>5.13.1</junit.jupiter.version>
+		<junit.jupiter.version>5.11.4</junit.jupiter.version>
-		<mockito.version>5.18.0</mockito.version>
+		<mockito.version>5.15.2</mockito.version>
 		<hamcrest.version>3.0</hamcrest.version>
 
 		<!-- build-time dependencies -->
-		<jetbrains.annotations.version>26.0.2</jetbrains.annotations.version>
+		<jetbrains.annotations.version>26.0.1</jetbrains.annotations.version>
-		<dependency-check.version>12.1.3</dependency-check.version>
+		<dependency-check.version>12.1.0</dependency-check.version>
-		<jacoco.version>0.8.13</jacoco.version>
+		<jacoco.version>0.8.12</jacoco.version>
 		<license-generator.version>2.5.0</license-generator.version>
 		<junit-tree-reporter.version>1.4.0</junit-tree-reporter.version>
-		<mvn-compiler.version>3.14.0</mvn-compiler.version>
+		<mvn-compiler.version>3.13.0</mvn-compiler.version>
 		<mvn-resources.version>3.3.1</mvn-resources.version>
 		<mvn-dependency.version>3.8.1</mvn-dependency.version>
-		<mvn-surefire.version>3.5.3</mvn-surefire.version>
+		<mvn-surefire.version>3.5.2</mvn-surefire.version>
 		<mvn-jar.version>3.4.2</mvn-jar.version>
 
 		<!-- Property used by surefire to determine jacoco engine -->
 		<surefire.jacoco.args></surefire.jacoco.args>
 	</properties>
 
-	<!-- TODO: Remove once webdav version 2.0.11 is released -->
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.cryptomator</groupId>
-				<artifactId>webdav-nio-adapter-servlet</artifactId>
-				<version>1.2.9</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<dependencies>
 		<!-- Cryptomator Libs -->
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>cryptolib</artifactId>
-			<version>2.2.1</version>
+			<version>2.2.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
@@ -170,12 +159,6 @@
 			<groupId>com.auth0</groupId>
 			<artifactId>java-jwt</artifactId>
 			<version>${jwt.version}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.fasterxml.jackson.core</groupId>
-					<artifactId>jackson-core</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.nimbusds</groupId>
@@ -225,7 +208,7 @@
 		<dependency>
 			<groupId>com.github.ben-manes.caffeine</groupId>
 			<artifactId>caffeine</artifactId>
-			<version>3.2.1</version>
+			<version>3.2.0</version>
 		</dependency>
 		<!-- JUnit / Mockito / Hamcrest -->
 		<dependency>
@@ -358,7 +341,7 @@
 					<consoleOutputReporter>
 						<disable>true</disable>
 					</consoleOutputReporter>
-					<argLine>@{surefire.jacoco.args} -javaagent:${org.mockito:mockito-core:jar} --enable-native-access=javafx.graphics</argLine>
+					<argLine>@{surefire.jacoco.args} -javaagent:${org.mockito:mockito-core:jar}</argLine>
 					<statelessTestsetInfoReporter
 							implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5StatelessTestsetInfoTreeReporter">
 					</statelessTestsetInfoReporter>

src/main/java/module-info.java

@@ -59,7 +59,6 @@ open module org.cryptomator.desktop {
 
 	uses org.cryptomator.common.locationpresets.LocationPresetsProvider;
 	uses SSLContextProvider;
-	uses org.cryptomator.event.NotificationHandler;
 
 	provides TrayMenuController with AwtTrayMenuController;
 	provides Configurator with LogbackConfiguratorFactory;

src/main/java/org/cryptomator/JavaFXUtil.java

@@ -1,22 +0,0 @@
-package org.cryptomator;
-
-import javafx.application.Platform;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-public class JavaFXUtil {
-
-	private JavaFXUtil() {}
-
-	public static boolean startPlatform() throws InterruptedException {
-		CountDownLatch latch = new CountDownLatch(1);
-		try {
-			Platform.startup(latch::countDown);
-		} catch (IllegalStateException e) {
-			//already initialized
-			latch.countDown();
-		}
-		return latch.await(5, TimeUnit.SECONDS);
-	}
-
-}

src/main/java/org/cryptomator/common/Environment.java

@@ -23,7 +23,6 @@ public class Environment {
 	private static final String SETTINGS_PATH_PROP_NAME = "cryptomator.settingsPath";
 	private static final String IPC_SOCKET_PATH_PROP_NAME = "cryptomator.ipcSocketPath";
 	private static final String KEYCHAIN_PATHS_PROP_NAME = "cryptomator.integrationsWin.keychainPaths";
-	private static final String WINDOWS_HELLO_KEYCHAIN_PATHS_PROP_NAME = "cryptomator.integrationsWin.windowsHelloKeychainPaths";
 	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";
@@ -46,7 +45,6 @@ public class Environment {
 		logCryptomatorSystemProperty(SETTINGS_PATH_PROP_NAME);
 		logCryptomatorSystemProperty(IPC_SOCKET_PATH_PROP_NAME);
 		logCryptomatorSystemProperty(KEYCHAIN_PATHS_PROP_NAME);
-		logCryptomatorSystemProperty(WINDOWS_HELLO_KEYCHAIN_PATHS_PROP_NAME);
 		logCryptomatorSystemProperty(P12_PATH_PROP_NAME);
 		logCryptomatorSystemProperty(LOG_DIR_PROP_NAME);
 		logCryptomatorSystemProperty(LOOPBACK_ALIAS_PROP_NAME);
@@ -87,10 +85,6 @@ public class Environment {
 		return getPaths(KEYCHAIN_PATHS_PROP_NAME);
 	}
 
-	public Stream<Path> getWindowsHelloKeychainPath() {
-		return getPaths(WINDOWS_HELLO_KEYCHAIN_PATHS_PROP_NAME);
-	}
-
 	public Stream<Path> getP12Path() {
 		return getPaths(P12_PATH_PROP_NAME);
 	}

src/main/java/org/cryptomator/common/EventMap.java

@@ -1,160 +0,0 @@
-package org.cryptomator.common;
-
-import org.cryptomator.cryptofs.event.BrokenDirFileEvent;
-import org.cryptomator.cryptofs.event.BrokenFileNodeEvent;
-import org.cryptomator.cryptofs.event.ConflictResolutionFailedEvent;
-import org.cryptomator.cryptofs.event.ConflictResolvedEvent;
-import org.cryptomator.cryptofs.event.DecryptionFailedEvent;
-import org.cryptomator.cryptofs.event.FilesystemEvent;
-import org.cryptomator.event.VaultEvent;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javafx.beans.InvalidationListener;
-import javafx.collections.FXCollections;
-import javafx.collections.MapChangeListener;
-import javafx.collections.ObservableMap;
-import java.nio.file.Path;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Map containing {@link VaultEvent}s.
- * The map is keyed by the ciphertext path of the affected resource _and_ the {@link FilesystemEvent}s class in order to group same events
- * <p>
- * Use {@link EventMap#put(VaultEvent)} to add an element and {@link EventMap#remove(VaultEvent)} to remove it.
- * <p>
- * The map is size restricted to {@value MAX_SIZE} elements. If a _new_ element (i.e. not already present) is added, the least recently added is removed.
- */
-@Singleton
-public class EventMap implements ObservableMap<EventMap.EventKey, VaultEvent> {
-
-	private static final int MAX_SIZE = 300;
-
-	public record EventKey(Path ciphertextPath, Class<? extends FilesystemEvent> c) {}
-
-	private final ObservableMap<EventMap.EventKey, VaultEvent> delegate;
-
-	@Inject
-	public EventMap() {
-		delegate = FXCollections.observableHashMap();
-	}
-
-	@Override
-	public void addListener(MapChangeListener<? super EventKey, ? super VaultEvent> mapChangeListener) {
-		delegate.addListener(mapChangeListener);
-	}
-
-	@Override
-	public void removeListener(MapChangeListener<? super EventKey, ? super VaultEvent> mapChangeListener) {
-		delegate.removeListener(mapChangeListener);
-	}
-
-	@Override
-	public int size() {
-		return delegate.size();
-	}
-
-	@Override
-	public boolean isEmpty() {
-		return delegate.isEmpty();
-	}
-
-	@Override
-	public boolean containsKey(Object key) {
-		return delegate.containsKey(key);
-	}
-
-	@Override
-	public boolean containsValue(Object value) {
-		return delegate.containsValue(value);
-	}
-
-	@Override
-	public VaultEvent get(Object key) {
-		return delegate.get(key);
-	}
-
-	@Override
-	public @Nullable VaultEvent put(EventKey key, VaultEvent value) {
-		return delegate.put(key, value);
-	}
-
-	@Override
-	public VaultEvent remove(Object key) {
-		return delegate.remove(key);
-	}
-
-	@Override
-	public void putAll(@NotNull Map<? extends EventKey, ? extends VaultEvent> m) {
-		delegate.putAll(m);
-	}
-
-	@Override
-	public void clear() {
-		delegate.clear();
-	}
-
-	@Override
-	public @NotNull Set<EventKey> keySet() {
-		return delegate.keySet();
-	}
-
-	@Override
-	public @NotNull Collection<VaultEvent> values() {
-		return delegate.values();
-	}
-
-	@Override
-	public @NotNull Set<Entry<EventKey, VaultEvent>> entrySet() {
-		return delegate.entrySet();
-	}
-
-	@Override
-	public void addListener(InvalidationListener invalidationListener) {
-		delegate.addListener(invalidationListener);
-	}
-
-	@Override
-	public void removeListener(InvalidationListener invalidationListener) {
-		delegate.removeListener(invalidationListener);
-	}
-
-	public synchronized void put(VaultEvent e) {
-		//compute key
-		var key = computeKey(e.actualEvent());
-		//if-else
-		var nullOrEntry = delegate.get(key);
-		if (nullOrEntry == null) {
-			if (size() == MAX_SIZE) {
-				delegate.entrySet().stream() //
-						.min(Comparator.comparing(entry -> entry.getValue().actualEvent().getTimestamp())) //
-						.ifPresent(oldestEntry -> delegate.remove(oldestEntry.getKey()));
-			}
-			delegate.put(key, e);
-		} else {
-			delegate.put(key, nullOrEntry.incrementCount(e.actualEvent()));
-		}
-	}
-
-	public synchronized VaultEvent remove(VaultEvent similar) {
-		//compute key
-		var key = computeKey(similar.actualEvent());
-		return this.remove(key);
-	}
-
-	private EventKey computeKey(FilesystemEvent e) {
-		var p = switch (e) {
-			case DecryptionFailedEvent(_, Path ciphertextPath, _) -> ciphertextPath;
-			case ConflictResolvedEvent(_, _, _, _, Path resolvedCiphertext) -> resolvedCiphertext;
-			case ConflictResolutionFailedEvent(_, _, Path conflictingCiphertext, _) -> conflictingCiphertext;
-			case BrokenDirFileEvent(_, Path ciphertext) -> ciphertext;
-			case BrokenFileNodeEvent(_, _, Path ciphertext) -> ciphertext;
-		};
-		return new EventKey(p, e.getClass());
-	}
-}

src/main/java/org/cryptomator/common/keychain/KeychainManager.java

@@ -2,7 +2,6 @@ package org.cryptomator.common.keychain;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
 import com.github.benmanes.caffeine.cache.LoadingCache;
-import org.cryptomator.common.Passphrase;
 import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
 
@@ -14,24 +13,20 @@ import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ReadOnlyBooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import java.util.Arrays;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 @Singleton
 public class KeychainManager implements KeychainAccessProvider {
 
 	private final ObjectExpression<KeychainAccessProvider> keychain;
 	private final LoadingCache<String, BooleanProperty> passphraseStoredProperties;
-	private final ReentrantReadWriteLock lock;
 
 	@Inject
 	KeychainManager(ObjectExpression<KeychainAccessProvider> selectedKeychain) {
 		this.keychain = selectedKeychain;
 		this.passphraseStoredProperties = Caffeine.newBuilder() //
-				.softValues() //
+				.weakValues() //
 				.build(this::createStoredPassphraseProperty);
 		keychain.addListener(ignored -> passphraseStoredProperties.invalidateAll());
-		this.lock = new ReentrantReadWriteLock(false);
 	}
 
 	private KeychainAccessProvider getKeychainOrFail() throws KeychainAccessException {
@@ -43,49 +38,33 @@ public class KeychainManager implements KeychainAccessProvider {
 	}
 
 	@Override
-	public void storePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
+	public String displayName() {
-		try {
+		return getClass().getName();
-			lock.writeLock().lock();
+	}
-			getKeychainOrFail().storePassphrase(key, displayName, passphrase);
+
-		} finally {
+	@Override
-			lock.writeLock().unlock();
+	public void storePassphrase(String key, String displayName, CharSequence passphrase, boolean ignored) throws KeychainAccessException {
-		}
+		getKeychainOrFail().storePassphrase(key, displayName, passphrase);
 		setPassphraseStored(key, true);
 	}
 
 	@Override
 	public char[] loadPassphrase(String key) throws KeychainAccessException {
-		char[] passphrase = null;
+		char[] passphrase = getKeychainOrFail().loadPassphrase(key);
-		try {
-			lock.readLock().lock();
-			passphrase = getKeychainOrFail().loadPassphrase(key);
-		} finally {
-			lock.readLock().unlock();
-		}
 		setPassphraseStored(key, passphrase != null);
 		return passphrase;
 	}
 
 	@Override
 	public void deletePassphrase(String key) throws KeychainAccessException {
-		try {
+		getKeychainOrFail().deletePassphrase(key);
-			lock.writeLock().lock();
-			getKeychainOrFail().deletePassphrase(key);
-		} finally {
-			lock.writeLock().unlock();
-		}
 		setPassphraseStored(key, false);
 	}
 
 	@Override
 	public void changePassphrase(String key, String displayName, CharSequence passphrase) throws KeychainAccessException {
 		if (isPassphraseStored(key)) {
-			try {
+			getKeychainOrFail().changePassphrase(key, displayName, passphrase);
-				lock.writeLock().lock();
-				getKeychainOrFail().changePassphrase(key, displayName, passphrase);
-			} finally {
-				lock.writeLock().unlock();
-			}
 			setPassphraseStored(key, true);
 		}
 	}
@@ -122,11 +101,13 @@ public class KeychainManager implements KeychainAccessProvider {
 	}
 
 	private void setPassphraseStored(String key, boolean value) {
-		BooleanProperty property = passphraseStoredProperties.get(key, _ -> new SimpleBooleanProperty(value));
+		BooleanProperty property = passphraseStoredProperties.getIfPresent(key);
-		if (Platform.isFxApplicationThread()) {
+		if (property != null) {
-			property.set(value);
+			if (Platform.isFxApplicationThread()) {
-		} else {
+				property.set(value);
-			Platform.runLater(() -> property.set(value));
+			} else {
+				Platform.runLater(() -> property.set(value));
+			}
 		}
 	}
 
@@ -153,22 +134,4 @@ public class KeychainManager implements KeychainAccessProvider {
 		}
 	}
 
-	public ObjectExpression<KeychainAccessProvider> getKeychainImplementation() {
-		return this.keychain;
-	}
-
-	public static void migrate(KeychainAccessProvider oldProvider, KeychainAccessProvider newProvider, Map<String, String> idsAndNames) throws KeychainAccessException {
-		if (oldProvider instanceof KeychainManager || newProvider instanceof KeychainManager) {
-			throw new IllegalArgumentException("KeychainManger must not be the source or target of migration");
-		}
-		for (var entry : idsAndNames.entrySet()) {
-			var passphrase = oldProvider.loadPassphrase(entry.getKey());
-			if (passphrase != null) {
-				var wrapper = new Passphrase(passphrase);
-				oldProvider.deletePassphrase(entry.getKey()); //we cannot apply "first-write-then-delete" pattern here, since we can potentially write to the same passphrase store (e.g., touchID and regular keychain)
-				newProvider.storePassphrase(entry.getKey(), entry.getValue(), wrapper);
-				wrapper.destroy();
-			}
-		}
-	}
 }

src/main/java/org/cryptomator/common/settings/Settings.java

@@ -44,7 +44,7 @@ public class Settings {
 	@Deprecated // to be changed to "whatever is available" eventually
 	static final String DEFAULT_KEYCHAIN_PROVIDER = SystemUtils.IS_OS_WINDOWS ? "org.cryptomator.windows.keychain.WindowsProtectedKeychainAccess" : //
 			SystemUtils.IS_OS_MAC ? "org.cryptomator.macos.keychain.MacSystemKeychainAccess" : //
-					"org.cryptomator.linux.keychain.GnomeKeyringKeychainAccess";
+					"org.cryptomator.linux.keychain.SecretServiceKeychainAccess";
 	static final String DEFAULT_QUICKACCESS_SERVICE = SystemUtils.IS_OS_WINDOWS ? "org.cryptomator.windows.quickaccess.ExplorerQuickAccessService" : //
 			SystemUtils.IS_OS_LINUX ? "org.cryptomator.linux.quickaccess.NautilusBookmarks" : null;
 
@@ -147,11 +147,6 @@ public class Settings {
 
 	@SuppressWarnings("deprecation")
 	private void migrateLegacySettings(SettingsJson json) {
-		// migrate renamed keychainAccess
-		if(this.keychainProvider.getValueSafe().equals("org.cryptomator.linux.keychain.SecretServiceKeychainAccess")) {
-			this.keychainProvider.setValue("org.cryptomator.linux.keychain.GnomeKeyringKeychainAccess");
-		}
-
 		// implicit migration of 1.6.x legacy setting "preferredVolumeImpl":
 		if (this.mountService.get() == null && json.preferredVolumeImpl != null) {
 			this.mountService.set(switch (json.preferredVolumeImpl) {

src/main/java/org/cryptomator/common/vaults/Vault.java

@@ -23,7 +23,6 @@ import org.cryptomator.cryptofs.event.FilesystemEvent;
 import org.cryptomator.cryptolib.api.CryptoException;
 import org.cryptomator.cryptolib.api.MasterkeyLoader;
 import org.cryptomator.cryptolib.api.MasterkeyLoadingFailedException;
-import org.cryptomator.event.VaultEvent;
 import org.cryptomator.integrations.mount.MountFailedException;
 import org.cryptomator.integrations.mount.Mountpoint;
 import org.cryptomator.integrations.mount.UnmountFailedException;
@@ -35,7 +34,6 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javax.inject.Named;
-import javafx.application.Platform;
 import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -425,17 +423,6 @@ public class Vault {
 		}
 	}
 
-	/**
-	 * Gets the cleartext name from a given path to an encrypted vault file
-	 */
-	public String getCleartextName(Path ciphertextPath) throws IOException {
-		if (!state.getValue().equals(VaultState.Value.UNLOCKED)) {
-			throw new IllegalStateException("Vault is not unlocked");
-		}
-		var fs = cryptoFileSystem.get();
-		return fs.getCleartextName(ciphertextPath);
-	}
-
 	public VaultConfigCache getVaultConfigCache() {
 		return configCache;
 	}

src/main/java/org/cryptomator/common/vaults/VaultListManager.java

@@ -9,7 +9,6 @@
 package org.cryptomator.common.vaults;
 
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.Constants;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.common.settings.VaultSettings;
 import org.cryptomator.cryptofs.CryptoFileSystemProvider;
@@ -36,7 +35,6 @@ import static org.cryptomator.common.Constants.MASTERKEY_FILENAME;
 import static org.cryptomator.common.Constants.VAULTCONFIG_FILENAME;
 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.NEEDS_MIGRATION;
 
 @Singleton
 public class VaultListManager {
@@ -106,7 +104,7 @@ public class VaultListManager {
 		vaultList.addAll(vaults);
 	}
 
-	public Optional<Vault> get(Path vaultPath) {
+	private Optional<Vault> get(Path vaultPath) {
 		assert vaultPath.isAbsolute();
 		assert vaultPath.normalize().equals(vaultPath);
 		return vaultList.stream() //
@@ -117,15 +115,13 @@ public class VaultListManager {
 	private Vault create(VaultSettings vaultSettings) {
 		var wrapper = new VaultConfigCache(vaultSettings);
 		try {
+			if (Objects.isNull(vaultSettings.lastKnownKeyLoader.get())) {
+				var keyIdScheme = wrapper.get().getKeyId().getScheme();
+				vaultSettings.lastKnownKeyLoader.set(keyIdScheme);
+			}
 			var vaultState = determineVaultState(vaultSettings.path.get());
 			if (vaultState == LOCKED) { //for legacy reasons: pre v8 vault do not have a config, but they are in the NEEDS_MIGRATION state
 				wrapper.reloadConfig();
-				if (Objects.isNull(vaultSettings.lastKnownKeyLoader.get())) {
-					var keyIdScheme = wrapper.get().getKeyId().getScheme();
-					vaultSettings.lastKnownKeyLoader.set(keyIdScheme);
-				}
-			} else if (vaultState == NEEDS_MIGRATION) {
-				vaultSettings.lastKnownKeyLoader.set(Constants.DEFAULT_KEY_ID.toString());
 			}
 			return vaultComponentFactory.create(vaultSettings, wrapper, vaultState, null).vault();
 		} catch (IOException e) {

src/main/java/org/cryptomator/event/Answer.java

@@ -1,14 +0,0 @@
-package org.cryptomator.event;
-
-public sealed interface Answer permits Answer.DoNothing, Answer.DoSomething {
-
-
-	record DoNothing() implements Answer {}
-
-	record DoSomething(Runnable action) implements Answer {
-
-		void run() {
-			action.run();
-		}
-	}
-}

src/main/java/org/cryptomator/event/FileSystemEventAggregator.java

@@ -16,12 +16,6 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-/**
- * Aggregator for {@link FilesystemEvent}s.
- * <p>
- * The aggregator groups filesystem events by the vault where the event occurred, an identifying path (clear- or ciphertext) and the event class (aka type).
- * A group is called an {@link FSEventBucket}, its {@link FSEventBucketContent} is the most recent event object and a count of how often the event already occurred.
- */
 @Singleton
 public class FileSystemEventAggregator {
 
@@ -42,6 +36,7 @@ public class FileSystemEventAggregator {
 	 */
 	public void put(Vault v, FilesystemEvent e) {
 		var key = computeKey(v, e);
+		hasUpdates.set(true);
 		map.compute(key, (k, val) -> {
 			if (val == null) {
 				return new FSEventBucketContent(e, 1);
@@ -49,28 +44,27 @@ public class FileSystemEventAggregator {
 				return new FSEventBucketContent(e, val.count() + 1);
 			}
 		});
-		hasUpdates.set(true);
+
 	}
 
 	/**
 	 * Removes an event bucket from the map.
 	 */
 	public FSEventBucketContent remove(FSEventBucket key) {
-		var content = map.remove(key);
 		hasUpdates.set(true);
-		return content;
+		return map.remove(key);
 	}
 
 	/**
 	 * Clears the event map.
 	 */
 	public void clear() {
-		map.clear();
 		hasUpdates.set(true);
+		map.clear();
 	}
 
 
-	public boolean hasMaybeUpdates() {
+	public boolean hasUpdates() {
 		return hasUpdates.get();
 	}
 

src/main/java/org/cryptomator/event/NotificationHandler.java

@@ -1,15 +0,0 @@
-package org.cryptomator.event;
-
-import org.cryptomator.integrations.common.IntegrationsLoader;
-
-import java.util.ServiceLoader;
-import java.util.stream.Stream;
-
-public interface NotificationHandler {
-
-	Answer handle(VaultEvent e);
-
-	static Stream<NotificationHandler> loadAll() {
-		return IntegrationsLoader.loadAll(ServiceLoader.load(NotificationHandler.class), NotificationHandler.class);
-	}
-}

src/main/java/org/cryptomator/event/VaultEvent.java

@@ -1,27 +0,0 @@
-package org.cryptomator.event;
-
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.cryptofs.event.FilesystemEvent;
-
-import java.time.Instant;
-
-public record VaultEvent(Vault v, FilesystemEvent actualEvent, int count) implements Comparable<VaultEvent> {
-
-	public VaultEvent(Vault v, FilesystemEvent actualEvent) {
-		this(v, actualEvent, 1);
-	}
-
-	@Override
-	public int compareTo(VaultEvent other) {
-		var timeResult = actualEvent.getTimestamp().compareTo(other.actualEvent().getTimestamp());
-		if(timeResult != 0) {
-			return timeResult;
-		} else {
-			return this.equals(other) ? 0 : this.actualEvent.getClass().getName().compareTo(other.actualEvent.getClass().getName());
-		}
-	}
-
-	public VaultEvent incrementCount(FilesystemEvent update) {
-		return new VaultEvent(v, update, count+1);
-	}
-}

src/main/java/org/cryptomator/logging/LogbackConfigurator.java

@@ -90,9 +90,6 @@ public class LogbackConfigurator extends ContextAwareBase implements Configurato
 			// configure fuse file locking logger:
 			Logger fuseLocking = context.getLogger("org.cryptomator.frontend.fuse.locks");
 			fuseLocking.setLevel(Level.OFF);
-			//deactivate kwallet unsettling message
-			Logger kdeWallet = context.getLogger("org.purejava.kwallet.freedesktop.dbus.handlers");
-			kdeWallet.setLevel(Level.OFF);
 		}
 		return ExecutionStatus.DO_NOT_INVOKE_NEXT_IF_ANY;
 	}

src/main/java/org/cryptomator/networking/CombinedKeyStoreSpi.java

@@ -1,185 +0,0 @@
-package org.cryptomator.networking;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.Key;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.KeyStoreSpi;
-import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.LinkedHashSet;
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class CombinedKeyStoreSpi extends KeyStoreSpi {
-
-	private final KeyStore primary;
-	private final KeyStore fallback;
-
-	public static CombinedKeyStoreSpi create(KeyStore primary, KeyStore fallback) {
-		checkIfLoaded(primary);
-		checkIfLoaded(fallback);
-		return new CombinedKeyStoreSpi(primary, fallback);
-	}
-
-	private static void checkIfLoaded(KeyStore s) {
-		try {
-			s.aliases();
-		} catch (KeyStoreException e) {
-			throw new IllegalArgumentException("Keystore %s is not loaded.".formatted(s.getType()));
-		}
-	}
-
-	private CombinedKeyStoreSpi(KeyStore primary, KeyStore fallback) {
-		this.primary = primary;
-		this.fallback = fallback;
-	}
-
-	@Override
-	public Key engineGetKey(String alias, char[] password) throws NoSuchAlgorithmException, UnrecoverableKeyException {
-		try {
-			Key key = primary.getKey(alias, password);
-			if (key == null) {
-				key = fallback.getKey(alias, password);
-			}
-			return key;
-		} catch (KeyStoreException e) {
-			throw new IllegalStateException("At least one keystore of [%s, %s] is not initialized.".formatted(primary.getType(), fallback.getType()), e);
-		}
-	}
-
-	@Override
-	public Certificate[] engineGetCertificateChain(String alias) {
-		try {
-			Certificate[] chain = primary.getCertificateChain(alias);
-			if (chain == null) {
-				chain = fallback.getCertificateChain(alias);
-			}
-			return chain;
-		} catch (KeyStoreException e) {
-			throw new IllegalStateException("At least one keystore of [%s, %s] is not initialized.".formatted(primary.getType(), fallback.getType()), e);
-		}
-	}
-
-	@Override
-	public Certificate engineGetCertificate(String alias) {
-		try {
-			Certificate cert = primary.getCertificate(alias);
-			if (cert == null) {
-				cert = fallback.getCertificate(alias);
-			}
-			return cert;
-		} catch (KeyStoreException e) {
-			throw new IllegalStateException("At least one keystore of [%s, %s] is not initialized.".formatted(primary.getType(), fallback.getType()), e);
-		}
-	}
-
-	@Override
-	public Date engineGetCreationDate(String alias) {
-		try {
-			Date date = primary.getCreationDate(alias);
-			if (date == null) {
-				date = fallback.getCreationDate(alias);
-			}
-			return date;
-		} catch (KeyStoreException e) {
-			throw new IllegalStateException("At least one keystore of [%s, %s] is not initialized.".formatted(primary.getType(), fallback.getType()), e);
-		}
-	}
-
-	@Override
-	public void engineSetKeyEntry(String alias, Key key, char[] password, Certificate[] chain) throws KeyStoreException {
-		throw new UnsupportedOperationException("Read-only KeyStore");
-	}
-
-	@Override
-	public void engineSetKeyEntry(String alias, byte[] key, Certificate[] chain) throws KeyStoreException {
-		throw new UnsupportedOperationException("Read-only KeyStore");
-	}
-
-	@Override
-	public void engineSetCertificateEntry(String alias, Certificate cert) throws KeyStoreException {
-		throw new UnsupportedOperationException("Read-only KeyStore");
-	}
-
-	@Override
-	public void engineDeleteEntry(String alias) throws KeyStoreException {
-		throw new UnsupportedOperationException("Read-only KeyStore");
-	}
-
-	@Override
-	public Enumeration<String> engineAliases() {
-		var aliases = new LinkedHashSet<String>();
-		try {
-			primary.aliases().asIterator().forEachRemaining(aliases::add);
-			fallback.aliases().asIterator().forEachRemaining(aliases::add);
-			return Collections.enumeration(aliases);
-		} catch (KeyStoreException e) {
-			throw new IllegalStateException("At least one keystore of [%s, %s] is not initialized.".formatted(primary.getType(), fallback.getType()), e);
-		}
-	}
-
-	@Override
-	public boolean engineContainsAlias(String alias) {
-		try {
-			return primary.containsAlias(alias) || fallback.containsAlias(alias);
-		} catch (KeyStoreException e) {
-			throw new IllegalStateException("At least one keystore of [%s, %s] is not initialized.".formatted(primary.getType(), fallback.getType()), e);
-		}
-	}
-
-	@Override
-	public int engineSize() {
-		var aliases = engineAliases();
-		var i = new AtomicInteger(0);
-		aliases.asIterator().forEachRemaining(_ -> i.incrementAndGet());
-		return i.get();
-	}
-
-	@Override
-	public boolean engineIsKeyEntry(String alias) {
-		try {
-			return primary.isKeyEntry(alias) || fallback.isKeyEntry(alias);
-		} catch (KeyStoreException e) {
-			throw new IllegalStateException("At least one keystore of [%s, %s] is not initialized.".formatted(primary.getType(), fallback.getType()), e);
-		}
-	}
-
-	@Override
-	public boolean engineIsCertificateEntry(String alias) {
-		try {
-			return primary.isCertificateEntry(alias) || fallback.isCertificateEntry(alias);
-		} catch (KeyStoreException e) {
-			throw new IllegalStateException("At least one keystore of [%s, %s] is not initialized.".formatted(primary.getType(), fallback.getType()), e);
-		}
-	}
-
-	@Override
-	public String engineGetCertificateAlias(Certificate cert) {
-		try {
-			String alias = primary.getCertificateAlias(cert);
-			if (alias == null) {
-				alias = fallback.getCertificateAlias(cert);
-			}
-			return alias;
-		} catch (KeyStoreException e) {
-			throw new IllegalStateException("At least one keystore of [%s, %s] is not initialized.".formatted(primary.getType(), fallback.getType()), e);
-		}
-	}
-
-	@Override
-	public void engineStore(OutputStream stream, char[] password) throws IOException, NoSuchAlgorithmException, CertificateException {
-		throw new UnsupportedOperationException("Read-only KeyStore");
-	}
-
-	@Override
-	public void engineLoad(InputStream stream, char[] password) throws IOException, NoSuchAlgorithmException, CertificateException {
-		// Nothing to do; the real keystores are already loaded.
-	}
-}

src/main/java/org/cryptomator/networking/SSLContextWithMacKeychain.java

@@ -6,7 +6,6 @@ import java.io.IOException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
-import java.security.Provider;
 import java.security.cert.CertificateException;
 
 /**
@@ -17,16 +16,6 @@ public class SSLContextWithMacKeychain extends SSLContextDifferentTrustStoreBase
 
 	@Override
 	KeyStore getTruststore() throws KeyStoreException, CertificateException, IOException, NoSuchAlgorithmException {
-		var userKeyStore = KeyStore.getInstance("KeychainStore");
+		return KeyStore.getInstance("KeychainStore-ROOT");
-		var systemRootKeyStore = KeyStore.getInstance("KeychainStore-ROOT");
-		userKeyStore.load(null);
-		systemRootKeyStore.load(null);
-		try {
-			CombinedKeyStoreSpi spi = CombinedKeyStoreSpi.create(userKeyStore, systemRootKeyStore);
-			Provider dummyProvider = new Provider("CombinedKeyStoreProvider", "1.0", "Provides a combined, read-only KeyStore") {};
-			return new KeyStore(spi, dummyProvider, "CombinedKeyStoreProvider") {};
-		} catch (IllegalArgumentException e) {
-			throw new KeyStoreException(e);
-		}
 	}
 }

src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java

@@ -79,7 +79,7 @@ public class ReadmeGenerator {
 			} else if (c <= 0xFF) {
 				sb.append("\\'").append(String.format("%02X", c));
 			} else if (c < 0xFFFF) {
-				sb.append("\\u").append(c);
+				sb.append("\\uc1\\u").append(c);
 			}
 		});
 	}

src/main/java/org/cryptomator/ui/common/FxmlFile.java

@@ -12,7 +12,6 @@ public enum FxmlFile {
 	CONVERTVAULT_HUBTOPASSWORD_START("/fxml/convertvault_hubtopassword_start.fxml"), //
 	CONVERTVAULT_HUBTOPASSWORD_CONVERT("/fxml/convertvault_hubtopassword_convert.fxml"), //
 	CONVERTVAULT_HUBTOPASSWORD_SUCCESS("/fxml/convertvault_hubtopassword_success.fxml"), //
-	DECRYPTNAMES("/fxml/decryptnames.fxml"), //
 	ERROR("/fxml/error.fxml"), //
 	EVENT_VIEW("/fxml/eventview.fxml"), //
 	FORGET_PASSWORD("/fxml/forget_password.fxml"), //

src/main/java/org/cryptomator/ui/decryptname/CipherAndCleartext.java

@@ -1,25 +0,0 @@
-package org.cryptomator.ui.decryptname;
-
-import javafx.beans.property.ReadOnlyStringWrapper;
-import javafx.beans.value.ObservableValue;
-import java.nio.file.Path;
-
-public record CipherAndCleartext(Path ciphertext, String cleartextName) {
-
-	public String getCiphertextFilename() {
-		return ciphertext.getFileName().toString();
-	}
-
-	public ObservableValue<String> ciphertextFilenameProperty() {
-		return new ReadOnlyStringWrapper(getCiphertextFilename());
-	}
-
-	public String getCleartextName() {
-		return cleartextName;
-	}
-
-	public ObservableValue<String> cleartextNameProperty() {
-		return new ReadOnlyStringWrapper(getCleartextName());
-	}
-
-}

src/main/java/org/cryptomator/ui/decryptname/DecryptFileNamesViewController.java

@@ -1,233 +0,0 @@
-package org.cryptomator.ui.decryptname;
-
-import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.cryptofs.common.Constants;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.controls.FontAwesome5Icon;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Inject;
-import javafx.application.Platform;
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.ListProperty;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleListProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.beans.value.ObservableValue;
-import javafx.collections.FXCollections;
-import javafx.fxml.FXML;
-import javafx.scene.control.TableColumn;
-import javafx.scene.control.TableView;
-import javafx.scene.control.cell.PropertyValueFactory;
-import javafx.scene.input.Clipboard;
-import javafx.scene.input.DataFormat;
-import javafx.scene.input.KeyCode;
-import javafx.scene.input.KeyCodeCombination;
-import javafx.scene.input.TransferMode;
-import javafx.stage.FileChooser;
-import javafx.stage.Stage;
-import java.io.File;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-@DecryptNameScoped
-public class DecryptFileNamesViewController implements FxController {
-
-	private static final Logger LOG = LoggerFactory.getLogger(DecryptFileNamesViewController.class);
-	private static final KeyCodeCombination COPY_TO_CLIPBOARD_SHORTCUT = new KeyCodeCombination(KeyCode.C, KeyCodeCombination.SHORTCUT_DOWN);
-	private static final String COPY_TO_CLIPBOARD_SHORTCUT_STRING_WIN = "CTRL+C";
-	private static final String COPY_TO_CLIPBOARD_SHORTCUT_STRING_MAC = "⌘C";
-	private static final String COPY_TO_CLIPBOARD_SHORTCUT_STRING_LINUX = "CTRL+C";
-
-	private final ListProperty<CipherAndCleartext> mapping;
-	private final StringProperty dropZoneText = new SimpleStringProperty();
-	private final ObjectProperty<FontAwesome5Icon> dropZoneIcon = new SimpleObjectProperty<>();
-	private final BooleanProperty wrongFilesSelected = new SimpleBooleanProperty(false);
-	private final Stage window;
-	private final Vault vault;
-	private final ResourceBundle resourceBundle;
-	private final List<Path> initialList;
-
-	@FXML
-	public TableColumn<CipherAndCleartext, String> ciphertextColumn;
-	@FXML
-	public TableColumn<CipherAndCleartext, String> cleartextColumn;
-	@FXML
-	public TableView<CipherAndCleartext> cipherToCleartextTable;
-
-	@Inject
-	public DecryptFileNamesViewController(@DecryptNameWindow Stage window, @DecryptNameWindow Vault vault, @DecryptNameWindow List<Path> pathsToDecrypt, ResourceBundle resourceBundle) {
-		this.window = window;
-		this.vault = vault;
-		this.resourceBundle = resourceBundle;
-		this.mapping = new SimpleListProperty<>(FXCollections.observableArrayList());
-		this.initialList = pathsToDecrypt;
-	}
-
-	@FXML
-	public void initialize() {
-		cipherToCleartextTable.setItems(mapping);
-		cipherToCleartextTable.setColumnResizePolicy(TableView.CONSTRAINED_RESIZE_POLICY_ALL_COLUMNS);
-		//DragNDrop
-		cipherToCleartextTable.setOnDragEntered(event -> {
-			if (event.getGestureSource() == null && event.getDragboard().hasFiles()) {
-				cipherToCleartextTable.setItems(FXCollections.emptyObservableList());
-			}
-		});
-		cipherToCleartextTable.setOnDragOver(event -> {
-			if (event.getGestureSource() == null && event.getDragboard().hasFiles()) {
-				if (SystemUtils.IS_OS_WINDOWS || SystemUtils.IS_OS_MAC) {
-					event.acceptTransferModes(TransferMode.LINK);
-				} else {
-					event.acceptTransferModes(TransferMode.ANY);
-				}
-			}
-		});
-		cipherToCleartextTable.setOnDragDropped(event -> {
-			if (event.getGestureSource() == null && event.getDragboard().hasFiles()) {
-				checkAndDecrypt(event.getDragboard().getFiles().stream().map(File::toPath).toList());
-				cipherToCleartextTable.setItems(mapping);
-			}
-		});
-		cipherToCleartextTable.setOnDragExited(_ -> cipherToCleartextTable.setItems(mapping));
-		//selectionModel and copy-to-clipboard action
-		cipherToCleartextTable.getSelectionModel().setCellSelectionEnabled(true);
-		cipherToCleartextTable.setOnKeyPressed(keyEvent -> {
-			if (COPY_TO_CLIPBOARD_SHORTCUT.match(keyEvent)) {
-				copySingleCelltoClipboard();
-			}
-		});
-		ciphertextColumn.setCellValueFactory(new PropertyValueFactory<>("ciphertextFilename"));
-		cleartextColumn.setCellValueFactory(new PropertyValueFactory<>("cleartextName"));
-
-		dropZoneText.setValue(resourceBundle.getString("decryptNames.dropZone.message"));
-		dropZoneIcon.setValue(FontAwesome5Icon.FILE_IMPORT);
-
-		wrongFilesSelected.addListener((_, _, areWrongFiles) -> {
-			if (areWrongFiles) {
-				CompletableFuture.delayedExecutor(5, TimeUnit.SECONDS, Platform::runLater).execute(() -> {
-					dropZoneText.setValue(resourceBundle.getString("decryptNames.dropZone.message"));
-					dropZoneIcon.setValue(FontAwesome5Icon.FILE_IMPORT);
-					wrongFilesSelected.setValue(false);
-				});
-			}
-		});
-		if (!initialList.isEmpty()) {
-			checkAndDecrypt(initialList);
-		}
-	}
-
-	private void copySingleCelltoClipboard() {
-		cipherToCleartextTable.getSelectionModel().getSelectedCells().stream().findFirst().ifPresent(tablePosition -> {
-			var selectedItem = cipherToCleartextTable.getSelectionModel().getSelectedItem();
-			//TODO: give user feedback, if content is copied -> must be done via a custom cell factory to access the actual table cell!
-			if (tablePosition.getTableColumn().equals(ciphertextColumn)) {
-				Clipboard.getSystemClipboard().setContent(Map.of(DataFormat.PLAIN_TEXT, selectedItem.ciphertext().toString()));
-			} else {
-				Clipboard.getSystemClipboard().setContent(Map.of(DataFormat.PLAIN_TEXT, selectedItem.cleartextName()));
-			}
-		});
-	}
-
-	@FXML
-	public void selectFiles() {
-		var fileChooser = new FileChooser();
-		fileChooser.setTitle(resourceBundle.getString("decryptNames.filePicker.title"));
-		fileChooser.setSelectedExtensionFilter(new FileChooser.ExtensionFilter(resourceBundle.getString("decryptNames.filePicker.extensionDescription"), List.of("*.c9r")));
-		fileChooser.setInitialDirectory(vault.getPath().toFile());
-		var ciphertextNodes = fileChooser.showOpenMultipleDialog(window);
-		if (ciphertextNodes != null) {
-			checkAndDecrypt(ciphertextNodes.stream().map(File::toPath).toList());
-		}
-	}
-
-	private void checkAndDecrypt(List<Path> pathsToDecrypt) {
-		mapping.clear();
-		//Assumption: All files are in the same directory
-		var testPath = pathsToDecrypt.getFirst();
-		if (!testPath.startsWith(vault.getPath())) {
-			setDropZoneError(resourceBundle.getString("decryptNames.dropZone.error.foreignFiles").formatted(vault.getDisplayName()));
-			return;
-		}
-		if (pathsToDecrypt.size() == 1 && testPath.endsWith(Constants.DIR_ID_BACKUP_FILE_NAME)) {
-			setDropZoneError(resourceBundle.getString("decryptNames.dropZone.error.vaultInternalFiles"));
-			return;
-		}
-
-		try {
-			var newMapping = pathsToDecrypt.stream().filter(p -> !p.endsWith(Constants.DIR_ID_BACKUP_FILE_NAME)).map(this::getCleartextName).toList();
-			mapping.addAll(newMapping);
-		} catch (UncheckedIOException e) {
-			setDropZoneError(resourceBundle.getString("decryptNames.dropZone.error.generic"));
-			LOG.info("Failed to decrypt filenames for directory {}", testPath.getParent(), e);
-		} catch (IllegalArgumentException e) {
-			setDropZoneError(resourceBundle.getString("decryptNames.dropZone.error.vaultInternalFiles"));
-		} catch (UnsupportedOperationException e) {
-			setDropZoneError(resourceBundle.getString("decryptNames.dropZone.error.noDirIdBackup"));
-		}
-	}
-
-	private void setDropZoneError(String text) {
-		dropZoneIcon.setValue(FontAwesome5Icon.TIMES);
-		dropZoneText.setValue(text);
-		wrongFilesSelected.setValue(true);
-	}
-
-	private CipherAndCleartext getCleartextName(Path ciphertextNode) {
-		try {
-			var cleartextName = vault.getCleartextName(ciphertextNode);
-			return new CipherAndCleartext(ciphertextNode, cleartextName);
-		} catch (IOException e) {
-			throw new UncheckedIOException(e);
-		}
-	}
-
-	//obvservable getter
-
-	public ObservableValue<String> dropZoneTextProperty() {
-		return dropZoneText;
-	}
-
-	public String getDropZoneText() {
-		return dropZoneText.get();
-	}
-
-	public ObservableValue<FontAwesome5Icon> dropZoneIconProperty() {
-		return dropZoneIcon;
-	}
-
-	public FontAwesome5Icon getDropZoneIcon() {
-		return dropZoneIcon.get();
-	}
-
-	public void clearTable() {
-		mapping.clear();
-	}
-
-	public void copyTableToClipboard() {
-		var csv = mapping.stream().map(cipherAndClear -> "\"" + cipherAndClear.ciphertext() + "\", \"" + cipherAndClear.cleartextName() + "\"").collect(Collectors.joining("\n"));
-		Clipboard.getSystemClipboard().setContent(Map.of(DataFormat.PLAIN_TEXT, csv));
-	}
-
-	public String getCopyToClipboardShortcutString() {
-		if (SystemUtils.IS_OS_WINDOWS) {
-			return COPY_TO_CLIPBOARD_SHORTCUT_STRING_WIN;
-		} else if (SystemUtils.IS_OS_MAC) {
-			return COPY_TO_CLIPBOARD_SHORTCUT_STRING_MAC;
-		} else {
-			return COPY_TO_CLIPBOARD_SHORTCUT_STRING_LINUX;
-		}
-	}
-}

src/main/java/org/cryptomator/ui/decryptname/DecryptNameComponent.java

@@ -1,50 +0,0 @@
-package org.cryptomator.ui.decryptname;
-
-import dagger.BindsInstance;
-import dagger.Lazy;
-import dagger.Subcomponent;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.common.vaults.VaultState;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlScene;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.inject.Named;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-import java.nio.file.Path;
-import java.util.List;
-
-@DecryptNameScoped
-@Subcomponent(modules = DecryptNameModule.class)
-public interface DecryptNameComponent {
-
-	Logger LOG = LoggerFactory.getLogger(DecryptNameComponent.class);
-
-	@DecryptNameWindow
-	Stage window();
-
-	@FxmlScene(FxmlFile.DECRYPTNAMES)
-	Lazy<Scene> decryptNamesView();
-
-	@DecryptNameWindow
-	Vault vault();
-
-	default void showDecryptFileNameWindow() {
-		Stage s = window();
-		s.setScene(decryptNamesView().get());
-		s.sizeToScene();
-		if (vault().isUnlocked()) {
-			s.show();
-		} else {
-			LOG.error("Aborted showing DecryptFileName window: vault state is not {}, but {}.", VaultState.Value.UNLOCKED, vault().getState());
-		}
-	}
-
-	@Subcomponent.Factory
-	interface Factory {
-
-		DecryptNameComponent create(@BindsInstance @DecryptNameWindow Vault vault, @BindsInstance @Named("windowOwner") Stage owner, @BindsInstance @DecryptNameWindow List<Path> pathsToDecrypt);
-	}
-}

src/main/java/org/cryptomator/ui/decryptname/DecryptNameModule.java

@@ -1,59 +0,0 @@
-package org.cryptomator.ui.decryptname;
-
-import dagger.Binds;
-import dagger.Module;
-import dagger.Provides;
-import dagger.multibindings.IntoMap;
-import org.cryptomator.common.vaults.Vault;
-import org.cryptomator.ui.common.DefaultSceneFactory;
-import org.cryptomator.ui.common.FxController;
-import org.cryptomator.ui.common.FxControllerKey;
-import org.cryptomator.ui.common.FxmlFile;
-import org.cryptomator.ui.common.FxmlLoaderFactory;
-import org.cryptomator.ui.common.FxmlScene;
-import org.cryptomator.ui.common.StageFactory;
-
-import javax.inject.Named;
-import javax.inject.Provider;
-import javafx.scene.Scene;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-@Module
-public abstract class DecryptNameModule {
-
-	@Provides
-	@DecryptNameScoped
-	@DecryptNameWindow
-	static Stage provideStage(StageFactory factory, @Named("windowOwner") Stage owner, @DecryptNameWindow Vault vault, ResourceBundle resourceBundle) {
-		Stage stage = factory.create();
-		stage.setResizable(true);
-		stage.initModality(Modality.WINDOW_MODAL);
-		stage.initOwner(owner);
-		stage.setTitle(resourceBundle.getString("decryptNames.title"));
-		vault.stateProperty().addListener(((_, _, _) -> stage.close())); //as soon as the state changes from unlocked, close the window
-		return stage;
-	}
-
-	@Provides
-	@DecryptNameScoped
-	@DecryptNameWindow
-	static FxmlLoaderFactory provideFxmlLoaderFactory(Map<Class<? extends FxController>, Provider<FxController>> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) {
-		return new FxmlLoaderFactory(factories, sceneFactory, resourceBundle);
-	}
-
-	@Provides
-	@FxmlScene(FxmlFile.DECRYPTNAMES)
-	@DecryptNameScoped
-	static Scene provideDecryptNamesViewScene(@DecryptNameWindow FxmlLoaderFactory fxmlLoaders) {
-		return fxmlLoaders.createScene(FxmlFile.DECRYPTNAMES);
-	}
-
-	@Binds
-	@IntoMap
-	@FxControllerKey(DecryptFileNamesViewController.class)
-	abstract FxController bindDecryptNamesViewController(DecryptFileNamesViewController controller);
-
-}

src/main/java/org/cryptomator/ui/decryptname/DecryptNameScoped.java

@@ -1,11 +0,0 @@
-package org.cryptomator.ui.decryptname;
-
-import javax.inject.Scope;
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@Scope
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@interface DecryptNameScoped {}

src/main/java/org/cryptomator/ui/decryptname/DecryptNameWindow.java

@@ -1,12 +0,0 @@
-package org.cryptomator.ui.decryptname;
-
-import javax.inject.Qualifier;
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-@Qualifier
-@Documented
-@Retention(RUNTIME)
-@interface DecryptNameWindow {}

src/main/java/org/cryptomator/ui/error/ErrorComponent.java

@@ -20,8 +20,8 @@ public interface ErrorComponent {
 	default Stage show() {
 		Stage stage = window();
 		stage.setScene(scene());
-		stage.setMinWidth(450);
+		stage.setMinWidth(420);
-		stage.setMinHeight(450);
+		stage.setMinHeight(300);
 		stage.show();
 		return stage;
 	}

src/main/java/org/cryptomator/ui/eventview/EventListCellController.java

@@ -133,9 +133,9 @@ public class EventListCellController implements FxController {
 		eventMessage.setValue(resourceBundle.getString("eventView.entry.brokenFileNode.message"));
 		eventDescription.setValue(bfe.ciphertextPath().getFileName().toString());
 		if (revealService != null) {
-			addAction("eventView.entry.brokenFileNode.showEncrypted", () -> reveal(revealService, bfe.ciphertextPath()));
+			addAction("eventView.entry.brokenFileNode.showEncrypted", () -> reveal(revealService, convertVaultPathToSystemPath(bfe.ciphertextPath())));
 		} else {
-			addAction("eventView.entry.brokenFileNode.copyEncrypted", () -> copyToClipboard(bfe.ciphertextPath().toString()));
+			addAction("eventView.entry.brokenFileNode.copyEncrypted", () -> copyToClipboard(convertVaultPathToSystemPath(bfe.ciphertextPath()).toString()));
 		}
 		addAction("eventView.entry.brokenFileNode.copyDecrypted", () -> copyToClipboard(convertVaultPathToSystemPath(bfe.cleartextPath()).toString()));
 	}
@@ -206,7 +206,7 @@ public class EventListCellController implements FxController {
 		if (vaultUnlocked.getValue()) {
 			return eventMessage.getValue();
 		} else {
-			return "***********";
+			return resourceBundle.getString("eventView.entry.vaultLocked.message");
 		}
 	}
 

src/main/java/org/cryptomator/ui/eventview/UpdateEventViewController.java

@@ -1,14 +0,0 @@
-package org.cryptomator.ui.eventview;
-
-import org.cryptomator.ui.common.FxController;
-
-import javax.inject.Inject;
-
-@EventViewScoped
-public class UpdateEventViewController implements FxController {
-
-	@Inject
-	public UpdateEventViewController() {
-
-	}
-}

src/main/java/org/cryptomator/ui/fxapp/AppLaunchEventHandler.java

@@ -12,7 +12,6 @@ import javax.inject.Named;
 import javafx.application.Platform;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Optional;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ExecutorService;
 
@@ -59,30 +58,29 @@ class AppLaunchEventHandler {
 		switch (event.type()) {
 			case REVEAL_APP -> appWindows.showMainWindow();
 			case OPEN_FILE -> Platform.runLater(() -> {
-				event.pathsToOpen().forEach(this::openPotentialVault);
+				event.pathsToOpen().forEach(this::addOrRevealVault);
 			});
 			default -> LOG.warn("Unsupported event type: {}", event.type());
 		}
 	}
 
 	// TODO deduplicate MainWindowController...
-	private void openPotentialVault(Path path) {
+	private void addOrRevealVault(Path potentialVaultPath) {
 		assert Platform.isFxApplicationThread();
 		try {
-			Path potentialVaultPath = path.getFileName().toString().endsWith(CRYPTOMATOR_FILENAME_EXT) ? path.getParent() : path;
+			final Vault v;
-			final Optional<Vault> v = vaultListManager.get(potentialVaultPath);
+			if (potentialVaultPath.getFileName().toString().endsWith(CRYPTOMATOR_FILENAME_EXT)) {
-			if (v.isPresent()) {
+				v = vaultListManager.add(potentialVaultPath.getParent());
-				if (v.get().isUnlocked()) {
-					vaultService.reveal(v.get());
-				} else if (v.get().isLocked()) {
-					appWindows.startUnlockWorkflow(v.get(), null);
-				}
 			} else {
-				vaultListManager.add(potentialVaultPath);
+				v = vaultListManager.add(potentialVaultPath);
-				LOG.debug("Added vault {}", potentialVaultPath);
 			}
+
+			if (v.isUnlocked()) {
+				vaultService.reveal(v);
+			}
+			LOG.debug("Added vault {}", potentialVaultPath);
 		} catch (IOException e) {
-			LOG.error("Failed to add vault " + path, e);
+			LOG.error("Failed to add vault " + potentialVaultPath, e);
 		}
 	}
 

src/main/java/org/cryptomator/ui/fxapp/FxApplication.java

@@ -29,7 +29,7 @@ public class FxApplication {
 	private final FxApplicationStyle applicationStyle;
 	private final FxApplicationTerminator applicationTerminator;
 	private final AutoUnlocker autoUnlocker;
-	private final FxFSEventList fxFSEventList;
+	private final FxFSEventList fxFSEventList; //not unused! By injecting it here, the object gets initiated the service starts
 
 	@Inject
 	FxApplication(@Named("startupTime") long startupTime, Environment environment, Settings settings, AppLaunchEventHandler launchEventHandler, Lazy<TrayMenuComponent> trayMenu, FxApplicationWindows appWindows, FxApplicationStyle applicationStyle, FxApplicationTerminator applicationTerminator, AutoUnlocker autoUnlocker, FxFSEventList fxFSEventList) {
@@ -87,7 +87,6 @@ public class FxApplication {
 		migrateAndInformDokanyRemoval();
 
 		launchEventHandler.startHandlingLaunchEvents();
-		fxFSEventList.schedulePollForUpdates();
 		autoUnlocker.tryUnlockForTimespan(2, TimeUnit.MINUTES);
 	}
 

src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java

@@ -7,7 +7,6 @@ package org.cryptomator.ui.fxapp;
 
 import dagger.Module;
 import dagger.Provides;
-import org.cryptomator.ui.decryptname.DecryptNameComponent;
 import org.cryptomator.ui.error.ErrorComponent;
 import org.cryptomator.ui.eventview.EventViewComponent;
 import org.cryptomator.ui.health.HealthCheckComponent;
@@ -29,7 +28,6 @@ import java.io.IOException;
 import java.io.InputStream;
 
 @Module(includes = {UpdateCheckerModule.class}, subcomponents = {TrayMenuComponent.class, //
-		DecryptNameComponent.class, //
 		MainWindowComponent.class, //
 		PreferencesComponent.class, //
 		VaultOptionsComponent.class, //

src/main/java/org/cryptomator/ui/fxapp/FxFSEventList.java

@@ -11,49 +11,45 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
 
-/**
- * List of all occurred filesystem events.
- * <p>
- * The list exposes an observable list and a property to listen for updates. Internally it polls the {@link FileSystemEventAggregator} in a regular interval for updates.
- * If an update is available, the list from the {@link FileSystemEventAggregator } is cloned to this list on the FX application thread.
- */
 @FxApplicationScoped
 public class FxFSEventList {
 
 	private final ObservableList<Map.Entry<FSEventBucket, FSEventBucketContent>> events;
 	private final FileSystemEventAggregator eventAggregator;
-	private final ScheduledExecutorService scheduler;
+	private final ScheduledFuture<?> scheduledTask;
 	private final BooleanProperty unreadEvents;
 
 	@Inject
 	public FxFSEventList(FileSystemEventAggregator fsEventAggregator, ScheduledExecutorService scheduler) {
 		this.events = FXCollections.observableArrayList();
 		this.eventAggregator = fsEventAggregator;
-		this.scheduler = scheduler;
 		this.unreadEvents = new SimpleBooleanProperty(false);
-	}
+		this.scheduledTask = scheduler.scheduleWithFixedDelay(() -> {
-
+			if (fsEventAggregator.hasUpdates()) {
-	public void schedulePollForUpdates() {
+				flush();
-		scheduler.schedule(this::checkForEventUpdates, 1000, TimeUnit.MILLISECONDS);
+			}
+		}, 1000, 1000, TimeUnit.MILLISECONDS);
 	}
 
 	/**
-	 * Checks for event updates and reschedules.
+	 * Starts the clone task on the FX thread and wait till it is completed
-	 * If updates are available, the aggregated events are copied from back- to the frontend.
-	 * Reschedules itself on successful execution
 	 */
-	private void checkForEventUpdates() {
+	private void flush() {
-		if (eventAggregator.hasMaybeUpdates()) {
+		var latch = new CountDownLatch(1);
-			Platform.runLater(() -> {
+		Platform.runLater(() -> {
-				eventAggregator.cloneTo(events);
+			eventAggregator.cloneTo(events);
-				unreadEvents.setValue(true);
+			unreadEvents.setValue(true);
-				schedulePollForUpdates();
+			latch.countDown();
-			});
+		});
-		} else {
+		try {
-			schedulePollForUpdates();
+			latch.await();
+		} catch (InterruptedException e) {
+			Thread.currentThread().interrupt();
 		}
 	}
 
@@ -64,4 +60,6 @@ public class FxFSEventList {
 	public BooleanProperty unreadEventsProperty() {
 		return unreadEvents;
 	}
+
+
 }

src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java

@@ -112,12 +112,12 @@ public class MasterkeyFileLoadingStrategy implements KeyLoadingStrategy {
 	}
 
 	private void savePasswordToSystemkeychain(Passphrase passphrase) {
-		try {
+		if (keychain.isSupported()) {
-			if (keychain.isSupported() && !keychain.getPassphraseStoredProperty(vault.getId()).get()) {
+			try {
 				keychain.storePassphrase(vault.getId(), vault.getDisplayName(), passphrase);
+			} catch (KeychainAccessException e) {
+				LOG.error("Failed to store passphrase in system keychain.", e);
 			}
-		} catch (KeychainAccessException e) {
-			LOG.error("Failed to store passphrase in system keychain.", e);
 		}
 	}
 

src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java

@@ -36,7 +36,6 @@ import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
 import javafx.util.Duration;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutorService;
 
 @PassphraseEntryScoped
 public class PassphraseEntryController implements FxController {
@@ -50,7 +49,6 @@ public class PassphraseEntryController implements FxController {
 	private final ForgetPasswordComponent.Builder forgetPassword;
 	private final KeychainManager keychain;
 	private final StringBinding vaultName;
-	private final ExecutorService backgroundExecutorService;
 	private final BooleanProperty unlockInProgress = new SimpleBooleanProperty();
 	private final ObjectBinding<ContentDisplay> unlockButtonContentDisplay = Bindings.when(unlockInProgress).then(ContentDisplay.LEFT).otherwise(ContentDisplay.TEXT_ONLY);
 	private final BooleanProperty unlockButtonDisabled = new SimpleBooleanProperty();
@@ -66,7 +64,7 @@ public class PassphraseEntryController implements FxController {
 	public Animation unlockAnimation;
 
 	@Inject
-	public PassphraseEntryController(@KeyLoading Stage window, @KeyLoading Vault vault, CompletableFuture<PassphraseEntryResult> result, @Nullable @Named("savedPassword") Passphrase savedPassword, ForgetPasswordComponent.Builder forgetPassword, KeychainManager keychain, ExecutorService backgroundExecutorService) {
+	public PassphraseEntryController(@KeyLoading Stage window, @KeyLoading Vault vault, CompletableFuture<PassphraseEntryResult> result, @Nullable @Named("savedPassword") Passphrase savedPassword, ForgetPasswordComponent.Builder forgetPassword, KeychainManager keychain) {
 		this.window = window;
 		this.vault = vault;
 		this.result = result;
@@ -74,8 +72,8 @@ public class PassphraseEntryController implements FxController {
 		this.forgetPassword = forgetPassword;
 		this.keychain = keychain;
 		this.vaultName = WeakBindings.bindString(vault.displayNameProperty());
-		this.backgroundExecutorService = backgroundExecutorService;
 		window.setOnHiding(this::windowClosed);
+		result.whenCompleteAsync((r, t) -> unlockInProgress.set(false), Platform::runLater);
 	}
 
 	@FXML
@@ -121,6 +119,8 @@ public class PassphraseEntryController implements FxController {
 				new KeyFrame(Duration.millis(800), legsExtendedY, legsExtendedX, faceHidden), //
 				new KeyFrame(Duration.millis(1000), faceVisible) //
 		);
+
+		result.whenCompleteAsync((r, t) -> stopUnlockAnimation());
 	}
 
 	@FXML
@@ -133,9 +133,6 @@ public class PassphraseEntryController implements FxController {
 			result.cancel(true);
 			LOG.debug("Unlock canceled by user.");
 		}
-		if( passwordField != null) {
-			passwordField.getCharacters().destroy();
-		}
 
 	}
 
@@ -145,7 +142,7 @@ public class PassphraseEntryController implements FxController {
 		unlockInProgress.set(true);
 		CharSequence pwFieldContents = passwordField.getCharacters();
 		Passphrase pw = Passphrase.copyOf(pwFieldContents);
-		result.completeAsync(() -> new PassphraseEntryResult(pw, savePasswordCheckbox.isSelected()), backgroundExecutorService);
+		result.complete(new PassphraseEntryResult(pw, savePasswordCheckbox.isSelected()));
 		startUnlockAnimation();
 	}
 

src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java

@@ -95,6 +95,16 @@ public class MainWindowController implements FxController {
 		int width = settings.windowWidth.get();
 		int height = settings.windowHeight.get();
 
+		// Minimizing a window in Windows and closing it could result in an out of bounds position at (x, y) = (-32000, -32000)
+		// See https://devblogs.microsoft.com/oldnewthing/20041028-00/?p=37453
+		// If the position is (-32000, -32000), restore to the last saved position
+		if (window.getX() == -32000 && window.getY() == -32000) {
+			window.setX(x);
+			window.setY(y);
+			window.setWidth(width);
+			window.setHeight(height);
+		}
+
 		Rectangle2D primaryScreenBounds = Screen.getPrimary().getBounds();
 		if (!isWithinDisplayBounds(x, y, width, height)) { //use stored window position
 			LOG.debug("Resetting window position due to insufficient screen overlap");
@@ -166,7 +176,7 @@ public class MainWindowController implements FxController {
 		return updateAvailable.get();
 	}
 
-	public BooleanBinding licenseValidProperty() {
+	public BooleanBinding licenseValidProperty(){
 		return licenseHolder.validLicenseProperty();
 	}
 

src/main/java/org/cryptomator/ui/mainwindow/VaultDetailLockedController.java

@@ -8,9 +8,9 @@ import org.cryptomator.ui.vaultoptions.SelectedVaultOptionsTab;
 import org.cryptomator.ui.vaultoptions.VaultOptionsComponent;
 
 import javax.inject.Inject;
-import javafx.beans.binding.Bindings;
 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;
@@ -21,6 +21,7 @@ public class VaultDetailLockedController implements FxController {
 	private final ReadOnlyObjectProperty<Vault> vault;
 	private final FxApplicationWindows appWindows;
 	private final VaultOptionsComponent.Factory vaultOptionsWindow;
+	private final KeychainManager keychain;
 	private final Stage mainWindow;
 	private final ObservableValue<Boolean> passwordSaved;
 
@@ -29,11 +30,13 @@ public class VaultDetailLockedController implements FxController {
 		this.vault = vault;
 		this.appWindows = appWindows;
 		this.vaultOptionsWindow = vaultOptionsWindow;
+		this.keychain = keychain;
 		this.mainWindow = mainWindow;
-		this.passwordSaved = Bindings.createBooleanBinding(() -> {
+		if (keychain.isSupported() && !keychain.isLocked()) {
-			var v = vault.get();
+			this.passwordSaved = vault.flatMap(v -> keychain.getPassphraseStoredProperty(v.getId())).orElse(false);
-			return v != null && keychain.getPassphraseStoredProperty(v.getId()).getValue();
+		} else {
-		}, vault, keychain.getKeychainImplementation());
+			this.passwordSaved = new SimpleBooleanProperty(false);
+		}
 	}
 
 	@FXML

src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java

@@ -6,14 +6,12 @@ import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.tobiasdiez.easybind.EasyBind;
 import org.apache.commons.lang3.SystemUtils;
-import org.cryptomator.common.Nullable;
 import org.cryptomator.common.vaults.Vault;
 import org.cryptomator.integrations.mount.Mountpoint;
 import org.cryptomator.integrations.revealpath.RevealFailedException;
 import org.cryptomator.integrations.revealpath.RevealPathService;
 import org.cryptomator.ui.common.FxController;
 import org.cryptomator.ui.common.VaultService;
-import org.cryptomator.ui.decryptname.DecryptNameComponent;
 import org.cryptomator.ui.fxapp.FxApplicationWindows;
 import org.cryptomator.ui.stats.VaultStatisticsComponent;
 import org.cryptomator.ui.wrongfilealert.WrongFileAlertComponent;
@@ -41,13 +39,10 @@ import java.io.IOException;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.function.Function;
 
 @MainWindowScoped
 public class VaultDetailUnlockedController implements FxController {
@@ -61,39 +56,26 @@ public class VaultDetailUnlockedController implements FxController {
 	private final WrongFileAlertComponent.Builder wrongFileAlert;
 	private final Stage mainWindow;
 	private final Optional<RevealPathService> revealPathService;
-	private final DecryptNameComponent.Factory decryptNameWindowFactory;
 	private final ResourceBundle resourceBundle;
 	private final LoadingCache<Vault, VaultStatisticsComponent> vaultStats;
 	private final VaultStatisticsComponent.Builder vaultStatsBuilder;
 	private final ObservableValue<Boolean> accessibleViaPath;
 	private final ObservableValue<Boolean> accessibleViaUri;
 	private final ObservableValue<String> mountPoint;
-	private final BooleanProperty draggingOverLocateEncrypted = new SimpleBooleanProperty();
+	private final BooleanProperty draggingOver = new SimpleBooleanProperty();
-	private final BooleanProperty draggingOverDecryptName = new SimpleBooleanProperty();
 	private final BooleanProperty ciphertextPathsCopied = new SimpleBooleanProperty();
 
-	@FXML
+	//FXML
-	public Button revealEncryptedDropZone;
+	public Button dropZone;
-	@FXML
-	public Button decryptNameDropZone;
 
 	@Inject
-	public VaultDetailUnlockedController(ObjectProperty<Vault> vault, //
+	public VaultDetailUnlockedController(ObjectProperty<Vault> vault, FxApplicationWindows appWindows, VaultService vaultService, VaultStatisticsComponent.Builder vaultStatsBuilder, WrongFileAlertComponent.Builder wrongFileAlert, @MainWindow Stage mainWindow, Optional<RevealPathService> revealPathService, ResourceBundle resourceBundle) {
-										 FxApplicationWindows appWindows, //
-										 VaultService vaultService, //
-										 VaultStatisticsComponent.Builder vaultStatsBuilder, //
-										 WrongFileAlertComponent.Builder wrongFileAlert, //
-										 @MainWindow Stage mainWindow, //
-										 Optional<RevealPathService> revealPathService, //
-										 DecryptNameComponent.Factory decryptNameWindowFactory, //
-										 ResourceBundle resourceBundle) {
 		this.vault = vault;
 		this.appWindows = appWindows;
 		this.vaultService = vaultService;
 		this.wrongFileAlert = wrongFileAlert;
 		this.mainWindow = mainWindow;
 		this.revealPathService = revealPathService;
-		this.decryptNameWindowFactory = decryptNameWindowFactory;
 		this.resourceBundle = resourceBundle;
 		this.vaultStats = CacheBuilder.newBuilder().weakValues().build(CacheLoader.from(this::buildVaultStats));
 		this.vaultStatsBuilder = vaultStatsBuilder;
@@ -110,81 +92,89 @@ public class VaultDetailUnlockedController implements FxController {
 	}
 
 	public void initialize() {
-		revealEncryptedDropZone.setOnDragOver(e -> handleDragOver(e, draggingOverLocateEncrypted));
+		dropZone.setOnDragEntered(this::handleDragEvent);
-		revealEncryptedDropZone.setOnDragDropped(e -> handleDragDropped(e, this::getCiphertextPath, this::revealOrCopyPaths));
+		dropZone.setOnDragOver(this::handleDragEvent);
-		revealEncryptedDropZone.setOnDragExited(_ -> draggingOverLocateEncrypted.setValue(false));
+		dropZone.setOnDragDropped(this::handleDragEvent);
+		dropZone.setOnDragExited(this::handleDragEvent);
 
-		decryptNameDropZone.setOnDragOver(e -> handleDragOver(e, draggingOverDecryptName));
+		EasyBind.includeWhen(dropZone.getStyleClass(), ACTIVE_CLASS, draggingOver);
-		decryptNameDropZone.setOnDragDropped(e -> showDecryptNameWindow(e.getDragboard().getFiles().stream().map(File::toPath).toList()));
-		decryptNameDropZone.setOnDragExited(_ -> draggingOverDecryptName.setValue(false));
-
-		EasyBind.includeWhen(revealEncryptedDropZone.getStyleClass(), ACTIVE_CLASS, draggingOverLocateEncrypted);
-		EasyBind.includeWhen(decryptNameDropZone.getStyleClass(), ACTIVE_CLASS, draggingOverDecryptName);
 	}
 
-	private void handleDragOver(DragEvent event, BooleanProperty prop) {
+	private void handleDragEvent(DragEvent event) {
-		if (event.getGestureSource() == null && event.getDragboard().hasFiles()) {
+		if (DragEvent.DRAG_OVER.equals(event.getEventType()) && event.getGestureSource() == null && event.getDragboard().hasFiles()) {
-			if (SystemUtils.IS_OS_WINDOWS || SystemUtils.IS_OS_MAC) {
+			if(SystemUtils.IS_OS_WINDOWS || SystemUtils.IS_OS_MAC) {
 				event.acceptTransferModes(TransferMode.LINK);
 			} else {
 				event.acceptTransferModes(TransferMode.ANY);
 			}
-			prop.set(true);
+			draggingOver.set(true);
+		} else if (DragEvent.DRAG_DROPPED.equals(event.getEventType()) && event.getGestureSource() == null && event.getDragboard().hasFiles()) {
+			List<Path> ciphertextPaths = event.getDragboard().getFiles().stream().map(File::toPath).map(this::getCiphertextPath).flatMap(Optional::stream).toList();
+			if (ciphertextPaths.isEmpty()) {
+				wrongFileAlert.build().showWrongFileAlertWindow();
+			} else {
+				revealOrCopyPaths(ciphertextPaths);
+			}
+			event.setDropCompleted(!ciphertextPaths.isEmpty());
+			event.consume();
+		} else if (DragEvent.DRAG_EXITED.equals(event.getEventType())) {
+			draggingOver.set(false);
 		}
 	}
 
-	private <T> void handleDragDropped(DragEvent event, Function<Path, T> computation, Consumer<List<T>> positiveAction) {
+	private VaultStatisticsComponent buildVaultStats(Vault vault) {
-		if (event.getGestureSource() == null && event.getDragboard().hasFiles()) {
+		return vaultStatsBuilder.vault(vault).build();
-			List<T> objects = event.getDragboard().getFiles().stream().map(File::toPath).map(computation).filter(Objects::nonNull).toList();
-			if (objects.isEmpty()) {
-				wrongFileAlert.build().showWrongFileAlertWindow();
-			} else {
-				positiveAction.accept(objects);
-			}
-			event.setDropCompleted(!objects.isEmpty());
-			event.consume();
-		}
 	}
 
 	@FXML
-	public void chooseDecryptedFileAndReveal() {
+	public void revealAccessLocation() {
+		vaultService.reveal(vault.get());
+	}
+
+	@FXML
+	public void copyMountUri() {
+		ClipboardContent clipboardContent = new ClipboardContent();
+		clipboardContent.putString(mountPoint.getValue());
+		Clipboard.getSystemClipboard().setContent(clipboardContent);
+	}
+
+	@FXML
+	public void lock() {
+		appWindows.startLockWorkflow(vault.get(), mainWindow);
+	}
+
+	@FXML
+	public void showVaultStatistics() {
+		vaultStats.getUnchecked(vault.get()).showVaultStatisticsWindow();
+	}
+
+	@FXML
+	public void chooseFileAndReveal() {
 		Preconditions.checkState(accessibleViaPath.getValue());
 		var fileChooser = new FileChooser();
-		fileChooser.setTitle(resourceBundle.getString("main.vaultDetail.locateEncrypted.filePickerTitle"));
+		fileChooser.setTitle(resourceBundle.getString("main.vaultDetail.filePickerTitle"));
 		fileChooser.setInitialDirectory(Path.of(mountPoint.getValue()).toFile());
 		var cleartextFile = fileChooser.showOpenDialog(mainWindow);
 		if (cleartextFile != null) {
-			var ciphertextPath = getCiphertextPath(cleartextFile.toPath());
+			var ciphertextPaths = getCiphertextPath(cleartextFile.toPath()).stream().toList();
-			if (ciphertextPath != null) {
+			revealOrCopyPaths(ciphertextPaths);
-				revealOrCopyPaths(List.of(ciphertextPath));
-			}
 		}
 	}
 
-	@FXML
-	public void showDecryptNameWindow() {
-		showDecryptNameWindow(List.of());
-	}
-
-	private void showDecryptNameWindow(List<Path> pathsToDecrypt) {
-		decryptNameWindowFactory.create(vault.get(), mainWindow, pathsToDecrypt).showDecryptFileNameWindow();
-	}
-
 	private boolean startsWithVaultAccessPoint(Path path) {
 		return path.startsWith(Path.of(mountPoint.getValue()));
 	}
 
-	@Nullable
+	private Optional<Path> getCiphertextPath(Path path) {
-	private Path getCiphertextPath(Path path) {
 		if (!startsWithVaultAccessPoint(path)) {
-			LOG.debug("Path does not start with mount point of selected vault: {}", path);
+			LOG.debug("Path does not start with access point of selected vault: {}", path);
-			return null;
+			return Optional.empty();
 		}
 		try {
-			return vault.get().getCiphertextPath(path);
+			return Optional.of(vault.get().getCiphertextPath(path));
 		} catch (IOException e) {
 			LOG.warn("Unable to get ciphertext path from path: {}", path, e);
-			return null;
+			return Optional.empty();
 		}
 	}
 
@@ -216,32 +206,6 @@ public class VaultDetailUnlockedController implements FxController {
 		});
 	}
 
-	private VaultStatisticsComponent buildVaultStats(Vault vault) {
-		return vaultStatsBuilder.vault(vault).build();
-	}
-
-	@FXML
-	public void revealAccessLocation() {
-		vaultService.reveal(vault.get());
-	}
-
-	@FXML
-	public void copyMountUri() {
-		ClipboardContent clipboardContent = new ClipboardContent();
-		clipboardContent.putString(mountPoint.getValue());
-		Clipboard.getSystemClipboard().setContent(clipboardContent);
-	}
-
-	@FXML
-	public void lock() {
-		appWindows.startLockWorkflow(vault.get(), mainWindow);
-	}
-
-	@FXML
-	public void showVaultStatistics() {
-		vaultStats.getUnchecked(vault.get()).showVaultStatisticsWindow();
-	}
-
 	/* Getter/Setter */
 
 	public ReadOnlyObjectProperty<Vault> vaultProperty() {
@@ -283,6 +247,4 @@ public class VaultDetailUnlockedController implements FxController {
 	public boolean isCiphertextPathsCopied() {
 		return ciphertextPathsCopied.get();
 	}
-
 }
-

src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java

@@ -270,6 +270,7 @@ public class VaultListController implements FxController {
 	@FXML
 	public void showEventViewer() {
 		appWindows.showEventViewer();
+		unreadEvents.setValue(false);
 	}
 	// Getter and Setter
 

src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java

@@ -1,13 +1,10 @@
 package org.cryptomator.ui.preferences;
 
-import org.apache.commons.lang3.SystemUtils;
 import org.cryptomator.common.Environment;
-import org.cryptomator.common.keychain.KeychainManager;
 import org.cryptomator.common.settings.Settings;
 import org.cryptomator.integrations.autostart.AutoStartProvider;
 import org.cryptomator.integrations.autostart.ToggleAutoStartFailedException;
 import org.cryptomator.integrations.common.NamedServiceProvider;
-import org.cryptomator.integrations.keychain.KeychainAccessException;
 import org.cryptomator.integrations.keychain.KeychainAccessProvider;
 import org.cryptomator.integrations.quickaccess.QuickAccessService;
 import org.cryptomator.ui.common.FxController;
@@ -17,7 +14,6 @@ import org.slf4j.LoggerFactory;
 
 import javax.inject.Inject;
 import javafx.application.Application;
-import javafx.beans.Observable;
 import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
@@ -27,10 +23,6 @@ import javafx.stage.Stage;
 import javafx.util.StringConverter;
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.ExecutorService;
-import java.util.stream.Collectors;
 
 @PreferencesScoped
 public class GeneralPreferencesController implements FxController {
@@ -44,8 +36,6 @@ public class GeneralPreferencesController implements FxController {
 	private final Application application;
 	private final Environment environment;
 	private final List<KeychainAccessProvider> keychainAccessProviders;
-	private final KeychainManager keychain;
-	private final ExecutorService backgroundExecutor;
 	private final FxApplicationWindows appWindows;
 	public CheckBox useKeychainCheckbox;
 	public ChoiceBox<KeychainAccessProvider> keychainBackendChoiceBox;
@@ -57,18 +47,12 @@ public class GeneralPreferencesController implements FxController {
 	public CheckBox autoStartCheckbox;
 	public ToggleGroup nodeOrientation;
 
-	private CompletionStage<Void> keychainMigrations = CompletableFuture.completedFuture(null);
-
 	@Inject
-	GeneralPreferencesController(@PreferencesWindow Stage window, Settings settings, Optional<AutoStartProvider> autoStartProvider, //
+	GeneralPreferencesController(@PreferencesWindow Stage window, Settings settings, Optional<AutoStartProvider> autoStartProvider, List<KeychainAccessProvider> keychainAccessProviders, Application application, Environment environment, FxApplicationWindows appWindows) {
-								 List<KeychainAccessProvider> keychainAccessProviders, KeychainManager keychain, Application application, //
-								 Environment environment, FxApplicationWindows appWindows, ExecutorService backgroundExecutor) {
 		this.window = window;
 		this.settings = settings;
 		this.autoStartProvider = autoStartProvider;
 		this.keychainAccessProviders = keychainAccessProviders;
-		this.keychain = keychain;
-		this.backgroundExecutor = backgroundExecutor;
 		this.quickAccessServices = QuickAccessService.get().toList();
 		this.application = application;
 		this.environment = environment;
@@ -85,11 +69,10 @@ public class GeneralPreferencesController implements FxController {
 		var keychainSettingsConverter = new ServiceToSettingsConverter<>(keychainAccessProviders);
 		keychainBackendChoiceBox.getItems().addAll(keychainAccessProviders);
 		keychainBackendChoiceBox.setValue(keychainSettingsConverter.fromString(settings.keychainProvider.get()));
-		keychainBackendChoiceBox.setConverter(new NamedServiceConverter<>());
+		keychainBackendChoiceBox.setConverter(new KeychainProviderDisplayNameConverter());
 		Bindings.bindBidirectional(settings.keychainProvider, keychainBackendChoiceBox.valueProperty(), keychainSettingsConverter);
 		useKeychainCheckbox.selectedProperty().bindBidirectional(settings.useKeychain);
 		keychainBackendChoiceBox.disableProperty().bind(useKeychainCheckbox.selectedProperty().not());
-		keychainBackendChoiceBox.valueProperty().addListener(this::migrateKeychainEntries);
 
 		useQuickAccessCheckbox.selectedProperty().bindBidirectional(settings.useQuickAccess);
 		var quickAccessSettingsConverter = new ServiceToSettingsConverter<>(quickAccessServices);
@@ -100,25 +83,6 @@ public class GeneralPreferencesController implements FxController {
 		quickAccessServiceChoiceBox.disableProperty().bind(useQuickAccessCheckbox.selectedProperty().not());
 	}
 
-	private void migrateKeychainEntries(Observable observable, KeychainAccessProvider oldProvider, KeychainAccessProvider newProvider) {
-		//currently, we only migrate on macOS (touchID vs regular keychain)
-		if (SystemUtils.IS_OS_MAC) {
-			var idsAndNames = settings.directories.stream().collect(Collectors.toMap(vs -> vs.id, vs -> vs.displayName.getValue()));
-			if (!idsAndNames.isEmpty()) {
-				if (LOG.isDebugEnabled()) {
-					LOG.debug("Migrating keychain entries {} from {} to {}", idsAndNames.keySet(), oldProvider.getName(), newProvider.getName());
-				}
-				keychainMigrations = keychainMigrations.thenRunAsync(() -> {
-					try {
-						KeychainManager.migrate(oldProvider, newProvider, idsAndNames);
-					} catch (KeychainAccessException e) {
-						LOG.warn("Failed to migrate all entries from {} to {}", oldProvider.getName(), newProvider.getName(), e);
-					}
-				}, backgroundExecutor);
-			}
-		}
-	}
-
 	public boolean isAutoStartSupported() {
 		return autoStartProvider.isPresent();
 	}
@@ -151,6 +115,25 @@ public class GeneralPreferencesController implements FxController {
 	}
 
 	/* Helper classes */
+
+	private static class KeychainProviderDisplayNameConverter extends StringConverter<KeychainAccessProvider> {
+
+		@Override
+		public String toString(KeychainAccessProvider provider) {
+			if (provider == null) {
+				return null;
+			} else {
+				return provider.displayName();
+			}
+		}
+
+		@Override
+		public KeychainAccessProvider fromString(String string) {
+			throw new UnsupportedOperationException();
+		}
+
+	}
+
 	private static class NamedServiceConverter<T extends NamedServiceProvider> extends StringConverter<T> {
 
 		@Override

src/main/resources/css/dark_theme.css

@@ -16,10 +16,6 @@
 	src: url('opensans_bold.ttf');
 }
 
-@font-face {
-	src: url('firacode_regular.ttf');
-}
-
 /*******************************************************************************
  *                                                                             *
  * Root Styling & Colors                                                       *
@@ -129,12 +125,6 @@
 	-fx-fill: TEXT_FILL;
 }
 
-.cryptic-text {
-	-fx-fill: TEXT_FILL;
-	-fx-font-family: 'Fira Code';
-	-fx-font-size: 1.1em;
-}
-
 /*******************************************************************************
  *                                                                             *
  * Glyph Icons                                                                 *
@@ -312,10 +302,6 @@
 	-fx-font-size: 1.0em;
 }
 
-.list-cell .header-misc {
-	-fx-font-size: 1.0em;
-}
-
 .list-cell .detail-label {
 	-fx-text-fill: TEXT_FILL_MUTED;
 	-fx-font-size: 0.8em;
@@ -655,7 +641,7 @@
  *                                                                             *
  ******************************************************************************/
 
-.icon-update-indicator {
+.update-indicator {
 	-fx-fill: RED_5;
 }
 
@@ -1022,167 +1008,4 @@
 	-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_NORMAL;
 	-fx-background-insets: 0, 1px;
 	-fx-background-radius: 4px;
-}
+}
-
-/*******************************************************************************
- *                                                                             *
- * Decrypt Name Window
- *                                                                             *
- ******************************************************************************/
-
-.decrypt-name-window .button-bar {
-	-fx-min-height:42px;
-	-fx-max-height:42px;
-	-fx-background-color: MAIN_BG;
-	-fx-border-color: transparent transparent CONTROL_BORDER_NORMAL transparent;
-	-fx-border-width: 0 0 1px 0;
-}
-
-.decrypt-name-window .button-bar .button-right {
-	-fx-border-color: transparent transparent transparent CONTROL_BORDER_NORMAL;
-	-fx-border-width: 0 0 0 1px;
-	-fx-background-color: MAIN_BG;
-	-fx-background-radius: 0px;
-	-fx-min-height: 42px;
-	-fx-max-height: 42px;
-}
-
-.decrypt-name-window .button-bar .button-right:armed {
-	-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_ARMED;
-}
-
-.decrypt-name-window .table-view {
-    -fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_NORMAL;
-    -fx-background-insets: 0,1;
-    /* There is some oddness if padding is in em values rather than pixels,
-       in particular, the left border of the control doesn't show. */
-    -fx-padding: 1; /* 0.083333em; */
-}
-
-.table-view > .placeholder {
-	-fx-background-color: transparent;
-	-fx-background-radius: 0px;
-}
-
-.table-view > .placeholder > .button {
-	-fx-border-width: 0;
-    -fx-border-color: transparent;
-	-fx-background-radius: 0px;
-}
-
-.table-view:focused {
-    -fx-background-color: CONTROL_BORDER_FOCUSED, CONTROL_BG_NORMAL;
-    -fx-background-insets: 0, 1;
-    -fx-background-radius: 0, 0;
-    /* There is some oddness if padding is in em values rather than pixels,
-      in particular, the left border of the control doesn't show. */
-    -fx-padding: 1; /* 0.083333em; */
-}
-
-.table-view > .virtual-flow > .scroll-bar:vertical {
-    -fx-background-insets: 0, 0 0 0 1;
-    -fx-padding: -1 -1 -1 0;
-}
-
-.table-view > .virtual-flow > .corner {
-    -fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_NORMAL ;
-    -fx-background-insets: 0, 1 0 0 1;
-}
-
-/* Each row in the table is a table-row-cell. Inside a table-row-cell is any
-   number of table-cell. */
-.table-row-cell {
-    -fx-background-color: GRAY_3, CONTROL_BG_NORMAL;
-    -fx-background-insets: 0, 0 0 1 0;
-    -fx-padding: 0.0em; /* 0 */
-    -fx-text-fill: TEXT_FILL;
-}
-
-.table-row-cell:odd {
-    -fx-background-color: GRAY_3, GRAY_1;
-    -fx-background-insets: 0, 0 0 1 0;
-}
-
-.table-cell {
-    -fx-padding: 3px 6px 3px 6px;
-    -fx-background-color: transparent;
-    -fx-border-color: transparent CONTROL_BORDER_NORMAL transparent transparent;
-    -fx-border-width: 1px;
-    -fx-cell-size: 30px;
-    -fx-text-fill: TEXT_FILL;
-    -fx-text-overrun: center-ellipsis;
-}
-
-.table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected > .table-cell {
-    -fx-text-fill: TEXT_FILL;
-}
-
-/* selected, hover - not specified */
-
-/* selected, focused, hover */
-/* selected, focused */
-/* selected */
-.table-view:focused:cell-selection > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .table-cell:selected,
-.table-view:focused:cell-selection > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .table-cell:focused:selected,
-.table-view:focused:cell-selection > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .table-cell:focused:selected:hover {
-    -fx-background-color: CONTROL_PRIMARY_BG_NORMAL, PRIMARY_D1;
-    -fx-background-insets: 0 0 0 0, 1 1 1 3;
-   	-fx-text-fill: TEXT_FILL;
-}
-/* focused */
-.table-view:focused:cell-selection > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .table-cell:focused {
-    -fx-background-color: CONTROL_PRIMARY_BORDER_FOCUSED, CONTROL_PRIMARY_BG_NORMAL , CONTROL_BG_NORMAL;
-    -fx-background-insets: 0 1 0 0, 1 2 1 1, 2 3 2 2;
-    -fx-text-fill: TEXT_FILL;
-}
-/* focused, hover */
-.table-view:focused:cell-selection > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .table-cell:focused:hover {
-    -fx-background-color: CONTROL_PRIMARY_BORDER_FOCUSED, CONTROL_PRIMARY_BG_NORMAL , PRIMARY_D2;
-    -fx-background-insets: 0 1 0 0, 1 2 1 1, 2 3 2 2;
-    -fx-text-fill: TEXT_FILL;
-}
-/* hover */
-.table-view:cell-selection > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .table-cell:hover {
-	-fx-background-color: PRIMARY_D2;
-	-fx-text-fill: TEXT_FILL;
-	-fx-background-insets: 0 0 1 0;
-}
-
-/* The column-resize-line is shown when the user is attempting to resize a column. */
-.table-view .column-resize-line {
-    -fx-background-color: CONTROL_BG_ARMED;
-    -fx-padding: 0.0em 0.0416667em 0.0em 0.0416667em; /* 0 0.571429 0 0.571429 */
-}
-
-/* This is the area behind the column headers. An ideal place to specify background
-   and border colors for the whole area (not individual column-header's). */
-.table-view .column-header-background {
-    -fx-background-color: GRAY_2;
-    -fx-padding: 0;
-}
-
-/* The column header row is made up of a number of column-header, one for each
-   TableColumn, and a 'filler' area that extends from the right-most column
-   to the edge of the tableview, or up to the 'column control' button. */
-.table-view .column-header {
-    -fx-text-fill: TEXT_FILL;
-    -fx-font-size: 1.083333em; /* 13pt ;  1 more than the default font */
-    -fx-size: 24;
-    -fx-border-style: solid;
-    -fx-border-color:
-    	transparent
-        GRAY_3
-        GRAY_3
-        transparent;
-    -fx-border-insets: 0 0 0 0;
-    -fx-border-width: 0.083333em;
-}
-
-.table-view .column-header .label {
-    -fx-alignment: center;
-}
-
-.table-view .empty-table {
-    -fx-background-color: MAIN_BG;
-    -fx-font-size: 1.166667em; /* 14pt - 2 more than the default font */
-}

src/main/resources/css/light_theme.css

@@ -16,10 +16,6 @@
 	src: url('opensans_bold.ttf');
 }
 
-@font-face {
-	src: url('firacode_regular.ttf');
-}
-
 /*******************************************************************************
  *                                                                             *
  * Root Styling & Colors                                                       *
@@ -83,7 +79,6 @@
 	PROGRESS_INDICATOR_END: GRAY_4;
 	PROGRESS_BAR_BG: GRAY_8;
 
-
 	-fx-background-color: MAIN_BG;
 	-fx-text-fill: TEXT_FILL;
 	-fx-font-family: 'Open Sans';
@@ -129,12 +124,6 @@
 	-fx-fill: TEXT_FILL;
 }
 
-.cryptic-text {
-	-fx-fill: TEXT_FILL;
-	-fx-font-family: 'Fira Code';
-	-fx-font-size: 1.1em;
-}
-
 /*******************************************************************************
  *                                                                             *
  * Glyph Icons                                                                 *
@@ -1022,167 +1011,4 @@
 	-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_NORMAL;
 	-fx-background-insets: 0, 1px;
 	-fx-background-radius: 4px;
-}
+}
-
-/*******************************************************************************
- *                                                                             *
- * Decrypt Name Window
- *                                                                             *
- ******************************************************************************/
-
-.decrypt-name-window .button-bar {
-	-fx-min-height:42px;
-	-fx-max-height:42px;
-	-fx-background-color: MAIN_BG;
-	-fx-border-color: transparent transparent CONTROL_BORDER_NORMAL transparent;
-	-fx-border-width: 0 0 1px 0;
-}
-
-.decrypt-name-window .button-bar .button-right {
-	-fx-border-color: transparent transparent transparent CONTROL_BORDER_NORMAL;
-	-fx-border-width: 0 0 0 1px;
-	-fx-background-color: MAIN_BG;
-	-fx-background-radius: 0px;
-	-fx-min-height: 42px;
-	-fx-max-height: 42px;
-}
-
-.decrypt-name-window .button-bar .button-right:armed {
-	-fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_ARMED;
-}
-
-.decrypt-name-window .table-view {
-    -fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_NORMAL;
-    -fx-background-insets: 0,1;
-    /* There is some oddness if padding is in em values rather than pixels,
-       in particular, the left border of the control doesn't show. */
-    -fx-padding: 1; /* 0.083333em; */
-}
-
-.table-view > .placeholder {
-	-fx-background-color: transparent;
-	-fx-background-radius: 0px;
-}
-
-.table-view > .placeholder > .button {
-	-fx-border-width: 0;
-    -fx-border-color: transparent;
-	-fx-background-radius: 0px;
-}
-
-.table-view:focused {
-    -fx-background-color: CONTROL_BORDER_FOCUSED, CONTROL_BG_NORMAL;
-    -fx-background-insets: 0, 1;
-    -fx-background-radius: 0, 0;
-    /* There is some oddness if padding is in em values rather than pixels,
-      in particular, the left border of the control doesn't show. */
-    -fx-padding: 1; /* 0.083333em; */
-}
-
-.table-view > .virtual-flow > .scroll-bar:vertical {
-    -fx-background-insets: 0, 0 0 0 1;
-    -fx-padding: -1 -1 -1 0;
-}
-
-.table-view > .virtual-flow > .corner {
-    -fx-background-color: CONTROL_BORDER_NORMAL, CONTROL_BG_NORMAL ;
-    -fx-background-insets: 0, 1 0 0 1;
-}
-
-/* Each row in the table is a table-row-cell. Inside a table-row-cell is any
-   number of table-cell. */
-.table-row-cell {
-    -fx-background-color: GRAY_6, CONTROL_BG_NORMAL;
-    -fx-background-insets: 0, 0 0 1 0;
-    -fx-padding: 0.0em; /* 0 */
-    -fx-text-fill: TEXT_FILL;
-}
-
-.table-row-cell:odd {
-    -fx-background-color: GRAY_6, GRAY_9;
-    -fx-background-insets: 0, 0 0 1 0;
-}
-
-.table-cell {
-    -fx-padding: 3px 6px 3px 6px;
-    -fx-background-color: transparent;
-    -fx-border-color: transparent CONTROL_BORDER_NORMAL transparent transparent;
-    -fx-border-width: 1px;
-    -fx-cell-size: 30px;
-    -fx-text-fill: TEXT_FILL;
-    -fx-text-overrun: center-ellipsis;
-}
-
-.table-view:focused > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled:selected > .table-cell {
-    -fx-text-fill: TEXT_FILL;
-}
-
-/* selected, hover - not specified */
-
-/* selected, focused, hover */
-/* selected, focused */
-/* selected */
-.table-view:focused:cell-selection > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .table-cell:selected,
-.table-view:focused:cell-selection > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .table-cell:focused:selected,
-.table-view:focused:cell-selection > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .table-cell:focused:selected:hover {
-    -fx-background-color: CONTROL_PRIMARY_BG_NORMAL, CONTROL_BG_SELECTED;
-    -fx-background-insets: 0 0 0 0, 1 1 1 3;
-   	-fx-text-fill: TEXT_FILL;
-}
-/* focused */
-.table-view:focused:cell-selection > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .table-cell:focused {
-    -fx-background-color: CONTROL_PRIMARY_BORDER_FOCUSED, CONTROL_PRIMARY_BG_NORMAL , CONTROL_BG_NORMAL;
-    -fx-background-insets: 0 1 0 0, 1 2 1 1, 2 3 2 2;
-    -fx-text-fill: TEXT_FILL;
-}
-/* focused, hover */
-.table-view:focused:cell-selection > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .table-cell:focused:hover {
-    -fx-background-color: CONTROL_PRIMARY_BORDER_FOCUSED, CONTROL_PRIMARY_BG_NORMAL , PRIMARY_L2;
-    -fx-background-insets: 0 1 0 0, 1 2 1 1, 2 3 2 2;
-    -fx-text-fill: TEXT_FILL;
-}
-/* hover */
-.table-view:cell-selection > .virtual-flow > .clipped-container > .sheet > .table-row-cell:filled > .table-cell:hover {
-	-fx-background-color: PRIMARY_L2;
-	-fx-text-fill: TEXT_FILL;
-	-fx-background-insets: 0 0 1 0;
-}
-
-/* The column-resize-line is shown when the user is attempting to resize a column. */
-.table-view .column-resize-line {
-    -fx-background-color: CONTROL_BG_ARMED;
-    -fx-padding: 0.0em 0.0416667em 0.0em 0.0416667em; /* 0 0.571429 0 0.571429 */
-}
-
-/* This is the area behind the column headers. An ideal place to specify background
-   and border colors for the whole area (not individual column-header's). */
-.table-view .column-header-background {
-    -fx-background-color: GRAY_7;
-    -fx-padding: 0;
-}
-
-/* The column header row is made up of a number of column-header, one for each
-   TableColumn, and a 'filler' area that extends from the right-most column
-   to the edge of the tableview, or up to the 'column control' button. */
-.table-view .column-header {
-    -fx-text-fill: TEXT_FILL;
-    -fx-font-size: 1.083333em; /* 13pt ;  1 more than the default font */
-    -fx-size: 24;
-    -fx-border-style: solid;
-    -fx-border-color:
-        CONTROL_BORDER_NORMAL
-        GRAY_5
-        GRAY_5
-        transparent;
-    -fx-border-insets: 0 0 0 0;
-    -fx-border-width: 0.083333em;
-}
-
-.table-view .column-header .label {
-    -fx-alignment: center;
-}
-
-.table-view .empty-table {
-    -fx-background-color: MAIN_BG;
-    -fx-font-size: 1.166667em; /* 14pt - 2 more than the default font */
-}

src/main/resources/fxml/decryptnames.fxml

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
-<?import org.cryptomator.ui.controls.FormattedLabel?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.control.Tooltip?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
-<?import javafx.scene.layout.VBox?>
-<VBox xmlns="http://javafx.com/javafx"
-	  xmlns:fx="http://javafx.com/fxml"
-	  fx:controller="org.cryptomator.ui.decryptname.DecryptFileNamesViewController"
-	  styleClass="decrypt-name-window"
-	  minWidth="400"
-	  maxWidth="400"
-	  minHeight="145">
-	<HBox styleClass="button-bar" alignment="CENTER">
-		<padding>
-			<Insets left="6"/>
-		</padding>
-		<Region HBox.hgrow="ALWAYS"/>
-		<Button styleClass="button-right" contentDisplay="GRAPHIC_ONLY" onAction="#copyTableToClipboard">
-			<graphic>
-				<FontAwesome5IconView glyph="CLIPBOARD" glyphSize="16"/>
-			</graphic>
-			<tooltip>
-				<Tooltip text="%decryptNames.copyTable.tooltip"/>
-			</tooltip>
-		</Button>
-		<Button styleClass="button-right" contentDisplay="GRAPHIC_ONLY" onAction="#clearTable">
-			<graphic>
-				<FontAwesome5IconView glyph="TRASH" glyphSize="16"/>
-			</graphic>
-			<tooltip>
-				<Tooltip text="%decryptNames.clearTable.tooltip"/>
-			</tooltip>
-		</Button>
-	</HBox>
-	<TableView fx:id="cipherToCleartextTable" VBox.vgrow="ALWAYS">
-		<placeholder>
-			<Button alignment="CENTER" onAction="#selectFiles" text="${controller.dropZoneText}" contentDisplay="TOP" maxWidth="Infinity" maxHeight="Infinity">
-				<graphic>
-					<FontAwesome5IconView glyph="${controller.dropZoneIcon}" glyphSize="16"/>
-				</graphic>
-			</Button>
-		</placeholder>
-		<columns>
-			<TableColumn fx:id="ciphertextColumn" prefWidth="${cipherToCleartextTable.width * 0.5}">
-				<graphic>
-					<FontAwesome5IconView glyph="LOCK"/>
-				</graphic>
-			</TableColumn>
-			<TableColumn fx:id="cleartextColumn" prefWidth="${cipherToCleartextTable.width * 0.5}">
-				<graphic>
-					<FontAwesome5IconView glyph="LOCK_OPEN"/>
-				</graphic>
-			</TableColumn>
-		</columns>
-	</TableView>
-	<HBox>
-		<padding>
-			<Insets topRightBottomLeft="6"/>
-		</padding>
-		<Region HBox.hgrow="ALWAYS"/>
-		<FormattedLabel styleClass="label-small" format="%decryptNames.copyHint" arg1="${controller.copyToClipboardShortcutString}"/>
-	</HBox>
-</VBox>

src/main/resources/fxml/eventview.fxml

@@ -20,7 +20,7 @@
 		<padding>
 			<Insets left="6" />
 		</padding>
-		<ChoiceBox fx:id="vaultFilterChoiceBox" minWidth="42"/>
+		<ChoiceBox fx:id="vaultFilterChoiceBox"/>
 		<Region HBox.hgrow="ALWAYS"/>
 		<Button styleClass="button-right" onAction="#clearEvents" contentDisplay="GRAPHIC_ONLY">
 			<graphic>

src/main/resources/fxml/vault_detail_unlocked.fxml

@@ -1,14 +1,12 @@
 <?import org.cryptomator.ui.controls.FontAwesome5IconView?>
 <?import org.cryptomator.ui.controls.ThroughputLabel?>
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Tooltip?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
-<?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Text?>
+<?import javafx.scene.control.Tooltip?>
+<?import javafx.geometry.Insets?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
 	  fx:controller="org.cryptomator.ui.mainwindow.VaultDetailUnlockedController"
@@ -46,37 +44,28 @@
 	<Region VBox.vgrow="ALWAYS"/>
 
 	<HBox alignment="BOTTOM_CENTER">
-		<StackPane visible="${controller.accessibleViaPath}" managed="${controller.accessibleViaPath}">
+		<HBox visible="${controller.accessibleViaPath}" managed="${controller.accessibleViaPath}">
 			<padding>
 				<Insets topRightBottomLeft="0"/>
 			</padding>
-			<Button fx:id="revealEncryptedDropZone" styleClass="drag-n-drop" text="%main.vaultDetail.locateEncryptedFileBtn" minWidth="120" maxWidth="180" prefHeight="72" wrapText="true" textAlignment="CENTER" onAction="#chooseDecryptedFileAndReveal" contentDisplay="TOP" visible="${!controller.ciphertextPathsCopied}" managed="${!controller.ciphertextPathsCopied}">
+			<Button fx:id="dropZone" styleClass="drag-n-drop" text="%main.vaultDetail.locateEncryptedFileBtn" minWidth="120" maxWidth="180" wrapText="true" textAlignment="CENTER" onAction="#chooseFileAndReveal" contentDisplay="TOP" visible="${!controller.ciphertextPathsCopied}" managed="${!controller.ciphertextPathsCopied}">
 				<graphic>
-					<Text styleClass="cryptic-text" text="abc → 101010"/>
+					<FontAwesome5IconView glyph="FILE_DOWNLOAD" glyphSize="15"/>
 				</graphic>
 				<tooltip>
 					<Tooltip text="%main.vaultDetail.locateEncryptedFileBtn.tooltip"/>
 				</tooltip>
 			</Button>
-			<!-- TODO: instead of showing a button, show on error a small dialog and if copied, show a tooltip -->
+			<Button styleClass="drag-n-drop" text="%main.vaultDetail.encryptedPathsCopied" minWidth="120" maxWidth="180" wrapText="true" textAlignment="CENTER" onAction="#chooseFileAndReveal" contentDisplay="TOP" visible="${controller.ciphertextPathsCopied}" managed="${controller.ciphertextPathsCopied}">
-			<Button styleClass="drag-n-drop" text="%main.vaultDetail.encryptedPathsCopied" minWidth="120" maxWidth="180" prefHeight="72" wrapText="true" textAlignment="CENTER" onAction="#chooseDecryptedFileAndReveal" contentDisplay="TOP" visible="${controller.ciphertextPathsCopied}" managed="${controller.ciphertextPathsCopied}">
 				<graphic>
 					<FontAwesome5IconView glyph="CHECK" glyphSize="15"/>
 				</graphic>
 			</Button>
-		</StackPane>
+		</HBox>
-		<!-- decrypt file name -->
+
-		<Button fx:id="decryptNameDropZone" styleClass="drag-n-drop" text="%main.vaultDetail.decryptName.buttonLabel" minWidth="120" maxWidth="180" prefHeight="72" wrapText="true" textAlignment="CENTER" onAction="#showDecryptNameWindow" contentDisplay="TOP">
-			<graphic>
-				<Text styleClass="cryptic-text" text="101010 → abc"/>
-			</graphic>
-			<tooltip>
-				<Tooltip text="%main.vaultDetail.decryptName.tooltip"/>
-			</tooltip>
-		</Button>
 		<Region HBox.hgrow="ALWAYS"/>
 
-		<Button text="%main.vaultDetail.stats" minWidth="120" onAction="#showVaultStatistics" contentDisplay="BOTTOM" prefHeight="72">
+		<Button text="%main.vaultDetail.stats" minWidth="120" onAction="#showVaultStatistics" contentDisplay="BOTTOM">
 			<graphic>
 				<VBox spacing="6">
 					<HBox alignment="CENTER_RIGHT" spacing="6">

src/main/resources/i18n/strings.properties

@@ -425,9 +425,7 @@ main.vaultDetail.stats=Vault Statistics
 main.vaultDetail.locateEncryptedFileBtn=Locate Encrypted File
 main.vaultDetail.locateEncryptedFileBtn.tooltip=Choose a file from your vault to locate its encrypted counterpart
 main.vaultDetail.encryptedPathsCopied=Paths Copied to Clipboard!
-main.vaultDetail.locateEncrypted.filePickerTitle=Select File Inside Vault
+main.vaultDetail.filePickerTitle=Select File Inside Vault
-main.vaultDetail.decryptName.buttonLabel=Decrypt File Name
-main.vaultDetail.decryptName.tooltip=Choose an encrypted vault file to decrypt its name
 ### Missing
 main.vaultDetail.missing.info=Cryptomator could not find a vault at this path.
 main.vaultDetail.missing.recheck=Recheck
@@ -583,25 +581,12 @@ shareVault.hub.instruction.1=1. Share access of the encrypted vault folder via c
 shareVault.hub.instruction.2=2. Grant access to team member in Cryptomator Hub.
 shareVault.hub.openHub=Open Cryptomator Hub
 
-# Decrypt File Names
-decryptNames.title=Decrypt File Names
-decryptNames.filePicker.title=Select encrypted file
-decryptNames.filePicker.extensionDescription=Cryptomator encrypted file
-decryptNames.copyTable.tooltip=Copy table
-decryptNames.clearTable.tooltip=Clear table
-decryptNames.copyHint=Copy cell content with %s
-decryptNames.dropZone.message=Drop files or click to select
-decryptNames.dropZone.error.vaultInternalFiles=Vault internal files with no decrypt-able name selected
-decryptNames.dropZone.error.foreignFiles=Files do not belong to vault "%s"
-decryptNames.dropZone.error.noDirIdBackup=Directory of selected files does not contain dirId.c9r file
-decryptNames.dropZone.error.generic=Failed to decrypt file names
-
-
 # Event View
 eventView.title=Events
 eventView.filter.allVaults=All
-eventView.clearListButton.tooltip=Clear list
+eventView.clearListButton.tooltip=Dismiss all
 ## event list entries
+eventView.entry.vaultLocked.message=***********
 eventView.entry.vaultLocked.description=Unlock "%s" for details
 eventView.entry.conflictResolved.message=Resolved conflict
 eventView.entry.conflictResolved.showDecrypted=Show decrypted file

src/main/resources/i18n/strings_af.properties

@@ -121,10 +121,3 @@
 #Retry If Readonly
 
 # Share Vault
-
-
-# Decrypt File Names
-
-
-# Event View
-## event list entries

src/main/resources/i18n/strings_ar.properties

@@ -1,7 +1,6 @@
 # Locale Specific CSS files such as CJK, RTL,...
 
 # Generics
-generic.action.dismiss=تجاهل
 ## Button
 generic.button.apply=تطبيق
 generic.button.back=رجوع
@@ -177,7 +176,6 @@ hub.registerFailed.description.generic=حدث خطأ في عملية تسجيل
 hub.registerFailed.description.deviceAlreadyExists=هذا الجهاز مسجل لمستخدم مختلف بالفعل. حاول تغيير حساب المستخدم أو استخدام جهاز مختلف.
 ### Unauthorized
 hub.unauthorized.message=تم رفض الوصول
-hub.unauthorized.description=غير مسموح لك بفتح هذا المستودع. اتصل بمالك المستودع لطلب الوصول.
 ### Requires Account Initialization
 hub.requireAccountInit.message=مطلوب اتخاذ إجراء
 hub.requireAccountInit.description.0=للمتابعة، يرجى إكمال الخطوات المطلوبة في 
@@ -283,7 +281,7 @@ preferences.title=تفضيلات
 ## General
 preferences.general=عام
 preferences.general.startHidden=إخفاء النافذة عند بدء تشغيل Cryptomator
-preferences.general.autoCloseVaults=اقفل المخازن دون السؤال عند الإقلاع عن التطبيق
+preferences.general.autoCloseVaults=اقفل الخزانات المفتوحة تلقائياً عند الإقلاع عن التطبيق
 preferences.general.debugLogging=تمكين سجلات التصحيح
 preferences.general.debugDirectory=عرض ملفات السجل
 preferences.general.autoStart=تشغيل Cryptomator عند بدء تشغيل النظام
@@ -423,7 +421,7 @@ main.vaultDetail.stats=إحصائيات الخزنة
 main.vaultDetail.locateEncryptedFileBtn=تحديد موقع الملف المشفر
 main.vaultDetail.locateEncryptedFileBtn.tooltip=اختر ملف من خزانتك لتحديد مكان نظيره المشفر
 main.vaultDetail.encryptedPathsCopied=تم نسخ مسارات الملفات إلى الحافظة!
-main.vaultDetail.decryptName.buttonLabel=فك تشفير اسم الملف
+main.vaultDetail.filePickerTitle=إختر الملف من الخزنة
 ### Missing
 main.vaultDetail.missing.info=لم يتمكن Cryptomator من العثور على خزنة في هذا المسار.
 main.vaultDetail.missing.recheck=إعادة الفحص
@@ -554,10 +552,6 @@ dokanySupportEnd.description=نوع وحدة التخزين Dokany لم يعد
 dokanySupportEnd.preferencesBtn=فتح التفضيلات
 
 #Retry If Readonly
-retryIfReadonly.title=الوصول إلى المخزن المقيّد
-retryIfReadonly.message=لا يوجد وصول للكتابة إلى مجلد المخزن
-retryIfReadonly.description=Cryptomator لا يمكنه الكتابة إلى دليل المخزن. يمكنك تغيير المخزن ليكون للقراءة فقط وحاول مرة أخرى. يمكن تعطيل هذا الخيار في خيارات المخزن.
-retryIfReadonly.retry=غيّر وأعد المحاولة
 
 # Share Vault
 shareVault.title=مشاركة الخزانة
@@ -577,10 +571,4 @@ shareVault.hub.message=كيفية مشاركة خزانة Hub
 shareVault.hub.description=لمشاركة محتوى الخزانة مع عضو آخر في الفريق، عليك القيام بخطوتين:
 shareVault.hub.instruction.1=1. شارك الوصول إلى مجلد الخزانة المشفر عبر التخزين السحابي.
 shareVault.hub.instruction.2=2. امنح الوصول لعضو الفريق في Cryptomator Hub.
-shareVault.hub.openHub=زيارة Cryptomator Hub
+shareVault.hub.openHub=زيارة Cryptomator Hub
-
-# Decrypt File Names
-
-
-# Event View
-## event list entries

src/main/resources/i18n/strings_ba.properties

@@ -1,7 +1,6 @@
 # Locale Specific CSS files such as CJK, RTL,...
 
 # Generics
-generic.action.dismiss=Кире ҡаҡ
 ## Button
 generic.button.apply=Ҡуллан
 generic.button.back=Артҡа
@@ -270,6 +269,7 @@ preferences.title=Көйләүҙәр
 ## General
 preferences.general=Дөйөм
 preferences.general.startHidden=Cryptomator башланған саҡта тәҙрәне йәшерергә
+preferences.general.autoCloseVaults=Ҡушымтанан сыҡҡан ваҡытта һаҡлағыстарҙы автоматик рәүештә бикләргә
 preferences.general.debugLogging=Төҙөкләндереү журналын асырға
 preferences.general.debugDirectory=Журнал файлдарын күрһәт
 preferences.general.autoStart=Система стартында Cryptomator-ҙы эшләтеп ебәрергә
@@ -389,6 +389,7 @@ main.vaultDetail.stats=Һаҡлағыс статистикаһы
 main.vaultDetail.locateEncryptedFileBtn=Шифрланған файлды тап
 main.vaultDetail.locateEncryptedFileBtn.tooltip=Шифрланған аналогын табыр өсөн һаҡлағыстан файл һайлағыҙ
 main.vaultDetail.encryptedPathsCopied=Юлдарҙын Clipboard-ҡа күсермәһе алынды!
+main.vaultDetail.filePickerTitle=Һаҡлағыс эсендә файл һайлау
 ### Missing
 main.vaultDetail.missing.info=Cryptomator был юлдан һаҡлағыс таба алманы.
 main.vaultDetail.missing.recheck=Яңынан тикшер
@@ -517,10 +518,3 @@ dokanySupportEnd.preferencesBtn=Көйләүҙәрҙе ас
 #Retry If Readonly
 
 # Share Vault
-
-
-# Decrypt File Names
-
-
-# Event View
-## event list entries

src/main/resources/i18n/strings_be.properties

@@ -1,7 +1,6 @@
 # Locale Specific CSS files such as CJK, RTL,...
 
 # Generics
-generic.action.dismiss=Адхіліць
 ## Button
 generic.button.apply=Ужыць
 generic.button.back=Назад
@@ -259,6 +258,7 @@ preferences.title=Налады
 ## General
 preferences.general=Агульныя
 preferences.general.startHidden=Хаваць акно пры запуску Cryptomator
+preferences.general.autoCloseVaults=Замыкаць адчыненыя скарбніцы аўтаматычна пры выхадзе з праграмы
 preferences.general.debugLogging=Уключыць пратакаляванне адладкі
 preferences.general.debugDirectory=Паказаць файлы пратаколу
 preferences.general.autoStart=Запускаць Cryptomator падчас запуску сістэмы
@@ -376,6 +376,7 @@ main.vaultDetail.stats=Статыстыка скарбніцы
 main.vaultDetail.locateEncryptedFileBtn=Знайсці зашыфраваны файл
 main.vaultDetail.locateEncryptedFileBtn.tooltip=Абяры файл у тваёй скрабніцы, каб знайсці ягоны зашыфраваны адпаведнік
 main.vaultDetail.encryptedPathsCopied=Шлях скапіяваны ў буфер абмену!
+main.vaultDetail.filePickerTitle=Абраць файл унутры скарбніцы
 ### Missing
 main.vaultDetail.missing.info=Cryptomator ня змог знайсці скарбніцу па гэтай сцежцы.
 main.vaultDetail.missing.recheck=Пераправерыць
@@ -497,10 +498,3 @@ dokanySupportEnd.preferencesBtn=Адчыніць налады
 #Retry If Readonly
 
 # Share Vault
-
-
-# Decrypt File Names
-
-
-# Event View
-## event list entries

src/main/resources/i18n/strings_bg.properties

@@ -1,7 +1,6 @@
 # Locale Specific CSS files such as CJK, RTL,...
 
 # Generics
-generic.action.dismiss=Отхвърляне
 ## Button
 generic.button.apply=Прилагане
 generic.button.back=Назад
@@ -270,11 +269,11 @@ preferences.title=Настройки
 ## General
 preferences.general=Общи
 preferences.general.startHidden=Скриване на прозореца при отваряне на Криптоматор
+preferences.general.autoCloseVaults=Заключване на хранилищата при затваряне на приложението
 preferences.general.debugLogging=Дневник за отстраняване на дефекти
 preferences.general.debugDirectory=Файлове на дневниците
 preferences.general.autoStart=Отваряне на Криптоматор при старт на системата
 preferences.general.keychainBackend=Съхраняванеа паролите в
-preferences.general.quickAccessService=Добавяне на отключените хранилища в зоната за бърз достъп
 ## Interface
 preferences.interface=Външен вид
 preferences.interface.theme=Тема
@@ -390,6 +389,7 @@ main.vaultDetail.stats=Статистики на хранилището
 main.vaultDetail.locateEncryptedFileBtn=Намиране на шифровани файлове
 main.vaultDetail.locateEncryptedFileBtn.tooltip=Изберете файл от хранилището, за да бъде намерено шифрованото му копие
 main.vaultDetail.encryptedPathsCopied=Пътищата са копирани!
+main.vaultDetail.filePickerTitle=Изберете файл от хранилището
 ### Missing
 main.vaultDetail.missing.info=Криптоматор не намира хранилище на това място.
 main.vaultDetail.missing.recheck=Повторен опит
@@ -518,10 +518,3 @@ dokanySupportEnd.preferencesBtn=Към настройките
 #Retry If Readonly
 
 # Share Vault
-
-
-# Decrypt File Names
-
-
-# Event View
-## event list entries

src/main/resources/i18n/strings_bn.properties

@@ -185,10 +185,3 @@ vaultOptions.mount.mountPoint.directoryPickerButton=নির্বাচন ক
 #Retry If Readonly
 
 # Share Vault
-
-
-# Decrypt File Names
-
-
-# Event View
-## event list entries

src/main/resources/i18n/strings_bs.properties

@@ -321,10 +321,3 @@ quit.lockAndQuitBtn=Zaključaj i zatvori
 #Retry If Readonly
 
 # Share Vault
-
-
-# Decrypt File Names
-
-
-# Event View
-## event list entries

src/main/resources/i18n/strings_ca.properties

@@ -1,7 +1,6 @@
 # Locale Specific CSS files such as CJK, RTL,...
 
 # Generics
-generic.action.dismiss=Descartar
 ## Button
 generic.button.apply=Aplica
 generic.button.back=Enrere
@@ -177,7 +176,6 @@ hub.registerFailed.description.generic=S'ha produït un error en el procés de r
 hub.registerFailed.description.deviceAlreadyExists=El dispositiu ja ha estat registrat per un altre usuari. Mireu de canviar el compte d'usuari o feu servir un dispositiu diferent.
 ### Unauthorized
 hub.unauthorized.message=Accés denegat
-hub.unauthorized.description=No estàs autoritzat a obrir aquesta caixa forta. Contacta amb el seu propietari per obtenir accés.
 ### Requires Account Initialization
 hub.requireAccountInit.message=Acció necessària
 hub.requireAccountInit.description.0=Per a continuar, si us plau, seguiu els passos necessaris en el vostre
@@ -283,7 +281,7 @@ preferences.title=Preferències
 ## General
 preferences.general=General
 preferences.general.startHidden=Amaga la finestra quan s'inicia Cryptomator
-preferences.general.autoCloseVaults=Bloca les caixes fortes sense preguntar-ho en sortir de l'aplicació
+preferences.general.autoCloseVaults=Bloquejar les caixes fortes automàticament quan surti de l'aplicació
 preferences.general.debugLogging=Habilita el registre de depuració
 preferences.general.debugDirectory=Mostra els fitxers de registres
 preferences.general.autoStart=Executa Cryptomator en engegar el sistema
@@ -342,7 +340,6 @@ preferences.contribute.sponsor=Patrocinador
 
 ### Remove License Key Dialog
 removeCert.title=Suprimeix certificat
-removeCert.message=Eliminar certificat de col·laborador?
 removeCert.description=Les característiques principals de Cryptomator no es veuen afectades per això. Ni l'accés a les vostres caixes fortes s'ha restringit ni el nivell de seguretat ha estat rebaixat.
 #<-- Add entries for donations and code/translation/documentation contribution -->
 
@@ -423,6 +420,7 @@ main.vaultDetail.stats=Estadístiques de la caixa forta
 main.vaultDetail.locateEncryptedFileBtn=Trobar fitxer xifrat
 main.vaultDetail.locateEncryptedFileBtn.tooltip=Esculli un fitxer de la caixa forta per trobar el seu homòleg xifrat
 main.vaultDetail.encryptedPathsCopied=Rutes copiades al porta-retalls!
+main.vaultDetail.filePickerTitle=Seleccioni un fitxer dins la caixa forta
 ### Missing
 main.vaultDetail.missing.info=Cryptomator no ha trobat una caixa forta en aquesta ruta.
 main.vaultDetail.missing.recheck=Torna a comprovar
@@ -547,9 +545,6 @@ updateReminder.yesOnce=Sí, una vegada
 updateReminder.yesAutomatically=Sí, automàticament
 
 #Dokany Support End
-dokanySupportEnd.title=Avís d'obsolescència
-dokanySupportEnd.message=Fi de la compatibilitat amb Dokany
-dokanySupportEnd.description=El tipus de volum Dokany ja no és compatible amb Cryptomator. La teva configuració canviarà al tipus de volum predeterminat. Pots veure el tipus de volum predeterminat en la configuració.
 dokanySupportEnd.preferencesBtn=Obrir les Preferències
 
 #Retry If Readonly
@@ -572,10 +567,4 @@ shareVault.hub.message=Com compartir una caixa forta al Hub
 shareVault.hub.description=Per tal de compartir el contingut de la caixa forta amb un altre membre de l'equip, heu de seguir dos passos:
 shareVault.hub.instruction.1=1. Compartiu l'accés a la carpeta via emmagatzematge en el núvol.
 shareVault.hub.instruction.2=2. Doneu accés al membre de l'equip a Cryptomator Hub.
-shareVault.hub.openHub=Obre Cryptomator Hub
+shareVault.hub.openHub=Obre Cryptomator Hub
-
-# Decrypt File Names
-
-
-# Event View
-## event list entries

src/main/resources/i18n/strings_cs.properties

@@ -1,7 +1,6 @@
 # Locale Specific CSS files such as CJK, RTL,...
 
 # Generics
-generic.action.dismiss=Zrušit
 ## Button
 generic.button.apply=Použít
 generic.button.back=Zpět
@@ -273,6 +272,7 @@ preferences.title=Nastavení
 ## General
 preferences.general=Obecné
 preferences.general.startHidden=Skrýt okno Cryptomatoru při spuštění
+preferences.general.autoCloseVaults=Zamknout trezory automaticky při ukončení aplikace
 preferences.general.debugLogging=Ladicí režim
 preferences.general.debugDirectory=Ukázat soubory se záznamy událostí (log)
 preferences.general.autoStart=Spustit Cryptomator při spuštění systému
@@ -390,6 +390,7 @@ main.vaultDetail.stats=Statistiky trezoru
 main.vaultDetail.locateEncryptedFileBtn=Najít šifrovaný soubor
 main.vaultDetail.locateEncryptedFileBtn.tooltip=Vyberte soubor z vašeho trezoru, abyste našli jeho šifrovaný protějšek
 main.vaultDetail.encryptedPathsCopied=Cesta souboru byla zkopírována do schránky!
+main.vaultDetail.filePickerTitle=Vyberte soubor uvnitř trezoru
 ### Missing
 main.vaultDetail.missing.info=Cryptomator nemohl najít trezor na této cestě.
 main.vaultDetail.missing.recheck=Znovu zkontrolovat
@@ -533,10 +534,4 @@ shareVault.hub.message=Jak sdílet Hub trezor
 shareVault.hub.description=Chcete-li sdílet obsah trezoru s jiným členem týmu, musíte provést dva kroky:
 shareVault.hub.instruction.1=1. Sdílejte přístup ke šifrované složce trezoru prostřednictvím cloudového úložiště.
 shareVault.hub.instruction.2=2. Udělte přístup členovi týmu v Cryptomator Hubu.
-shareVault.hub.openHub=Otevřít Cryptomator Hub
+shareVault.hub.openHub=Otevřít Cryptomator Hub
-
-# Decrypt File Names
-
-
-# Event View
-## event list entries

src/main/resources/i18n/strings_da.properties

@@ -1,7 +1,6 @@
 # Locale Specific CSS files such as CJK, RTL,...
 
 # Generics
-generic.action.dismiss=Luk
 ## Button
 generic.button.apply=Anvend
 generic.button.back=Tilbage
@@ -283,6 +282,7 @@ preferences.title=Præferencer
 ## General
 preferences.general=Generelt
 preferences.general.startHidden=Skjul vinduet når Cryptomator starter
+preferences.general.autoCloseVaults=Lås åbne bokse automatisk, når programmet afsluttes
 preferences.general.debugLogging=Aktivér fejllogning
 preferences.general.debugDirectory=Vis logfiler
 preferences.general.autoStart=Start Cryptomator automatisk ved opstart
@@ -407,6 +407,7 @@ main.vaultDetail.stats=Boks statistik
 main.vaultDetail.locateEncryptedFileBtn=Find Krypteret Fil
 main.vaultDetail.locateEncryptedFileBtn.tooltip=Vælg en fil fra din boks for at finde dens krypterede modpart
 main.vaultDetail.encryptedPathsCopied=Stier kopieret!
+main.vaultDetail.filePickerTitle=Vælg fil inde i boks
 ### Missing
 main.vaultDetail.missing.info=Cryptomator kunne ikke finde en boks på denne sti.
 main.vaultDetail.missing.recheck=Kontrollér igen
@@ -553,10 +554,4 @@ shareVault.hub.message=Sådan deler du en Hub boks
 shareVault.hub.description=For at dele indholdet i boksen med et andet holdmedlem skal du udføre to trin:
 shareVault.hub.instruction.1=1. Del adgang til den krypterede boks-mappe vha. opbevaring i skyen.
 shareVault.hub.instruction.2=2. Giv adgang til holdmedlem i Cryptomator Hub.
-shareVault.hub.openHub=Åben Cryptomator Hub
+shareVault.hub.openHub=Åben Cryptomator Hub
-
-# Decrypt File Names
-
-
-# Event View
-## event list entries

src/main/resources/i18n/strings_de.properties

@@ -1,7 +1,6 @@
 # Locale Specific CSS files such as CJK, RTL,...
 
 # Generics
-generic.action.dismiss=Verwerfen
 ## Button
 generic.button.apply=Übernehmen
 generic.button.back=Zurück
@@ -177,7 +176,6 @@ hub.registerFailed.description.generic=Im Registrierungsprozess ist ein Fehler a
 hub.registerFailed.description.deviceAlreadyExists=Dieses Gerät ist bereits für einen anderen Benutzer registriert. Ändere das Benutzerkonto oder verwende ein anderes Gerät.
 ### Unauthorized
 hub.unauthorized.message=Zugriff verweigert
-hub.unauthorized.description=Du bist nicht berechtigt, diesen Tresor zu öffnen. Wende dich an den Tresoreigentümer, um Zugriff zu erhalten.
 ### Requires Account Initialization
 hub.requireAccountInit.message=Aktion erforderlich
 hub.requireAccountInit.description.0=Um fortzufahren, führe bitte die erforderlichen Schritte in deinem
@@ -395,7 +393,6 @@ main.vaultlist.contextMenu.vaultoptions=Tresoroptionen anzeigen
 main.vaultlist.contextMenu.reveal=Laufwerk anzeigen
 main.vaultlist.addVaultBtn.menuItemNew=Neuen Tresor erstellen...
 main.vaultlist.addVaultBtn.menuItemExisting=Bestehenden Tresor öffnen...
-main.vaultlist.showEventsButton.tooltip=Ereignis-Ansicht öffnen
 ##Notificaition
 main.notification.updateAvailable=Eine neue Version ist verfügbar.
 main.notification.support=Unterstütze Cryptomator.
@@ -424,9 +421,7 @@ main.vaultDetail.stats=Tresorstatistik
 main.vaultDetail.locateEncryptedFileBtn=Verschlüsselte Datei finden
 main.vaultDetail.locateEncryptedFileBtn.tooltip=Wähle eine Datei aus deinem Tresor aus, um das verschlüsselte Gegenstück zu finden
 main.vaultDetail.encryptedPathsCopied=Pfade in Zwischenablage kopiert!
-main.vaultDetail.locateEncrypted.filePickerTitle=Datei im Tresor auswählen
+main.vaultDetail.filePickerTitle=Datei im Tresor auswählen
-main.vaultDetail.decryptName.buttonLabel=Dateiname entschlüsseln
-main.vaultDetail.decryptName.tooltip=Wählen eine verschlüsselte Tresordatei, um ihren Namen zu entschlüsseln
 ### Missing
 main.vaultDetail.missing.info=Cryptomator konnte keinen Tresor mit diesem Pfad finden.
 main.vaultDetail.missing.recheck=Erneut prüfen
@@ -557,10 +552,6 @@ dokanySupportEnd.description=Der Laufwerkstyp Dokany wird von Cryptomator nicht
 dokanySupportEnd.preferencesBtn=Einstellungen öffnen
 
 #Retry If Readonly
-retryIfReadonly.title=Eingeschränkter Tresorzugriff
-retryIfReadonly.message=Kein Schreibzugriff auf Tresor
-retryIfReadonly.description=Cryptomator kann nicht in das Verzeichnis des Tresors schreiben. Du kannst den Tresor auf schreibgeschützt umstellen und es erneut versuchen. Diese Option kann in den Tresoroptionen deaktiviert werden.
-retryIfReadonly.retry=Ändern und wiederholen
 
 # Share Vault
 shareVault.title=Tresor teilen
@@ -580,43 +571,4 @@ shareVault.hub.message=Teilen eines Hub-Tresors
 shareVault.hub.description=Zur Freigabe des Tresorinhalts für ein anderes Teammitglied sind zwei Schritte erforderlich:
 shareVault.hub.instruction.1=1. Teile den Zugriff auf den verschlüsselten Tresorordner über den Cloud-Speicher.
 shareVault.hub.instruction.2=2. Füge das Teammitglied in Cryptomator Hub als Tresormitglied hinzu.
-shareVault.hub.openHub=Cryptomator Hub öffnen
+shareVault.hub.openHub=Cryptomator Hub öffnen
-
-# Decrypt File Names
-decryptNames.title=Dateinamen entschlüsseln
-decryptNames.filePicker.title=Verschlüsselte Datei auswählen
-decryptNames.filePicker.extensionDescription=Cryptomator-verschlüsselte Datei
-decryptNames.copyTable.tooltip=Tabelle kopieren
-decryptNames.clearTable.tooltip=Tabelle leeren
-decryptNames.copyHint=Inhalt der Zelle mit %s kopieren
-decryptNames.dropZone.message=Dateien ablegen oder zum Auswählen klicken
-decryptNames.dropZone.error.vaultInternalFiles=Tresor interne Dateien mit nicht-entschlüsselbaren Namen ausgewählt
-decryptNames.dropZone.error.foreignFiles=Dateien gehören nicht zum Tresor "%s"
-decryptNames.dropZone.error.noDirIdBackup=Verzeichnis der ausgewählten Dateien enthält keine dirId.c9r Datei
-decryptNames.dropZone.error.generic=Fehler beim Entschlüsseln der Dateinamen
-
-
-# Event View
-eventView.title=Ereignisse
-eventView.filter.allVaults=Alle
-eventView.clearListButton.tooltip=Liste leeren
-## event list entries
-eventView.entry.vaultLocked.description=Entsperre "%s" für Details
-eventView.entry.conflictResolved.message=Konflikt gelöst
-eventView.entry.conflictResolved.showDecrypted=Entschlüsselte Datei anzeigen
-eventView.entry.conflictResolved.copyDecrypted=Pfad der entschlüsselten Datei kopieren
-eventView.entry.conflict.message=Konfliktlösung fehlgeschlagen
-eventView.entry.conflict.showDecrypted=Entschlüsselte, ursprüngliche Datei anzeigen
-eventView.entry.conflict.copyDecrypted=Entschlüsselten, ursprünglicher Pfad kopieren
-eventView.entry.conflict.showEncrypted=Zeige verschlüsselte Konfliktdatei
-eventView.entry.conflict.copyEncrypted=Verschlüsselten Konfliktpfad kopieren
-eventView.entry.decryptionFailed.message=Entschlüsselung fehlgeschlagen
-eventView.entry.decryptionFailed.showEncrypted=Verschlüsselte Datei anzeigen
-eventView.entry.decryptionFailed.copyEncrypted=Pfad der verschlüsselten Datei kopieren
-eventView.entry.brokenDirFile.message=Ungültiger Verzeichnislink
-eventView.entry.brokenDirFile.showEncrypted=Defekten, verschlüsselten Link anzeigen
-eventView.entry.brokenDirFile.copyEncrypted=Pfad des ungültigen Links kopieren
-eventView.entry.brokenFileNode.message=Beschädigter Dateisystemknoten
-eventView.entry.brokenFileNode.showEncrypted=Beschädigten, verschlüsselten Knoten anzeigen
-eventView.entry.brokenFileNode.copyEncrypted=Pfad des beschädigten, verschlüsselten Knotens kopieren
-eventView.entry.brokenFileNode.copyDecrypted=Pfad der entschlüsselten Datei kopieren

src/main/resources/i18n/strings_el.properties

@@ -1,7 +1,6 @@
 # Locale Specific CSS files such as CJK, RTL,...
 
 # Generics
-generic.action.dismiss=Παράβλεψη
 ## Button
 generic.button.apply=Εφαρμογή
 generic.button.back=Πίσω
@@ -283,7 +282,7 @@ preferences.title=Προτιμήσεις
 ## General
 preferences.general=Γενικά
 preferences.general.startHidden=Απόκρυψη παραθύρου όταν ξεκινά το Cryptomator
-preferences.general.autoCloseVaults=Κλείδωμα κρυπτών χωρίς ερώτηση κατά την έξοδο από την εφαρμογή
+preferences.general.autoCloseVaults=Αυτόματο κλείδωμα ανοιγμένης κρύπτης κατά την έξοδο της εφαρμογής
 preferences.general.debugLogging=Ενεργοποίηση καταγραφής σφαλμάτων
 preferences.general.debugDirectory=Αποκάλυψη αρχείων καταγραφής
 preferences.general.autoStart=Εκκίνηση Cryptomator στην εκκίνηση του συστήματος
@@ -423,6 +422,7 @@ main.vaultDetail.stats=Στατιστικά Vault
 main.vaultDetail.locateEncryptedFileBtn=Εντοπισμός Κρυπτογραφημένου Αρχείου
 main.vaultDetail.locateEncryptedFileBtn.tooltip=Επιλέξτε ένα αρχείο από την κρύπτη σας για να εντοπίσετε το κρυπτογραφημένο αντίστοιχο
 main.vaultDetail.encryptedPathsCopied=Οι Διαδρομές Αντιγράφηκαν στο Πρόχειρο!
+main.vaultDetail.filePickerTitle=Επιλογή Αρχείου Μέσα Στην Κρύπτη
 ### Missing
 main.vaultDetail.missing.info=Cryptomator δεν βρήκε vault σε αυτόν τον κατάλογο.
 main.vaultDetail.missing.recheck=Επανέλεγχος
@@ -576,11 +576,4 @@ shareVault.hub.message=Πώς να μοιραστείτε μια κρύπτη Hu
 shareVault.hub.description=Για να μοιραστείτε το περιεχόμενο της κρύπτης με άλλο μέλος της ομάδας, πρέπει να εκτελέσετε δύο βήματα:
 shareVault.hub.instruction.1=1. Μοιραστείτε την πρόσβαση στον κρυπτογραφημένο φάκελο κρύπτης μέσω του χώρου αποθήκευσης στο cloud.
 shareVault.hub.instruction.2=2. Παραχωρήστε πρόσβαση σε μέλος της ομάδας στο Cryptomator Hub.
-shareVault.hub.openHub=Ανοίξτε το Cryptomator Hub
+shareVault.hub.openHub=Ανοίξτε το Cryptomator Hub
-
-# Decrypt File Names
-
-
-# Event View
-eventView.filter.allVaults=Όλες
-## event list entries

src/main/resources/i18n/strings_es.properties

@@ -1,7 +1,6 @@
 # Locale Specific CSS files such as CJK, RTL,...
 
 # Generics
-generic.action.dismiss=Descartar
 ## Button
 generic.button.apply=Aplicar
 generic.button.back=Volver
@@ -283,7 +282,7 @@ preferences.title=Preferencias
 ## General
 preferences.general=General
 preferences.general.startHidden=Ocultar ventana al iniciar Cryptomator
-preferences.general.autoCloseVaults=Bloquear bóvedas sin preguntar al salir de la aplicación
+preferences.general.autoCloseVaults=Bloquear automáticamente las bóvedas abiertas al salir de la aplicación
 preferences.general.debugLogging=Habilitar registro de depuración
 preferences.general.debugDirectory=Revelar archivos de registro
 preferences.general.autoStart=Cargar Cryptomator al iniciar el sistema
@@ -395,7 +394,6 @@ main.vaultlist.contextMenu.vaultoptions=Mostrar opciones de la bóveda
 main.vaultlist.contextMenu.reveal=Revelar unidad
 main.vaultlist.addVaultBtn.menuItemNew=Crear Bóveda Nueva...
 main.vaultlist.addVaultBtn.menuItemExisting=Abrir Bóveda Existente...
-main.vaultlist.showEventsButton.tooltip=Abrir vista de evento
 ##Notificaition
 main.notification.updateAvailable=Existen actualizaciones disponibles.
 main.notification.support=Soporte de Cryptomator.
@@ -424,9 +422,7 @@ main.vaultDetail.stats=Estadísticas de la bóveda
 main.vaultDetail.locateEncryptedFileBtn=Ubicar archivo cifrado
 main.vaultDetail.locateEncryptedFileBtn.tooltip=Elija un archivo de su bóveda para ubicar su contraparte cifrada
 main.vaultDetail.encryptedPathsCopied=¡Rutas copiadas al portapapeles!
-main.vaultDetail.locateEncrypted.filePickerTitle=Seleccionar archivo dentro de la bóveda
+main.vaultDetail.filePickerTitle=Seleccionar archivo dentro de la bóveda
-main.vaultDetail.decryptName.buttonLabel=Descifrar nombre de archivo
-main.vaultDetail.decryptName.tooltip=Elija un archivo de bóveda cifrado para descifrar su nombre
 ### Missing
 main.vaultDetail.missing.info=Cryptomator no pudo encontrar una bóveda en esta ruta.
 main.vaultDetail.missing.recheck=Volver a comprobar
@@ -580,43 +576,4 @@ shareVault.hub.message=Cómo compartir una bóveda de Hub
 shareVault.hub.description=Para compartir el contenido de la bóveda con otro miembro del equipo, tiene que realizar dos pasos:
 shareVault.hub.instruction.1=1. Comparta el acceso a la carpeta de la bóveda cifrada a través del almacenamiento en la nube.
 shareVault.hub.instruction.2=2. Conceda el acceso al miembro del equipo en Cryptomator Hub.
-shareVault.hub.openHub=Abrir Cryptomator Hub
+shareVault.hub.openHub=Abrir Cryptomator Hub
-
-# Decrypt File Names
-decryptNames.title=Descifrar nombre de archivos
-decryptNames.filePicker.title=Seleccione archivo cifrado
-decryptNames.filePicker.extensionDescription=Archivo cifrado Cryptomator
-decryptNames.copyTable.tooltip=Copiar tabla
-decryptNames.clearTable.tooltip=Limpiar tabla
-decryptNames.copyHint=Copiar contenido de celda con %s
-decryptNames.dropZone.message=Soltar archivos o hacer clic para seleccionar
-decryptNames.dropZone.error.vaultInternalFiles=Archivos internos de la bóveda sin nombre descifrable seleccionado
-decryptNames.dropZone.error.foreignFiles=Los archivos no pertenecen a la bóveda "%s"
-decryptNames.dropZone.error.noDirIdBackup=El directorio de los archivos seleccionados no contiene el archivo dirId.c9r
-decryptNames.dropZone.error.generic=Error al descifrar nombre de archivos
-
-
-# Event View
-eventView.title=Eventos
-eventView.filter.allVaults=Todos
-eventView.clearListButton.tooltip=Borrar lista
-## event list entries
-eventView.entry.vaultLocked.description=Desbloquear "%s" para más detalles
-eventView.entry.conflictResolved.message=Conflicto resuelto
-eventView.entry.conflictResolved.showDecrypted=Mostrar archivo descifrado
-eventView.entry.conflictResolved.copyDecrypted=Copiar ruta descifrada
-eventView.entry.conflict.message=Resolución de conflictos fallida
-eventView.entry.conflict.showDecrypted=Mostrar archivo descifrado, original
-eventView.entry.conflict.copyDecrypted=Copiar ruta descifrada, original
-eventView.entry.conflict.showEncrypted=Mostrar archivo en conflicto, cifrado
-eventView.entry.conflict.copyEncrypted=Copiar ruta en conflicto, cifrada
-eventView.entry.decryptionFailed.message=Desencriptación fallida
-eventView.entry.decryptionFailed.showEncrypted=Mostrar archivo cifrado
-eventView.entry.decryptionFailed.copyEncrypted=Copiar ruta cifrada
-eventView.entry.brokenDirFile.message=Enlace de directorio roto
-eventView.entry.brokenDirFile.showEncrypted=Mostrar enlace roto, cifrado
-eventView.entry.brokenDirFile.copyEncrypted=Copiar ruta del enlace roto
-eventView.entry.brokenFileNode.message=Nodo de sistema de archivos roto
-eventView.entry.brokenFileNode.showEncrypted=Mostrar nodo roto, cifrado
-eventView.entry.brokenFileNode.copyEncrypted=Copiar ruta del enlace roto, encriptado
-eventView.entry.brokenFileNode.copyDecrypted=Copiar ruta descifrada

src/main/resources/i18n/strings_fa.properties

@@ -1,9 +1,8 @@
 # Locale Specific CSS files such as CJK, RTL,...
 
 # Generics
-generic.action.dismiss=لغو
 ## Button
-generic.button.apply=اعمال
+generic.button.apply=درخواست
 generic.button.back=بازگشت
 generic.button.cancel=انصراف
 generic.button.change=تغییر
@@ -107,14 +106,11 @@ addvaultwizard.existing.chooseBtn=انتخاب کنید…
 unlock.unlockBtn=بازکردن قفل
 ## Select
 ## Success
-unlock.success.revealBtn=نمایش درایو
 ## Failure
 ## Hub
-hub.noKeychain.openBtn=باز کردن تنظیمات
 ### Waiting
 ### Receive Key
 ### Register Device
-hub.register.message=دستگاه جدید
 ### Register Device Legacy
 ### Registration Success
 hub.registerSuccess.unlockBtn=بازکردن قفل
@@ -174,13 +170,11 @@ preferences.updates.upToDate=Cryptomator به روز می باشد.
 # Main Window
 ## Vault List
 main.vaultlist.contextMenu.lock=قفل
-main.vaultlist.contextMenu.reveal=نمایش درایو
 ##Notificaition
 ## Vault Detail
 ### Welcome
 ### Locked
 ### Unlocked
-main.vaultDetail.revealBtn=نمایش درایو
 main.vaultDetail.lockBtn=قفل
 ### Missing
 ### Needs Migration
@@ -191,7 +185,6 @@ main.vaultDetail.lockBtn=قفل
 # Vault Options
 ## General
 vaultOptions.general.vaultName=نام گاوصندوق
-vaultOptions.general.actionAfterUnlock.reveal=نمایش درایو
 
 ## Mount
 vaultOptions.mount.mountPoint.directoryPickerButton=انتخاب کنید…
@@ -216,15 +209,7 @@ vaultOptions.mount.mountPoint.directoryPickerButton=انتخاب کنید…
 # Update Reminder
 
 #Dokany Support End
-dokanySupportEnd.preferencesBtn=باز کردن تنظیمات
 
 #Retry If Readonly
 
 # Share Vault
-
-
-# Decrypt File Names
-
-
-# Event View
-## event list entries