From 1ed77ebcc05f97b44d77a543b9d8764885cf6d21 Mon Sep 17 00:00:00 2001 From: Jan-Peter Klein Date: Fri, 8 Mar 2024 10:27:35 +0100 Subject: [PATCH] code cleanup --- src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java | 3 +-- .../ui/preferences/UpdatesPreferencesController.java | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java b/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java index 369ab168a..2cbf9bb31 100644 --- a/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java +++ b/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java @@ -87,7 +87,6 @@ public class UpdateChecker { String latestVersion = updateCheckerService.getValue(); LOG.info("Current version: {}, latest version: {}", getCurrentVersion(), latestVersion); updateCheckTimeProperty.set(LocalDateTime.now()); - //settings.lastUpdateCheck.set(updateCheckTimeProperty.get().toString()); latestVersionProperty.set(latestVersion); state.set(UpdateCheckState.CHECK_SUCCESSFUL); } @@ -114,7 +113,7 @@ public class UpdateChecker { } public String getCurrentVersion() { - return "1.12.3";//env.getAppVersion(); + return env.getAppVersion(); } public ObjectProperty updateCheckTimeProperty() { diff --git a/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java b/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java index f168b0a5c..49f2a2250 100644 --- a/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java +++ b/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java @@ -28,7 +28,6 @@ import java.util.Comparator; import java.util.Locale; - @PreferencesScoped public class UpdatesPreferencesController implements FxController { @@ -77,7 +76,7 @@ public class UpdatesPreferencesController implements FxController { checkForUpdatesCheckbox.selectedProperty().bindBidirectional(settings.checkForUpdates); DateTimeFormatter formatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM).withLocale(Locale.getDefault()); - updateCheckDateFormattedLabel.arg1Property().bind(Bindings.createStringBinding(() -> (!updateCheckDateProperty.get().equals(LocalDateTime.parse(Settings.DEFAULT_LAST_UPDATE_CHECK)) && latestVersionProperty().isNotNull().get() ) ? updateCheckDateProperty.get().format(formatter) : "-", updateCheckDateProperty, latestVersionProperty())); + updateCheckDateFormattedLabel.arg1Property().bind(Bindings.createStringBinding(() -> (!updateCheckDateProperty.get().equals(LocalDateTime.parse(Settings.DEFAULT_LAST_UPDATE_CHECK)) && latestVersionProperty().isNotNull().get()) ? updateCheckDateProperty.get().format(formatter) : "-", updateCheckDateProperty, latestVersionProperty())); BooleanBinding isUpdateCheckFailed = updateCheckStateProperty.isEqualTo(UpdateChecker.UpdateCheckState.CHECK_FAILED); checkFailedHBox.managedProperty().bind(isUpdateCheckFailed); @@ -85,8 +84,7 @@ public class UpdatesPreferencesController implements FxController { latestVersionFormattedLabel.arg1Property().bind(Bindings.createStringBinding(() -> (latestVersion.get() != null) ? latestVersion.get() : "-", latestVersion)); - BooleanBinding isUpdateSuccessfulAndCurrent = updateCheckStateProperty.isEqualTo(UpdateChecker.UpdateCheckState.CHECK_SUCCESSFUL) - .and(latestVersion.isEqualTo(currentVersion)); + BooleanBinding isUpdateSuccessfulAndCurrent = updateCheckStateProperty.isEqualTo(UpdateChecker.UpdateCheckState.CHECK_SUCCESSFUL).and(latestVersion.isEqualTo(currentVersion)); updateCheckStateProperty.addListener((_, _, _) -> { if (isUpdateSuccessfulAndCurrent.get()) {