mirror/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-04-18 16:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4025 from purejava/new-secret-service

Browse Source 
New keychain backend SecretService for Linux
This commit is contained in:
Armin Schrenk
2026-02-17 13:16:06 +01:00
committed by GitHub
parent 1e8f272f6a bdfd22c483
commit f21cb90e7d
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/cryptomator/common/settings/Settings.java
View File

@@ -153,11 +153,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) {

5
src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
View File

@@ -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()) {