From 10c60d749236934dc298d96daf91b22eefcc0fbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ju=CC=88rgen=20Kleer?= Date: Wed, 26 Apr 2023 15:24:50 +0200 Subject: [PATCH 01/18] https://github.com/cryptomator/cryptomator/issues/2813 > List of languages should have system default, English and then all other languages in alphabetic order. > That is, in alphabetic order with respect to the language the list is localized in (seems to be English always) --- .../launcher/SupportedLanguages.java | 21 +++++++++++++------ .../InterfacePreferencesController.java | 11 +++++----- .../launcher/SupportedLanguagesTest.java | 2 +- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java index 760fb1168..988641fa8 100644 --- a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java +++ b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java @@ -7,6 +7,8 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; import javax.inject.Singleton; +import java.text.Collator; +import java.util.Arrays; import java.util.List; import java.util.Locale; @@ -14,10 +16,12 @@ import java.util.Locale; public class SupportedLanguages { private static final Logger LOG = LoggerFactory.getLogger(SupportedLanguages.class); - // these are BCP 47 language codes, not ISO. Note the "-" instead of the "_": - public static final List LANGUAGAE_TAGS = List.of("en", "ar", "be", "bn", "bs", "ca", "cs", "da", "de", "el", "es", "fil", "fa", "fr", "gl", "he", // + // these are BCP 47 language codes, not ISO. Note the "-" instead of the "_". + // "en" is not part of this list - it is always inserted at the top. + public static final List LANGUAGE_TAGS = Arrays.asList("ar", "be", "bn", "bs", "ca", "cs", "da", "de", "el", "es", "fil", "fa", "fr", "gl", "he", // "hi", "hr", "hu", "id", "it", "ja", "ko", "lv", "mk", "nb", "nl", "nn", "no", "pa", "pl", "pt", "pt-BR", "ro", "ru", "si", "sk", "sr", "sr-Latn", "sv", "sw", // "ta", "te", "th", "tr", "uk", "vi", "zh", "zh-HK", "zh-TW"); + public static final String ENGLISH = "en"; @Nullable private final String preferredLanguage; @@ -30,10 +34,15 @@ public class SupportedLanguages { public void applyPreferred() { if (preferredLanguage == null) { LOG.debug("Using system locale"); - return; + } else { + var preferredLocale = Locale.forLanguageTag(preferredLanguage); + LOG.debug("Applying preferred locale {}", preferredLocale.getDisplayName(Locale.ENGLISH)); + Locale.setDefault(preferredLocale); } - var preferredLocale = Locale.forLanguageTag(preferredLanguage); - LOG.debug("Applying preferred locale {}", preferredLocale.getDisplayName(Locale.ENGLISH)); - Locale.setDefault(preferredLocale); + SupportedLanguages.LANGUAGE_TAGS.sort((a, b) -> { + var collator = Collator.getInstance(Locale.getDefault()); + collator.setStrength(Collator.PRIMARY); + return collator.compare(Locale.forLanguageTag(a).getDisplayName(), Locale.forLanguageTag(b).getDisplayName()); + }); } } diff --git a/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java index dd463b9e3..9cc94a83f 100644 --- a/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java +++ b/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java @@ -1,6 +1,5 @@ package org.cryptomator.ui.preferences; -import com.google.common.base.Strings; import org.cryptomator.common.LicenseHolder; import org.cryptomator.common.settings.Settings; import org.cryptomator.common.settings.UiTheme; @@ -66,8 +65,10 @@ public class InterfacePreferencesController implements FxController { showTrayIconCheckbox.selectedProperty().bindBidirectional(settings.showTrayIcon()); - preferredLanguageChoiceBox.getItems().add(null); - preferredLanguageChoiceBox.getItems().addAll(SupportedLanguages.LANGUAGAE_TAGS); + // System default and English at the top of the list + preferredLanguageChoiceBox.getItems().add(Settings.DEFAULT_LANGUAGE); + preferredLanguageChoiceBox.getItems().add(SupportedLanguages.ENGLISH); + preferredLanguageChoiceBox.getItems().addAll(SupportedLanguages.LANGUAGE_TAGS); preferredLanguageChoiceBox.valueProperty().bindBidirectional(settings.languageProperty()); preferredLanguageChoiceBox.setConverter(new LanguageTagConverter(resourceBundle)); @@ -141,9 +142,7 @@ public class InterfacePreferencesController implements FxController { return resourceBundle.getString("preferences.interface.language.auto"); } else { var locale = Locale.forLanguageTag(tag); - var lang = locale.getDisplayLanguage(locale); - var region = locale.getDisplayCountry(locale); - return lang + (Strings.isNullOrEmpty(region) ? "" : " (" + region + ")"); + return locale.getDisplayName(); } } diff --git a/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java b/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java index 7d76409e8..8ea48465b 100644 --- a/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java +++ b/src/test/java/org/cryptomator/launcher/SupportedLanguagesTest.java @@ -25,7 +25,7 @@ public class SupportedLanguagesTest { } public static Stream languageTags() { - return SupportedLanguages.LANGUAGAE_TAGS.stream() // + return SupportedLanguages.LANGUAGE_TAGS.stream() // .filter(tag -> !"en".equals(tag)); // english uses the default bundle } } \ No newline at end of file From 8e7e7de358aca956af8c9237d22e5d09b8c09706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ju=CC=88rgen=20Kleer?= Date: Wed, 26 Apr 2023 17:34:47 +0200 Subject: [PATCH 02/18] Refactoring make LANGUAGE_TAGS private and provide a getter --- .../org/cryptomator/launcher/Cryptomator.java | 5 +--- .../launcher/SupportedLanguages.java | 28 +++++++++++-------- .../InterfacePreferencesController.java | 9 +++--- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/org/cryptomator/launcher/Cryptomator.java b/src/main/java/org/cryptomator/launcher/Cryptomator.java index 2b066c730..c8f0dd3d3 100644 --- a/src/main/java/org/cryptomator/launcher/Cryptomator.java +++ b/src/main/java/org/cryptomator/launcher/Cryptomator.java @@ -35,15 +35,13 @@ public class Cryptomator { private static final Logger LOG = LoggerFactory.getLogger(Cryptomator.class); private final DebugMode debugMode; - private final SupportedLanguages supportedLanguages; private final Environment env; private final Lazy ipcMessageHandler; private final ShutdownHook shutdownHook; @Inject - Cryptomator(DebugMode debugMode, SupportedLanguages supportedLanguages, Environment env, Lazy ipcMessageHandler, ShutdownHook shutdownHook) { + Cryptomator(DebugMode debugMode, Environment env, Lazy ipcMessageHandler, ShutdownHook shutdownHook) { this.debugMode = debugMode; - this.supportedLanguages = supportedLanguages; this.env = env; this.ipcMessageHandler = ipcMessageHandler; this.shutdownHook = shutdownHook; @@ -80,7 +78,6 @@ public class Cryptomator { LOG.debug("Dagger graph initialized after {}ms", System.currentTimeMillis() - STARTUP_TIME); LOG.info("Starting Cryptomator {} on {} {} ({})", env.getAppVersion(), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH); debugMode.initialize(); - supportedLanguages.applyPreferred(); /* * Attempts to create an IPC connection to a running Cryptomator instance and sends it the given args. diff --git a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java index 988641fa8..e50b7b29a 100644 --- a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java +++ b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java @@ -1,16 +1,16 @@ package org.cryptomator.launcher; import org.cryptomator.common.settings.Settings; -import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.inject.Inject; import javax.inject.Singleton; import java.text.Collator; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Locale; +import java.util.stream.Collectors; @Singleton public class SupportedLanguages { @@ -18,20 +18,16 @@ public class SupportedLanguages { private static final Logger LOG = LoggerFactory.getLogger(SupportedLanguages.class); // these are BCP 47 language codes, not ISO. Note the "-" instead of the "_". // "en" is not part of this list - it is always inserted at the top. - public static final List LANGUAGE_TAGS = Arrays.asList("ar", "be", "bn", "bs", "ca", "cs", "da", "de", "el", "es", "fil", "fa", "fr", "gl", "he", // + public static final List LANGUAGE_TAGS = List.of("ar", "be", "bn", "bs", "ca", "cs", "da", "de", "el", "es", "fil", "fa", "fr", "gl", "he", // "hi", "hr", "hu", "id", "it", "ja", "ko", "lv", "mk", "nb", "nl", "nn", "no", "pa", "pl", "pt", "pt-BR", "ro", "ru", "si", "sk", "sr", "sr-Latn", "sv", "sw", // "ta", "te", "th", "tr", "uk", "vi", "zh", "zh-HK", "zh-TW"); - public static final String ENGLISH = "en"; + public static final String ENGLISH = "en"; - @Nullable - private final String preferredLanguage; + private final List sortedLanguageTags; @Inject public SupportedLanguages(Settings settings) { - this.preferredLanguage = settings.languageProperty().get(); - } - - public void applyPreferred() { + var preferredLanguage = settings.languageProperty().get(); if (preferredLanguage == null) { LOG.debug("Using system locale"); } else { @@ -39,10 +35,18 @@ public class SupportedLanguages { LOG.debug("Applying preferred locale {}", preferredLocale.getDisplayName(Locale.ENGLISH)); Locale.setDefault(preferredLocale); } - SupportedLanguages.LANGUAGE_TAGS.sort((a, b) -> { + sortedLanguageTags = LANGUAGE_TAGS.stream().sorted((a, b) -> { var collator = Collator.getInstance(Locale.getDefault()); collator.setStrength(Collator.PRIMARY); return collator.compare(Locale.forLanguageTag(a).getDisplayName(), Locale.forLanguageTag(b).getDisplayName()); - }); + }).collect(Collectors.toList()); + sortedLanguageTags.add(0, Settings.DEFAULT_LANGUAGE); + sortedLanguageTags.add(1, ENGLISH); + } + + public List getLanguageTags() { + return Collections.unmodifiableList(sortedLanguageTags); + } + } diff --git a/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java index 9cc94a83f..05b733f86 100644 --- a/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java +++ b/src/main/java/org/cryptomator/ui/preferences/InterfacePreferencesController.java @@ -34,6 +34,7 @@ public class InterfacePreferencesController implements FxController { private final ObjectProperty selectedTabProperty; private final LicenseHolder licenseHolder; private final ResourceBundle resourceBundle; + private final SupportedLanguages supportedLanguages; public ChoiceBox themeChoiceBox; public CheckBox showMinimizeButtonCheckbox; public CheckBox showTrayIconCheckbox; @@ -43,13 +44,14 @@ public class InterfacePreferencesController implements FxController { public RadioButton nodeOrientationRtl; @Inject - InterfacePreferencesController(Settings settings, TrayMenuComponent trayMenu, ObjectProperty selectedTabProperty, LicenseHolder licenseHolder, ResourceBundle resourceBundle) { + InterfacePreferencesController(Settings settings, SupportedLanguages supportedLanguages, TrayMenuComponent trayMenu, ObjectProperty selectedTabProperty, LicenseHolder licenseHolder, ResourceBundle resourceBundle) { this.settings = settings; this.trayMenuInitialized = trayMenu.isInitialized(); this.trayMenuSupported = trayMenu.isSupported(); this.selectedTabProperty = selectedTabProperty; this.licenseHolder = licenseHolder; this.resourceBundle = resourceBundle; + this.supportedLanguages = supportedLanguages; } @FXML @@ -65,10 +67,7 @@ public class InterfacePreferencesController implements FxController { showTrayIconCheckbox.selectedProperty().bindBidirectional(settings.showTrayIcon()); - // System default and English at the top of the list - preferredLanguageChoiceBox.getItems().add(Settings.DEFAULT_LANGUAGE); - preferredLanguageChoiceBox.getItems().add(SupportedLanguages.ENGLISH); - preferredLanguageChoiceBox.getItems().addAll(SupportedLanguages.LANGUAGE_TAGS); + preferredLanguageChoiceBox.getItems().addAll(supportedLanguages.getLanguageTags()); preferredLanguageChoiceBox.valueProperty().bindBidirectional(settings.languageProperty()); preferredLanguageChoiceBox.setConverter(new LanguageTagConverter(resourceBundle)); From 7d62fc78de92627f916da5c0561f8103220b543d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ju=CC=88rgen=20Kleer?= Date: Thu, 27 Apr 2023 18:03:41 +0200 Subject: [PATCH 03/18] Set preferred locale in constructor, make it default in applyPreferred --- .../org/cryptomator/launcher/Cryptomator.java | 5 +++- .../launcher/SupportedLanguages.java | 25 ++++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/cryptomator/launcher/Cryptomator.java b/src/main/java/org/cryptomator/launcher/Cryptomator.java index c8f0dd3d3..2b066c730 100644 --- a/src/main/java/org/cryptomator/launcher/Cryptomator.java +++ b/src/main/java/org/cryptomator/launcher/Cryptomator.java @@ -35,13 +35,15 @@ public class Cryptomator { private static final Logger LOG = LoggerFactory.getLogger(Cryptomator.class); private final DebugMode debugMode; + private final SupportedLanguages supportedLanguages; private final Environment env; private final Lazy ipcMessageHandler; private final ShutdownHook shutdownHook; @Inject - Cryptomator(DebugMode debugMode, Environment env, Lazy ipcMessageHandler, ShutdownHook shutdownHook) { + Cryptomator(DebugMode debugMode, SupportedLanguages supportedLanguages, Environment env, Lazy ipcMessageHandler, ShutdownHook shutdownHook) { this.debugMode = debugMode; + this.supportedLanguages = supportedLanguages; this.env = env; this.ipcMessageHandler = ipcMessageHandler; this.shutdownHook = shutdownHook; @@ -78,6 +80,7 @@ public class Cryptomator { LOG.debug("Dagger graph initialized after {}ms", System.currentTimeMillis() - STARTUP_TIME); LOG.info("Starting Cryptomator {} on {} {} ({})", env.getAppVersion(), SystemUtils.OS_NAME, SystemUtils.OS_VERSION, SystemUtils.OS_ARCH); debugMode.initialize(); + supportedLanguages.applyPreferred(); /* * Attempts to create an IPC connection to a running Cryptomator instance and sends it the given args. diff --git a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java index e50b7b29a..23d3e8fe0 100644 --- a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java +++ b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java @@ -25,28 +25,29 @@ public class SupportedLanguages { private final List sortedLanguageTags; + private final Locale preferredLocale; + @Inject public SupportedLanguages(Settings settings) { var preferredLanguage = settings.languageProperty().get(); - if (preferredLanguage == null) { - LOG.debug("Using system locale"); - } else { - var preferredLocale = Locale.forLanguageTag(preferredLanguage); - LOG.debug("Applying preferred locale {}", preferredLocale.getDisplayName(Locale.ENGLISH)); - Locale.setDefault(preferredLocale); - } - sortedLanguageTags = LANGUAGE_TAGS.stream().sorted((a, b) -> { - var collator = Collator.getInstance(Locale.getDefault()); + preferredLocale = preferredLanguage == null ? Locale.getDefault() : Locale.forLanguageTag(preferredLanguage); + var sorted = LANGUAGE_TAGS.stream().sorted((a, b) -> { + var collator = Collator.getInstance(preferredLocale); collator.setStrength(Collator.PRIMARY); return collator.compare(Locale.forLanguageTag(a).getDisplayName(), Locale.forLanguageTag(b).getDisplayName()); }).collect(Collectors.toList()); - sortedLanguageTags.add(0, Settings.DEFAULT_LANGUAGE); - sortedLanguageTags.add(1, ENGLISH); + sorted.add(0, Settings.DEFAULT_LANGUAGE); + sorted.add(1, ENGLISH); + sortedLanguageTags = Collections.unmodifiableList(sorted); + } + public void applyPreferred() { + LOG.debug("Using locale {}", preferredLocale); + Locale.setDefault(preferredLocale); } public List getLanguageTags() { - return Collections.unmodifiableList(sortedLanguageTags); + return sortedLanguageTags; } } From 9297562c99be7e9bd6ddbc266c2776f5ecc7ae4d Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 5 May 2023 10:52:51 +0200 Subject: [PATCH 04/18] improve auto-generated release notes [ci skip] --- .github/release.yml | 23 +++++++++++++++++++++++ .github/workflows/build.yml | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 .github/release.yml diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 000000000..9f091a4d6 --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,23 @@ +# .github/release.yml +# see https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuring-automatically-generated-release-notes + +changelog: + exclude: + authors: + - cryptobot + - dependabot + - github-actions + categories: + - title: What's New 🎉 + labels: + - release-notes:feature + - title: Bugfixes 🐛 + labels: + - release-notes:bugfix + - title: Other Changes 📎 + labels: + - "*" + exclude: + labels: + - release-notes:feature + - release-notes:bugfix \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b31bfa08a..681ba1f94 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -53,4 +53,8 @@ jobs: body: |- :construction: Work in Progress + Please be patient, the builds are still running. We will publish new versions of Cryptomator here in a few moments. + + As usual, the GPG signatures can be checked using [our public key `5811 7AFA 1F85 B3EE C154 677D 615D 449F E6E6 A235`](https://gist.github.com/cryptobot/211111cf092037490275f39d408f461a). --- + \ No newline at end of file From e8f8466d9a2747f4bf338a0fbaee13148d155e36 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Fri, 5 May 2023 10:56:44 +0200 Subject: [PATCH 05/18] adjusted labels used in auto-generated release notes [ci skip] --- .github/release.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/release.yml b/.github/release.yml index 9f091a4d6..5ab2e03f7 100644 --- a/.github/release.yml +++ b/.github/release.yml @@ -10,14 +10,20 @@ changelog: categories: - title: What's New 🎉 labels: - - release-notes:feature + - type:feature-request + - type:enhancement - title: Bugfixes 🐛 labels: - - release-notes:bugfix + - type:security-issue + - type:bug + - type:minor-bug - title: Other Changes 📎 labels: - "*" exclude: labels: - - release-notes:feature - - release-notes:bugfix \ No newline at end of file + - type:feature-request + - type:enhancement + - type:security-issue + - type:bug + - type:minor-bug \ No newline at end of file From 2a704d5eb49c0fd509c72fdfb7ff7192e8a5cb09 Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Fri, 5 May 2023 11:45:02 +0200 Subject: [PATCH 06/18] init collator once --- .../org/cryptomator/launcher/SupportedLanguages.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java index 23d3e8fe0..1d2f22da7 100644 --- a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java +++ b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java @@ -31,11 +31,11 @@ public class SupportedLanguages { public SupportedLanguages(Settings settings) { var preferredLanguage = settings.languageProperty().get(); preferredLocale = preferredLanguage == null ? Locale.getDefault() : Locale.forLanguageTag(preferredLanguage); - var sorted = LANGUAGE_TAGS.stream().sorted((a, b) -> { - var collator = Collator.getInstance(preferredLocale); - collator.setStrength(Collator.PRIMARY); - return collator.compare(Locale.forLanguageTag(a).getDisplayName(), Locale.forLanguageTag(b).getDisplayName()); - }).collect(Collectors.toList()); + var collator = Collator.getInstance(preferredLocale); + collator.setStrength(Collator.PRIMARY); + var sorted = LANGUAGE_TAGS.stream() // + .sorted((a, b) -> collator.compare(Locale.forLanguageTag(a).getDisplayName(), Locale.forLanguageTag(b).getDisplayName())) // + .collect(Collectors.toList()); sorted.add(0, Settings.DEFAULT_LANGUAGE); sorted.add(1, ENGLISH); sortedLanguageTags = Collections.unmodifiableList(sorted); From 151ef6c7b26dd21709df98f9b63bbae19291e49f Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 8 May 2023 19:12:35 +0200 Subject: [PATCH 07/18] upgrade to jdk20 * use pattern matching preview feature * bump fuse-nio-adapter --- .idea/misc.xml | 2 +- pom.xml | 9 ++++--- .../cryptomator/ipc/IpcMessageListener.java | 8 +++--- .../ui/health/StartController.java | 18 +++++++------ .../ui/traymenu/AwtTrayMenuController.java | 25 ++++++++++--------- .../UnlockInvalidMountPointController.java | 13 +++++----- 6 files changed, 40 insertions(+), 35 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index e5d629592..891096945 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 084ceeb7e..433a89f2b 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ UTF-8 - 19 + 20 @@ -38,7 +38,7 @@ 1.2.0 1.2.0 1.2.0 - 2.0.5 + 3.0.0 2.0.0 2.0.2 @@ -64,7 +64,7 @@ 23.0.0 8.1.0 - 0.8.8 + 0.8.9 @@ -332,6 +332,9 @@ org.apache.maven.plugins maven-surefire-plugin + + --enable-preview + org.apache.maven.plugins diff --git a/src/main/java/org/cryptomator/ipc/IpcMessageListener.java b/src/main/java/org/cryptomator/ipc/IpcMessageListener.java index f49275824..f2e76dc2a 100644 --- a/src/main/java/org/cryptomator/ipc/IpcMessageListener.java +++ b/src/main/java/org/cryptomator/ipc/IpcMessageListener.java @@ -5,10 +5,10 @@ import java.util.List; public interface IpcMessageListener { default void handleMessage(IpcMessage message) { - if (message instanceof RevealRunningAppMessage) { - revealRunningApp(); - } else if (message instanceof HandleLaunchArgsMessage m) { - handleLaunchArgs(m.args()); + switch (message) { + case RevealRunningAppMessage x -> revealRunningApp(); + case HandleLaunchArgsMessage hlam -> handleLaunchArgs(hlam.args()); + default -> {} } } diff --git a/src/main/java/org/cryptomator/ui/health/StartController.java b/src/main/java/org/cryptomator/ui/health/StartController.java index fa41a7fdc..4e95b6b0f 100644 --- a/src/main/java/org/cryptomator/ui/health/StartController.java +++ b/src/main/java/org/cryptomator/ui/health/StartController.java @@ -102,14 +102,16 @@ public class StartController implements FxController { } private void loadingKeyFailed(Throwable e) { - if (e instanceof UnlockCancelledException) { - // ok - } else if (e instanceof VaultKeyInvalidException) { - LOG.error("Invalid key"); //TODO: specific error screen - appWindows.showErrorWindow(e, window, null); - } else { - LOG.error("Failed to load key.", e); - appWindows.showErrorWindow(e, window, null); + switch (e) { + case UnlockCancelledException uce -> {} //ok + case VaultKeyInvalidException vkie -> { + LOG.error("Invalid key"); //TODO: specific error screen + appWindows.showErrorWindow(e, window, null); + } + default -> { + LOG.error("Failed to load key.", e); + appWindows.showErrorWindow(e, window, null); + } } } diff --git a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java index 704ffa9ab..2f1d4e620 100644 --- a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java +++ b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java @@ -84,18 +84,19 @@ public class AwtTrayMenuController implements TrayMenuController { private void addChildren(Menu menu, List items) { for (var item : items) { - // TODO: use Pattern Matching for switch, once available - if (item instanceof ActionItem a) { - var menuItem = new MenuItem(a.title()); - menuItem.addActionListener(evt -> a.action().run()); - menuItem.setEnabled(a.enabled()); - menu.add(menuItem); - } else if (item instanceof SeparatorItem) { - menu.addSeparator(); - } else if (item instanceof SubMenuItem s) { - var submenu = new Menu(s.title()); - addChildren(submenu, s.items()); - menu.add(submenu); + switch (item) { + case ActionItem a -> { + var menuItem = new MenuItem(a.title()); + menuItem.addActionListener(evt -> a.action().run()); + menuItem.setEnabled(a.enabled()); + menu.add(menuItem); + } + case SeparatorItem si -> menu.addSeparator(); + case SubMenuItem smi -> { + var submenu = new Menu(smi.title()); + addChildren(submenu, smi.items()); + menu.add(submenu); + } } } } diff --git a/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java b/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java index aeb4a9166..22a1b1eec 100644 --- a/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java +++ b/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java @@ -38,13 +38,12 @@ public class UnlockInvalidMountPointController implements FxController { @FXML public void initialize() { var e = unlockException.get(); - String translationKey = "unlock.error.customPath.description.generic"; - if (e instanceof MountPointNotSupportedException) { - translationKey = "unlock.error.customPath.description.notSupported"; - } else if (e instanceof MountPointNotExistsException) { - translationKey = "unlock.error.customPath.description.notExists"; - } - dialogDescription.setFormat(resourceBundle.getString(translationKey)); + var translationKeySuffix = switch (e) { + case MountPointNotSupportedException x -> "notSupported"; + case MountPointNotExistsException x -> "notExists"; + default -> "generic"; + }; + dialogDescription.setFormat(resourceBundle.getString("unlock.error.customPath.description." + translationKeySuffix)); dialogDescription.setArg1(e.getMessage()); } From a3f05db189a2b92d483f7b86b0fb8df4c856cbc6 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 8 May 2023 19:41:02 +0200 Subject: [PATCH 08/18] bump javafx --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 433a89f2b..37f45a940 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 2.2 31.1-jre 2.10.1 - 19.0.2.1 + 20.0.1 4.3.0 9.31 1.4.5 From 6386dd3d500f2b08f2784c004626d3fac649ce18 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 8 May 2023 19:41:58 +0200 Subject: [PATCH 09/18] update workflows --- .github/workflows/appimage.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/debian.yml | 18 +++++++++++++++--- .github/workflows/get-version.yml | 2 +- .github/workflows/mac-dmg.yml | 2 +- .github/workflows/pullrequest.yml | 2 +- .github/workflows/release-check.yml | 2 +- .github/workflows/win-exe.yml | 8 ++++---- 8 files changed, 25 insertions(+), 13 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 4e81a4295..f966f6b22 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -10,7 +10,7 @@ on: required: false env: - JAVA_VERSION: 19 + JAVA_VERSION: 20 jobs: get-version: diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 681ba1f94..bf21af27c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: types: [labeled] env: - JAVA_VERSION: 19 + JAVA_VERSION: 20 defaults: run: diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index 700322c06..b2d2bf4c8 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -19,9 +19,11 @@ on: type: boolean env: - JAVA_VERSION: 19 - OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/19.0.2.1/openjfx-19.0.2.1_linux-x64_bin-jmods.zip' - OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/19.0.2.1/openjfx-19.0.2.1_linux-aarch64_bin-jmods.zip' + JAVA_VERSION: 20 + OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/20.0.1/openjfx-20.0.1_linux-x64_bin-jmods.zip' + JMODS_AMD64_HASH: '0b244b08354dc5e1b639765fd0858cbc154774e9cb05467c4111b7c63d3b3721' + OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/20.0.1/openjfx-20.0.1_linux-aarch64_bin-jmods.zip' + JMODS_AARCH64_HASH: '4b0dd30282c067aa07fe840374115b5ec5dcfd8dc479ebd2231dfdb6a518b3b3' jobs: build: @@ -58,9 +60,19 @@ jobs: id: download-jmods run: | curl -L ${{ env.OPENJFX_JMODS_AMD64 }} -o openjfx-amd64.zip + echo "${{ env.JMODS_AMD64_HASH }} openjfx-amd64.zip" | sha256sum -c + if [ $? != 0 ]; then + echo "Wrong checksum of JMOD archive downloaded from ${{ env.OPENJFX_JMODS_AMD64 }}."; + exit 1 + fi mkdir -p jmods/amd64 unzip -j openjfx-amd64.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d jmods/amd64 curl -L ${{ env.OPENJFX_JMODS_AARCH64 }} -o openjfx-aarch64.zip + echo "${{ env.JMODS_AARCH64_HASH }} openjfx-aarch64.zip" | sha256sum -c + if [ $? != 0 ]; then + echo "Wrong checksum of JMOD archive downloaded from ${{ env.OPENJFX_JMODS_AARCH64 }}."; + exit 1 + fi mkdir -p jmods/aarch64 unzip -j openjfx-aarch64.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d jmods/aarch64 - name: Ensure major jfx version in pom and in jmods is the same diff --git a/.github/workflows/get-version.yml b/.github/workflows/get-version.yml index 5cffb56fb..d8684dc20 100644 --- a/.github/workflows/get-version.yml +++ b/.github/workflows/get-version.yml @@ -22,7 +22,7 @@ on: value: ${{ jobs.determine-version.outputs.type }} env: - JAVA_VERSION: 19 + JAVA_VERSION: 20 JAVA_DIST: 'temurin' JAVA_CACHE: 'maven' diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 27320dba8..bad80138b 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -10,7 +10,7 @@ on: required: false env: - JAVA_VERSION: 19 + JAVA_VERSION: 20 jobs: get-version: diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 48f7bd185..73a21edde 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -4,7 +4,7 @@ on: pull_request: env: - JAVA_VERSION: 19 + JAVA_VERSION: 20 defaults: run: diff --git a/.github/workflows/release-check.yml b/.github/workflows/release-check.yml index 7309cb852..481861540 100644 --- a/.github/workflows/release-check.yml +++ b/.github/workflows/release-check.yml @@ -7,7 +7,7 @@ on: - 'hotfix/**' env: - JAVA_VERSION: 19 + JAVA_VERSION: 20 defaults: run: diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 45ce36c2e..df67c1dcb 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -14,11 +14,11 @@ on: env: - JAVA_VERSION: 19 + JAVA_VERSION: 20 JAVA_DIST: 'temurin' JAVA_CACHE: 'maven' - JFX_JMODS_URL: 'https://download2.gluonhq.com/openjfx/19.0.2.1/openjfx-19.0.2.1_windows-x64_bin-jmods.zip' - JFX_JMODS_HASH: 'B7CF2CAD2468842B3B78D99F6C0555771499A36FA1F1EE3DD1B9A4597F1FAB86' + JFX_JMODS_URL: 'https://download2.gluonhq.com/openjfx/20.0.1/openjfx-20.0.1_windows-x64_bin-jmods.zip' + JFX_JMODS_HASH: 'D00767334C43B8832B5CF10267D34CA8F563D187C4655B73EB6020DD79C054B5' defaults: run: @@ -51,7 +51,7 @@ jobs: run: | curl --output jfxjmods.zip -L "${{ env.JFX_JMODS_URL }}" if(!(Get-FileHash -Path jfxjmods.zip -Algorithm SHA256).Hash.equals("${{ env.JFX_JMODS_HASH }}")) { - exit 1; + throw "Wrong checksum of JMOD archive downloaded from ${{ env.JFX_JMODS_URL }}."; } Expand-Archive -Path jfxjmods.zip -DestinationPath jfxjmods Get-ChildItem -Path jfxjmods -Recurse -Filter "*.jmod" | ForEach-Object { Move-Item -Path $_ -Destination $_.Directory.Parent} From ff80f634d201b8c5025c03939cc34d9019bc226d Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 9 May 2023 09:42:01 +0200 Subject: [PATCH 10/18] Apply suggestions from code review Co-authored-by: Sebastian Stenzel --- .../java/org/cryptomator/ipc/IpcMessageListener.java | 5 ++--- .../cryptomator/ui/traymenu/AwtTrayMenuController.java | 8 ++++---- .../ui/unlock/UnlockInvalidMountPointController.java | 10 +++++----- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/cryptomator/ipc/IpcMessageListener.java b/src/main/java/org/cryptomator/ipc/IpcMessageListener.java index f2e76dc2a..756305cbe 100644 --- a/src/main/java/org/cryptomator/ipc/IpcMessageListener.java +++ b/src/main/java/org/cryptomator/ipc/IpcMessageListener.java @@ -6,9 +6,8 @@ public interface IpcMessageListener { default void handleMessage(IpcMessage message) { switch (message) { - case RevealRunningAppMessage x -> revealRunningApp(); - case HandleLaunchArgsMessage hlam -> handleLaunchArgs(hlam.args()); - default -> {} + case RevealRunningAppMessage m -> revealRunningApp(); // TODO: rename to _ with JEP 443 + case HandleLaunchArgsMessage m -> handleLaunchArgs(m.args()); } } diff --git a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java index 2f1d4e620..5cb1af7a3 100644 --- a/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java +++ b/src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java @@ -91,10 +91,10 @@ public class AwtTrayMenuController implements TrayMenuController { menuItem.setEnabled(a.enabled()); menu.add(menuItem); } - case SeparatorItem si -> menu.addSeparator(); - case SubMenuItem smi -> { - var submenu = new Menu(smi.title()); - addChildren(submenu, smi.items()); + case SeparatorItem s -> menu.addSeparator(); // TODO: rename to _ with JEP 443 + case SubMenuItem s -> { + var submenu = new Menu(s.title()); + addChildren(submenu, s.items()); menu.add(submenu); } } diff --git a/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java b/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java index 22a1b1eec..7bc0cbccd 100644 --- a/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java +++ b/src/main/java/org/cryptomator/ui/unlock/UnlockInvalidMountPointController.java @@ -38,12 +38,12 @@ public class UnlockInvalidMountPointController implements FxController { @FXML public void initialize() { var e = unlockException.get(); - var translationKeySuffix = switch (e) { - case MountPointNotSupportedException x -> "notSupported"; - case MountPointNotExistsException x -> "notExists"; - default -> "generic"; + var translationKey = switch (e) { + case MountPointNotSupportedException x -> "unlock.error.customPath.description.notSupported"; + case MountPointNotExistsException x -> "unlock.error.customPath.description.notExists"; + default -> "unlock.error.customPath.description.generic"; }; - dialogDescription.setFormat(resourceBundle.getString("unlock.error.customPath.description." + translationKeySuffix)); + dialogDescription.setFormat(resourceBundle.getString(translationKey)); dialogDescription.setArg1(e.getMessage()); } From d4cba2fd6ed56900c4b5245c0a6bf5d9355f4fd6 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 9 May 2023 09:55:56 +0200 Subject: [PATCH 11/18] fix errors --- dist/linux/debian/control | 2 +- src/main/java/org/cryptomator/ipc/IpcMessage.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/linux/debian/control b/dist/linux/debian/control index edf9dd3ce..b04812fbb 100644 --- a/dist/linux/debian/control +++ b/dist/linux/debian/control @@ -2,7 +2,7 @@ Source: cryptomator Maintainer: Cryptobot Section: utils Priority: optional -Build-Depends: debhelper (>=10), coffeelibs-jdk-19, libgtk2.0-0, libgtk-3-0, libxxf86vm1, libgl1 +Build-Depends: debhelper (>=10), coffeelibs-jdk-20, libgtk2.0-0, libgtk-3-0, libxxf86vm1, libgl1 Standards-Version: 4.5.0 Homepage: https://cryptomator.org Vcs-Git: https://github.com/cryptomator/cryptomator.git diff --git a/src/main/java/org/cryptomator/ipc/IpcMessage.java b/src/main/java/org/cryptomator/ipc/IpcMessage.java index 9d1c8d3de..7f76da295 100644 --- a/src/main/java/org/cryptomator/ipc/IpcMessage.java +++ b/src/main/java/org/cryptomator/ipc/IpcMessage.java @@ -9,8 +9,8 @@ import java.nio.channels.ReadableByteChannel; import java.nio.channels.WritableByteChannel; import java.util.function.Function; -// TODO make sealed, remove enum -interface IpcMessage { +//TODO can the enum be removed? +sealed interface IpcMessage permits HandleLaunchArgsMessage, RevealRunningAppMessage { enum MessageType { REVEAL_RUNNING_APP(RevealRunningAppMessage::decode), From 82de8b6994aec8e7fdaa62b303713e0adb99a421 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 9 May 2023 09:57:23 +0200 Subject: [PATCH 12/18] remove unrelated change --- .github/workflows/debian.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index b2d2bf4c8..c61563c63 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -21,9 +21,7 @@ on: env: JAVA_VERSION: 20 OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/20.0.1/openjfx-20.0.1_linux-x64_bin-jmods.zip' - JMODS_AMD64_HASH: '0b244b08354dc5e1b639765fd0858cbc154774e9cb05467c4111b7c63d3b3721' OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/20.0.1/openjfx-20.0.1_linux-aarch64_bin-jmods.zip' - JMODS_AARCH64_HASH: '4b0dd30282c067aa07fe840374115b5ec5dcfd8dc479ebd2231dfdb6a518b3b3' jobs: build: @@ -60,19 +58,9 @@ jobs: id: download-jmods run: | curl -L ${{ env.OPENJFX_JMODS_AMD64 }} -o openjfx-amd64.zip - echo "${{ env.JMODS_AMD64_HASH }} openjfx-amd64.zip" | sha256sum -c - if [ $? != 0 ]; then - echo "Wrong checksum of JMOD archive downloaded from ${{ env.OPENJFX_JMODS_AMD64 }}."; - exit 1 - fi mkdir -p jmods/amd64 unzip -j openjfx-amd64.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d jmods/amd64 curl -L ${{ env.OPENJFX_JMODS_AARCH64 }} -o openjfx-aarch64.zip - echo "${{ env.JMODS_AARCH64_HASH }} openjfx-aarch64.zip" | sha256sum -c - if [ $? != 0 ]; then - echo "Wrong checksum of JMOD archive downloaded from ${{ env.OPENJFX_JMODS_AARCH64 }}."; - exit 1 - fi mkdir -p jmods/aarch64 unzip -j openjfx-aarch64.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d jmods/aarch64 - name: Ensure major jfx version in pom and in jmods is the same From 2ff71ed7b003769a0d3de0023d95f02025972733 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 9 May 2023 14:51:44 +0200 Subject: [PATCH 13/18] remove langauges with insufficient translation --- .../java/org/cryptomator/launcher/SupportedLanguages.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java index 1d2f22da7..e57184af8 100644 --- a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java +++ b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java @@ -18,9 +18,9 @@ public class SupportedLanguages { private static final Logger LOG = LoggerFactory.getLogger(SupportedLanguages.class); // these are BCP 47 language codes, not ISO. Note the "-" instead of the "_". // "en" is not part of this list - it is always inserted at the top. - public static final List LANGUAGE_TAGS = List.of("ar", "be", "bn", "bs", "ca", "cs", "da", "de", "el", "es", "fil", "fa", "fr", "gl", "he", // - "hi", "hr", "hu", "id", "it", "ja", "ko", "lv", "mk", "nb", "nl", "nn", "no", "pa", "pl", "pt", "pt-BR", "ro", "ru", "si", "sk", "sr", "sr-Latn", "sv", "sw", // - "ta", "te", "th", "tr", "uk", "vi", "zh", "zh-HK", "zh-TW"); + public static final List LANGUAGE_TAGS = List.of("ar", "be", "bn", "bs", "ca", "cs", "da", "de", "el", "es", "fr", "gl", "he", // + "hi", "hr", "hu", "id", "it", "ja", "ko", "lv", "nb", "nl", "nn", "pa", "pl", "pt", "pt-BR", "ro", "ru", "sk", "sr", "sr-Latn", "sv", "sw", // + "ta", "th", "tr", "uk", "vi", "zh", "zh-HK", "zh-TW"); public static final String ENGLISH = "en"; private final List sortedLanguageTags; From 4429d57b5ed4bca20bf47e2f6bac32147ead86b2 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 9 May 2023 14:52:15 +0200 Subject: [PATCH 14/18] ensure mutability of temporary collection --- .../org/cryptomator/launcher/SupportedLanguages.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java index e57184af8..0838c420e 100644 --- a/src/main/java/org/cryptomator/launcher/SupportedLanguages.java +++ b/src/main/java/org/cryptomator/launcher/SupportedLanguages.java @@ -7,10 +7,10 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; import javax.inject.Singleton; import java.text.Collator; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Locale; -import java.util.stream.Collectors; @Singleton public class SupportedLanguages { @@ -33,11 +33,12 @@ public class SupportedLanguages { preferredLocale = preferredLanguage == null ? Locale.getDefault() : Locale.forLanguageTag(preferredLanguage); var collator = Collator.getInstance(preferredLocale); collator.setStrength(Collator.PRIMARY); - var sorted = LANGUAGE_TAGS.stream() // - .sorted((a, b) -> collator.compare(Locale.forLanguageTag(a).getDisplayName(), Locale.forLanguageTag(b).getDisplayName())) // - .collect(Collectors.toList()); + var sorted = new ArrayList(); sorted.add(0, Settings.DEFAULT_LANGUAGE); sorted.add(1, ENGLISH); + LANGUAGE_TAGS.stream() // + .sorted((a, b) -> collator.compare(Locale.forLanguageTag(a).getDisplayName(), Locale.forLanguageTag(b).getDisplayName())) // + .forEach(sorted::add); sortedLanguageTags = Collections.unmodifiableList(sorted); } From d23bd2865a13e33a7a8352492c260fa938ad992a Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 9 May 2023 14:56:44 +0200 Subject: [PATCH 15/18] update location preset for Dropbox --- src/main/java/org/cryptomator/common/LocationPreset.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/cryptomator/common/LocationPreset.java b/src/main/java/org/cryptomator/common/LocationPreset.java index 17d276bf8..7861c6266 100644 --- a/src/main/java/org/cryptomator/common/LocationPreset.java +++ b/src/main/java/org/cryptomator/common/LocationPreset.java @@ -10,7 +10,7 @@ import java.util.List; */ public enum LocationPreset { - DROPBOX("Dropbox", "~/Dropbox"), + DROPBOX("Dropbox", "~/Library/CloudStorage/Dropbox", "~/Dropbox"), ICLOUDDRIVE("iCloud Drive", "~/Library/Mobile Documents/com~apple~CloudDocs", "~/iCloudDrive"), GDRIVE("Google Drive", "~/Google Drive/My Drive", "~/Google Drive"), MEGA("MEGA", "~/MEGA"), From 7dd1c3576f756cd6784bb28ed4ae7bca34073044 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 9 May 2023 15:02:15 +0200 Subject: [PATCH 16/18] always use the same JDK version in debian workflow --- .github/workflows/debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml index c61563c63..bd353a434 100644 --- a/.github/workflows/debian.yml +++ b/.github/workflows/debian.yml @@ -45,7 +45,7 @@ jobs: run: | sudo add-apt-repository ppa:coffeelibs/openjdk sudo apt-get update - sudo apt-get install debhelper devscripts dput coffeelibs-jdk-19 libgtk2.0-0 + sudo apt-get install debhelper devscripts dput coffeelibs-jdk-${{ env.JAVA_VERSION }} libgtk2.0-0 - name: Setup Java uses: actions/setup-java@v3 with: From 085f762a350646e307b24d4fcfe9fcf53645b8ed Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 9 May 2023 15:48:06 +0200 Subject: [PATCH 17/18] further fixing debian --- dist/linux/debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/linux/debian/rules b/dist/linux/debian/rules index be1014ea9..e0f077cc9 100755 --- a/dist/linux/debian/rules +++ b/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-19-coffeelibs +JAVA_HOME = /usr/lib/jvm/java-20-coffeelibs DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) ifeq ($(DEB_BUILD_ARCH),amd64) JMODS_PATH = jmods/amd64:${JAVA_HOME}/jmods From a9ec76a344b8b1600514413d51b9f18af071c7c7 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 9 May 2023 17:40:13 +0200 Subject: [PATCH 18/18] update wix main file due to updated jpackage installer template --- dist/win/resources/main.wxs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dist/win/resources/main.wxs b/dist/win/resources/main.wxs index 50edd6371..df73b195f 100644 --- a/dist/win/resources/main.wxs +++ b/dist/win/resources/main.wxs @@ -70,6 +70,9 @@ + + + @@ -172,11 +175,12 @@ - JP_UPGRADABLE_FOUND + JP_UPGRADABLE_FOUND - JP_DOWNGRADABLE_FOUND + JP_DOWNGRADABLE_FOUND + @@ -188,6 +192,10 @@ NOT Installed OR REINSTALL + + + +