From 9a74194391c3c1eec6b5c98ac35c376fda90d189 Mon Sep 17 00:00:00 2001 From: Ralph Plawetzki Date: Mon, 27 Oct 2025 05:33:35 +0100 Subject: [PATCH 1/4] Make SecretServiceKeychainAccess the default selection --- src/main/java/org/cryptomator/common/settings/Settings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/cryptomator/common/settings/Settings.java b/src/main/java/org/cryptomator/common/settings/Settings.java index a711e6536..dfa32e90d 100644 --- a/src/main/java/org/cryptomator/common/settings/Settings.java +++ b/src/main/java/org/cryptomator/common/settings/Settings.java @@ -46,7 +46,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; From cd0a640a3631dced6bd8efee3c28da122594736e Mon Sep 17 00:00:00 2001 From: Ralph Plawetzki Date: Thu, 5 Feb 2026 07:09:38 +0100 Subject: [PATCH 2/4] Enable migrating KeychainEntries on Linux as well --- .../ui/preferences/GeneralPreferencesController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java index 584749920..088bad0dd 100644 --- a/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java +++ b/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java @@ -101,8 +101,9 @@ public class GeneralPreferencesController implements FxController { } private void migrateKeychainEntries(Observable observable, KeychainAccessProvider oldProvider, KeychainAccessProvider newProvider) { - //currently, we only migrate on macOS (touchID vs regular keychain) - if (SystemUtils.IS_OS_MAC) { + //currently, we migrate on macOS (touchID vs regular keychain) + //and on Linux (GNOME Keyring / KDE Wallet / Secret Service) + if (SystemUtils.IS_OS_MAC || SystemUtils.IS_OS_LINUX) { var idsAndNames = settings.directories.stream().collect(Collectors.toMap(vs -> vs.id, vs -> vs.displayName.getValue())); if (!idsAndNames.isEmpty()) { if (LOG.isDebugEnabled()) { From 561432bc98ecb0bc7fb9dc2402e7a31c32a56906 Mon Sep 17 00:00:00 2001 From: Ralph Plawetzki Date: Thu, 5 Feb 2026 08:14:36 +0100 Subject: [PATCH 3/4] Revert "Make SecretServiceKeychainAccess the default selection" This reverts commit 9a74194391c3c1eec6b5c98ac35c376fda90d189. Users decide when to migrate. --- src/main/java/org/cryptomator/common/settings/Settings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/cryptomator/common/settings/Settings.java b/src/main/java/org/cryptomator/common/settings/Settings.java index dfa32e90d..a711e6536 100644 --- a/src/main/java/org/cryptomator/common/settings/Settings.java +++ b/src/main/java/org/cryptomator/common/settings/Settings.java @@ -46,7 +46,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.SecretServiceKeychainAccess"; + "org.cryptomator.linux.keychain.GnomeKeyringKeychainAccess"; 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; From bdfd22c4831c712ff72d15335e5e9a446db5fde9 Mon Sep 17 00:00:00 2001 From: Ralph Plawetzki Date: Wed, 11 Feb 2026 06:07:01 +0100 Subject: [PATCH 4/4] Partially reverts https://github.com/cryptomator/cryptomator/commit/dd1af8cd783589e8c8b06e7c4881195e10a67815 Not needed anymore, see https://github.com/cryptomator/integrations-linux/pull/125#issuecomment-3876060158 --- src/main/java/org/cryptomator/common/settings/Settings.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/org/cryptomator/common/settings/Settings.java b/src/main/java/org/cryptomator/common/settings/Settings.java index a711e6536..efce23fef 100644 --- a/src/main/java/org/cryptomator/common/settings/Settings.java +++ b/src/main/java/org/cryptomator/common/settings/Settings.java @@ -152,11 +152,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) {