From 71e4f986657fbb8a8c4597f0ad3cc51d3d86f1d1 Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Tue, 6 Aug 2024 12:26:26 +0200 Subject: [PATCH] hard code default quickaccess service --- .../java/org/cryptomator/common/settings/Settings.java | 7 ++++++- .../java/org/cryptomator/common/settings/SettingsJson.java | 2 +- .../org/cryptomator/common/settings/SettingsProvider.java | 7 +------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/cryptomator/common/settings/Settings.java b/src/main/java/org/cryptomator/common/settings/Settings.java index c8acc2659..24dbed679 100644 --- a/src/main/java/org/cryptomator/common/settings/Settings.java +++ b/src/main/java/org/cryptomator/common/settings/Settings.java @@ -43,7 +43,12 @@ public class Settings { static final boolean DEFAULT_DEBUG_MODE = false; static final UiTheme DEFAULT_THEME = UiTheme.LIGHT; @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"; + 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"; + 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; + static final String DEFAULT_USER_INTERFACE_ORIENTATION = NodeOrientation.LEFT_TO_RIGHT.name(); static final boolean DEFAULT_SHOW_MINIMIZE_BUTTON = false; public static final Instant DEFAULT_TIMESTAMP = Instant.parse("2000-01-01T00:00:00Z"); diff --git a/src/main/java/org/cryptomator/common/settings/SettingsJson.java b/src/main/java/org/cryptomator/common/settings/SettingsJson.java index 481a09dde..7996dcb39 100644 --- a/src/main/java/org/cryptomator/common/settings/SettingsJson.java +++ b/src/main/java/org/cryptomator/common/settings/SettingsJson.java @@ -90,5 +90,5 @@ class SettingsJson { boolean useQuickAccess = Settings.DEFAULT_USE_QUICKACCESS; @JsonProperty("quickAccessService") - String quickAccessService; + String quickAccessService = Settings.DEFAULT_QUICKACCESS_SERVICE; } diff --git a/src/main/java/org/cryptomator/common/settings/SettingsProvider.java b/src/main/java/org/cryptomator/common/settings/SettingsProvider.java index dd31062fc..79d9b7399 100644 --- a/src/main/java/org/cryptomator/common/settings/SettingsProvider.java +++ b/src/main/java/org/cryptomator/common/settings/SettingsProvider.java @@ -47,13 +47,11 @@ public class SettingsProvider implements Supplier { private final Supplier settings = Suppliers.memoize(this::load); private final Environment env; private final ScheduledExecutorService scheduler; - private final Optional quickAccessService; @Inject - public SettingsProvider(Environment env, ScheduledExecutorService scheduler, List quickAccessServices) { + public SettingsProvider(Environment env, ScheduledExecutorService scheduler) { this.env = env; this.scheduler = scheduler; - this.quickAccessService = quickAccessServices.stream().findFirst(); } @Override @@ -66,9 +64,6 @@ public class SettingsProvider implements Supplier { .flatMap(this::tryLoad) // .findFirst() // .orElseGet(() -> Settings.create(env)); - if (settings.quickAccessService.getValue() == null) { - quickAccessService.ifPresent(s -> settings.quickAccessService.setValue(s.getClass().getName())); - } settings.setSaveCmd(this::scheduleSave); return settings; }