From a884c2e135538a5c650a9563861e6123b4d0ec2a Mon Sep 17 00:00:00 2001
From: Loay Ghreeb <loayahmed655@gmail.com>
Date: Thu, 11 Jul 2024 18:02:59 +0300
Subject: [PATCH 1/6] Store version check setting in internal preferences

---
 .../gui/preferences/general/GeneralTabViewModel.java     | 9 ---------
 .../gui/preferences/network/NetworkTabViewModel.java     | 1 +
 src/main/java/org/jabref/logic/util/Version.java         | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
index 54d934c5f39..4690d33a049 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -40,9 +40,7 @@
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
 import org.jabref.preferences.FilePreferences;
-import org.jabref.preferences.InternalPreferences;
 import org.jabref.preferences.LibraryPreferences;
-import org.jabref.preferences.MergeDialogPreferences;
 import org.jabref.preferences.PreferencesService;
 import org.jabref.preferences.WorkspacePreferences;
 
@@ -93,7 +91,6 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final LibraryPreferences libraryPreferences;
     private final FilePreferences filePreferences;
     private final RemotePreferences remotePreferences;
-    private final MergeDialogPreferences mergeDialogPreferences;
 
     private final Validator fontSizeValidator;
     private final Validator customPathToThemeValidator;
@@ -102,8 +99,6 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
     private final StringProperty remotePortProperty = new SimpleStringProperty("");
     private final Validator remotePortValidator;
-    private final InternalPreferences internalPreferences;
-    private final BooleanProperty versionCheckProperty = new SimpleBooleanProperty();
     private final FileUpdateMonitor fileUpdateMonitor;
     private final BibEntryTypesManager entryTypesManager;
     private final TrustStoreManager trustStoreManager;
@@ -115,8 +110,6 @@ public GeneralTabViewModel(DialogService dialogService, PreferencesService prefe
         this.libraryPreferences = preferences.getLibraryPreferences();
         this.filePreferences = preferences.getFilePreferences();
         this.remotePreferences = preferences.getRemotePreferences();
-        this.internalPreferences = preferences.getInternalPreferences();
-        this.mergeDialogPreferences = preferences.getMergeDialogPreferences();
         this.fileUpdateMonitor = fileUpdateMonitor;
         this.entryTypesManager = entryTypesManager;
 
@@ -246,8 +239,6 @@ public void storeSettings() {
             }
         });
 
