From 90441d8c5213d4566e1aabd918d530fb765acaf7 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Mon, 3 Jul 2023 18:58:18 +0200
Subject: [PATCH 01/27] Introduced gdpr dialog

---
 src/main/java/org/jabref/gui/JabRefGUI.java   | 18 ++++--
 .../entryeditor/EntryEditorPreferences.java   | 15 -----
 .../gui/entryeditor/RelatedArticlesTab.java   |  5 +-
 .../java/org/jabref/gui/gdpr/GdprDialog.css   |  8 +++
 .../java/org/jabref/gui/gdpr/GdprDialog.fxml  | 38 +++++++++++
 .../org/jabref/gui/gdpr/GdprDialogView.java   | 63 +++++++++++++++++++
 .../jabref/gui/gdpr/GdprDialogViewModel.java  | 58 +++++++++++++++++
 .../gui/help/SearchForUpdateAction.java       |  2 +
 .../org/jabref/gui/help/VersionWorker.java    |  8 +++
 .../java/org/jabref/gui/icon/IconTheme.java   |  3 +-
 .../fetcher/WebSearchPaneViewModel.java       | 10 +++
 .../entryeditor/EntryEditorTabViewModel.java  |  7 ++-
 .../preferences/websearch/WebSearchTab.fxml   |  1 +
 .../preferences/websearch/WebSearchTab.java   |  2 +
 .../websearch/WebSearchTabViewModel.java      |  7 +++
 .../logic/importer/ImporterPreferences.java   | 17 ++++-
 .../preferences/InternalPreferences.java      | 15 +++++
 .../jabref/preferences/JabRefPreferences.java | 14 ++++-
 18 files changed, 261 insertions(+), 30 deletions(-)
 create mode 100644 src/main/java/org/jabref/gui/gdpr/GdprDialog.css
 create mode 100644 src/main/java/org/jabref/gui/gdpr/GdprDialog.fxml
 create mode 100644 src/main/java/org/jabref/gui/gdpr/GdprDialogView.java
 create mode 100644 src/main/java/org/jabref/gui/gdpr/GdprDialogViewModel.java

diff --git a/src/main/java/org/jabref/gui/JabRefGUI.java b/src/main/java/org/jabref/gui/JabRefGUI.java
index 133df390b3f..f87665f0247 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -13,6 +13,7 @@
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 
+import org.jabref.gui.gdpr.GdprDialogView;
 import org.jabref.gui.help.VersionWorker;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.importer.ParserResultWarningDialog;
