Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Importing pdfs will now always ask for permission to send file to Grobid #9291

Closed
wants to merge 8 commits into from
Closed

Importing pdfs will now always ask for permission to send file to Grobid #9291

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2b1ae49
Fixes koppor#566
Oct 23, 2022
a52fb39
Changed dialogue box
Oct 29, 2022
8e2f8fb
Finished dialogue box. Need to add privacy statement
Oct 29, 2022
041fca2
Added privacy statement in prefs
Oct 29, 2022
b5ff8b8
Changelog
Oct 29, 2022
ae6234b
Removed print lines
Oct 29, 2022
79e703c
Merge branch 'main' into fix-for-issue-koppor566
DunkDoge Oct 29, 2022
4a93c85
Update GrobidOptInDialogHelper.java
DunkDoge Oct 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We fixed an issue where a message about changed metadata would occur on saving although nothing changed. [#9159](https://github.com/JabRef/jabref/issues/9159)
- When adding or editing a subgroup it is placed w.r.t. to alphabetical ordering rather than at the end. [koppor#577](https://github.com/koppor/jabref/issues/577)
- We modified the Directory of Open Access Books (DOAB) fetcher so that it will now also fetch the ISBN when possible. [#8708](https://github.com/JabRef/jabref/issues/8708)
- We removed the opt out option for the Grobid dialogue box and added an extra privacy statement in prefs for Grobid. [koppor#566](https://github.com/koppor/jabref/issues/566)
- We changed the color of found text from red to high-contrast colors (background: yellow; font color: purple). [koppor#552](https://github.com/koppor/jabref/issues/552)
- We modified the "Delete file" dialog and add the full file path to the dialog text. The file path in the title was changed to file name only. [koppor#534](https://github.com/koppor/jabref/issues/534)
- Download from URL now automatically fills with URL from clipboard. [koppor#535](https://github.com/koppor/jabref/issues/535)
Expand Down Expand Up @@ -86,7 +87,6 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve




## [5.7] - 2022-08-05

### Added
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ public static boolean showAndWaitIfUserIsUndecided(DialogService dialogService,
return true;
}
if (preferences.isGrobidOptOut()) {
return false;
return preferences.isGrobidEnabled();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we not completely remove the isGrobidOptOut check and everything else related to the opt-out?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi I've removed all the opt out stuff from the dialoghelper. Could you have another look? The only thing I'm confused about though is that the dialog is meant to be single instance. Wouldn't removing opt out cause it to show the box everytime import if Grobid is disabled in prefs?

}
boolean grobidEnabled = dialogService.showConfirmationDialogWithOptOutAndWait(
boolean grobidEnabled = dialogService.showConfirmationDialogAndWait(
Localization.lang("Remote services"),
Localization.lang("Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results."),
Localization.lang("Do not ask again"),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep this!

(optOut) -> preferences.grobidOptOutProperty().setValue(optOut));
Localization.lang("Yes"),
Localization.lang("No"));
preferences.grobidEnabledProperty().setValue(grobidEnabled);
preferences.grobidOptOutProperty().setValue(true);
return grobidEnabled;
}
}
1 change: 1 addition & 0 deletions src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

<Label styleClass="sectionHeader" text="%Remote services"/>
<CheckBox fx:id="grobidEnabled" text="%Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results."/>
<Label text="%Note: Enabling Grobid means you consent to your data in the pdf/string being sent to Grobid. This information will only be used to create a better citation."/>
<HBox alignment="CENTER_LEFT" spacing="10.0">
<Label text="%Grobid URL" />
<TextField fx:id="grobidURL" HBox.hgrow="ALWAYS"/>
Expand Down