From 7331144f9d0f0d807c74c93934d34ab6ad5f2d5f Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Thu, 12 Mar 2026 13:13:49 +0100 Subject: [PATCH] Set cryptomator.hub.enableTrustOnFirstUse (#4182) in installers/package containers --- .github/workflows/appimage.yml | 1 + .github/workflows/mac-dmg-x64.yml | 1 + .github/workflows/mac-dmg.yml | 1 + .github/workflows/win-exe.yml | 1 + dist/linux/appimage/build.sh | 1 + dist/linux/debian/rules | 1 + dist/linux/makepkg/PKGBUILD.template | 1 + dist/mac/dmg/build.sh | 1 + dist/win/build.ps1 | 1 + 9 files changed, 9 insertions(+) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 04d92fa3f..b12a74569 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -144,6 +144,7 @@ jobs: --java-options "-Dcryptomator.integrationsLinux.trayIconsDir=\"@{appdir}/usr/share/icons/hicolor/symbolic/apps\"" --java-options "-Dcryptomator.buildNumber=\"appimage-${REV_NUM}\"" --java-options "-Dcryptomator.networking.truststore.p12Path=\"/etc/cryptomator/certs.p12\"" + --java-options "-Dcryptomator.hub.enableTrustOnFirstUse=true" --java-options "-XX:ErrorFile=/cryptomator/cryptomator_crash.log" --resource-dir dist/linux/resources - name: Patch Cryptomator.AppDir diff --git a/.github/workflows/mac-dmg-x64.yml b/.github/workflows/mac-dmg-x64.yml index bdb66d667..8454fed14 100644 --- a/.github/workflows/mac-dmg-x64.yml +++ b/.github/workflows/mac-dmg-x64.yml @@ -138,6 +138,7 @@ jobs: --java-options "-Dcryptomator.showTrayIcon=true" --java-options "-Dcryptomator.updateMechanism=org.cryptomator.macos.update.DmgUpdateMechanism" --java-options "-Dcryptomator.buildNumber=\"dmg-${{ needs.get-version.outputs.revNum }}\"" + --java-options "-Dcryptomator.hub.enableTrustOnFirstUse=true" --mac-package-identifier org.cryptomator --resource-dir dist/mac/resources - name: Patch Cryptomator.app diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 743586153..b4a456782 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -137,6 +137,7 @@ jobs: --java-options "-Dcryptomator.updateMechanism=org.cryptomator.macos.update.DmgUpdateMechanism" --java-options "-Dcryptomator.buildNumber=\"dmg-${{ needs.get-version.outputs.revNum }}\"" --java-options "-XX:ErrorFile=/cryptomator/cryptomator_crash.log" + --java-options "-Dcryptomator.hub.enableTrustOnFirstUse=true" --mac-package-identifier org.cryptomator --resource-dir dist/mac/resources - name: Patch Cryptomator.app diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 1e36d0af4..b452acaf3 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -157,6 +157,7 @@ jobs: --java-options "-Dcryptomator.integrationsWin.windowsHelloKeychainPaths=\"@{appdata}/Cryptomator/windowsHelloKeychain.json\"" --java-options "-Dcryptomator.disableUpdateCheck=false" --java-options "-XX:ErrorFile=C:/cryptomator/cryptomator_crash.log" + --java-options "-Dcryptomator.hub.enableTrustOnFirstUse=true" --resource-dir dist/win/resources --icon dist/win/resources/Cryptomator.ico --add-launcher "Cryptomator (Debug)=dist/win/debug-launcher.properties" diff --git a/dist/linux/appimage/build.sh b/dist/linux/appimage/build.sh index f12fb4cbf..8beb229de 100755 --- a/dist/linux/appimage/build.sh +++ b/dist/linux/appimage/build.sh @@ -99,6 +99,7 @@ ${JAVA_HOME}/bin/jpackage \ --java-options "-Dcryptomator.buildNumber=\"appimage-${REVISION_NO}\"" \ --java-options "-Dcryptomator.networking.truststore.p12Path=\"/etc/cryptomator/certs.p12\"" \ --java-options "-XX:ErrorFile=/cryptomator/cryptomator_crash.log" \ + --java-options "-Dcryptomator.hub.enableTrustOnFirstUse=true" \ --resource-dir ../resources # transform AppDir diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index fef465b65..0fefef2e0 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -64,6 +64,7 @@ override_dh_auto_build: --java-options "-Dcryptomator.disableUpdateCheck=\"${DISABLE_UPDATE_CHECK}\"" \ --java-options "-Dcryptomator.integrationsLinux.autoStartCmd=\"cryptomator\"" \ --java-options "-Dcryptomator.networking.truststore.p12Path=\"/etc/cryptomator/certs.p12\"" \ + --java-options "-Dcryptomator.hub.enableTrustOnFirstUse=true" \ --app-version "${VERSION_NUM}.${REVISION_NUM}" \ --resource-dir resources \ --verbose diff --git a/dist/linux/makepkg/PKGBUILD.template b/dist/linux/makepkg/PKGBUILD.template index 003ca8c47..e29a4396c 100644 --- a/dist/linux/makepkg/PKGBUILD.template +++ b/dist/linux/makepkg/PKGBUILD.template @@ -94,6 +94,7 @@ build() { --java-options "-Dcryptomator.p12Path=\"@{userhome}/.config/Cryptomator/key.p12\"" \ --java-options "-Dcryptomator.settingsPath=\"@{userhome}/.config/Cryptomator/settings.json:~/.Cryptomator/settings.json\"" \ --java-options "-Dcryptomator.showTrayIcon=true" \ + --java-options "-Dcryptomator.hub.enableTrustOnFirstUse=true" \ --app-version "${pkgver//_*/}" \ --verbose } diff --git a/dist/mac/dmg/build.sh b/dist/mac/dmg/build.sh index 3a8ac2d70..53abb794f 100755 --- a/dist/mac/dmg/build.sh +++ b/dist/mac/dmg/build.sh @@ -125,6 +125,7 @@ ${JAVA_HOME}/bin/jpackage \ --java-options "-Dcryptomator.showTrayIcon=true" \ --java-options "-Dcryptomator.updateMechanism=org.cryptomator.macos.update.DmgUpdateMechanism" \ --java-options "-Dcryptomator.buildNumber=\"dmg-${REVISION_NO}\"" \ + --java-options "-Dcryptomator.hub.enableTrustOnFirstUse=true" \ --mac-package-identifier ${PACKAGE_IDENTIFIER} \ --resource-dir ../resources diff --git a/dist/win/build.ps1 b/dist/win/build.ps1 index 82f5125b9..cd5fa805d 100644 --- a/dist/win/build.ps1 +++ b/dist/win/build.ps1 @@ -167,6 +167,7 @@ $javaOptions = @( "--java-options", "-Dcryptomator.showTrayIcon=true" "--java-options", "-Dcryptomator.buildNumber=`"msi-$revisionNo`"" "--java-options", "-Dcryptomator.disableUpdateCheck=false" +"--java-options", "-Dcryptomator.hub.enableTrustOnFirstUse=true" )