@@ -32,6 +33,7 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.injection.Injector;
+import com.tobiasdiez.easybind.EasyBind;
 import impl.org.controlsfx.skin.DecorationPane;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -67,11 +69,17 @@ public JabRefGUI(Stage mainStage,
 
         openWindow(mainStage);
 
-        new VersionWorker(Globals.BUILD_INFO.version,
-                mainFrame.getDialogService(),
-                Globals.TASK_EXECUTOR,
-                preferencesService.getInternalPreferences())
-                .checkForNewVersionDelayed();
+        mainFrame.getDialogService().showCustomDialogAndWait(new GdprDialogView());
+
+        EasyBind.subscribe(preferencesService.getInternalPreferences().versionCheckEnabledProperty(), enabled -> {
+            if (enabled) {
+                new VersionWorker(Globals.BUILD_INFO.version,
+                        mainFrame.getDialogService(),
+                        Globals.TASK_EXECUTOR,
+                        preferencesService.getInternalPreferences())
+                        .checkForNewVersionDelayed();
+            }
+        });
 
         setupProxy();
     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
index 763d0e633d9..ceb82f12b6a 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
@@ -20,7 +20,6 @@ public class EntryEditorPreferences {
     private final MapProperty<String, Set<Field>> defaultEntryEditorTabList;
     private final BooleanProperty shouldOpenOnNewEntry;
     private final BooleanProperty shouldShowRecommendationsTab;
-    private final BooleanProperty isMrdlibAccepted;
     private final BooleanProperty shouldShowLatexCitationsTab;
     private final BooleanProperty showSourceTabByDefault;
     private final BooleanProperty enableValidation;
@@ -32,7 +31,6 @@ public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList,
                                   Map<String, Set<Field>> defaultEntryEditorTabList,
                                   boolean shouldOpenOnNewEntry,
                                   boolean shouldShowRecommendationsTab,
-                                  boolean isMrdlibAccepted,
                                   boolean shouldShowLatexCitationsTab,
                                   boolean showSourceTabByDefault,
                                   boolean enableValidation,
@@ -44,7 +42,6 @@ public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList,
         this.defaultEntryEditorTabList = new SimpleMapProperty<>(FXCollections.observableMap(defaultEntryEditorTabList));
         this.shouldOpenOnNewEntry = new SimpleBooleanProperty(shouldOpenOnNewEntry);
         this.shouldShowRecommendationsTab = new SimpleBooleanProperty(shouldShowRecommendationsTab);
-        this.isMrdlibAccepted = new SimpleBooleanProperty(isMrdlibAccepted);
         this.shouldShowLatexCitationsTab = new SimpleBooleanProperty(shouldShowLatexCitationsTab);
         this.showSourceTabByDefault = new SimpleBooleanProperty(showSourceTabByDefault);
         this.enableValidation = new SimpleBooleanProperty(enableValidation);
@@ -93,18 +90,6 @@ public void setShouldShowRecommendationsTab(boolean shouldShowRecommendationsTab
         this.shouldShowRecommendationsTab.set(shouldShowRecommendationsTab);
     }
 
-    public boolean isMrdlibAccepted() {
-        return isMrdlibAccepted.get();
-    }
-
-    public BooleanProperty isMrdlibAcceptedProperty() {
-        return isMrdlibAccepted;
-    }
-
-    public void setIsMrdlibAccepted(boolean isMrdlibAccepted) {
-        this.isMrdlibAccepted.set(isMrdlibAccepted);
-    }
-
     public boolean shouldShowLatexCitationsTab() {
         return shouldShowLatexCitationsTab.get();
     }
diff --git a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
index ec1faf68ca2..c0e22a5b66a 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
@@ -212,9 +212,8 @@ private ScrollPane getPrivacyDialog(BibEntry entry) {
         vb.setSpacing(10);
 
         button.setOnAction(event -> {
-            preferences.setIsMrdlibAccepted(true);
-
             MrDlibPreferences mrDlibPreferences = preferencesService.getMrDlibPreferences();
+            mrDlibPreferences.setAcceptRecommendations(true);
             mrDlibPreferences.setSendLanguage(cbLanguage.isSelected());
             mrDlibPreferences.setSendOs(cbOS.isSelected());
             mrDlibPreferences.setSendTimezone(cbTimezone.isSelected());
@@ -237,7 +236,7 @@ public boolean shouldShow(BibEntry entry) {
     @Override
     protected void bindToEntry(BibEntry entry) {
         // Ask for consent to send data to Mr. DLib on first time to tab
-        if (preferences.isMrdlibAccepted()) {
+        if (preferencesService.getMrDlibPreferences().shouldAcceptRecommendations()) {
             setContent(getRelatedArticlesPane(entry));
         } else {
             setContent(getPrivacyDialog(entry));
diff --git a/src/main/java/org/jabref/gui/gdpr/GdprDialog.css b/src/main/java/org/jabref/gui/gdpr/GdprDialog.css
new file mode 100644
index 00000000000..373ab8b3ea4
--- /dev/null
+++ b/src/main/java/org/jabref/gui/gdpr/GdprDialog.css
@@ -0,0 +1,8 @@
+.info-section {
+    -fx-padding: 10px;
+    -fx-background-color: -fx-background;
+}
+
+.info-section .ikonli-font-icon {
+    -fx-font-size: 36.0;
+}
diff --git a/src/main/java/org/jabref/gui/gdpr/GdprDialog.fxml b/src/main/java/org/jabref/gui/gdpr/GdprDialog.fxml
new file mode 100644
index 00000000000..e02fa02c352
--- /dev/null
+++ b/src/main/java/org/jabref/gui/gdpr/GdprDialog.fxml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Hyperlink?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import org.jabref.gui.icon.JabRefIconView?>
+<DialogPane prefWidth="400.0" prefHeight="200.0"
+            xmlns="http://javafx.com/javafx"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="org.jabref.gui.gdpr.GdprDialogView">
+    <header>
+        <HBox styleClass="info-section" spacing="4.0">
+            <Label>
+                <graphic>
+                    <JabRefIconView glyph="PRIVACY"/>
+                </graphic>
+            </Label>
+            <VBox>
+                <Label text="%JabRef enhances the user experience with remote services. Please Opt-In to the following services." wrapText="true"/>
+                <Hyperlink fx:id="moreInformation" text="%See also the privacy policy (external link)" />
+            </VBox>
+    </HBox>
+    </header>
+    <content>
+        <VBox spacing="4.0">
+            <CheckBox fx:id="version" text="Updates check"/>
+            <CheckBox fx:id="webSearch" text="Web search for references" />
+            <CheckBox fx:id="pdfMetaDataParser" text="PDF Metadata parser (Grobid)" />
+            <CheckBox fx:id="relatedArticles" text="Related articles suggestions (Mr. Dlib)" />
+        </VBox>
+    </content>
+    <ButtonType buttonData="APPLY" fx:id="btnApply" text="Apply selected"/>
+    <ButtonType buttonData="OK_DONE" fx:id="btnApplyAll" text="Apply all"/>
+</DialogPane>
diff --git a/src/main/java/org/jabref/gui/gdpr/GdprDialogView.java b/src/main/java/org/jabref/gui/gdpr/GdprDialogView.java
new file mode 100644
index 00000000000..4f46a69700f
--- /dev/null
+++ b/src/main/java/org/jabref/gui/gdpr/GdprDialogView.java
@@ -0,0 +1,63 @@
+package org.jabref.gui.gdpr;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.CheckBox;
+import javafx.scene.control.Hyperlink;
+import javafx.stage.Modality;
+
+import org.jabref.gui.DialogService;
+import org.jabref.gui.desktop.JabRefDesktop;
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.preferences.PreferencesService;
+
+import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
+
+public class GdprDialogView extends BaseDialog<Boolean> {
+    @FXML private Hyperlink moreInformation;
+    @FXML private CheckBox version;
+    @FXML private CheckBox webSearch;
+    @FXML private CheckBox pdfMetaDataParser;
+    @FXML private CheckBox relatedArticles;
+    @FXML private ButtonType btnApply;
+    @FXML private ButtonType btnApplyAll;
+
+    @Inject private PreferencesService preferencesService;
+    @Inject private DialogService dialogService;
+
+    private GdprDialogViewModel viewModel;
+
+    public GdprDialogView() {
+        this.setTitle(Localization.lang("Privacy setup"));
+        this.initModality(Modality.APPLICATION_MODAL);
+        this.setResizable(false);
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new GdprDialogViewModel(preferencesService);
+
+        moreInformation.setOnAction(event -> JabRefDesktop.openBrowserShowPopup("https://jabref.org", dialogService));
+
+        version.selectedProperty().bindBidirectional(viewModel.versionEnabledProperty());
+        webSearch.selectedProperty().bindBidirectional(viewModel.webSearchEnabledProperty());
+        pdfMetaDataParser.selectedProperty().bindBidirectional(viewModel.pdfMetaDataParserEnabledProperty());
+        relatedArticles.selectedProperty().bindBidirectional(viewModel.relatedArticlesEnabledProperty());
+
+        setResultConverter(button -> {
+            if (button == btnApply) {
+                viewModel.storeSettings();
+            } else if (button == btnApplyAll) {
+                viewModel.selectAll();
+                viewModel.storeSettings();
+            }
+            return true;
+        });
+    }
+}
diff --git a/src/main/java/org/jabref/gui/gdpr/GdprDialogViewModel.java b/src/main/java/org/jabref/gui/gdpr/GdprDialogViewModel.java
new file mode 100644
index 00000000000..e0f7c1fe51c
--- /dev/null
+++ b/src/main/java/org/jabref/gui/gdpr/GdprDialogViewModel.java
@@ -0,0 +1,58 @@
+package org.jabref.gui.gdpr;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+
+import org.jabref.preferences.PreferencesService;
+
+public class GdprDialogViewModel {
+    private final BooleanProperty versionEnabledProperty = new SimpleBooleanProperty();
+    private final BooleanProperty webSearchEnabledProperty = new SimpleBooleanProperty();
+    private final BooleanProperty pdfMetaDataParserEnabledProperty = new SimpleBooleanProperty();
+    private final BooleanProperty relatedArticlesEnabledProperty = new SimpleBooleanProperty();
+
+    private final PreferencesService preferencesService;
+
+    GdprDialogViewModel(PreferencesService preferencesService) {
+        this.preferencesService = preferencesService;
+
+        setValues();
+    }
+
+    public void setValues() {
+        versionEnabledProperty.set(preferencesService.getInternalPreferences().isVersionCheckEnabled());
+        webSearchEnabledProperty.set(preferencesService.getImporterPreferences().areImporterEnabled());
+        pdfMetaDataParserEnabledProperty.set(preferencesService.getGrobidPreferences().isGrobidEnabled());
+        relatedArticlesEnabledProperty.set(preferencesService.getMrDlibPreferences().shouldAcceptRecommendations());
+    }
+
+    public void storeSettings() {
+        preferencesService.getInternalPreferences().setVersionCheckEnabled(versionEnabledProperty.get());
+        preferencesService.getImporterPreferences().setImporterEnabled(webSearchEnabledProperty.get());
+        preferencesService.getGrobidPreferences().setGrobidEnabled(pdfMetaDataParserEnabledProperty.get());
+        preferencesService.getMrDlibPreferences().setAcceptRecommendations(relatedArticlesEnabledProperty.get());
+    }
+
+    public void selectAll() {
+        versionEnabledProperty.set(true);
+        webSearchEnabledProperty.set(true);
+        pdfMetaDataParserEnabledProperty.set(true);
+        relatedArticlesEnabledProperty.set(true);
+    }
+
+    public BooleanProperty versionEnabledProperty() {
+        return versionEnabledProperty;
+    }
+
+    public BooleanProperty webSearchEnabledProperty() {
+        return webSearchEnabledProperty;
+    }
+
+    public BooleanProperty pdfMetaDataParserEnabledProperty() {
+        return pdfMetaDataParserEnabledProperty;
+    }
+
+    public BooleanProperty relatedArticlesEnabledProperty() {
+        return relatedArticlesEnabledProperty;
+    }
+}
diff --git a/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java b/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
index f2e0fff9bbc..3b39dbb473f 100644
--- a/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
+++ b/src/main/java/org/jabref/gui/help/SearchForUpdateAction.java
@@ -18,6 +18,8 @@ public SearchForUpdateAction(BuildInfo buildInfo, InternalPreferences internalPr
         this.internalPreferences = internalPreferences;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
+
+        this.executable.bind(internalPreferences.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 b4760f58c9b..73963da0386 100644
--- a/src/main/java/org/jabref/gui/help/VersionWorker.java
+++ b/src/main/java/org/jabref/gui/help/VersionWorker.java
@@ -58,6 +58,10 @@ 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))
@@ -65,6 +69,10 @@ public void checkForNewVersionAsync() {
     }
 
     public void checkForNewVersionDelayed() {
+        if (!internalPreferences.isVersionCheckEnabled()) {
+            return;
+        }
+
         BackgroundTask.wrap(this::getNewVersion)
                       .onSuccess(version -> showUpdateInfo(version, false))
                       .onFailure(exception -> showConnectionError(exception, false))
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index c92fea5ac8e..3633f49ac3b 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -348,7 +348,8 @@ public enum JabRefIcons implements JabRefIcon {
         REMOVE_TAGS(MaterialDesignC.CLOSE),
         ACCEPT_LEFT(MaterialDesignS.SUBDIRECTORY_ARROW_LEFT),
         ACCEPT_RIGHT(MaterialDesignS.SUBDIRECTORY_ARROW_RIGHT),
-        MERGE_GROUPS(MaterialDesignS.SOURCE_MERGE);
+        MERGE_GROUPS(MaterialDesignS.SOURCE_MERGE),
+        PRIVACY(MaterialDesignS.SHIELD_SEARCH);
 
         private final JabRefIcon icon;
 
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
index b038a406f5c..8dfacb8df6f 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
@@ -17,6 +17,7 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.StateManager;
+import org.jabref.gui.gdpr.GdprDialogView;
 import org.jabref.gui.importer.ImportEntriesDialog;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.logic.importer.ParserResult;
@@ -133,6 +134,15 @@ public StringProperty queryProperty() {
     }
 
     public void search() {
+        if (!preferencesService.getImporterPreferences().areImporterEnabled()) {
+            dialogService.showCustomDialogAndWait(new GdprDialogView());
+
+            if (!preferencesService.getImporterPreferences().areImporterEnabled()) {
+                dialogService.notify(Localization.lang("Web search disabled"));
+                return;
+            }
+        }
+
         String query = getQuery().trim();
         if (StringUtil.isBlank(query)) {
             dialogService.notify(Localization.lang("Please enter a search string"));
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
index 1f53eeabd3e..81e3a3339a6 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
@@ -16,6 +16,7 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
+import org.jabref.preferences.MrDlibPreferences;
 import org.jabref.preferences.PreferencesService;
 
 public class EntryEditorTabViewModel implements PreferenceTabViewModel {
@@ -34,11 +35,13 @@ public class EntryEditorTabViewModel implements PreferenceTabViewModel {
     private final DialogService dialogService;
     private final PreferencesService preferencesService;
     private final EntryEditorPreferences entryEditorPreferences;
+    private final MrDlibPreferences mrDlibPreferences;
 
     public EntryEditorTabViewModel(DialogService dialogService, PreferencesService preferencesService) {
         this.dialogService = dialogService;
         this.preferencesService = preferencesService;
         this.entryEditorPreferences = preferencesService.getEntryEditorPreferences();
+        this.mrDlibPreferences = preferencesService.getMrDlibPreferences();
     }
 
     @Override
@@ -49,7 +52,7 @@ public void setValues() {
         openOnNewEntryProperty.setValue(entryEditorPreferences.shouldOpenOnNewEntry());
         defaultSourceProperty.setValue(entryEditorPreferences.showSourceTabByDefault());
         enableRelatedArticlesTabProperty.setValue(entryEditorPreferences.shouldShowRecommendationsTab());
-        acceptRecommendationsProperty.setValue(entryEditorPreferences.isMrdlibAccepted());
+        acceptRecommendationsProperty.setValue(mrDlibPreferences.shouldAcceptRecommendations());
         enableLatexCitationsTabProperty.setValue(entryEditorPreferences.shouldShowLatexCitationsTab());
         enableValidationProperty.setValue(entryEditorPreferences.shouldEnableValidation());
         allowIntegerEditionProperty.setValue(entryEditorPreferences.shouldAllowIntegerEditionBibtex());
@@ -80,7 +83,7 @@ public void storeSettings() {
         // entryEditorPreferences.setEntryEditorTabList();
         entryEditorPreferences.setShouldOpenOnNewEntry(openOnNewEntryProperty.getValue());
         entryEditorPreferences.setShouldShowRecommendationsTab(enableRelatedArticlesTabProperty.getValue());
-        entryEditorPreferences.setIsMrdlibAccepted(acceptRecommendationsProperty.getValue());
+        mrDlibPreferences.setAcceptRecommendations(acceptRecommendationsProperty.getValue());
         entryEditorPreferences.setShouldShowLatexCitationsTab(enableLatexCitationsTabProperty.getValue());
         entryEditorPreferences.setShowSourceTabByDefault(defaultSourceProperty.getValue());
         entryEditorPreferences.setEnableValidation(enableValidationProperty.getValue());
diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
index 53a3d9c31f1..628f070c9f0 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
@@ -14,6 +14,7 @@
     <Label styleClass="titleHeader" text="%Web search"/>
 
     <Label styleClass="sectionHeader" text="%General"/>
+    <CheckBox fx:id="enableWebSearch" text="%Enable web search"/>
     <CheckBox fx:id="generateNewKeyOnImport" text="%Generate a new key for imported entries (overwriting their default)"/>
     <CheckBox fx:id="warnAboutDuplicatesOnImport" text="%Warn about duplicates on import"/>
     <CheckBox fx:id="downloadLinkedOnlineFiles" text="%Download linked online files"/>
diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
index d2690a43d56..5d0d97c99f1 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
@@ -17,6 +17,7 @@
 
 public class WebSearchTab extends AbstractPreferenceTabView<WebSearchTabViewModel> implements PreferencesTab {
 
+    @FXML private CheckBox enableWebSearch;
     @FXML private CheckBox generateNewKeyOnImport;
     @FXML private CheckBox warnAboutDuplicatesOnImport;
     @FXML private CheckBox downloadLinkedOnlineFiles;
@@ -46,6 +47,7 @@ public String getTabName() {
     public void initialize() {
         this.viewModel = new WebSearchTabViewModel(preferencesService, dialogService);
 
+        enableWebSearch.selectedProperty().bindBidirectional(viewModel.enableWebSearchProperty());
         generateNewKeyOnImport.selectedProperty().bindBidirectional(viewModel.generateKeyOnImportProperty());
         warnAboutDuplicatesOnImport.selectedProperty().bindBidirectional(viewModel.warnAboutDuplicatesOnImportProperty());
         downloadLinkedOnlineFiles.selectedProperty().bindBidirectional(viewModel.shouldDownloadLinkedOnlineFiles());
diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
index b623728413d..fda6e248bd2 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
@@ -32,6 +32,7 @@
 import org.jabref.preferences.PreferencesService;
 
 public class WebSearchTabViewModel implements PreferenceTabViewModel {
+    private final BooleanProperty enableWebSearchProperty = new SimpleBooleanProperty();
     private final BooleanProperty generateKeyOnImportProperty = new SimpleBooleanProperty();
     private final BooleanProperty warnAboutDuplicatesOnImportProperty = new SimpleBooleanProperty();
     private final BooleanProperty shouldDownloadLinkedOnlineFiles = new SimpleBooleanProperty();
@@ -63,6 +64,7 @@ public WebSearchTabViewModel(PreferencesService preferencesService, DialogServic
 
     @Override
     public void setValues() {
+        enableWebSearchProperty.setValue(importerPreferences.areImporterEnabled());
         generateKeyOnImportProperty.setValue(importerPreferences.isGenerateNewKeyOnImport());
         warnAboutDuplicatesOnImportProperty.setValue(importerPreferences.shouldWarnAboutDuplicatesOnImport());
         shouldDownloadLinkedOnlineFiles.setValue(filePreferences.shouldDownloadLinkedFiles());
@@ -78,6 +80,7 @@ public void setValues() {
 
     @Override
     public void storeSettings() {
+        importerPreferences.setImporterEnabled(enableWebSearchProperty.getValue());
         importerPreferences.setGenerateNewKeyOnImport(generateKeyOnImportProperty.getValue());
         importerPreferences.setWarnAboutDuplicatesOnImport(warnAboutDuplicatesOnImportProperty.getValue());
         filePreferences.setDownloadLinkedFiles(shouldDownloadLinkedOnlineFiles.getValue());
@@ -93,6 +96,10 @@ public void storeSettings() {
         preferencesService.getImporterPreferences().getApiKeys().addAll(apiKeys);
     }
 
+    public BooleanProperty enableWebSearchProperty() {
+        return generateKeyOnImportProperty;
+    }
+
     public BooleanProperty generateKeyOnImportProperty() {
         return generateKeyOnImportProperty;
     }
diff --git a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
index a1b56c26b85..96e6e1c60be 100644
--- a/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/ImporterPreferences.java
@@ -15,17 +15,20 @@
 
 public class ImporterPreferences {
 
+    private final BooleanProperty importerEnabled;
     private final BooleanProperty generateNewKeyOnImport;
     private final BooleanProperty warnAboutDuplicatesOnImport;
     private final ObjectProperty<Path> importWorkingDirectory;
     private final ObservableSet<FetcherApiKey> apiKeys;
     private final ObservableSet<CustomImporter> customImporters;
 
-    public ImporterPreferences(boolean generateNewKeyOnImport,
+    public ImporterPreferences(boolean importerEnabled,
+                               boolean generateNewKeyOnImport,
                                Path importWorkingDirectory,
                                boolean warnAboutDuplicatesOnImport,
                                Set<CustomImporter> customImporters,
                                Set<FetcherApiKey> apiKeys) {
+        this.importerEnabled = new SimpleBooleanProperty(importerEnabled);
         this.generateNewKeyOnImport = new SimpleBooleanProperty(generateNewKeyOnImport);
         this.importWorkingDirectory = new SimpleObjectProperty<>(importWorkingDirectory);
         this.warnAboutDuplicatesOnImport = new SimpleBooleanProperty(warnAboutDuplicatesOnImport);
@@ -33,6 +36,18 @@ public ImporterPreferences(boolean generateNewKeyOnImport,
         this.apiKeys = FXCollections.observableSet(apiKeys);
     }
 
+    public boolean areImporterEnabled() {
+        return importerEnabled.get();
+    }
+
+    public BooleanProperty importerEnabledProperty() {
+        return importerEnabled;
+    }
+
+    public void setImporterEnabled(boolean importerEnabled) {
+        this.importerEnabled.set(importerEnabled);
+    }
+
     public boolean isGenerateNewKeyOnImport() {
         return generateNewKeyOnImport.get();
     }
diff --git a/src/main/java/org/jabref/preferences/InternalPreferences.java b/src/main/java/org/jabref/preferences/InternalPreferences.java
index f7996473c5c..0276dc88ca0 100644
--- a/src/main/java/org/jabref/preferences/InternalPreferences.java
+++ b/src/main/java/org/jabref/preferences/InternalPreferences.java
@@ -14,15 +14,18 @@
 public class InternalPreferences {
 
     private final ObjectProperty<Version> ignoredVersion;
+    private final BooleanProperty versionCheckEnabled;
     private final ObjectProperty<Path> lastPreferencesExportPath;
     private final StringProperty userAndHost;
     private final BooleanProperty memoryStickMode;
 
     public InternalPreferences(Version ignoredVersion,
+                               boolean versionCheck,
                                Path exportPath,
                                String userAndHost,
                                boolean memoryStickMode) {
         this.ignoredVersion = new SimpleObjectProperty<>(ignoredVersion);
+        this.versionCheckEnabled = new SimpleBooleanProperty(versionCheck);
         this.lastPreferencesExportPath = new SimpleObjectProperty<>(exportPath);
         this.userAndHost = new SimpleStringProperty(userAndHost);
         this.memoryStickMode = new SimpleBooleanProperty(memoryStickMode);
@@ -40,6 +43,18 @@ public void setIgnoredVersion(Version ignoredVersion) {
         this.ignoredVersion.set(ignoredVersion);
     }
 
+    public boolean isVersionCheckEnabled() {
+        return versionCheckEnabled.get();
+    }
+
+    public BooleanProperty versionCheckEnabledProperty() {
+        return versionCheckEnabled;
+    }
+
+    public void setVersionCheckEnabled(boolean versionCheckEnabled) {
+        this.versionCheckEnabled.set(versionCheckEnabled);
+    }
+
     public Path getLastPreferencesExportPath() {
         return lastPreferencesExportPath.get();
     }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index f97680c67d7..75f0fc98bbd 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -262,6 +262,8 @@ public class JabRefPreferences implements PreferencesService {
     public static final String SEARCH_KEEP_GLOBAL_WINDOW_ON_TOP = "keepOnTop";
     public static final String SEARCH_WINDOW_HEIGHT = "searchWindowHeight";
     public static final String SEARCH_WINDOW_WIDTH = "searchWindowWidth";
+
+    public static final String IMPORTERS_ENABLED = "importersEnabled";
     public static final String GENERATE_KEY_ON_IMPORT = "generateKeyOnImport";
     public static final String GROBID_ENABLED = "grobidEnabled";
     public static final String GROBID_OPT_OUT = "grobidOptOut";
@@ -330,6 +332,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String CUSTOMIZED_BIBLATEX_TYPES = "customizedBiblatexTypes";
     // Version
     public static final String VERSION_IGNORED_UPDATE = "versionIgnoreUpdate";
+    public static final String VERSION_CHECK_ENABLED = "versionCheck";
     // KeyBindings - keys - public because needed for pref migration
     public static final String BINDINGS = "bindings";
 
@@ -495,7 +498,8 @@ private JabRefPreferences() {
         defaults.put(SEARCH_WINDOW_HEIGHT, 176.0);
         defaults.put(SEARCH_WINDOW_WIDTH, 600.0);
 
-        defaults.put(GENERATE_KEY_ON_IMPORT, Boolean.TRUE);
+        defaults.put(IMPORTERS_ENABLED, false);
+        defaults.put(GENERATE_KEY_ON_IMPORT, true);
         defaults.put(GROBID_ENABLED, Boolean.FALSE);
         defaults.put(GROBID_OPT_OUT, Boolean.FALSE);
         defaults.put(GROBID_URL, "http://grobid.jabref.org:8070");
@@ -738,6 +742,7 @@ private JabRefPreferences() {
 
         // version check defaults
         defaults.put(VERSION_IGNORED_UPDATE, "");
+        defaults.put(VERSION_CHECK_ENABLED, false);
 
         // preview
         defaults.put(CYCLE_PREVIEW, "Preview;" + CitationStyle.DEFAULT);
@@ -1411,7 +1416,6 @@ public EntryEditorPreferences getEntryEditorPreferences() {
                 getDefaultEntryEditorTabs(),
                 getBoolean(AUTO_OPEN_FORM),
                 getBoolean(SHOW_RECOMMENDATIONS),
-                getBoolean(ACCEPT_RECOMMENDATIONS),
                 getBoolean(SHOW_LATEX_CITATIONS),
                 getBoolean(DEFAULT_SHOW_SOURCE),
                 getBoolean(VALIDATE_IN_ENTRY_EDITOR),
@@ -1423,7 +1427,6 @@ public EntryEditorPreferences getEntryEditorPreferences() {
         // defaultEntryEditorTabs are read-only
         EasyBind.listen(entryEditorPreferences.shouldOpenOnNewEntryProperty(), (obs, oldValue, newValue) -> putBoolean(AUTO_OPEN_FORM, newValue));
         EasyBind.listen(entryEditorPreferences.shouldShowRecommendationsTabProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_RECOMMENDATIONS, newValue));
-        EasyBind.listen(entryEditorPreferences.isMrdlibAcceptedProperty(), (obs, oldValue, newValue) -> putBoolean(ACCEPT_RECOMMENDATIONS, newValue));
         EasyBind.listen(entryEditorPreferences.shouldShowLatexCitationsTabProperty(), (obs, oldValue, newValue) -> putBoolean(SHOW_LATEX_CITATIONS, newValue));
         EasyBind.listen(entryEditorPreferences.showSourceTabByDefaultProperty(), (obs, oldValue, newValue) -> putBoolean(DEFAULT_SHOW_SOURCE, newValue));
         EasyBind.listen(entryEditorPreferences.enableValidationProperty(), (obs, oldValue, newValue) -> putBoolean(VALIDATE_IN_ENTRY_EDITOR, newValue));
@@ -2009,12 +2012,15 @@ public InternalPreferences getInternalPreferences() {
 
         internalPreferences = new InternalPreferences(
                 Version.parse(get(VERSION_IGNORED_UPDATE)),
+                getBoolean(VERSION_CHECK_ENABLED),
                 getPath(PREFS_EXPORT_PATH, OS.getNativeDesktop().getDefaultFileChooserDirectory()),
                 getUserAndHost(),
                 getBoolean(MEMORY_STICK_MODE));
 
         EasyBind.listen(internalPreferences.ignoredVersionProperty(),
                 (obs, oldValue, newValue) -> put(VERSION_IGNORED_UPDATE, newValue.toString()));
+        EasyBind.listen(internalPreferences.versionCheckEnabledProperty(),
+                (obs, oldValue, newValue) -> putBoolean(VERSION_CHECK_ENABLED, newValue));
         EasyBind.listen(internalPreferences.lastPreferencesExportPathProperty(),
                 (obs, oldValue, newValue) -> put(PREFS_EXPORT_PATH, newValue.toString()));
         // user is a static value, should only be changed for debugging
@@ -2759,6 +2765,7 @@ public ImporterPreferences getImporterPreferences() {
         }
 
         importerPreferences = new ImporterPreferences(
+                getBoolean(IMPORTERS_ENABLED),
                 getBoolean(GENERATE_KEY_ON_IMPORT),
                 Path.of(get(IMPORT_WORKING_DIRECTORY)),
                 getBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION),
@@ -2766,6 +2773,7 @@ public ImporterPreferences getImporterPreferences() {
                 getFetcherKeys()
         );
 
+        EasyBind.listen(importerPreferences.importerEnabledProperty(), (obs, oldValue, newValue) -> putBoolean(IMPORTERS_ENABLED, newValue));
         EasyBind.listen(importerPreferences.generateNewKeyOnImportProperty(), (obs, oldValue, newValue) -> putBoolean(GENERATE_KEY_ON_IMPORT, newValue));
         EasyBind.listen(importerPreferences.importWorkingDirectoryProperty(), (obs, oldValue, newValue) -> put(IMPORT_WORKING_DIRECTORY, newValue.toString()));
         EasyBind.listen(importerPreferences.warnAboutDuplicatesOnImportProperty(), (obs, oldValue, newValue) -> putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue));

From 487695bbe057ef69c3db165fab06221436a1747b Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Mon, 3 Jul 2023 19:59:33 +0200
Subject: [PATCH 02/27] Added check for first run

---
 src/main/java/org/jabref/gui/JabRefGUI.java     |  5 ++++-
 .../jabref/preferences/InternalPreferences.java | 17 ++++++++++++++++-
 .../jabref/preferences/JabRefPreferences.java   |  8 ++++++++
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/JabRefGUI.java b/src/main/java/org/jabref/gui/JabRefGUI.java
index f87665f0247..a319b2b9d10 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -69,7 +69,10 @@ public JabRefGUI(Stage mainStage,
 
         openWindow(mainStage);
 
-        mainFrame.getDialogService().showCustomDialogAndWait(new GdprDialogView());
+        if (!preferencesService.getInternalPreferences().isGdprSetup()) {
+            mainFrame.getDialogService().showCustomDialogAndWait(new GdprDialogView());
+            preferencesService.getInternalPreferences().setGdprSetup(true);
+        }
 
         EasyBind.subscribe(preferencesService.getInternalPreferences().versionCheckEnabledProperty(), enabled -> {
             if (enabled) {
diff --git a/src/main/java/org/jabref/preferences/InternalPreferences.java b/src/main/java/org/jabref/preferences/InternalPreferences.java
index 0276dc88ca0..ab3f8660a4d 100644
--- a/src/main/java/org/jabref/preferences/InternalPreferences.java
+++ b/src/main/java/org/jabref/preferences/InternalPreferences.java
@@ -13,17 +13,20 @@
 
 public class InternalPreferences {
 
+    private final BooleanProperty gdprSetup;
     private final ObjectProperty<Version> ignoredVersion;
     private final BooleanProperty versionCheckEnabled;
     private final ObjectProperty<Path> lastPreferencesExportPath;
     private final StringProperty userAndHost;
     private final BooleanProperty memoryStickMode;
 
-    public InternalPreferences(Version ignoredVersion,
+    public InternalPreferences(boolean gdprSetup,
+                               Version ignoredVersion,
                                boolean versionCheck,
                                Path exportPath,
                                String userAndHost,
                                boolean memoryStickMode) {
+        this.gdprSetup = new SimpleBooleanProperty(gdprSetup);
         this.ignoredVersion = new SimpleObjectProperty<>(ignoredVersion);
         this.versionCheckEnabled = new SimpleBooleanProperty(versionCheck);
         this.lastPreferencesExportPath = new SimpleObjectProperty<>(exportPath);
@@ -31,6 +34,18 @@ public InternalPreferences(Version ignoredVersion,
         this.memoryStickMode = new SimpleBooleanProperty(memoryStickMode);
     }
 
+    public boolean isGdprSetup() {
+        return gdprSetup.get();
+    }
+
+    public BooleanProperty gdprSetupProperty() {
+        return gdprSetup;
+    }
+
+    public void setGdprSetup(boolean gdprSetup) {
+        this.gdprSetup.set(gdprSetup);
+    }
+
     public Version getIgnoredVersion() {
         return ignoredVersion.getValue();
     }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 75f0fc98bbd..ed78d54c32a 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -351,6 +351,9 @@ public class JabRefPreferences implements PreferencesService {
     public static final String CYCLE_PREVIEW = "cyclePreview";
     public static final String PREVIEW_AS_TAB = "previewAsTab";
 
+    // General
+    private static final String GDPR_SETUP = "gdprSetup";
+
     // UI
     private static final String FONT_FAMILY = "fontFamily";
 
@@ -520,6 +523,8 @@ private JabRefPreferences() {
         defaults.put(USE_CUSTOM_DOI_URI, Boolean.FALSE);
         defaults.put(BASE_DOI_URI, "https://doi.org");
 
+        defaults.put(GDPR_SETUP, Boolean.FALSE);
+
         if (OS.OS_X) {
             defaults.put(FONT_FAMILY, "SansSerif");
             defaults.put(PUSH_EMACS_PATH, "emacsclient");
@@ -2011,12 +2016,15 @@ public InternalPreferences getInternalPreferences() {
         }
 
         internalPreferences = new InternalPreferences(
+                getBoolean(GDPR_SETUP),
                 Version.parse(get(VERSION_IGNORED_UPDATE)),
                 getBoolean(VERSION_CHECK_ENABLED),
                 getPath(PREFS_EXPORT_PATH, OS.getNativeDesktop().getDefaultFileChooserDirectory()),
                 getUserAndHost(),
                 getBoolean(MEMORY_STICK_MODE));
 
+        EasyBind.listen(internalPreferences.gdprSetupProperty(),
+                (obs, oldValue, newValue) -> putBoolean(GDPR_SETUP, newValue));
         EasyBind.listen(internalPreferences.ignoredVersionProperty(),
                 (obs, oldValue, newValue) -> put(VERSION_IGNORED_UPDATE, newValue.toString()));
         EasyBind.listen(internalPreferences.versionCheckEnabledProperty(),

From 8ac58eed52c47a98a88e75094ae0dfd0bb85ed4f Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Mon, 3 Jul 2023 23:41:30 +0200
Subject: [PATCH 03/27] l10n

---
 src/main/resources/l10n/JabRef_en.properties | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 8d4f41569a5..17c589d87c5 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2524,6 +2524,12 @@ Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbrevi
 
 Library\ to\ import\ into=Library to import into
 
+Enable\ web\ search=Enable web search
+JabRef\ enhances\ the\ user\ experience\ with\ remote\ services.\ Please\ Opt-In\ to\ the\ following\ services.=JabRef enhances the user experience with remote services. Please Opt-In to the following services.
+Privacy\ setup=Privacy setup
+See\ also\ the\ privacy\ policy\ (external\ link)=See also the privacy policy (external link)
+Web\ search\ disabled=Web search disabled
+
 Multiline=Multiline
 
 Unable\ to\ open\ linked\ eprint.\ Please\ set\ the\ eprinttype\ field=Unable to open linked eprint. Please set the eprinttype field

From d37064790838e84ca0b200e329480a744452743c Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Mon, 3 Jul 2023 23:46:01 +0200
Subject: [PATCH 04/27] Adjust icon size

---
 src/main/java/org/jabref/gui/gdpr/GdprDialog.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/gdpr/GdprDialog.css b/src/main/java/org/jabref/gui/gdpr/GdprDialog.css
index 373ab8b3ea4..9c2bfc9d4d8 100644
--- a/src/main/java/org/jabref/gui/gdpr/GdprDialog.css
+++ b/src/main/java/org/jabref/gui/gdpr/GdprDialog.css
@@ -4,5 +4,5 @@
 }
 
 .info-section .ikonli-font-icon {
-    -fx-font-size: 36.0;
+    -fx-font-size: 4em;
 }

From d9ac20d12575d5894f3b0e055eb02faf4962a6c2 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sat, 19 Aug 2023 23:04:37 +0200
Subject: [PATCH 05/27] Removed dialog

---
 src/main/java/org/jabref/gui/JabRefGUI.java   |  6 --
 .../java/org/jabref/gui/gdpr/GdprDialog.css   |  8 ---
 .../java/org/jabref/gui/gdpr/GdprDialog.fxml  | 38 -----------
 .../org/jabref/gui/gdpr/GdprDialogView.java   | 63 -------------------
 .../jabref/gui/gdpr/GdprDialogViewModel.java  | 58 -----------------
 .../java/org/jabref/gui/icon/IconTheme.java   |  3 +-
 .../fetcher/WebSearchPaneViewModel.java       |  3 -
 .../preferences/InternalPreferences.java      | 17 +----
 .../jabref/preferences/JabRefPreferences.java | 14 +----
 9 files changed, 5 insertions(+), 205 deletions(-)
 delete mode 100644 src/main/java/org/jabref/gui/gdpr/GdprDialog.css
 delete mode 100644 src/main/java/org/jabref/gui/gdpr/GdprDialog.fxml
 delete mode 100644 src/main/java/org/jabref/gui/gdpr/GdprDialogView.java
 delete mode 100644 src/main/java/org/jabref/gui/gdpr/GdprDialogViewModel.java

diff --git a/src/main/java/org/jabref/gui/JabRefGUI.java b/src/main/java/org/jabref/gui/JabRefGUI.java
index a319b2b9d10..af1e5e19782 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -13,7 +13,6 @@
 import javafx.stage.Screen;
 import javafx.stage.Stage;
 
-import org.jabref.gui.gdpr.GdprDialogView;
 import org.jabref.gui.help.VersionWorker;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.importer.ParserResultWarningDialog;
@@ -69,11 +68,6 @@ public JabRefGUI(Stage mainStage,
 
         openWindow(mainStage);
 
-        if (!preferencesService.getInternalPreferences().isGdprSetup()) {
-            mainFrame.getDialogService().showCustomDialogAndWait(new GdprDialogView());
-            preferencesService.getInternalPreferences().setGdprSetup(true);
-        }
-
         EasyBind.subscribe(preferencesService.getInternalPreferences().versionCheckEnabledProperty(), enabled -> {
             if (enabled) {
                 new VersionWorker(Globals.BUILD_INFO.version,
diff --git a/src/main/java/org/jabref/gui/gdpr/GdprDialog.css b/src/main/java/org/jabref/gui/gdpr/GdprDialog.css
deleted file mode 100644
index 9c2bfc9d4d8..00000000000
--- a/src/main/java/org/jabref/gui/gdpr/GdprDialog.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.info-section {
-    -fx-padding: 10px;
-    -fx-background-color: -fx-background;
-}
-
-.info-section .ikonli-font-icon {
-    -fx-font-size: 4em;
-}
diff --git a/src/main/java/org/jabref/gui/gdpr/GdprDialog.fxml b/src/main/java/org/jabref/gui/gdpr/GdprDialog.fxml
deleted file mode 100644
index e02fa02c352..00000000000
--- a/src/main/java/org/jabref/gui/gdpr/GdprDialog.fxml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.ButtonType?>
-<?import javafx.scene.control.CheckBox?>
-<?import javafx.scene.control.DialogPane?>
-<?import javafx.scene.control.Hyperlink?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<?import org.jabref.gui.icon.JabRefIconView?>
-<DialogPane prefWidth="400.0" prefHeight="200.0"
-            xmlns="http://javafx.com/javafx"
-            xmlns:fx="http://javafx.com/fxml"
-            fx:controller="org.jabref.gui.gdpr.GdprDialogView">
-    <header>
-        <HBox styleClass="info-section" spacing="4.0">
-            <Label>
-                <graphic>
-                    <JabRefIconView glyph="PRIVACY"/>
-                </graphic>
-            </Label>
-            <VBox>
-                <Label text="%JabRef enhances the user experience with remote services. Please Opt-In to the following services." wrapText="true"/>
-                <Hyperlink fx:id="moreInformation" text="%See also the privacy policy (external link)" />
-            </VBox>
-    </HBox>
-    </header>
-    <content>
-        <VBox spacing="4.0">
-            <CheckBox fx:id="version" text="Updates check"/>
-            <CheckBox fx:id="webSearch" text="Web search for references" />
-            <CheckBox fx:id="pdfMetaDataParser" text="PDF Metadata parser (Grobid)" />
-            <CheckBox fx:id="relatedArticles" text="Related articles suggestions (Mr. Dlib)" />
-        </VBox>
-    </content>
-    <ButtonType buttonData="APPLY" fx:id="btnApply" text="Apply selected"/>
-    <ButtonType buttonData="OK_DONE" fx:id="btnApplyAll" text="Apply all"/>
-</DialogPane>
diff --git a/src/main/java/org/jabref/gui/gdpr/GdprDialogView.java b/src/main/java/org/jabref/gui/gdpr/GdprDialogView.java
deleted file mode 100644
index 4f46a69700f..00000000000
--- a/src/main/java/org/jabref/gui/gdpr/GdprDialogView.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.jabref.gui.gdpr;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.Hyperlink;
-import javafx.stage.Modality;
-
-import org.jabref.gui.DialogService;
-import org.jabref.gui.desktop.JabRefDesktop;
-import org.jabref.gui.util.BaseDialog;
-import org.jabref.logic.l10n.Localization;
-import org.jabref.preferences.PreferencesService;
-
-import com.airhacks.afterburner.views.ViewLoader;
-import jakarta.inject.Inject;
-
-public class GdprDialogView extends BaseDialog<Boolean> {
-    @FXML private Hyperlink moreInformation;
-    @FXML private CheckBox version;
-    @FXML private CheckBox webSearch;
-    @FXML private CheckBox pdfMetaDataParser;
-    @FXML private CheckBox relatedArticles;
-    @FXML private ButtonType btnApply;
-    @FXML private ButtonType btnApplyAll;
-
-    @Inject private PreferencesService preferencesService;
-    @Inject private DialogService dialogService;
-
-    private GdprDialogViewModel viewModel;
-
-    public GdprDialogView() {
-        this.setTitle(Localization.lang("Privacy setup"));
-        this.initModality(Modality.APPLICATION_MODAL);
-        this.setResizable(false);
-
-        ViewLoader.view(this)
-                  .load()
-                  .setAsDialogPane(this);
-    }
-
-    @FXML
-    private void initialize() {
-        viewModel = new GdprDialogViewModel(preferencesService);
-
-        moreInformation.setOnAction(event -> JabRefDesktop.openBrowserShowPopup("https://jabref.org", dialogService));
-
-        version.selectedProperty().bindBidirectional(viewModel.versionEnabledProperty());
-        webSearch.selectedProperty().bindBidirectional(viewModel.webSearchEnabledProperty());
-        pdfMetaDataParser.selectedProperty().bindBidirectional(viewModel.pdfMetaDataParserEnabledProperty());
-        relatedArticles.selectedProperty().bindBidirectional(viewModel.relatedArticlesEnabledProperty());
-
-        setResultConverter(button -> {
-            if (button == btnApply) {
-                viewModel.storeSettings();
-            } else if (button == btnApplyAll) {
-                viewModel.selectAll();
-                viewModel.storeSettings();
-            }
-            return true;
-        });
-    }
-}
diff --git a/src/main/java/org/jabref/gui/gdpr/GdprDialogViewModel.java b/src/main/java/org/jabref/gui/gdpr/GdprDialogViewModel.java
deleted file mode 100644
index e0f7c1fe51c..00000000000
--- a/src/main/java/org/jabref/gui/gdpr/GdprDialogViewModel.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.jabref.gui.gdpr;
-
-import javafx.beans.property.BooleanProperty;
-import javafx.beans.property.SimpleBooleanProperty;
-
-import org.jabref.preferences.PreferencesService;
-
-public class GdprDialogViewModel {
-    private final BooleanProperty versionEnabledProperty = new SimpleBooleanProperty();
-    private final BooleanProperty webSearchEnabledProperty = new SimpleBooleanProperty();
-    private final BooleanProperty pdfMetaDataParserEnabledProperty = new SimpleBooleanProperty();
-    private final BooleanProperty relatedArticlesEnabledProperty = new SimpleBooleanProperty();
-
-    private final PreferencesService preferencesService;
-
-    GdprDialogViewModel(PreferencesService preferencesService) {
-        this.preferencesService = preferencesService;
-
-        setValues();
-    }
-
-    public void setValues() {
-        versionEnabledProperty.set(preferencesService.getInternalPreferences().isVersionCheckEnabled());
-        webSearchEnabledProperty.set(preferencesService.getImporterPreferences().areImporterEnabled());
-        pdfMetaDataParserEnabledProperty.set(preferencesService.getGrobidPreferences().isGrobidEnabled());
-        relatedArticlesEnabledProperty.set(preferencesService.getMrDlibPreferences().shouldAcceptRecommendations());
-    }
-
-    public void storeSettings() {
-        preferencesService.getInternalPreferences().setVersionCheckEnabled(versionEnabledProperty.get());
-        preferencesService.getImporterPreferences().setImporterEnabled(webSearchEnabledProperty.get());
-        preferencesService.getGrobidPreferences().setGrobidEnabled(pdfMetaDataParserEnabledProperty.get());
-        preferencesService.getMrDlibPreferences().setAcceptRecommendations(relatedArticlesEnabledProperty.get());
-    }
-
-    public void selectAll() {
-        versionEnabledProperty.set(true);
-        webSearchEnabledProperty.set(true);
-        pdfMetaDataParserEnabledProperty.set(true);
-        relatedArticlesEnabledProperty.set(true);
-    }
-
-    public BooleanProperty versionEnabledProperty() {
-        return versionEnabledProperty;
-    }
-
-    public BooleanProperty webSearchEnabledProperty() {
-        return webSearchEnabledProperty;
-    }
-
-    public BooleanProperty pdfMetaDataParserEnabledProperty() {
-        return pdfMetaDataParserEnabledProperty;
-    }
-
-    public BooleanProperty relatedArticlesEnabledProperty() {
-        return relatedArticlesEnabledProperty;
-    }
-}
diff --git a/src/main/java/org/jabref/gui/icon/IconTheme.java b/src/main/java/org/jabref/gui/icon/IconTheme.java
index 3633f49ac3b..c92fea5ac8e 100644
--- a/src/main/java/org/jabref/gui/icon/IconTheme.java
+++ b/src/main/java/org/jabref/gui/icon/IconTheme.java
@@ -348,8 +348,7 @@ public enum JabRefIcons implements JabRefIcon {
         REMOVE_TAGS(MaterialDesignC.CLOSE),
         ACCEPT_LEFT(MaterialDesignS.SUBDIRECTORY_ARROW_LEFT),
         ACCEPT_RIGHT(MaterialDesignS.SUBDIRECTORY_ARROW_RIGHT),
-        MERGE_GROUPS(MaterialDesignS.SOURCE_MERGE),
-        PRIVACY(MaterialDesignS.SHIELD_SEARCH);
+        MERGE_GROUPS(MaterialDesignS.SOURCE_MERGE);
 
         private final JabRefIcon icon;
 
diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
index 8dfacb8df6f..5049e8ef6f4 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
@@ -17,7 +17,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.Globals;
 import org.jabref.gui.StateManager;
-import org.jabref.gui.gdpr.GdprDialogView;
 import org.jabref.gui.importer.ImportEntriesDialog;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.logic.importer.ParserResult;
@@ -135,8 +134,6 @@ public StringProperty queryProperty() {
 
     public void search() {
         if (!preferencesService.getImporterPreferences().areImporterEnabled()) {
-            dialogService.showCustomDialogAndWait(new GdprDialogView());
-
             if (!preferencesService.getImporterPreferences().areImporterEnabled()) {
                 dialogService.notify(Localization.lang("Web search disabled"));
                 return;
diff --git a/src/main/java/org/jabref/preferences/InternalPreferences.java b/src/main/java/org/jabref/preferences/InternalPreferences.java
index ab3f8660a4d..0276dc88ca0 100644
--- a/src/main/java/org/jabref/preferences/InternalPreferences.java
+++ b/src/main/java/org/jabref/preferences/InternalPreferences.java
@@ -13,20 +13,17 @@
 
 public class InternalPreferences {
 
-    private final BooleanProperty gdprSetup;
     private final ObjectProperty<Version> ignoredVersion;
     private final BooleanProperty versionCheckEnabled;
     private final ObjectProperty<Path> lastPreferencesExportPath;
     private final StringProperty userAndHost;
     private final BooleanProperty memoryStickMode;
 
-    public InternalPreferences(boolean gdprSetup,
-                               Version ignoredVersion,
+    public InternalPreferences(Version ignoredVersion,
                                boolean versionCheck,
                                Path exportPath,
                                String userAndHost,
                                boolean memoryStickMode) {
-        this.gdprSetup = new SimpleBooleanProperty(gdprSetup);
         this.ignoredVersion = new SimpleObjectProperty<>(ignoredVersion);
         this.versionCheckEnabled = new SimpleBooleanProperty(versionCheck);
         this.lastPreferencesExportPath = new SimpleObjectProperty<>(exportPath);
@@ -34,18 +31,6 @@ public InternalPreferences(boolean gdprSetup,
         this.memoryStickMode = new SimpleBooleanProperty(memoryStickMode);
     }
 
-    public boolean isGdprSetup() {
-        return gdprSetup.get();
-    }
-
-    public BooleanProperty gdprSetupProperty() {
-        return gdprSetup;
-    }
-
-    public void setGdprSetup(boolean gdprSetup) {
-        this.gdprSetup.set(gdprSetup);
-    }
-
     public Version getIgnoredVersion() {
         return ignoredVersion.getValue();
     }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index ed78d54c32a..96425fe89f2 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -351,9 +351,6 @@ public class JabRefPreferences implements PreferencesService {
     public static final String CYCLE_PREVIEW = "cyclePreview";
     public static final String PREVIEW_AS_TAB = "previewAsTab";
 
-    // General
-    private static final String GDPR_SETUP = "gdprSetup";
-
     // UI
     private static final String FONT_FAMILY = "fontFamily";
 
@@ -501,8 +498,8 @@ private JabRefPreferences() {
         defaults.put(SEARCH_WINDOW_HEIGHT, 176.0);
         defaults.put(SEARCH_WINDOW_WIDTH, 600.0);
 
-        defaults.put(IMPORTERS_ENABLED, false);
-        defaults.put(GENERATE_KEY_ON_IMPORT, true);
+        defaults.put(IMPORTERS_ENABLED, Boolean.TRUE);
+        defaults.put(GENERATE_KEY_ON_IMPORT, Boolean.TRUE);
         defaults.put(GROBID_ENABLED, Boolean.FALSE);
         defaults.put(GROBID_OPT_OUT, Boolean.FALSE);
         defaults.put(GROBID_URL, "http://grobid.jabref.org:8070");
@@ -523,8 +520,6 @@ private JabRefPreferences() {
         defaults.put(USE_CUSTOM_DOI_URI, Boolean.FALSE);
         defaults.put(BASE_DOI_URI, "https://doi.org");
 
-        defaults.put(GDPR_SETUP, Boolean.FALSE);
-
         if (OS.OS_X) {
             defaults.put(FONT_FAMILY, "SansSerif");
             defaults.put(PUSH_EMACS_PATH, "emacsclient");
@@ -747,7 +742,7 @@ private JabRefPreferences() {
 
         // version check defaults
         defaults.put(VERSION_IGNORED_UPDATE, "");
-        defaults.put(VERSION_CHECK_ENABLED, false);
+        defaults.put(VERSION_CHECK_ENABLED, Boolean.TRUE);
 
         // preview
         defaults.put(CYCLE_PREVIEW, "Preview;" + CitationStyle.DEFAULT);
@@ -2016,15 +2011,12 @@ public InternalPreferences getInternalPreferences() {
         }
 
         internalPreferences = new InternalPreferences(
-                getBoolean(GDPR_SETUP),
                 Version.parse(get(VERSION_IGNORED_UPDATE)),
                 getBoolean(VERSION_CHECK_ENABLED),
                 getPath(PREFS_EXPORT_PATH, OS.getNativeDesktop().getDefaultFileChooserDirectory()),
                 getUserAndHost(),
                 getBoolean(MEMORY_STICK_MODE));
 
-        EasyBind.listen(internalPreferences.gdprSetupProperty(),
-                (obs, oldValue, newValue) -> putBoolean(GDPR_SETUP, newValue));
         EasyBind.listen(internalPreferences.ignoredVersionProperty(),
                 (obs, oldValue, newValue) -> put(VERSION_IGNORED_UPDATE, newValue.toString()));
         EasyBind.listen(internalPreferences.versionCheckEnabledProperty(),

From dffff2ffc01a600be5fa52dd0a0c0990638ff2f3 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sat, 19 Aug 2023 23:04:52 +0200
Subject: [PATCH 06/27] Fixed enable web search

---
 .../jabref/gui/preferences/websearch/WebSearchTabViewModel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
index fda6e248bd2..0675dde017b 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
@@ -97,7 +97,7 @@ public void storeSettings() {
     }
 
     public BooleanProperty enableWebSearchProperty() {
-        return generateKeyOnImportProperty;
+        return enableWebSearchProperty;
     }
 
     public BooleanProperty generateKeyOnImportProperty() {

From 45c956eae137d505a8769da169cbba02c8833ae3 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sun, 20 Aug 2023 00:00:15 +0200
Subject: [PATCH 07/27] Bind search button to enable preference

---
 .../org/jabref/gui/importer/fetcher/WebSearchPaneView.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java
index df252ccc8df..3d163fd9cb2 100644
--- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java
+++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneView.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.importer.fetcher;
 
+import javafx.beans.binding.BooleanExpression;
 import javafx.css.PseudoClass;
 import javafx.scene.control.Button;
 import javafx.scene.control.ComboBox;
@@ -86,10 +87,12 @@ private void initialize() {
         });
 
         // Create button that triggers search
+        BooleanExpression importerEnabled = preferences.getImporterPreferences().importerEnabledProperty();
         Button search = new Button(Localization.lang("Search"));
         search.setDefaultButton(false);
         search.setOnAction(event -> viewModel.search());
         search.setMaxWidth(Double.MAX_VALUE);
+        search.disableProperty().bind(importerEnabled.not());
         getChildren().addAll(fetcherContainer, query, search);
     }
 }

From 4285f32af2acbe65defc6a5f03e772ec7ae88421 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Thu, 24 Aug 2023 21:07:24 +0200
Subject: [PATCH 08/27] Added privacy policy

Co-authored-by: Oliver Kopp <kopp.dev@gmail.com>
---
 PRIVACY.md | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 PRIVACY.md

diff --git a/PRIVACY.md b/PRIVACY.md
new file mode 100644
index 00000000000..29874cd060b
--- /dev/null
+++ b/PRIVACY.md
@@ -0,0 +1,109 @@
+# Privacy Policy
+Last updated: 2023-08-24
+
+Your privacy is a fundamental right JabRef e.V. respects and supports.
+By using JabRef and its related online services, you choose to share some of this information.
+In this Privacy Policy We explain how We collect, use, and share information about You, along with the choices you have.
+
+Please remember that no method of transmission over the Internet, or method of electronic storage is absolute secure.
+While We strive to use commercially acceptable means to protect Your Personal Data, We cannot guarantee its absolute security.
+Also, whenever somebody communicates through the internet, your IP-Address will be transmitted and retained by other parties for technical reasons.
+
+The term 'Personal information' in this policy means any information that either directly identifies you or can be somehow linked to you. 'JabRef' is the software application, JabRef e.V. provides.
+
+## JabRef
+
+### Collecting information
+JabRef does not collect any personal information directly linked to You.
+However, on certain occasions the software application will send some information to the online services of JabRef e.V.:
+- On application start, JabRef will check for the latest version online (by default *enabled*).
+- A pdf document You automatically want to extract citation information from, using our GROBID service (by default *disabled*).
+- Anonymized statistical data on the use of the graphical user interface for internal analysis purposes (by default *disabled*).
+
+### Storing information
+JabRef does not store any personal information, except:
+- Your proxy username and password, if You decide to store them (by default *disabled*).
+- Any personal API key You use to access third party online services (by default *disabled*). 
+
+### Sharing information
+Certain operations you perform in JabRef may trigger requests to public third-party services such as Zotero, Crossref or the Library of Congress for metadata retrieval.
+These third parties may log besides your IP address and the search terms (e.g., DOI, ISBN or the current URL) according to their privacy policies.
+
+These third-party services are the following:
+
+| Service                                                                                                         | Privacy Policy |
+|-----------------------------------------------------------------------------------------------------------------|----------------|
+| [ACM](https://www.acm.org/)                                                                                     | <https://www.acm.org/privacy-policy> |
+| [ACS Publications](https://pubs.acs.org/)                                                                       | <https://www.acs.org/privacy.html> |
+| [APS Advancing Physics](https://harvest.aps.org/)                                                               | <https://www.aps.org/about/privacy.cfm#privacy> |
+| [arXiv.org](https://arxiv.org/)                                                                                 | <https://info.arxiv.org/help/policies/privacy_policy.html> |
+| [Bibliotheksverbund Bayern](https://www.bib-bvb.de/)                                                            | <https://www.bib-bvb.de/web/guest/datenschutzerklaerung-bvb-homepage> |
+| [Biodiversity Heritage Library](https://www.biodiversitylibrary.org/)                                           | <https://www.si.edu/Privacy> |
+| [Collection of Computer Science Bibliographies](http://liinwww.ira.uka.de/)                                     | **currently unavailable**, offline  |
+| [CrossRef](https://www.crossref.org/)                                                                           | <https://www.crossref.org/operations-and-sustainability/privacy/> |
+| [dblp](https://dblp.uni-trier.de/)                                                                              | <https://dblp.uni-trier.de/db/about/privacy.html> |
+| [Directory of Open Access Books](https://www.doabooks.org/)                                                     | <https://www.doabooks.org/en/resources/accessibility> |
+| [Digitala Vetenskapliga Arkivet](https://www.diva-portal.org/)                                                  | <https://www.uu.se/en/about-uu/data-protection-policy/> |
+| [DOI Foundation](https://www.doi.org/)                                                                          | <https://www.doi.org/privacy-policy/> |
+| [Elsevier](https://www.elsevier.com/)                                                                           | <https://www.elsevier.com/legal/privacy-policy> |
+| [Google Scholar](https://scholar.google.com/)                                                                   | <https://policies.google.com/privacy> |
+| [Gemeinsamer Verbundkatalog](https://www.gbv.de/)                                                               | <https://www.gbv.de/datenschutz> |
+| [IACR](https://www.iacr.org/)                                                                                   | <https://www.iacr.org/privacy.html> |
+| [IEEEXplore](https://ieeexplore.ieee.org/Xplore/home.jsp)                                                       | <https://www.ieee.org/security-privacy.html> |
+| [INSPIRE](https://inspirehep.net/)                                                                              | <https://cern.service-now.com/service-portal?id=privacy_policy&se=INSPIRE-Online&notice=main> |
+| [JSTOR](https://www.jstor.org/)                                                                                 | <https://www.ithaka.org/privacypolicy/> |
+| [Library of Congress](https://lccn.loc.gov/)                                                                    | <https://www.loc.gov/legal/> |
+| [National Library of Medicine](https://www.ncbi.nlm.nih.gov/)                                                   | <https://www.nlm.nih.gov/web_policies.html> |
+| [MathSciNet](http://www.ams.org/mathscinet)                                                                     | <https://www.ams.org/about-us/privacy> |
+| [mEDRA](https://medra.org/)                                                                                     | <https://www.medra.org/stdoc/en/Servizio_DOI_Informativa_ENG.pdf> |
+| [Mr. DLib](https://mr-dlib.org/) &ast;                                                                          | <https://support.dataverse.harvard.edu/harvard-dataverse-privacy-policy> |
+| [Openlibrary](https://openlibrary.org)                                                                          | <https://archive.org/about/terms.php> |
+| [ResearchGate](https://www.researchgate.net/)                                                                   | <https://www.researchgate.net/privacy-policy> |
+| [IETF Datatracker](https://datatracker.ietf.org/)                                                               | <https://www.ietf.org/privacy-statement/> |
+| [Semantic Scholar](https://www.semanticscholar.org/), powered by [Allen Institute for AI](https://allenai.org/) | <https://allenai.org/privacy-policy> |
+| [Springer Nature](https://dev.springernature.com/)                                                              | <https://dev.springernature.com/privacypolicy> |
+| [The SAO/NASA Astrophysics Data System](https://ui.adsabs.harvard.edu/)                                         | <https://ui.adsabs.harvard.edu/help/privacy/> |
+| [Unpaywall](https://unpaywall.org/)                                                                             | <https://unpaywall.org/legal/privacy> |
+| [zbMATH Open](https://www.zbmath.org)                                                                           | <https://zbmath.org/privacy-policy/> |
+
+&ast; *Note: The Mr. DLib service is used for the related articles tab in the entry editor and collects also your language, your browser and operating system (by default *disabled*).* 
+
+## JabRef Browser Extension
+
+No personal data (like name, email address, billing address or credit card) is collected.
+By using the extension you will remain completely anonymous.
+
+### Collecting information
+
+When you access a website with your web browser, the Browser Extension is designed to save time by allowing you to quickly import bibliographic information into JabRef.
+Therefor the extension collects and analyzes some information concerning your browser activity.
+In particular, the following information is used:
+- the url of the current website you are visiting,
+- the content of the current website.
+
+### Storing information
+No data will be stored by the Browser Extension.
+
+### Sharing information
+The Browser Extension does not share any data except with the local instance of the JabRef software application, which stores the citation data as a new entry in its library.
+
+## Links to other Websites
+- Our Service may contain links to other websites that are not operated by Us. If You click on a third party link, You will be directed to that third party's site. We strongly advise You to review the Privacy Policy of every site You visit.
+- We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.
+
+## Changes to this Privacy Policy
+This privacy policy may be changed eventually. 
+We encourage you to check this Privacy Policy periodically for any changes.
+Any material change will be mentioned in the changelog and in our blog.
+
+This privacy policy is in effect as of the day mentioned as "last updated" above and will remain in effect except with respect to any changes in its provisions in the future, which will be in effect immediately after being posted on this page.
+
+## Contact
+For any questions or concerns regarding the privacy policy, please send us an email to <vorstand@jabref.org> or write to
+
+JabRef e.V.<br>
+Josef-Lanner-Str. 9<br>
+71069 Sindelfingen<br>
+Germany
+
+If you get in touch with us, We may aks You to provide Us with certain personal information (e.g. name and email address) that can be used to contact or identify You.

From 611429e957d5515d85ee6bedc4e90fb5ce4639db Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Thu, 24 Aug 2023 21:13:41 +0200
Subject: [PATCH 09/27] Small changes, introducing journals

---
 PRIVACY.md | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/PRIVACY.md b/PRIVACY.md
index 29874cd060b..b2f48f240eb 100644
--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -3,10 +3,10 @@ Last updated: 2023-08-24
 
 Your privacy is a fundamental right JabRef e.V. respects and supports.
 By using JabRef and its related online services, you choose to share some of this information.
-In this Privacy Policy We explain how We collect, use, and share information about You, along with the choices you have.
+In this Privacy Policy We explain how We collect, use, and share information about you, along with the choices you have.
 
 Please remember that no method of transmission over the Internet, or method of electronic storage is absolute secure.
-While We strive to use commercially acceptable means to protect Your Personal Data, We cannot guarantee its absolute security.
+While We strive to use commercially acceptable means to protect your Personal Data, We cannot guarantee its absolute security.
 Also, whenever somebody communicates through the internet, your IP-Address will be transmitted and retained by other parties for technical reasons.
 
 The term 'Personal information' in this policy means any information that either directly identifies you or can be somehow linked to you. 'JabRef' is the software application, JabRef e.V. provides.
@@ -14,16 +14,17 @@ The term 'Personal information' in this policy means any information that either
 ## JabRef
 
 ### Collecting information
-JabRef does not collect any personal information directly linked to You.
+JabRef does not collect any personal information directly linked to you.
 However, on certain occasions the software application will send some information to the online services of JabRef e.V.:
 - On application start, JabRef will check for the latest version online (by default *enabled*).
-- A pdf document You automatically want to extract citation information from, using our GROBID service (by default *disabled*).
+- Information about a journal you are citing when looking for more information about this journal, using our journal database (by default *enabled*).
+- A pdf document you automatically want to extract citation information from, using our GROBID service (by default *disabled*).
 - Anonymized statistical data on the use of the graphical user interface for internal analysis purposes (by default *disabled*).
 
 ### Storing information
 JabRef does not store any personal information, except:
-- Your proxy username and password, if You decide to store them (by default *disabled*).
-- Any personal API key You use to access third party online services (by default *disabled*). 
+- Your proxy username and password, if you decide to store them (by default *disabled*).
+- Any personal API key you use to access third party online services (by default *disabled*). 
 
 ### Sharing information
 Certain operations you perform in JabRef may trigger requests to public third-party services such as Zotero, Crossref or the Library of Congress for metadata retrieval.
@@ -88,7 +89,7 @@ No data will be stored by the Browser Extension.
 The Browser Extension does not share any data except with the local instance of the JabRef software application, which stores the citation data as a new entry in its library.
 
 ## Links to other Websites
-- Our Service may contain links to other websites that are not operated by Us. If You click on a third party link, You will be directed to that third party's site. We strongly advise You to review the Privacy Policy of every site You visit.
+- Our Service may contain links to other websites that are not operated by Us. If you click on a third party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit.
 - We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.
 
 ## Changes to this Privacy Policy
@@ -106,4 +107,4 @@ Josef-Lanner-Str. 9<br>
 71069 Sindelfingen<br>
 Germany
 
-If you get in touch with us, We may aks You to provide Us with certain personal information (e.g. name and email address) that can be used to contact or identify You.
+If you get in touch with us, We may aks you to provide Us with certain personal information (e.g. name and email address) that can be used to contact or identify you.

From 3e3f7ad2118ef0f31c95b53bd8e6af7bbae585f7 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Thu, 24 Aug 2023 21:19:30 +0200
Subject: [PATCH 10/27] Removed inconsistency

---
 PRIVACY.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/PRIVACY.md b/PRIVACY.md
index b2f48f240eb..128b52d55a3 100644
--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -89,8 +89,9 @@ No data will be stored by the Browser Extension.
 The Browser Extension does not share any data except with the local instance of the JabRef software application, which stores the citation data as a new entry in its library.
 
 ## Links to other Websites
-- Our Service may contain links to other websites that are not operated by Us. If you click on a third party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit.
-- We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.
+Our Service may contain links to other websites that are not operated by Us. If you click on a third party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit.
+
+We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.
 
 ## Changes to this Privacy Policy
 This privacy policy may be changed eventually. 

From 5c77ca75c93e40032a2bec00a44ece89a5525b28 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Thu, 24 Aug 2023 21:22:15 +0200
Subject: [PATCH 11/27] Removed inconsistency

---
 PRIVACY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PRIVACY.md b/PRIVACY.md
index 128b52d55a3..7974d423f67 100644
--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -7,7 +7,7 @@ In this Privacy Policy We explain how We collect, use, and share information abo
 
 Please remember that no method of transmission over the Internet, or method of electronic storage is absolute secure.
 While We strive to use commercially acceptable means to protect your Personal Data, We cannot guarantee its absolute security.
-Also, whenever somebody communicates through the internet, your IP-Address will be transmitted and retained by other parties for technical reasons.
+Also, whenever you communicate through the internet, your IP-Address will be transmitted and retained by other parties for technical reasons.
 
 The term 'Personal information' in this policy means any information that either directly identifies you or can be somehow linked to you. 'JabRef' is the software application, JabRef e.V. provides.
 

From 25a102019c9b8cdd1c030a7138394cf342bf7c4c Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Sun, 27 Aug 2023 00:49:20 +0200
Subject: [PATCH 12/27] Add hint to zotero (and Markdown lint fixes)

Quote of privacy policy of Zotero:

We log requests made to our servers by Zotero or third-party software, including IP address and client information, in order to prevent abuse, diagnose technical issues, and assess usage. We retain these logs for up to 90 days. You can opt out of all requests to our servers.
---
 PRIVACY.md | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/PRIVACY.md b/PRIVACY.md
index 7974d423f67..6048a83dadb 100644
--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -14,19 +14,24 @@ The term 'Personal information' in this policy means any information that either
 ## JabRef
 
 ### Collecting information
+
 JabRef does not collect any personal information directly linked to you.
 However, on certain occasions the software application will send some information to the online services of JabRef e.V.:
+
 - On application start, JabRef will check for the latest version online (by default *enabled*).
 - Information about a journal you are citing when looking for more information about this journal, using our journal database (by default *enabled*).
 - A pdf document you automatically want to extract citation information from, using our GROBID service (by default *disabled*).
 - Anonymized statistical data on the use of the graphical user interface for internal analysis purposes (by default *disabled*).
 
 ### Storing information
+
 JabRef does not store any personal information, except:
+
 - Your proxy username and password, if you decide to store them (by default *disabled*).
 - Any personal API key you use to access third party online services (by default *disabled*). 
 
 ### Sharing information
+
 Certain operations you perform in JabRef may trigger requests to public third-party services such as Zotero, Crossref or the Library of Congress for metadata retrieval.
 These third parties may log besides your IP address and the search terms (e.g., DOI, ISBN or the current URL) according to their privacy policies.
 
@@ -71,29 +76,35 @@ These third-party services are the following:
 
 ## JabRef Browser Extension
 
-No personal data (like name, email address, billing address or credit card) is collected.
-By using the extension you will remain completely anonymous.
+No personal data (like name, email address, billing address or credit card) is collected by the Browser Extension.
+The Browser Extension uses Zotero services, where [Zotero's Privacy Policy](https://www.zotero.org/support/privacy) applies.
 
 ### Collecting information
 
 When you access a website with your web browser, the Browser Extension is designed to save time by allowing you to quickly import bibliographic information into JabRef.
-Therefor the extension collects and analyzes some information concerning your browser activity.
+Therefore, the extension collects and analyzes some information concerning your browser activity.
+
 In particular, the following information is used:
+
 - the url of the current website you are visiting,
 - the content of the current website.
 
 ### Storing information
+
 No data will be stored by the Browser Extension.
 
 ### Sharing information
+
 The Browser Extension does not share any data except with the local instance of the JabRef software application, which stores the citation data as a new entry in its library.
 
 ## Links to other Websites
+
 Our Service may contain links to other websites that are not operated by Us. If you click on a third party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit.
 
 We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.
 
 ## Changes to this Privacy Policy
+
 This privacy policy may be changed eventually. 
 We encourage you to check this Privacy Policy periodically for any changes.
 Any material change will be mentioned in the changelog and in our blog.
@@ -101,6 +112,7 @@ Any material change will be mentioned in the changelog and in our blog.
 This privacy policy is in effect as of the day mentioned as "last updated" above and will remain in effect except with respect to any changes in its provisions in the future, which will be in effect immediately after being posted on this page.
 
 ## Contact
+
 For any questions or concerns regarding the privacy policy, please send us an email to <vorstand@jabref.org> or write to
 
 JabRef e.V.<br>

From 1578dc79b28fdc7c38817976cf2fbab275677594 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sun, 27 Aug 2023 01:04:42 +0200
Subject: [PATCH 13/27] Update PRIVACY.md

Co-authored-by: Christoph <siedlerkiller@gmail.com>
---
 PRIVACY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PRIVACY.md b/PRIVACY.md
index 6048a83dadb..fc6cb244e3f 100644
--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -33,7 +33,7 @@ JabRef does not store any personal information, except:
 ### Sharing information
 
 Certain operations you perform in JabRef may trigger requests to public third-party services such as Zotero, Crossref or the Library of Congress for metadata retrieval.
-These third parties may log besides your IP address and the search terms (e.g., DOI, ISBN or the current URL) according to their privacy policies.
+These third parties may log additional information besides your IP address and the search terms (e.g., DOI, ISBN or the current URL) according to their privacy policies.
 
 These third-party services are the following:
 

From 4e84578f310c6bc92b9b391236d2fcbe9c54635f Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sun, 27 Aug 2023 01:05:07 +0200
Subject: [PATCH 14/27] Update PRIVACY.md

Co-authored-by: Tobias Diez <tobiasdiez@gmx.de>
---
 PRIVACY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PRIVACY.md b/PRIVACY.md
index fc6cb244e3f..68291ea2994 100644
--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -25,7 +25,7 @@ However, on certain occasions the software application will send some informatio
 
 ### Storing information
 
-JabRef does not store any personal information, except:
+JabRef only stores the following personal information locally on your computer:
 
 - Your proxy username and password, if you decide to store them (by default *disabled*).
 - Any personal API key you use to access third party online services (by default *disabled*). 

From c16446256dd4db9a9c26d6edaccba3f85b389662 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sun, 27 Aug 2023 01:08:34 +0200
Subject: [PATCH 15/27] Update PRIVACY.md

Co-authored-by: Tobias Diez <tobiasdiez@gmx.de>
---
 PRIVACY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PRIVACY.md b/PRIVACY.md
index 68291ea2994..90c86104665 100644
--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -11,7 +11,7 @@ Also, whenever you communicate through the internet, your IP-Address will be tra
 
 The term 'Personal information' in this policy means any information that either directly identifies you or can be somehow linked to you. 'JabRef' is the software application, JabRef e.V. provides.
 
-## JabRef
+## JabRef Desktop Application 
 
 ### Collecting information
 

From d72615e3df24dbd46cf51c3853e17a4c1130cfc9 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sun, 27 Aug 2023 01:08:54 +0200
Subject: [PATCH 16/27] Update PRIVACY.md

Co-authored-by: Tobias Diez <tobiasdiez@gmx.de>
---
 PRIVACY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PRIVACY.md b/PRIVACY.md
index 90c86104665..d0055985d0d 100644
--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -9,7 +9,7 @@ Please remember that no method of transmission over the Internet, or method of e
 While We strive to use commercially acceptable means to protect your Personal Data, We cannot guarantee its absolute security.
 Also, whenever you communicate through the internet, your IP-Address will be transmitted and retained by other parties for technical reasons.
 
-The term 'Personal information' in this policy means any information that either directly identifies you or can be somehow linked to you. 'JabRef' is the software application, JabRef e.V. provides.
+The term 'Personal information' in this policy means any information that either directly identifies you or can be somehow linked to you. 'JabRef' refers to the desktop application that is provided by JabRef e.V.
 
 ## JabRef Desktop Application 
 

From 4f0917438d918dd37e9b484221465fa9241bace9 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sun, 27 Aug 2023 01:23:20 +0200
Subject: [PATCH 17/27] Update PRIVACY.md

---
 PRIVACY.md | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/PRIVACY.md b/PRIVACY.md
index d0055985d0d..1e107890af6 100644
--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -2,21 +2,21 @@
 Last updated: 2023-08-24
 
 Your privacy is a fundamental right JabRef e.V. respects and supports.
-By using JabRef and its related online services, you choose to share some of this information.
-In this Privacy Policy We explain how We collect, use, and share information about you, along with the choices you have.
-
-Please remember that no method of transmission over the Internet, or method of electronic storage is absolute secure.
-While We strive to use commercially acceptable means to protect your Personal Data, We cannot guarantee its absolute security.
-Also, whenever you communicate through the internet, your IP-Address will be transmitted and retained by other parties for technical reasons.
+By using JabRef and its related online services, you choose to share some of your personal information.
+In this Privacy Policy we explain how we collect, use, and share information about you, along with the choices you have.
 
 The term 'Personal information' in this policy means any information that either directly identifies you or can be somehow linked to you. 'JabRef' refers to the desktop application that is provided by JabRef e.V.
 
+Please remember that no method of transmission over the Internet, or method of electronic storage is absolute secure.
+While we strive to use commercially acceptable means to protect your Personal Data, we cannot guarantee its absolute security.
+Also, whenever you communicate through the internet, your IP-Address will always be transmitted and retained by third parties for technical and in some cases for legal reasons.
+
 ## JabRef Desktop Application 
 
 ### Collecting information
 
 JabRef does not collect any personal information directly linked to you.
-However, on certain occasions the software application will send some information to the online services of JabRef e.V.:
+However, on certain occasions JabRef will send some information to the online services of JabRef e.V.:
 
 - On application start, JabRef will check for the latest version online (by default *enabled*).
 - Information about a journal you are citing when looking for more information about this journal, using our journal database (by default *enabled*).
@@ -62,7 +62,7 @@ These third-party services are the following:
 | [National Library of Medicine](https://www.ncbi.nlm.nih.gov/)                                                   | <https://www.nlm.nih.gov/web_policies.html> |
 | [MathSciNet](http://www.ams.org/mathscinet)                                                                     | <https://www.ams.org/about-us/privacy> |
 | [mEDRA](https://medra.org/)                                                                                     | <https://www.medra.org/stdoc/en/Servizio_DOI_Informativa_ENG.pdf> |
-| [Mr. DLib](https://mr-dlib.org/) &ast;                                                                          | <https://support.dataverse.harvard.edu/harvard-dataverse-privacy-policy> |
+| [Mr. DLib](https://mr-dlib.org/) [1]                                                                            | <https://support.dataverse.harvard.edu/harvard-dataverse-privacy-policy> |
 | [Openlibrary](https://openlibrary.org)                                                                          | <https://archive.org/about/terms.php> |
 | [ResearchGate](https://www.researchgate.net/)                                                                   | <https://www.researchgate.net/privacy-policy> |
 | [IETF Datatracker](https://datatracker.ietf.org/)                                                               | <https://www.ietf.org/privacy-statement/> |
@@ -72,19 +72,16 @@ These third-party services are the following:
 | [Unpaywall](https://unpaywall.org/)                                                                             | <https://unpaywall.org/legal/privacy> |
 | [zbMATH Open](https://www.zbmath.org)                                                                           | <https://zbmath.org/privacy-policy/> |
 
-&ast; *Note: The Mr. DLib service is used for the related articles tab in the entry editor and collects also your language, your browser and operating system (by default *disabled*).* 
+[1]: *Note: The Mr. DLib service is used for the related articles tab in the entry editor and collects also your language, your browser and operating system (by default *disabled*).* 
 
 ## JabRef Browser Extension
 
-No personal data (like name, email address, billing address or credit card) is collected by the Browser Extension.
-The Browser Extension uses Zotero services, where [Zotero's Privacy Policy](https://www.zotero.org/support/privacy) applies.
+No personal data (like name, email address, billing address or credit card) is collected by the Browser Extension itself.
+But be aware that the browser Extension uses Zotero services, where [Zotero's Privacy Policy](https://www.zotero.org/support/privacy) applies.
 
 ### Collecting information
 
-When you access a website with your web browser, the Browser Extension is designed to save time by allowing you to quickly import bibliographic information into JabRef.
-Therefore, the extension collects and analyzes some information concerning your browser activity.
-
-In particular, the following information is used:
+When actively used, the extension has access to the current website and its content to process citation information. In particular, the following information is used:
 
 - the url of the current website you are visiting,
 - the content of the current website.
@@ -99,7 +96,7 @@ The Browser Extension does not share any data except with the local instance of
 
 ## Links to other Websites
 
-Our Service may contain links to other websites that are not operated by Us. If you click on a third party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit.
+Our Service may contain links to other websites that are not operated by us. If you click on a third party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit.
 
 We have no control over and assume no responsibility for the content, privacy policies or practices of any third party sites or services.
 
@@ -107,17 +104,16 @@ We have no control over and assume no responsibility for the content, privacy po
 
 This privacy policy may be changed eventually. 
 We encourage you to check this Privacy Policy periodically for any changes.
-Any material change will be mentioned in the changelog and in our blog.
+Any material change will be mentioned in the changelog of the desktop application and in our [blog](https://blog.jabref.org/).
 
 This privacy policy is in effect as of the day mentioned as "last updated" above and will remain in effect except with respect to any changes in its provisions in the future, which will be in effect immediately after being posted on this page.
 
 ## Contact
 
+If you get in touch with us, we may aks you to provide us with certain personal information (e.g. name and email address) to stay in contact with you.
 For any questions or concerns regarding the privacy policy, please send us an email to <vorstand@jabref.org> or write to
 
 JabRef e.V.<br>
 Josef-Lanner-Str. 9<br>
 71069 Sindelfingen<br>
 Germany
-
-If you get in touch with us, We may aks you to provide Us with certain personal information (e.g. name and email address) that can be used to contact or identify you.

From 4ca3d9f2986b4dc1b6a394fff3790f6c5d4a75e6 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sun, 27 Aug 2023 01:28:37 +0200
Subject: [PATCH 18/27] l10n

---
 src/main/resources/l10n/JabRef_en.properties | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 6ded04f6cd7..61f5c50e67e 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2545,9 +2545,6 @@ Use\ the\ field\ FJournal\ to\ store\ the\ full\ journal\ name\ for\ (un)abbrevi
 Library\ to\ import\ into=Library to import into
 
 Enable\ web\ search=Enable web search
-JabRef\ enhances\ the\ user\ experience\ with\ remote\ services.\ Please\ Opt-In\ to\ the\ following\ services.=JabRef enhances the user experience with remote services. Please Opt-In to the following services.
-Privacy\ setup=Privacy setup
-See\ also\ the\ privacy\ policy\ (external\ link)=See also the privacy policy (external link)
 Web\ search\ disabled=Web search disabled
 
 Multiline=Multiline

From dad9de17bf426f479987089b2388a0d08eafc084 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sun, 27 Aug 2023 02:24:57 +0200
Subject: [PATCH 19/27] Refactor and relocate journal popup preferences

---
 .../entryeditor/EntryEditorPreferences.java   | 37 ++++++++++++++++++-
 .../jabref/gui/fieldeditors/ISSNEditor.java   |  2 +-
 .../gui/fieldeditors/JournalEditor.java       |  2 +-
 .../JournalInfoOptInDialogHelper.java         | 13 ++++---
 .../entryeditor/EntryEditorTab.fxml           |  1 +
 .../entryeditor/EntryEditorTab.java           |  2 +
 .../entryeditor/EntryEditorTabViewModel.java  |  9 +++++
 .../preferences/websearch/WebSearchTab.fxml   |  1 -
 .../preferences/websearch/WebSearchTab.java   |  4 --
 .../websearch/WebSearchTabViewModel.java      | 18 ---------
 .../JournalInformationPreferences.java        | 26 -------------
 .../jabref/logic/util/EnablementStatus.java   | 19 ----------
 .../jabref/preferences/JabRefPreferences.java | 24 +++---------
 .../preferences/PreferencesService.java       |  3 --
 src/main/resources/l10n/JabRef_en.properties  |  1 +
 15 files changed, 63 insertions(+), 99 deletions(-)
 delete mode 100644 src/main/java/org/jabref/logic/journals/JournalInformationPreferences.java
 delete mode 100644 src/main/java/org/jabref/logic/util/EnablementStatus.java

diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
index ceb82f12b6a..73431acb78d 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java
@@ -6,9 +6,11 @@
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.MapProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleMapProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableMap;
 
@@ -16,6 +18,24 @@
 
 public class EntryEditorPreferences {
 
+    /**
+     * Specifies the different possible enablement states for online services
+     */
+    public enum JournalPopupEnabled {
+        FIRST_START, // The first time a user uses this service
+        ENABLED,
+        DISABLED;
+
+        public static JournalPopupEnabled fromString(String status) {
+            for (JournalPopupEnabled value : JournalPopupEnabled.values()) {
+                if (value.toString().equalsIgnoreCase(status)) {
+                    return value;
+                }
+            }
+            throw new IllegalArgumentException("No enum found with value: " + status);
+        }
+    }
+
     private final MapProperty<String, Set<Field>> entryEditorTabList;
     private final MapProperty<String, Set<Field>> defaultEntryEditorTabList;
     private final BooleanProperty shouldOpenOnNewEntry;
@@ -26,6 +46,7 @@ public class EntryEditorPreferences {
     private final BooleanProperty allowIntegerEditionBibtex;
     private final DoubleProperty dividerPosition;
     private final BooleanProperty autoLinkFiles;
+    private final ObjectProperty<JournalPopupEnabled> enablementStatus;
 
     public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList,
                                   Map<String, Set<Field>> defaultEntryEditorTabList,
@@ -36,7 +57,8 @@ public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList,
                                   boolean enableValidation,
                                   boolean allowIntegerEditionBibtex,
                                   double dividerPosition,
-                                  boolean autolinkFilesEnabled) {
+                                  boolean autolinkFilesEnabled,
+                                  JournalPopupEnabled journalPopupEnabled) {
 
         this.entryEditorTabList = new SimpleMapProperty<>(FXCollections.observableMap(entryEditorTabList));
         this.defaultEntryEditorTabList = new SimpleMapProperty<>(FXCollections.observableMap(defaultEntryEditorTabList));
@@ -48,6 +70,7 @@ public EntryEditorPreferences(Map<String, Set<Field>> entryEditorTabList,
         this.allowIntegerEditionBibtex = new SimpleBooleanProperty(allowIntegerEditionBibtex);
         this.dividerPosition = new SimpleDoubleProperty(dividerPosition);
         this.autoLinkFiles = new SimpleBooleanProperty(autolinkFilesEnabled);
+        this.enablementStatus = new SimpleObjectProperty<>(journalPopupEnabled);
     }
 
     public ObservableMap<String, Set<Field>> getEntryEditorTabs() {
@@ -161,4 +184,16 @@ public BooleanProperty autoLinkEnabledProperty() {
     public void setAutoLinkFilesEnabled(boolean enabled) {
         this.autoLinkFiles.setValue(enabled);
     }
+
+    public JournalPopupEnabled shouldEnableJournalPopup() {
+        return enablementStatus.get();
+    }
+
+    public ObjectProperty<JournalPopupEnabled> enableJournalPopupProperty() {
+        return enablementStatus;
+    }
+
+    public void setEnableJournalPopup(JournalPopupEnabled journalPopupEnabled) {
+        this.enablementStatus.set(journalPopupEnabled);
+    }
 }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java
index ae676008475..55dea620477 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/ISSNEditor.java
@@ -70,7 +70,7 @@ public void requestFocus() {
 
     @FXML
     private void showJournalInfo() {
-        if (JournalInfoOptInDialogHelper.isJournalInfoEnabled(dialogService, preferencesService.getJournalInformationPreferences())) {
+        if (JournalInfoOptInDialogHelper.isJournalInfoEnabled(dialogService, preferencesService.getEntryEditorPreferences())) {
             viewModel.showJournalInfo(journalInfoButton);
         }
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
index 2fb0891fb39..5c12abccd71 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalEditor.java
@@ -77,7 +77,7 @@ private void toggleAbbreviation() {
 
     @FXML
     private void showJournalInfo() {
-        if (JournalInfoOptInDialogHelper.isJournalInfoEnabled(dialogService, preferencesService.getJournalInformationPreferences())) {
+        if (JournalInfoOptInDialogHelper.isJournalInfoEnabled(dialogService, preferencesService.getEntryEditorPreferences())) {
             viewModel.showJournalInfo(journalInfoButton);
         }
     }
diff --git a/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java b/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java
index 8cd3dd37aa9..c811936a379 100644
--- a/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java
+++ b/src/main/java/org/jabref/gui/fieldeditors/JournalInfoOptInDialogHelper.java
@@ -1,21 +1,20 @@
 package org.jabref.gui.fieldeditors;
 
 import org.jabref.gui.DialogService;
-import org.jabref.logic.journals.JournalInformationPreferences;
+import org.jabref.gui.entryeditor.EntryEditorPreferences;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.util.EnablementStatus;
 
 public class JournalInfoOptInDialogHelper {
 
     /**
      * Using the journal information data fetcher service needs to be opt-in for GDPR compliance.
      */
-    public static boolean isJournalInfoEnabled(DialogService dialogService, JournalInformationPreferences preferences) {
-        if (preferences.getEnablementStatus() == EnablementStatus.ENABLED) {
+    public static boolean isJournalInfoEnabled(DialogService dialogService, EntryEditorPreferences preferences) {
+        if (preferences.shouldEnableJournalPopup() == EntryEditorPreferences.JournalPopupEnabled.ENABLED) {
             return true;
         }
 
-        if (preferences.getEnablementStatus() == EnablementStatus.DISABLED) {
+        if (preferences.shouldEnableJournalPopup() == EntryEditorPreferences.JournalPopupEnabled.DISABLED) {
             dialogService.notify(
                     Localization.lang("Please enable journal information fetching in %0 > %1",
                             Localization.lang("Preferences"),
@@ -28,7 +27,9 @@ public static boolean isJournalInfoEnabled(DialogService dialogService, JournalI
                 Localization.lang("Remote services"),
                 Localization.lang("Allow sending ISSN to a JabRef online service (SCimago) for fetching journal information"));
 
-        preferences.setEnablementStatus(journalInfoEnabled ? EnablementStatus.ENABLED : EnablementStatus.DISABLED);
+        preferences.setEnableJournalPopup(journalInfoEnabled
+                ? EntryEditorPreferences.JournalPopupEnabled.ENABLED
+                : EntryEditorPreferences.JournalPopupEnabled.DISABLED);
         return journalInfoEnabled;
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
index 894e207fe17..373d531eb8d 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.fxml
@@ -33,6 +33,7 @@
     <CheckBox fx:id="enableLatexCitationsTab" text="%Show 'LaTeX Citations' tab"/>
     <CheckBox fx:id="enableValidation" text="%Show validation messages"/>
     <CheckBox fx:id="allowIntegerEdition" text="%Allow integers in 'edition' field in BibTeX mode"/>
+    <CheckBox fx:id="journalPopupEnabled" text="%Fetch journal information online to show"/>
 
     <Label styleClass="sectionHeader" text="%Custom editor tabs"/>
     <HBox>
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
index 46f3573b569..46b3d642362 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTab.java
@@ -26,6 +26,7 @@ public class EntryEditorTab extends AbstractPreferenceTabView<EntryEditorTabView
     @FXML private CheckBox enableLatexCitationsTab;
     @FXML private CheckBox enableValidation;
     @FXML private CheckBox allowIntegerEdition;
+    @FXML private CheckBox journalPopupEnabled;
     @FXML private CheckBox autoLinkFilesEnabled;
 
     @FXML private Button generalFieldsHelp;
@@ -54,6 +55,7 @@ public void initialize() {
         enableLatexCitationsTab.selectedProperty().bindBidirectional(viewModel.enableLatexCitationsTabProperty());
         enableValidation.selectedProperty().bindBidirectional(viewModel.enableValidationProperty());
         allowIntegerEdition.selectedProperty().bindBidirectional(viewModel.allowIntegerEditionProperty());
+        journalPopupEnabled.selectedProperty().bindBidirectional(viewModel.journalPopupProperty());
         autoLinkFilesEnabled.selectedProperty().bindBidirectional(viewModel.autoLinkFilesEnabledProperty());
 
         fieldsTextArea.textProperty().bindBidirectional(viewModel.fieldsProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
index 81e3a3339a6..dfbd5847fb1 100644
--- a/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/entryeditor/EntryEditorTabViewModel.java
@@ -28,6 +28,7 @@ public class EntryEditorTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty enableLatexCitationsTabProperty = new SimpleBooleanProperty();
     private final BooleanProperty enableValidationProperty = new SimpleBooleanProperty();
     private final BooleanProperty allowIntegerEditionProperty = new SimpleBooleanProperty();
+    private final BooleanProperty journalPopupProperty = new SimpleBooleanProperty();
     private final BooleanProperty autoLinkEnabledProperty = new SimpleBooleanProperty();
 
     private final StringProperty fieldsProperty = new SimpleStringProperty();
@@ -56,6 +57,7 @@ public void setValues() {
         enableLatexCitationsTabProperty.setValue(entryEditorPreferences.shouldShowLatexCitationsTab());
         enableValidationProperty.setValue(entryEditorPreferences.shouldEnableValidation());
         allowIntegerEditionProperty.setValue(entryEditorPreferences.shouldAllowIntegerEditionBibtex());
+        journalPopupProperty.setValue(entryEditorPreferences.shouldEnableJournalPopup() == EntryEditorPreferences.JournalPopupEnabled.ENABLED);
         autoLinkEnabledProperty.setValue(entryEditorPreferences.autoLinkFilesEnabled());
 
         setFields(entryEditorPreferences.getEntryEditorTabs());
@@ -88,6 +90,9 @@ public void storeSettings() {
         entryEditorPreferences.setShowSourceTabByDefault(defaultSourceProperty.getValue());
         entryEditorPreferences.setEnableValidation(enableValidationProperty.getValue());
         entryEditorPreferences.setAllowIntegerEditionBibtex(allowIntegerEditionProperty.getValue());
+        entryEditorPreferences.setEnableJournalPopup(journalPopupProperty.getValue()
+                ? EntryEditorPreferences.JournalPopupEnabled.ENABLED
+                : EntryEditorPreferences.JournalPopupEnabled.DISABLED);
         // entryEditorPreferences.setDividerPosition();
         entryEditorPreferences.setAutoLinkFilesEnabled(autoLinkEnabledProperty.getValue());
 
@@ -150,6 +155,10 @@ public BooleanProperty allowIntegerEditionProperty() {
         return this.allowIntegerEditionProperty;
     }
 
+    public BooleanProperty journalPopupProperty() {
+        return journalPopupProperty;
+    }
+
     public StringProperty fieldsProperty() {
         return fieldsProperty;
     }
diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
index bda7625ae99..628f070c9f0 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.fxml
@@ -31,7 +31,6 @@
         <Label text="%Grobid URL" />
         <TextField fx:id="grobidURL" HBox.hgrow="ALWAYS"/>
     </HBox>
-    <CheckBox fx:id="journalInfoEnabled" text="%Allow sending ISSN to a JabRef online service (SCimago) for fetching journal information"/>
 
     <Label styleClass="sectionHeader" text="%Custom API key"/>
     <HBox alignment="CENTER_LEFT" spacing="10.0">
diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
index 31166b55ffa..5d0d97c99f1 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTab.java
@@ -28,8 +28,6 @@ public class WebSearchTab extends AbstractPreferenceTabView<WebSearchTabViewMode
     @FXML private CheckBox grobidEnabled;
     @FXML private TextField grobidURL;
 
-    @FXML private CheckBox journalInfoEnabled;
-
     @FXML private ComboBox<FetcherApiKey> apiKeySelector;
     @FXML private TextField customApiKey;
     @FXML private CheckBox useCustomApiKey;
@@ -58,8 +56,6 @@ public void initialize() {
         grobidURL.textProperty().bindBidirectional(viewModel.grobidURLProperty());
         grobidURL.disableProperty().bind(grobidEnabled.selectedProperty().not());
 
-        journalInfoEnabled.selectedProperty().bindBidirectional(viewModel.journalInfoEnabledProperty());
-
         useCustomDOI.selectedProperty().bindBidirectional(viewModel.useCustomDOIProperty());
         useCustomDOIName.textProperty().bindBidirectional(viewModel.useCustomDOINameProperty());
         useCustomDOIName.disableProperty().bind(useCustomDOI.selectedProperty().not());
diff --git a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
index 2d3d8705bc7..0675dde017b 100644
--- a/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/websearch/WebSearchTabViewModel.java
@@ -24,12 +24,10 @@
 import org.jabref.logic.importer.WebFetchers;
 import org.jabref.logic.importer.fetcher.CustomizableKeyFetcher;
 import org.jabref.logic.importer.fetcher.GrobidPreferences;
-import org.jabref.logic.journals.JournalInformationPreferences;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.net.URLDownload;
 import org.jabref.logic.preferences.DOIPreferences;
 import org.jabref.logic.preferences.FetcherApiKey;
-import org.jabref.logic.util.EnablementStatus;
 import org.jabref.preferences.FilePreferences;
 import org.jabref.preferences.PreferencesService;
 
@@ -45,8 +43,6 @@ public class WebSearchTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty grobidEnabledProperty = new SimpleBooleanProperty();
     private final StringProperty grobidURLProperty = new SimpleStringProperty("");
 
-    private final BooleanProperty journalInfoEnabledProperty = new SimpleBooleanProperty();
-
     private final ListProperty<FetcherApiKey> apiKeys = new SimpleListProperty<>();
     private final ObjectProperty<FetcherApiKey> selectedApiKeyProperty = new SimpleObjectProperty<>();
 
@@ -56,7 +52,6 @@ public class WebSearchTabViewModel implements PreferenceTabViewModel {
     private final GrobidPreferences grobidPreferences;
     private final ImporterPreferences importerPreferences;
     private final FilePreferences filePreferences;
-    private final JournalInformationPreferences journalInfoPreferences;
 
     public WebSearchTabViewModel(PreferencesService preferencesService, DialogService dialogService) {
         this.dialogService = dialogService;
@@ -65,7 +60,6 @@ public WebSearchTabViewModel(PreferencesService preferencesService, DialogServic
         this.grobidPreferences = preferencesService.getGrobidPreferences();
         this.doiPreferences = preferencesService.getDOIPreferences();
         this.filePreferences = preferencesService.getFilePreferences();
-        this.journalInfoPreferences = preferencesService.getJournalInformationPreferences();
     }
 
     @Override
@@ -81,8 +75,6 @@ public void setValues() {
         grobidEnabledProperty.setValue(grobidPreferences.isGrobidEnabled());
         grobidURLProperty.setValue(grobidPreferences.getGrobidURL());
 
-        journalInfoEnabledProperty.setValue(journalInfoPreferences.getEnablementStatus() == EnablementStatus.ENABLED);
-
         apiKeys.setValue(FXCollections.observableArrayList(preferencesService.getImporterPreferences().getApiKeys()));
     }
 
@@ -97,12 +89,6 @@ public void storeSettings() {
         grobidPreferences.setGrobidOptOut(grobidPreferences.isGrobidOptOut());
         grobidPreferences.setGrobidURL(grobidURLProperty.getValue());
 
-        if (journalInfoEnabledProperty.getValue()) {
-            journalInfoPreferences.setEnablementStatus(EnablementStatus.ENABLED);
-        } else {
-            journalInfoPreferences.setEnablementStatus(EnablementStatus.DISABLED);
-        }
-
         doiPreferences.setUseCustom(useCustomDOIProperty.get());
         doiPreferences.setDefaultBaseURI(useCustomDOINameProperty.getValue().trim());
 
@@ -134,10 +120,6 @@ public StringProperty grobidURLProperty() {
         return grobidURLProperty;
     }
 
-    public BooleanProperty journalInfoEnabledProperty() {
-        return journalInfoEnabledProperty;
-    }
-
     public ListProperty<FetcherApiKey> fetcherApiKeys() {
         return apiKeys;
     }
diff --git a/src/main/java/org/jabref/logic/journals/JournalInformationPreferences.java b/src/main/java/org/jabref/logic/journals/JournalInformationPreferences.java
deleted file mode 100644
index 9ec4cc4cb95..00000000000
--- a/src/main/java/org/jabref/logic/journals/JournalInformationPreferences.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.jabref.logic.journals;
-
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-
-import org.jabref.logic.util.EnablementStatus;
-
-public class JournalInformationPreferences {
-    private final ObjectProperty<EnablementStatus> enablementStatus;
-
-    public JournalInformationPreferences(EnablementStatus enablementStatus) {
-        this.enablementStatus = new SimpleObjectProperty<>(enablementStatus);
-    }
-
-    public EnablementStatus getEnablementStatus() {
-        return enablementStatus.get();
-    }
-
-    public ObjectProperty<EnablementStatus> enablementStatusProperty() {
-        return enablementStatus;
-    }
-
-    public void setEnablementStatus(EnablementStatus enablementStatus) {
-        this.enablementStatus.set(enablementStatus);
-    }
-}
diff --git a/src/main/java/org/jabref/logic/util/EnablementStatus.java b/src/main/java/org/jabref/logic/util/EnablementStatus.java
deleted file mode 100644
index 4381817c91e..00000000000
--- a/src/main/java/org/jabref/logic/util/EnablementStatus.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.jabref.logic.util;
-
-/**
- * Specifies the different possible enablement states for online services
- */
-public enum EnablementStatus {
-    FIRST_START, // The first time a user uses this service
-    ENABLED,
-    DISABLED;
-
-    public static EnablementStatus fromString(String status) {
-        for (EnablementStatus value : EnablementStatus.values()) {
-            if (value.toString().equalsIgnoreCase(status)) {
-                return value;
-            }
-        }
-        throw new IllegalArgumentException("No enum found with value: " + status);
-    }
-}
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index e44c380d35e..f14eeeec056 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -75,7 +75,6 @@
 import org.jabref.logic.importer.fileformat.CustomImporter;
 import org.jabref.logic.importer.util.MetaDataParser;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
-import org.jabref.logic.journals.JournalInformationPreferences;
 import org.jabref.logic.l10n.Language;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
@@ -96,7 +95,6 @@
 import org.jabref.logic.remote.RemotePreferences;
 import org.jabref.logic.shared.prefs.SharedDatabasePreferences;
 import org.jabref.logic.shared.security.Password;
-import org.jabref.logic.util.EnablementStatus;
 import org.jabref.logic.util.OS;
 import org.jabref.logic.util.Version;
 import org.jabref.logic.util.io.AutoLinkPreferences;
@@ -273,7 +271,7 @@ public class JabRefPreferences implements PreferencesService {
     public static final String GROBID_OPT_OUT = "grobidOptOut";
     public static final String GROBID_URL = "grobidURL";
 
-    public static final String JOURNALINFO_ENABLEMENT_STATUS = "journalInfoEnablementStatus";
+    public static final String JOURNAL_POPUP = "journalPopup";
 
     public static final String DEFAULT_CITATION_KEY_PATTERN = "defaultBibtexKeyPattern";
     public static final String UNWANTED_CITATION_KEY_CHARACTERS = "defaultUnwantedBibtexKeyCharacters";
@@ -475,7 +473,6 @@ public class JabRefPreferences implements PreferencesService {
     private ColumnPreferences searchDialogColumnPreferences;
     private JournalAbbreviationPreferences journalAbbreviationPreferences;
     private FieldPreferences fieldPreferences;
-    private JournalInformationPreferences journalInfoPreferences;
 
     // The constructor is made private to enforce this as a singleton class:
     private JabRefPreferences() {
@@ -511,7 +508,7 @@ private JabRefPreferences() {
         defaults.put(GROBID_OPT_OUT, Boolean.FALSE);
         defaults.put(GROBID_URL, "http://grobid.jabref.org:8070");
 
-        defaults.put(JOURNALINFO_ENABLEMENT_STATUS, EnablementStatus.FIRST_START.toString());
+        defaults.put(JOURNAL_POPUP, EntryEditorPreferences.JournalPopupEnabled.FIRST_START.toString());
 
         defaults.put(PUSH_TEXMAKER_PATH, OS.getNativeDesktop().detectProgramPath("texmaker", "Texmaker"));
         defaults.put(PUSH_WINEDT_PATH, OS.getNativeDesktop().detectProgramPath("WinEdt", "WinEdt Team\\WinEdt"));
@@ -1432,7 +1429,8 @@ public EntryEditorPreferences getEntryEditorPreferences() {
                 getBoolean(VALIDATE_IN_ENTRY_EDITOR),
                 getBoolean(ALLOW_INTEGER_EDITION_BIBTEX),
                 getDouble(ENTRY_EDITOR_HEIGHT),
-                getBoolean(AUTOLINK_FILES_ENABLED));
+                getBoolean(AUTOLINK_FILES_ENABLED),
+                EntryEditorPreferences.JournalPopupEnabled.fromString(get(JOURNAL_POPUP)));
 
         EasyBind.listen(entryEditorPreferences.entryEditorTabs(), (obs, oldValue, newValue) -> storeEntryEditorTabs(newValue));
         // defaultEntryEditorTabs are read-only
@@ -1444,6 +1442,7 @@ public EntryEditorPreferences getEntryEditorPreferences() {
         EasyBind.listen(entryEditorPreferences.allowIntegerEditionBibtexProperty(), (obs, oldValue, newValue) -> putBoolean(ALLOW_INTEGER_EDITION_BIBTEX, newValue));
         EasyBind.listen(entryEditorPreferences.dividerPositionProperty(), (obs, oldValue, newValue) -> putDouble(ENTRY_EDITOR_HEIGHT, newValue.doubleValue()));
         EasyBind.listen(entryEditorPreferences.autoLinkEnabledProperty(), (obs, oldValue, newValue) -> putBoolean(AUTOLINK_FILES_ENABLED, newValue));
+        EasyBind.listen(entryEditorPreferences.enableJournalPopupProperty(), (obs, oldValue, newValue) -> put(JOURNAL_POPUP, newValue.toString()));
 
         return entryEditorPreferences;
     }
@@ -2934,19 +2933,6 @@ public GrobidPreferences getGrobidPreferences() {
         return grobidPreferences;
     }
 
-    @Override
-    public JournalInformationPreferences getJournalInformationPreferences() {
-        if (Objects.nonNull(journalInfoPreferences)) {
-            return journalInfoPreferences;
-        }
-
-        journalInfoPreferences = new JournalInformationPreferences(EnablementStatus.fromString(get(JOURNALINFO_ENABLEMENT_STATUS)));
-
-        EasyBind.listen(journalInfoPreferences.enablementStatusProperty(), (obs, oldValue, newValue) -> put(JOURNALINFO_ENABLEMENT_STATUS, newValue.toString()));
-
-        return journalInfoPreferences;
-    }
-
     @Override
     public ImportFormatPreferences getImportFormatPreferences() {
         return new ImportFormatPreferences(
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 6a530c98fd7..0150a4314d2 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -20,7 +20,6 @@
 import org.jabref.logic.importer.ImporterPreferences;
 import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
-import org.jabref.logic.journals.JournalInformationPreferences;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.layout.format.NameFormatterPreferences;
 import org.jabref.logic.net.ProxyPreferences;
@@ -125,8 +124,6 @@ public interface PreferencesService {
 
     GrobidPreferences getGrobidPreferences();
 
-    JournalInformationPreferences getJournalInformationPreferences();
-
     PreviewPreferences getPreviewPreferences();
 
     SidePanePreferences getSidePanePreferences();
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 5079ccc0e25..60f3f5722a5 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -479,6 +479,7 @@ Remove\ journal\ '%0'=Remove journal '%0'
 Journal\ Information=Journal Information
 Year=Year
 ISSN\ or\ journal\ name\ required\ for\ fetching\ journal\ information=ISSN or journal name required for fetching journal information
+Fetch\ journal\ information\ online\ to\ show=Fetch journal information online to show
 Allow\ sending\ ISSN\ to\ a\ JabRef\ online\ service\ (SCimago)\ for\ fetching\ journal\ information=Allow sending ISSN to a JabRef online service (SCimago) for fetching journal information
 Please\ enable\ journal\ information\ fetching\ in\ %0\ >\ %1=Please enable journal information fetching in %0 > %1
 Categories=Categories

From b05be390394f0846244f5abfa156cf80c6bfa9ea Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sun, 27 Aug 2023 02:37:56 +0200
Subject: [PATCH 20/27] privacy.md displayed in installer

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 62ab2b3a12f..cca23caa832 100644
--- a/build.gradle
+++ b/build.gradle
@@ -610,6 +610,7 @@ jlink {
                     '--win-menu-group', "JabRef",
                     '--temp', "$buildDir/installer",
                     '--resource-dir', "${projectDir}/buildres/windows",
+                    '--license-file', "${projectDir}/PRIVACY.md",
                     '--file-associations', "${projectDir}/buildres/windows/bibtexAssociations.properties"
             ]
         }

From 6a5dfbb0c0764e9b2e73f8dbaa18591a6a467d73 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sun, 27 Aug 2023 02:48:59 +0200
Subject: [PATCH 21/27] CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15fa38c07f6..212fafd96b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,13 +34,15 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We added the ability to search for an identifier (DOI, ISBN, ArXiv ID) directly from 'Web Search'. [#7575](https://github.com/JabRef/jabref/issues/7575) [#9674](https://github.com/JabRef/jabref/issues/9674)
 - We added a cleanup activity that identifies a URL or a last-visited-date in the `note` field and moves it to the `url` and `urldate` field respectively. [koppor#216](https://github.com/koppor/jabref/issues/216)
 - We enabled the user to change the name of a field in a custom entry type by double-clicking on it. [#9840](https://github.com/JabRef/jabref/issues/9840)
+- We added some preferences options to disable online activity. [#10064](https://github.com/JabRef/jabref/issues/10064)
 - We integrated two mail actions ("As Email" and "To Kindle") under a new "Send" option in the right-click & Tools menus. The Kindle option creates an email targeted to the user's Kindle email, which can be set in preferences under "External programs" [#6186](https://github.com/JabRef/jabref/issues/6186)
 - We added an option to clear recent libraries' history. [#10003](https://github.com/JabRef/jabref/issues/10003)
 - We added an option to encrypt and remember the proxy password. [#8055](https://github.com/JabRef/jabref/issues/8055)[#10044](https://github.com/JabRef/jabref/issues/10044)
 - We added support for showing journal information, via info buttons next to the `Journal` and `ISSN` fields in the entry editor. [#6189](https://github.com/JabRef/jabref/issues/6189)
 - We added support for pushing citations to Sublime Text 3 [#10098](https://github.com/JabRef/jabref/issues/10098)
 - We added support for the Finnish language. [#10183](https://github.com/JabRef/jabref/pull/10183)
-- We added the option to automatically repleaces  illegal characters in the filename when adding a file to JabRef. [#10182](https://github.com/JabRef/jabref/issues/10182)
+- We added the option to automatically replaces illegal characters in the filename when adding a file to JabRef. [#10182](https://github.com/JabRef/jabref/issues/10182)
+- We added a privacy policy. [#10064](https://github.com/JabRef/jabref/issues/10064)
 
 ### Changed
 

From 2339cbe45ebdfdd893ef75df7323ddc36fee7848 Mon Sep 17 00:00:00 2001
From: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Date: Sun, 27 Aug 2023 03:08:36 +0200
Subject: [PATCH 22/27] Added pref vor version check

---
 .../jabref/gui/preferences/network/NetworkTab.fxml    |  2 ++
 .../jabref/gui/preferences/network/NetworkTab.java    |  3 +++
 .../gui/preferences/network/NetworkTabViewModel.java  | 11 +++++++++++
 src/main/resources/l10n/JabRef_en.properties          |  3 +++
 4 files changed, 19 insertions(+)

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 7817d437c75..f57faa70316 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
@@ -16,6 +16,8 @@
 <?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"/>
+    <Label text="%Please use the latest version of JabRef if you run into a bug. If you encounter an issue or a bug, check the latest version, if the issue is still present." wrapText="true"/>
     <Label styleClass="sectionHeader" text="%Remote operation" />
     <Label fx:id="remoteLabel" text="%This feature lets new files be opened or imported into an already running instance of JabRef instead of opening a new instance. For instance, this is useful when you open a file in JabRef from your web browser. Note that this will prevent you from running more than one instance of JabRef at a time." textOverrun="CLIP" wrapText="true" />
     <HBox alignment="CENTER_LEFT" spacing="10.0">
diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
index 19c3425edd0..bbb6182fc56 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.java
@@ -36,6 +36,7 @@
 
 public class NetworkTab extends AbstractPreferenceTabView<NetworkTabViewModel> implements PreferencesTab {
     @FXML private Label remoteLabel;
+    @FXML private CheckBox versionCheck;
     @FXML private CheckBox remoteServer;
     @FXML private TextField remotePort;
     @FXML private Button remoteHelp;
@@ -83,6 +84,8 @@ public String getTabName() {
     public void initialize() {
         this.viewModel = new NetworkTabViewModel(dialogService, preferencesService, fileUpdateMonitor);
 
+        versionCheck.selectedProperty().bindBidirectional(viewModel.versionCheckProperty());
+
         remoteLabel.setVisible(preferencesService.getWorkspacePreferences().shouldShowAdvancedHints());
         remoteServer.selectedProperty().bindBidirectional(viewModel.remoteServerProperty());
         remotePort.textProperty().bindBidirectional(viewModel.remotePortProperty());
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 1379d5ebbe2..004eceb1c72 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTabViewModel.java
@@ -34,6 +34,7 @@
 import org.jabref.logic.util.StandardFileType;
 import org.jabref.model.strings.StringUtil;
 import org.jabref.model.util.FileUpdateMonitor;
+import org.jabref.preferences.InternalPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
@@ -44,6 +45,7 @@
 import kong.unirest.UnirestException;
 
 public class NetworkTabViewModel implements PreferenceTabViewModel {
+    private final BooleanProperty versionCheckProperty = new SimpleBooleanProperty();
     private final BooleanProperty remoteServerProperty = new SimpleBooleanProperty();
     private final StringProperty remotePortProperty = new SimpleStringProperty("");
     private final BooleanProperty proxyUseProperty = new SimpleBooleanProperty();
@@ -69,6 +71,7 @@ public class NetworkTabViewModel implements PreferenceTabViewModel {
     private final ProxyPreferences proxyPreferences;
     private final ProxyPreferences backupProxyPreferences;
     private final SSLPreferences sslPreferences;
+    private final InternalPreferences internalPreferences;
 
     private final TrustStoreManager trustStoreManager;
 
@@ -81,6 +84,7 @@ public NetworkTabViewModel(DialogService dialogService, PreferencesService prefe
         this.remotePreferences = preferences.getRemotePreferences();
         this.proxyPreferences = preferences.getProxyPreferences();
         this.sslPreferences = preferences.getSSLPreferences();
+        this.internalPreferences = preferences.getInternalPreferences();
 
         backupProxyPreferences = new ProxyPreferences(
                 proxyPreferences.shouldUseProxy(),
@@ -143,6 +147,7 @@ public NetworkTabViewModel(DialogService dialogService, PreferencesService prefe
 
     @Override
     public void setValues() {
+        versionCheckProperty.setValue(internalPreferences.isVersionCheckEnabled());
         remoteServerProperty.setValue(remotePreferences.useRemoteServer());
         remotePortProperty.setValue(String.valueOf(remotePreferences.getPort()));
 
@@ -180,6 +185,8 @@ private void setSSLValues() {
 
     @Override
     public void storeSettings() {
+        internalPreferences.setVersionCheckEnabled(versionCheckProperty.getValue());
+
         getPortAsInt(remotePortProperty.getValue()).ifPresent(newPort -> {
             if (remotePreferences.isDifferentPort(newPort)) {
                 remotePreferences.setPort(newPort);
@@ -307,6 +314,10 @@ public List<String> getRestartWarnings() {
         }
     }
 
+    public BooleanProperty versionCheckProperty() {
+        return versionCheckProperty;
+    }
+
     public BooleanProperty remoteServerProperty() {
         return remoteServerProperty;
     }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 60f3f5722a5..b39f06b51d9 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -496,6 +496,9 @@ 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
+Please\ use\ the\ latest\ version\ of\ JabRef\ if\ you\ run\ into\ a\ bug.\ If\ you\ encounter\ an\ issue\ or\ a\ bug,\ check\ the\ latest\ version,\ if\ the\ issue\ is\ still\ present.=Please use the latest version of JabRef if you run into a bug. If you encounter an issue or a bug, check the latest version, if the issue is still present.
+
 Keep\ both=Keep both
 
 Keep\ subgroups=Keep subgroups

From 3f8f0e8c208efd91742fdfc6c342bfe4fe493807 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 28 Aug 2023 20:42:26 +0200
Subject: [PATCH 23/27] mege license and privacy policy together

---
 PRIVACY.md                       |  15 +--
 build.gradle                     |   5 +-
 buildres/LICENSE_With_Privacy.md | 179 +++++++++++++++++++++++++++++++
 3 files changed, 189 insertions(+), 10 deletions(-)
 create mode 100644 buildres/LICENSE_With_Privacy.md

diff --git a/PRIVACY.md b/PRIVACY.md
index 1e107890af6..f5552fed91b 100644
--- a/PRIVACY.md
+++ b/PRIVACY.md
@@ -1,4 +1,5 @@
 # Privacy Policy
+
 Last updated: 2023-08-24
 
 Your privacy is a fundamental right JabRef e.V. respects and supports.
@@ -11,7 +12,7 @@ Please remember that no method of transmission over the Internet, or method of e
 While we strive to use commercially acceptable means to protect your Personal Data, we cannot guarantee its absolute security.
 Also, whenever you communicate through the internet, your IP-Address will always be transmitted and retained by third parties for technical and in some cases for legal reasons.
 
-## JabRef Desktop Application 
+## JabRef Desktop Application
 
 ### Collecting information
 
@@ -28,7 +29,7 @@ However, on certain occasions JabRef will send some information to the online se
 JabRef only stores the following personal information locally on your computer:
 
 - Your proxy username and password, if you decide to store them (by default *disabled*).
-- Any personal API key you use to access third party online services (by default *disabled*). 
+- Any personal API key you use to access third party online services (by default *disabled*).
 
 ### Sharing information
 
@@ -72,7 +73,7 @@ These third-party services are the following:
 | [Unpaywall](https://unpaywall.org/)                                                                             | <https://unpaywall.org/legal/privacy> |
 | [zbMATH Open](https://www.zbmath.org)                                                                           | <https://zbmath.org/privacy-policy/> |
 
-[1]: *Note: The Mr. DLib service is used for the related articles tab in the entry editor and collects also your language, your browser and operating system (by default *disabled*).* 
+[1]: *Note: The Mr. DLib service is used for the related articles tab in the entry editor and collects also your language, your browser and operating system (by default*disabled*).*
 
 ## JabRef Browser Extension
 
@@ -102,7 +103,7 @@ We have no control over and assume no responsibility for the content, privacy po
 
 ## Changes to this Privacy Policy
 
-This privacy policy may be changed eventually. 
+This privacy policy may be changed eventually.
 We encourage you to check this Privacy Policy periodically for any changes.
 Any material change will be mentioned in the changelog of the desktop application and in our [blog](https://blog.jabref.org/).
 
@@ -113,7 +114,7 @@ This privacy policy is in effect as of the day mentioned as "last updated" above
 If you get in touch with us, we may aks you to provide us with certain personal information (e.g. name and email address) to stay in contact with you.
 For any questions or concerns regarding the privacy policy, please send us an email to <vorstand@jabref.org> or write to
 
-JabRef e.V.<br>
-Josef-Lanner-Str. 9<br>
-71069 Sindelfingen<br>
+JabRef e.V.  
+Josef-Lanner-Str. 9  
+71069 Sindelfingen  
 Germany
diff --git a/build.gradle b/build.gradle
index 912ff1ca13c..3b1b23c795c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -610,7 +610,7 @@ jlink {
                     '--win-menu-group', "JabRef",
                     '--temp', "$buildDir/installer",
                     '--resource-dir', "${projectDir}/buildres/windows",
-                    '--license-file', "${projectDir}/PRIVACY.md",
+                    '--license-file', "${projectDir}/buildres/LICENSE_With_Privacy.md",
                     '--file-associations', "${projectDir}/buildres/windows/bibtexAssociations.properties"
             ]
         }
@@ -640,8 +640,7 @@ jlink {
                     '--icon', "${projectDir}/src/main/resources/icons/jabref.icns",
                     '--resource-dir', "${projectDir}/buildres/mac"
             ]
-            // Due to a signing bug in jpackage we have to first resign the created app and therefore build the dmg manually
-            // See https://bugs.openjdk.java.net/browse/JDK-8251892 for details
+            // Notarized mac images and packages are built on the pipeline only
             skipInstaller = true
             installerOptions = [
                     '--verbose',
diff --git a/buildres/LICENSE_With_Privacy.md b/buildres/LICENSE_With_Privacy.md
new file mode 100644
index 00000000000..41264b1efcc
--- /dev/null
+++ b/buildres/LICENSE_With_Privacy.md
@@ -0,0 +1,179 @@
+MIT License
+
+Copyright © 2003-2021 [JabRef Authors](https://github.com/JabRef/jabref/blob/master/AUTHORS)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--- Privacy Policy ----
+
+# Privacy Policy
+
+Last updated: 2023-08-24
+
+Your privacy is a fundamental right JabRef e.V. respects and supports.
+By using JabRef and its related online services, you choose to share
+some of your personal information. In this Privacy Policy we explain how
+we collect, use, and share information about you, along with the choices
+you have.
+
+The term \'Personal information\' in this policy means any information
+that either directly identifies you or can be somehow linked to you.
+\'JabRef\' refers to the desktop application that is provided by JabRef
+e.V.
+
+Please remember that no method of transmission over the Internet, or
+method of electronic storage is absolute secure. While we strive to use
+commercially acceptable means to protect your Personal Data, we cannot
+guarantee its absolute security. Also, whenever you communicate through
+the internet, your IP-Address will always be transmitted and retained by
+third parties for technical and in some cases for legal reasons.
+
+## JabRef Desktop Application
+
+### Collecting information
+
+JabRef does not collect any personal information directly linked to you.
+However, on certain occasions JabRef will send some information to the
+online services of JabRef e.V.:
+
+- On application start, JabRef will check for the latest version
+    online (by default *enabled*).
+- Information about a journal you are citing when looking for more
+    information about this journal, using our journal database (by
+    default *enabled*).
+- A pdf document you automatically want to extract citation
+    information from, using our GROBID service (by default *disabled*).
+- Anonymized statistical data on the use of the graphical user
+    interface for internal analysis purposes (by default *disabled*).
+
+### Storing information
+
+JabRef only stores the following personal information locally on your
+computer:
+
+- Your proxy username and password, if you decide to store them (by
+    default *disabled*).
+- Any personal API key you use to access third party online services
+    (by default *disabled*).
+
+### Sharing information
+
+Certain operations you perform in JabRef may trigger requests to public
+third-party services such as Zotero, Crossref or the Library of Congress
+for metadata retrieval. These third parties may log additional
+information besides your IP address and the search terms (e.g., DOI,
+ISBN or the current URL) according to their privacy policies.
+
+These third-party services are the following:
+
+Service;Privacy Policy
+[ACM](https://www.acm.org/);<https://www.acm.org/privacy-policy>
+[ACS Publications](https://pubs.acs.org/);<https://www.acs.org/privacy.html>
+[APS Advancing Physics](https://harvest.aps.org/);<https://www.aps.org/about/privacy.cfm#privacy>
+[arXiv.org](https://arxiv.org/);<https://info.arxiv.org/help/policies/privacy_policy.html>
+[Bibliotheksverbund Bayern](https://www.bib-bvb.de/);<https://www.bib-bvb.de/web/guest/datenschutzerklaerung-bvb-homepage>
+[Biodiversity Heritage Library](https://www.biodiversitylibrary.org/);<https://www.si.edu/Privacy>
+[Collection of Computer Science Bibliographies](http://liinwww.ira.uka.de/);**currently unavailable**, offline
+[CrossRef](https://www.crossref.org/);<https://www.crossref.org/operations-and-sustainability/privacy/>
+[dblp](https://dblp.uni-trier.de/);<https://dblp.uni-trier.de/db/about/privacy.html>
+[Directory of Open Access Books](https://www.doabooks.org/);<https://www.doabooks.org/en/resources/accessibility>
+[Digitala Vetenskapliga Arkivet](https://www.diva-portal.org/);<https://www.uu.se/en/about-uu/data-protection-policy/>
+[DOI Foundation](https://www.doi.org/);<https://www.doi.org/privacy-policy/>
+[Elsevier](https://www.elsevier.com/);<https://www.elsevier.com/legal/privacy-policy>
+[Google Scholar](https://scholar.google.com/);<https://policies.google.com/privacy>
+[Gemeinsamer Verbundkatalog](https://www.gbv.de/);<https://www.gbv.de/datenschutz>
+[IACR](https://www.iacr.org/);<https://www.iacr.org/privacy.html>
+[IEEEXplore](https://ieeexplore.ieee.org/Xplore/home.jsp);<https://www.ieee.org/security-privacy.html>
+[INSPIRE](https://inspirehep.net/);<https://cern.service-now.com/service-portal?id=privacy_policy&se=INSPIRE-Online&notice=main>
+[JSTOR](https://www.jstor.org/);<https://www.ithaka.org/privacypolicy/>
+[Library of Congress](https://lccn.loc.gov/);<https://www.loc.gov/legal/>
+[National Library of Medicine](https://www.ncbi.nlm.nih.gov/);<https://www.nlm.nih.gov/web_policies.html>
+[MathSciNet](http://www.ams.org/mathscinet);<https://www.ams.org/about-us/privacy>
+[mEDRA](https://medra.org/);<https://www.medra.org/stdoc/en/Servizio_DOI_Informativa_ENG.pdf>
+[Mr. DLib](https://mr-dlib.org/) [1];<https://support.dataverse.harvard.edu/harvard-dataverse-privacy-policy>
+[Openlibrary](https://openlibrary.org);<https://archive.org/about/terms.php>
+[ResearchGate](https://www.researchgate.net/);<https://www.researchgate.net/privacy-policy>
+[IETF Datatracker](https://datatracker.ietf.org/);<https://www.ietf.org/privacy-statement/>
+[Semantic Scholar](https://www.semanticscholar.org/), powered by [Allen Institute for AI](https://allenai.org/);<https://allenai.org/privacy-policy>
+[Springer Nature](https://dev.springernature.com/);<https://dev.springernature.com/privacypolicy>
+[The SAO/NASA Astrophysics Data System](https://ui.adsabs.harvard.edu/);<https://ui.adsabs.harvard.edu/help/privacy/>
+[Unpaywall](https://unpaywall.org/);<https://unpaywall.org/legal/privacy>
+[zbMATH Open](https://www.zbmath.org);<https://zbmath.org/privacy-policy/>
+
+[1]: *Note: The Mr. DLib service is used for the related articles tab in the entry editor and collects also your language, your browser and operating system (by default*disabled*).*;
+
+## JabRef Browser Extension
+
+No personal data (like name, email address, billing address or credit
+card) is collected by the Browser Extension itself. But be aware that
+the browser Extension uses Zotero services, where [Zotero\'s Privacy
+Policy](https://www.zotero.org/support/privacy) applies.
+
+### Collecting information
+
+When actively used, the extension has access to the current website and
+its content to process citation information. In particular, the
+following information is used:
+
+- the url of the current website you are visiting,
+- the content of the current website.
+
+### Storing information
+
+No data will be stored by the Browser Extension.
+
+### Sharing information
+
+The Browser Extension does not share any data except with the local
+instance of the JabRef software application, which stores the citation
+data as a new entry in its library.
+
+## Links to other Websites
+
+Our Service may contain links to other websites that are not operated by
+us. If you click on a third party link, you will be directed to that
+third party\'s site. We strongly advise you to review the Privacy Policy
+of every site you visit.
+
+We have no control over and assume no responsibility for the content,
+privacy policies or practices of any third party sites or services.
+
+## Changes to this Privacy Policy
+
+This privacy policy may be changed eventually. We encourage you to check
+this Privacy Policy periodically for any changes. Any material change
+will be mentioned in the changelog of the desktop application and in our
+[blog](https://blog.jabref.org/).
+
+This privacy policy is in effect as of the day mentioned as \"last
+updated\" above and will remain in effect except with respect to any
+changes in its provisions in the future, which will be in effect
+immediately after being posted on this page.
+
+## Contact
+
+If you get in touch with us, we may aks you to provide us with certain
+personal information (e.g. name and email address) to stay in contact
+with you. For any questions or concerns regarding the privacy policy,
+please send us an email to <vorstand@jabref.org> or write to
+
+JabRef e.V.\
+Josef-Lanner-Str. 9\
+71069 Sindelfingen\
+Germany

From ef2f60e4fcdc98eeb9ccadbdfc9eb4b475d247ec Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 28 Aug 2023 21:40:29 +0200
Subject: [PATCH 24/27] Rename LICENSE_With_Privacy.md to
 LICENSE_with_Privacy.md

---
 buildres/{LICENSE_With_Privacy.md => LICENSE_with_Privacy.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename buildres/{LICENSE_With_Privacy.md => LICENSE_with_Privacy.md} (100%)

diff --git a/buildres/LICENSE_With_Privacy.md b/buildres/LICENSE_with_Privacy.md
similarity index 100%
rename from buildres/LICENSE_With_Privacy.md
rename to buildres/LICENSE_with_Privacy.md

From ad9987a475dec709a7f4a5f1039e475dd18acf68 Mon Sep 17 00:00:00 2001
From: Oliver Kopp <kopp.dev@gmail.com>
Date: Mon, 28 Aug 2023 21:40:53 +0200
Subject: [PATCH 25/27] Update build.gradle

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3b1b23c795c..8d6137957d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -610,7 +610,7 @@ jlink {
                     '--win-menu-group', "JabRef",
                     '--temp', "$buildDir/installer",
                     '--resource-dir', "${projectDir}/buildres/windows",
-                    '--license-file', "${projectDir}/buildres/LICENSE_With_Privacy.md",
+                    '--license-file', "${projectDir}/buildres/LICENSE_with_Privacy.md",
                     '--file-associations', "${projectDir}/buildres/windows/bibtexAssociations.properties"
             ]
         }

From 9ec80b4482eebc6febca1914c324733070d6cb5b Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 28 Aug 2023 21:45:57 +0200
Subject: [PATCH 26/27] add privacy policy button to about view

---
 src/main/java/org/jabref/gui/help/AboutDialog.fxml          | 1 +
 src/main/java/org/jabref/gui/help/AboutDialogView.java      | 5 +++++
 src/main/java/org/jabref/gui/help/AboutDialogViewModel.java | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/src/main/java/org/jabref/gui/help/AboutDialog.fxml b/src/main/java/org/jabref/gui/help/AboutDialog.fxml
index 494b3c5f537..bda361a6046 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialog.fxml
+++ b/src/main/java/org/jabref/gui/help/AboutDialog.fxml
@@ -38,6 +38,7 @@
                         <Label styleClass="space-after" text="${controller.viewModel.license}" wrapText="true"/>
                         <Hyperlink onAction="#openLicense" text="MIT"/>
                     </HBox>
+                    <Hyperlink onAction="#openPrivacyPolicy" text="Privacy Policy"/>
                     <Hyperlink onAction="#openExternalLibrariesWebsite" text="%Used libraries"/>
                     <HBox alignment="CENTER_LEFT">
                         <Label styleClass="space-after" text="%Want to help?" wrapText="true"/>
diff --git a/src/main/java/org/jabref/gui/help/AboutDialogView.java b/src/main/java/org/jabref/gui/help/AboutDialogView.java
index de23785d378..e6d10b42f5f 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogView.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogView.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.help;
 
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.TextArea;
@@ -86,4 +87,8 @@ public void openContributors() {
     public void openDonation() {
         viewModel.openDonation();
     }
+
+    public void openPrivacyPolicy() {
+        viewModel.openPrivacyPolicy();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
index 2d38961064f..f74c1176137 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogViewModel.java
@@ -29,6 +29,7 @@ public class AboutDialogViewModel extends AbstractViewModel {
     private static final String GITHUB_URL = "https://github.com/JabRef/jabref";
     private static final String LICENSE_URL = "https://github.com/JabRef/jabref/blob/main/LICENSE.md";
     private static final String CONTRIBUTORS_URL = "https://github.com/JabRef/jabref/graphs/contributors";
+    private static final String PRIVACY_POLICY_URL = "https://github.com/JabRef/jabref/blob/main/PRIVACY.md";
     private final String changelogUrl;
     private final String versionInfo;
     private final ReadOnlyStringWrapper environmentInfo = new ReadOnlyStringWrapper();
@@ -154,4 +155,8 @@ private void openWebsite(String url) {
             logger.error("Could not open default browser.", e);
         }
     }
+
+    public void openPrivacyPolicy() {
+        openWebsite(PRIVACY_POLICY_URL);
+    }
 }

From 0906da7448656e235191641de5356fbccae7627f Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Mon, 28 Aug 2023 21:52:00 +0200
Subject: [PATCH 27/27] checkstyle

---
 src/main/java/org/jabref/gui/help/AboutDialogView.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/help/AboutDialogView.java b/src/main/java/org/jabref/gui/help/AboutDialogView.java
index e6d10b42f5f..b0647f2d1df 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogView.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogView.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.help;
 
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.TextArea;