diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 470bbf76f..521edeedd 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -118,6 +118,7 @@ jobs: --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 "--sun-misc-unsafe-memory-access=allow" --java-options "-Xss5m" --java-options "-Xmx256m" --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\"" diff --git a/.github/workflows/mac-dmg-x64.yml b/.github/workflows/mac-dmg-x64.yml index dda3ac4eb..0a52e71a8 100644 --- a/.github/workflows/mac-dmg-x64.yml +++ b/.github/workflows/mac-dmg-x64.yml @@ -121,6 +121,7 @@ jobs: --app-version "${{ needs.get-version.outputs.semVerNum }}" --java-options "--enable-preview" --java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.mac" + --java-options "--sun-misc-unsafe-memory-access=allow" --java-options "-Xss5m" --java-options "-Xmx256m" --java-options "-Dfile.encoding=\"utf-8\"" diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 8ff1783e2..29b4a4b0c 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -119,6 +119,7 @@ jobs: --app-version "${{ needs.get-version.outputs.semVerNum }}" --java-options "--enable-preview" --java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.mac" + --java-options "--sun-misc-unsafe-memory-access=allow" --java-options "-Xss5m" --java-options "-Xmx256m" --java-options "-Dfile.encoding=\"utf-8\"" diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index c31af3fff..cfbbc05a7 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -145,6 +145,7 @@ jobs: --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 "--sun-misc-unsafe-memory-access=allow" --java-options "-Xss5m" --java-options "-Xmx256m" --java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\"" diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index 73bb62e3c..f69f4a789 100755 --- a/dist/linux/debian/rules +++ b/dist/linux/debian/rules @@ -45,6 +45,7 @@ override_dh_auto_build: --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 "--sun-misc-unsafe-memory-access=allow" \ --copyright "(C) 2016 - 2025 Skymatic GmbH" \ --java-options "-Xss5m" \ --java-options "-Xmx256m" \ diff --git a/pom.xml b/pom.xml index acd936ae1..62d1eb2d3 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 3.17.0 2.56.2 2.2 - 2.19.0 + 2.19.1 24.0.1 4.5.0 9.37.3 diff --git a/src/main/java/org/cryptomator/common/settings/Settings.java b/src/main/java/org/cryptomator/common/settings/Settings.java index 0f043b963..b382cd1ac 100644 --- a/src/main/java/org/cryptomator/common/settings/Settings.java +++ b/src/main/java/org/cryptomator/common/settings/Settings.java @@ -148,8 +148,8 @@ public class Settings { @SuppressWarnings("deprecation") private void migrateLegacySettings(SettingsJson json) { // migrate renamed keychainAccess - if(this.keychainProvider.getValueSafe().equals("org.cryptomator.linux.SecretServiceKeychainAccess")) { - this.keychainProvider.setValue("org.cryptomator.linux.GnomeKeyringKeychainAccess"); + 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": diff --git a/src/main/java/org/cryptomator/logging/LogbackConfigurator.java b/src/main/java/org/cryptomator/logging/LogbackConfigurator.java index 3b77993cc..7e8b9e6c4 100644 --- a/src/main/java/org/cryptomator/logging/LogbackConfigurator.java +++ b/src/main/java/org/cryptomator/logging/LogbackConfigurator.java @@ -90,6 +90,9 @@ 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; } diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java b/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java index a25384c78..a38929a35 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java +++ b/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("\\uc1\\u").append(c); + sb.append("\\u").append(c); } }); } diff --git a/src/main/resources/i18n/strings_fi.properties b/src/main/resources/i18n/strings_fi.properties index 397d38ccb..3ab91964b 100644 --- a/src/main/resources/i18n/strings_fi.properties +++ b/src/main/resources/i18n/strings_fi.properties @@ -442,6 +442,7 @@ main.vaultDetail.error.windowTitle=Virhe ladatessa holvia # Wrong File Alert wrongFileAlert.title=Kuinka tiedostoja salataan wrongFileAlert.message=Yritkö salata nämä tiedostot? +wrongFileAlert.description=Tätä varten Cryptomator luo levyn järjestelmäsi tiedostonhallintaan. wrongFileAlert.instruction.0=Salaa tiedostot seuraavasti: wrongFileAlert.instruction.1=1. Avaa holvisi. wrongFileAlert.instruction.2=2. Klikkaa "Paljasta" avataksesi aseman tiedostoselaimessasi. diff --git a/src/test/java/org/cryptomator/ui/addvaultwizard/ReadMeGeneratorTest.java b/src/test/java/org/cryptomator/ui/addvaultwizard/ReadMeGeneratorTest.java index 10451daa2..fe681531f 100644 --- a/src/test/java/org/cryptomator/ui/addvaultwizard/ReadMeGeneratorTest.java +++ b/src/test/java/org/cryptomator/ui/addvaultwizard/ReadMeGeneratorTest.java @@ -16,7 +16,7 @@ public class ReadMeGeneratorTest { @CsvSource({ // "test,test", // "t\u00E4st,t\\'E4st", // - "t\uD83D\uDE09st,t\\uc1\\u55357\\uc1\\u56841st", // + "t\uD83D\uDE09st,t\\u55357\\u56841st", // }) public void testEscapeNonAsciiChars(String input, String expectedResult) { ReadmeGenerator readmeGenerator = new ReadmeGenerator(null); @@ -40,7 +40,7 @@ public class ReadMeGeneratorTest { MatcherAssert.assertThat(result, CoreMatchers.startsWith("{\\rtf1\\fbidis\\ansi\\uc0\\fs32")); MatcherAssert.assertThat(result, CoreMatchers.containsString("{\\sa80 Dear User,}\\par")); MatcherAssert.assertThat(result, CoreMatchers.containsString("{\\sa80 \\b please don't touch the \"d\" directory.}\\par ")); - MatcherAssert.assertThat(result, CoreMatchers.containsString("{\\sa80 Thank you for your cooperation \\uc1\\u55357\\uc1\\u56841}\\par")); + MatcherAssert.assertThat(result, CoreMatchers.containsString("{\\sa80 Thank you for your cooperation \\u55357\\u56841}\\par")); MatcherAssert.assertThat(result, CoreMatchers.endsWith("}")); }