From 7ab64cfe461bd0cda771c2d035cab0f5e89bb048 Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Wed, 8 May 2024 09:05:26 +0200 Subject: [PATCH] removed lastUpdateReminder setting --- src/main/java/org/cryptomator/common/settings/Settings.java | 1 - .../java/org/cryptomator/common/settings/SettingsJson.java | 4 ---- src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java | 1 - .../ui/updatereminder/UpdateReminderComponent.java | 3 +-- 4 files changed, 1 insertion(+), 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 be0361153..b62d3b591 100644 --- a/src/main/java/org/cryptomator/common/settings/Settings.java +++ b/src/main/java/org/cryptomator/common/settings/Settings.java @@ -67,7 +67,6 @@ public class Settings { public final IntegerProperty windowHeight; public final StringProperty language; public final StringProperty mountService; - public final ObjectProperty lastUpdateReminder; public final ObjectProperty lastSuccessfulUpdateCheck; private Consumer saveCmd; diff --git a/src/main/java/org/cryptomator/common/settings/SettingsJson.java b/src/main/java/org/cryptomator/common/settings/SettingsJson.java index 0acd72fe7..2ded82885 100644 --- a/src/main/java/org/cryptomator/common/settings/SettingsJson.java +++ b/src/main/java/org/cryptomator/common/settings/SettingsJson.java @@ -82,10 +82,6 @@ class SettingsJson { @JsonProperty(value = "preferredVolumeImpl", access = JsonProperty.Access.WRITE_ONLY) // WRITE_ONLY means value is "written" into the java object during deserialization. Upvote this: https://github.com/FasterXML/jackson-annotations/issues/233 String preferredVolumeImpl; - @JsonProperty("lastUpdateReminder") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC") - Instant lastUpdateReminder = Settings.DEFAULT_TIMESTAMP; - @JsonProperty("lastSuccessfulUpdateCheck") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss'Z'", timezone = "UTC") Instant lastSuccessfulUpdateCheck = Settings.DEFAULT_TIMESTAMP; diff --git a/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java b/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java index 4386fca8e..dfc6121e2 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java +++ b/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java @@ -36,7 +36,6 @@ public class UpdateChecker { private final ObjectProperty lastSuccessfulUpdateCheck = new SimpleObjectProperty<>(); private final Comparator versionComparator = new SemVerComparator(); private final ObservableValue updateAvailable; - //private final BooleanBinding checkFailed; private final ObservableValue checkFailed; @Inject diff --git a/src/main/java/org/cryptomator/ui/updatereminder/UpdateReminderComponent.java b/src/main/java/org/cryptomator/ui/updatereminder/UpdateReminderComponent.java index dfa1e5484..58dbf5a1a 100644 --- a/src/main/java/org/cryptomator/ui/updatereminder/UpdateReminderComponent.java +++ b/src/main/java/org/cryptomator/ui/updatereminder/UpdateReminderComponent.java @@ -26,8 +26,7 @@ public interface UpdateReminderComponent { default void checkAndShowUpdateReminderWindow() { var now = Instant.now(); var twoWeeksAgo = now.minus(Duration.ofDays(14)); - if (settings().lastUpdateReminder.get().isBefore(twoWeeksAgo) && !settings().checkForUpdates.getValue() && settings().lastSuccessfulUpdateCheck.get().isBefore(twoWeeksAgo)) { - settings().lastUpdateReminder.set(now); + if (!settings().checkForUpdates.getValue() && settings().lastSuccessfulUpdateCheck.get().isBefore(twoWeeksAgo)) { Stage stage = window(); stage.setScene(updateReminderScene().get()); stage.sizeToScene();