-        internalPreferences.setVersionCheckEnabled(versionCheckProperty.getValue());
-
         getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
             if (remotePreferences.isDifferentPort(newPort)) {
                 remotePreferences.setPort(newPort);
diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
index c4c63bf5bb6..889fb378ee9 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
@@ -159,6 +159,7 @@ private void setSSLValues() {
 
     @Override
     public void storeSettings() {
+        internalPreferences.setVersionCheckEnabled(versionCheckProperty.getValue());
         proxyPreferences.setUseProxy(proxyUseProperty.getValue());
         proxyPreferences.setHostname(proxyHostnameProperty.getValue().trim());
         proxyPreferences.setPort(proxyPortProperty.getValue().trim());
diff --git a/src/main/java/org/jabref/logic/util/Version.java b/src/main/java/org/jabref/logic/util/Version.java
index 72bc7ec1e56..15f360a1ac5 100644
--- a/src/main/java/org/jabref/logic/util/Version.java
+++ b/src/main/java/org/jabref/logic/util/Version.java
@@ -173,7 +173,7 @@ public Optional<Version> shouldBeUpdatedTo(List<Version> availableVersions) {
         Optional<Version> newerVersion = Optional.empty();
         for (Version version : availableVersions) {
             if (this.shouldBeUpdatedTo(version)
-                    && (!newerVersion.isPresent() || version.isNewerThan(newerVersion.get()))) {
+                    && (newerVersion.isEmpty() || version.isNewerThan(newerVersion.get()))) {
                 newerVersion = Optional.of(version);
             }
         }

From 339e57ff632f396a44e51e0bae50e1b0796e8f80 Mon Sep 17 00:00:00 2001
From: Loay Ghreeb <loayahmed655@gmail.com>
Date: Thu, 11 Jul 2024 18:18:08 +0300
Subject: [PATCH 2/6] Update version check text

---
 .../java/org/jabref/gui/preferences/network/NetworkTab.fxml     | 2 +-
 src/main/resources/l10n/JabRef_en.properties                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
index 0cbe89e75a8..490b0d964a7 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
@@ -16,7 +16,7 @@
 <?import org.controlsfx.control.textfield.CustomPasswordField?>
 <fx:root spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.network.NetworkTab">
     <Label styleClass="titleHeader" text="%Network" />
-    <CheckBox fx:id="versionCheck" text="%Check for latest version online"/>
+    <CheckBox fx:id="versionCheck" text="%Check for updates automatically on startup"/>
     <Label text="%If you encounter an issue or a bug, please check the latest version, whether the issue is still present." wrapText="true"/>
 
     <Label styleClass="sectionHeader" text="%Proxy configuration" />
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 014b90c21fa..a39b0b63c2d 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -503,7 +503,7 @@ Docs\ (This\ Year)=Docs (This Year)
 Incorrect\ ISSN\ format=Incorrect ISSN format
 Error\ accessing\ catalog=Error accessing catalog
 
-Check\ for\ latest\ version\ online=Check for latest version online
+Check\ for\ updates\ automatically\ on\ startup=Check for updates automatically on startup
 If\ you\ encounter\ an\ issue\ or\ a\ bug,\ please\ check\ the\ latest\ version,\ whether\ the\ issue\ is\ still\ present.=If you encounter an issue or a bug, please check the latest version, whether the issue is still present.
 
 Keep\ both=Keep both

From 143d11d188cd3eb9c0bb989de4665cfd2c49d5fe Mon Sep 17 00:00:00 2001
From: Loay Ghreeb <loayahmed655@gmail.com>
Date: Thu, 11 Jul 2024 18:19:49 +0300
Subject: [PATCH 3/6] Always enable 'Check for Updates' menu button

---
 .../java/org/jabref/gui/help/SearchForUpdateAction.java   | 2 --
 src/main/java/org/jabref/gui/help/VersionWorker.java      | 8 --------
 2 files changed, 10 deletions(-)

diff --git a/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java b/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
index 94110fddf4f..d4b7d3aec25 100644
--- a/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
+++ b/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
@@ -20,8 +20,6 @@ public SearchForUpdateAction(PreferencesService preferencesService,
         this.preferencesService = preferencesService;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
-
-        this.executable.bind(preferencesService.getInternalPreferences().versionCheckEnabledProperty());
     }
 
     @Override
diff --git a/src/main/java/org/jabref/gui/help/VersionWorker.java b/src/main/java/org/jabref/gui/help/VersionWorker.java
index 5a21e89cf78..c53f0eaeccd 100644
--- a/src/main/java/org/jabref/gui/help/VersionWorker.java
+++ b/src/main/java/org/jabref/gui/help/VersionWorker.java
@@ -61,10 +61,6 @@ private Optional<Version> getNewVersion() throws IOException {
     }
 
     public void checkForNewVersionAsync() {
-        if (!internalPreferences.isVersionCheckEnabled()) {
-            return;
-        }
-
         BackgroundTask.wrap(this::getNewVersion)
                       .onSuccess(version -> showUpdateInfo(version, true))
                       .onFailure(exception -> showConnectionError(exception, true))
@@ -72,10 +68,6 @@ public void checkForNewVersionAsync() {
     }
 
     public void checkForNewVersionDelayed() {
-        if (!internalPreferences.isVersionCheckEnabled()) {
-            return;
-        }
-
         BackgroundTask.wrap(this::getNewVersion)
                       .onSuccess(version -> showUpdateInfo(version, false))
                       .onFailure(exception -> showConnectionError(exception, false))

From c8df5e43d54d442318a05611246b41a9267c05b4 Mon Sep 17 00:00:00 2001
From: Loay Ghreeb <loayahmed655@gmail.com>
Date: Thu, 11 Jul 2024 18:23:23 +0300
Subject: [PATCH 4/6] CHANGELOG

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1574426e4ca..f1766bb67e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,8 +13,12 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Changed
 
+- The 'Check for updates' menu bar button is now always enabled. [#11485](https://github.com/JabRef/jabref/pull/11485)
+
 ### Fixed
 
+- We fixed an issue where the 'Check for updates' preference was not saved. [#11485](https://github.com/JabRef/jabref/pull/11485)
+
 ### Removed
 
 

From 308b832b5aea9fe28667d79c736a9f09420fb3ff Mon Sep 17 00:00:00 2001
From: Loay Ghreeb <52158423+LoayGhreeb@users.noreply.github.com>
Date: Thu, 11 Jul 2024 22:24:11 +0300
Subject: [PATCH 5/6] Update src/main/resources/l10n/JabRef_en.properties

Co-authored-by: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
---
 src/main/resources/l10n/JabRef_en.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index a39b0b63c2d..2604fc5083f 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -503,7 +503,7 @@ Docs\ (This\ Year)=Docs (This Year)
 Incorrect\ ISSN\ format=Incorrect ISSN format
 Error\ accessing\ catalog=Error accessing catalog
 
-Check\ for\ updates\ automatically\ on\ startup=Check for updates automatically on startup
+Check\ for\ updates\ on\ startup=Check for updates on startup
 If\ you\ encounter\ an\ issue\ or\ a\ bug,\ please\ check\ the\ latest\ version,\ whether\ the\ issue\ is\ still\ present.=If you encounter an issue or a bug, please check the latest version, whether the issue is still present.
 
 Keep\ both=Keep both

From fb6ed17887c159c0678ee3e6653dde28b4b5666c Mon Sep 17 00:00:00 2001
From: Loay Ghreeb <loayahmed655@gmail.com>
Date: Thu, 11 Jul 2024 22:26:28 +0300
Subject: [PATCH 6/6] Update NetworkTab.fxml

---
 .../java/org/jabref/gui/preferences/network/NetworkTab.fxml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
index 490b0d964a7..2d235717ef5 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
@@ -16,7 +16,7 @@
 <?import org.controlsfx.control.textfield.CustomPasswordField?>
 <fx:root spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.network.NetworkTab">
     <Label styleClass="titleHeader" text="%Network" />
-    <CheckBox fx:id="versionCheck" text="%Check for updates automatically on startup"/>
+    <CheckBox fx:id="versionCheck" text="%Check for updates on startup"/>
     <Label text="%If you encounter an issue or a bug, please check the latest version, whether the issue is still present." wrapText="true"/>
 
     <Label styleClass="sectionHeader" text="%Proxy configuration" />