Skip to content

Commit cc440a4

Browse files
author
PSPDFKit
committed
Release 2.18.1
1 parent 401df05 commit cc440a4

File tree

14 files changed

+198
-193
lines changed

14 files changed

+198
-193
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 2.18.1 - 24 Jun 2025
2+
- Updates to Nutrient Android SDK 10.4.0.
3+
- Fixes an issue where the `enterAnnotationCreationMode` and `exitCurrentlyActiveMode` calls on Android resolved before being complete. (J#HYB-824)
4+
- Fixes an issue where setting the `pageIndex` property could result in a crash on Android. (J#HYB-817)
5+
- Fixes an issue where the thumbnail pages could not be selected on iOS. (J#HYB-816)
6+
17
## 2.18.0 - 20 May 2025
28

39
- Adds the new `AIAssistantConfiguration` class to configure AI Assistant and also add new `aiAssistantButtonItem` option to Toolbar configuration. (J#HYB-743)

‎android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* Contains gradle configuration constants
1616
*/
1717
ext {
18-
PSPDFKIT_VERSION = '10.2.0'
18+
PSPDFKIT_VERSION = '10.4.0'
1919
}
2020

2121
buildscript {

‎android/src/main/java/com/pspdfkit/react/ConfigurationAdapter.java‎

Lines changed: 19 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public ConfigurationAdapter(@NonNull final Context context, ReadableMap configur
162162
ReadableMapKeySetIterator iterator = configuration.keySetIterator();
163163
boolean hasConfiguration = iterator.hasNextKey();
164164
this.configuration = new PdfActivityConfiguration.Builder(context);
165-
this.configuration.disableContentEditing();
165+
this.configuration.contentEditingEnabled(false);
166166
if (hasConfiguration) {
167167
String key;
168168

@@ -393,11 +393,7 @@ public static String getStringValueForConfigurationItem(final Enum item) {
393393
}
394394

395395
private void configureShowPageNumberOverlay(final boolean showPageNumberOverlay) {
396-
if (showPageNumberOverlay) {
397-
configuration.showPageNumberOverlay();
398-
} else {
399-
configuration.hidePageNumberOverlay();
400-
}
396+
configuration.pageNumberOverlayEnabled(showPageNumberOverlay);
401397
}
402398

403399
private void configurePageScrollDirection(@Nullable final String pageScrollDirection) {
@@ -482,11 +478,7 @@ private void configureUserInterfaceViewMode(@Nullable final String userInterface
482478
}
483479

484480
private void configureShowSearchAction(final boolean showSearchAction) {
485-
if (showSearchAction) {
486-
configuration.enableSearch();
487-
} else {
488-
configuration.disableSearch();
489-
}
481+
configuration.searchEnabled(showSearchAction);
490482
}
491483

492484
private void configureSignatureSavingStrategy(@Nullable final String signatureSavingStrategy) {
@@ -532,45 +524,24 @@ private void configureShowThumbnailBar(@Nullable final String showThumbnailBar)
532524
}
533525

534526
private void configureShowThumbnailGridAction(final boolean showThumbnailGridAction) {
535-
if (showThumbnailGridAction) {
536-
configuration.showThumbnailGrid();
537-
} else {
538-
configuration.hideThumbnailGrid();
539-
}
527+
configuration.thumbnailGridEnabled(showThumbnailGridAction);
540528
}
541529

542530
private void configureShowOutlineAction(final boolean showOutlineAction) {
543-
if (showOutlineAction) {
544-
configuration.enableOutline();
545-
} else {
546-
configuration.disableOutline();
547-
}
531+
configuration.outlineEnabled(showOutlineAction);
548532
}
549533

550534
private void configureShowBookmarksAction(final boolean showBookmarksAction) {
551-
if (showBookmarksAction) {
552-
configuration.enableBookmarkList();
553-
} else {
554-
configuration.disableBookmarkList();
555-
}
535+
configuration.bookmarkListEnabled(showBookmarksAction);
556536
}
557537

558538
private void configureShowAnnotationListAction(final boolean showAnnotationListAction) {
559-
if (showAnnotationListAction) {
560-
configuration.enableAnnotationList();
561-
} else {
562-
configuration.disableAnnotationList();
563-
}
539+
configuration.annotationListEnabled(showAnnotationListAction);
564540
}
565541

566542
private void configureShowPageLabels(final boolean showPageLabels) {
567-
if (showPageLabels) {
568-
configuration.showPageLabels();
569-
configuration.showPageNumberOverlay();
570-
} else {
571-
configuration.hidePageLabels();
572-
configuration.hidePageNumberOverlay();
573-
}
543+
configuration.pageLabelsEnabled(showPageLabels);
544+
configuration.pageNumberOverlayEnabled(showPageLabels);
574545
}
575546

576547
private void configureGrayScale(final boolean grayScale) {
@@ -582,19 +553,11 @@ private void configureInvertColors(final boolean invertColors) {
582553
}
583554

584555
private void configureEnableAnnotationEditing(final boolean enableAnnotationEditing) {
585-
if (enableAnnotationEditing) {
586-
configuration.enableAnnotationEditing();
587-
} else {
588-
configuration.disableAnnotationEditing();
589-
}
556+
configuration.annotationEditingEnabled(enableAnnotationEditing);
590557
}
591558

592559
private void configureEnableFormEditing(final boolean enableFormEditing) {
593-
if (enableFormEditing) {
594-
configuration.enableFormEditing();
595-
} else {
596-
configuration.disableFormEditing();
597-
}
560+
configuration.formEditingEnabled(enableFormEditing);
598561
}
599562

600563
private void configureShowShareAction(final boolean showShareAction) {
@@ -606,31 +569,19 @@ private void configureShowShareAction(final boolean showShareAction) {
606569
}
607570

608571
private void configureShowPrintAction(final boolean showPrintAction) {
609-
if (showPrintAction) {
610-
configuration.enablePrinting();
611-
} else {
612-
configuration.disablePrinting();
613-
}
572+
configuration.printingEnabled(showPrintAction);
614573
}
615574

616575
private void configureEnableTextSelection(final boolean enableTextSelection) {
617576
configuration.textSelectionEnabled(enableTextSelection);
618577
}
619578

620579
private void configureDocumentInfoView(final boolean enableDocumentInfoView) {
621-
if (enableDocumentInfoView) {
622-
configuration.enableDocumentInfoView();
623-
} else {
624-
configuration.disableDocumentInfoView();
625-
}
580+
configuration.documentInfoViewEnabled(enableDocumentInfoView);
626581
}
627582

628583
private void configureShowDocumentTitleOverlay(final boolean showDocumentTitleOverlay) {
629-
if (showDocumentTitleOverlay) {
630-
configuration.showDocumentTitleOverlay();
631-
} else {
632-
configuration.hideDocumentTitleOverlay();
633-
}
584+
configuration.documentTitleOverlayEnabled(showDocumentTitleOverlay);
634585
}
635586

636587
private void configurePageMode(@Nullable final String pageMode) {
@@ -657,11 +608,7 @@ private void configureAutosaveEnabled(final boolean autosaveEnabled) {
657608
}
658609

659610
private void configureAnnotationEditingEnabled(final boolean annotationEditingEnabled) {
660-
if (annotationEditingEnabled) {
661-
configuration.enableAnnotationEditing();
662-
} else {
663-
configuration.disableAnnotationEditing();
664-
}
611+
configuration.annotationEditingEnabled(annotationEditingEnabled);
665612
}
666613

667614
private void configureEditableAnnotationTypes(@Nullable final ReadableArray editableAnnotationTypes) {
@@ -693,11 +640,7 @@ private void configureEditableAnnotationTypes(@Nullable final ReadableArray edit
693640
}
694641

695642
private void configureSettingsMenuShown(final boolean settingsMenuShown) {
696-
if (settingsMenuShown) {
697-
configuration.showSettingsMenu();
698-
} else {
699-
configuration.hideSettingsMenu();
700-
}
643+
configuration.settingsMenuEnabled(settingsMenuShown);
701644
}
702645

703646
private void configureToolbarTitle(@Nullable final String customTitle) {
@@ -720,20 +663,15 @@ private void configureShowDefaultToolbar(final boolean showDefaultToolbar) {
720663
if (showDefaultToolbar) {
721664
// Set it back to the default, which is AUTOMATIC_HIDE_SINGLE
722665
configuration.setTabBarHidingMode(TabBarHidingMode.AUTOMATIC_HIDE_SINGLE);
723-
configuration.enableDefaultToolbar();
666+
configuration.defaultToolbarEnabled(true);
724667
} else {
725668
configuration.setTabBarHidingMode(TabBarHidingMode.HIDE);
726-
configuration.disableDefaultToolbar();
669+
configuration.defaultToolbarEnabled(false);
727670
}
728671
}
729672

730673
private void configureShowActionButtons(final boolean showActionButtons) {
731-
if (showActionButtons) {
732-
// Set it back to the default, which is AUTOMATIC_HIDE_SINGLE
733-
configuration.showNavigationButtons();
734-
} else {
735-
configuration.hideNavigationButtons();
736-
}
674+
configuration.navigationButtonsEnabled(showActionButtons);
737675
}
738676

739677
public PdfActivityConfiguration build() {

‎android/src/main/java/com/pspdfkit/react/RNProcessor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void generatePDFFromHtmlString(@NonNull ReadableMap configuration, String
103103
assert outputFile != null;
104104
result.putString("fileURL", outputFile.toURI().toString());
105105

106-
HtmlToPdfConverter.fromHTMLString(getContext(), htmlString)
106+
HtmlToPdfConverter.fromHTMLString(getContext(), htmlString, null)
107107
.title("Converted document")
108108
.convertToPdfAsync(outputFile)
109109
.doFinally(() -> callback.resolve(result))

‎android/src/main/java/com/pspdfkit/react/ReactPdfViewManager.java‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,15 +309,26 @@ public void receiveCommand(@NonNull final PdfView root, int commandId, @Nullable
309309
final int requestId = args.getInt(0);
310310
if (args.size() == 2) {
311311
final String annotationType = args.getString(1);
312-
root.enterAnnotationCreationMode(annotationType);
312+
root.enterAnnotationCreationMode(annotationType,
313+
() -> root.getEventDispatcher().dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestId, true)),
314+
(Consumer<Throwable>) throwable -> root.getEventDispatcher().dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestId, throwable))
315+
);
313316
} else {
314-
root.enterAnnotationCreationMode(null);
317+
root.enterAnnotationCreationMode(null,
318+
() -> root.getEventDispatcher().dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestId, true)),
319+
(Consumer<Throwable>) throwable -> root.getEventDispatcher().dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestId, throwable))
320+
);
315321
}
316-
root.getEventDispatcher().dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestId, true));
317322
}
318323
break;
319324
case COMMAND_EXIT_CURRENTLY_ACTIVE_MODE:
320-
root.exitCurrentlyActiveMode();
325+
if (args != null) {
326+
final int requestId = args.getInt(0);
327+
root.exitCurrentlyActiveMode(
328+
() -> root.getEventDispatcher().dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestId, true)),
329+
(Consumer<Throwable>) throwable -> root.getEventDispatcher().dispatchEvent(new PdfViewDataReturnedEvent(root.getId(), requestId, throwable))
330+
);
331+
}
321332
break;
322333
case COMMAND_SAVE_CURRENT_DOCUMENT:
323334
if (args != null) {

‎android/src/main/java/com/pspdfkit/react/ToolbarMenuItemsAdapter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ public ToolbarMenuItemsAdapter(@NonNull final PdfActivityConfiguration currentCo
7171
}
7272

7373
private PdfActivityConfiguration.Builder disableDefaultToolbarItems(final PdfActivityConfiguration.Builder configuration) {
74-
configuration.disableAnnotationList()
75-
.disablePrinting()
76-
.disableBookmarkList();
74+
configuration.annotationListEnabled(false)
75+
.printingEnabled(false)
76+
.bookmarkListEnabled(false);
7777
return configuration;
7878
}
7979

0 commit comments

Comments
 (0)