Release 2.4.2

PSPDFKit · Feb 3, 2023 · c1d809b · c1d809b
1 parent 7e91b82
commit c1d809b
Show file tree

Hide file tree

Showing 114 changed files with 3,980 additions and 4,208 deletions.
diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md
@@ -462,7 +462,7 @@ OTHER DEALINGS IN THE FONT SOFTWARE.
 
 
 --------------------------------------------------------------------------------
-## clipper (http://www.angusj.com/delphi/clipper.php)
+## clipper2 (http://www.angusj.com/delphi/clipper.php)
 
 Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -488,6 +488,7 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
+
 --------------------------------------------------------------------------------
 ## cppformat (https://github.com/cppformat/cppformat)
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,18 @@
 ## Newest Release
 
+### 2.4.2 - 01 Feb 2023
+- Fixes bug issue for deleting multiple annotations (#38518)
+- Bump PSPDFKit for Android version to 8.5.0
+- Bump PSPDFKit for iOS version to 12.0.3
+- Bump minimum SDK version compileSdkVersion to API 33
+
+## Previous Releases
+
 ### 2.4.1 - 22 Nov 2022
 - Updates for PSPDFKit 12.0.1 for iOS.
 - Fixes Catalog example toolbar menu items not rendering. (#37368)
 - Fixes the Annotation Processing Catalog example. (#37534)
 
-## Previous Releases
-
 ### 2.4.0 - 25 Oct 2022
 
 - Adds PDF generation from HTML, images and template. (#36736)

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-All items and source code Copyright © 2010-2022 PSPDFKit GmbH.
+All items and source code Copyright © 2010-2023 PSPDFKit GmbH.
 
 PSPDFKit is a commercial product and requires a license to be used.
 

diff --git a/README.md b/README.md
@@ -692,6 +692,6 @@ For Troubleshooting common issues you might encounter when setting up PSPDFKit f
 ## License
 
 This project can be used for evaluation or if you have a valid PSPDFKit license.
-All items and source code Copyright © 2010-2022 PSPDFKit GmbH.
+All items and source code Copyright © 2010-2023 PSPDFKit GmbH.
 
 See [LICENSE](./LICENSE) for details.
diff --git a/android/.classpath b/android/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-14/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>
diff --git a/android/build.gradle b/android/build.gradle
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2021-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2021-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
@@ -15,7 +15,7 @@
  *   Contains gradle configuration constants
  */
 ext {
-    PSPDFKIT_VERSION = '8.4.1'
+    PSPDFKIT_VERSION = '8.5.0'
 }
 
 buildscript {
@@ -46,7 +46,7 @@ android {
         versionCode 1
         versionName "1.0"
     }
-    
+
      compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -4,7 +4,7 @@
   ~
   ~   PSPDFKit
   ~
-  ~   Copyright © 2017-2022 PSPDFKit GmbH. All rights reserved.
+  ~   Copyright © 2017-2023 PSPDFKit GmbH. All rights reserved.
   ~
   ~   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
   ~   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/ConfigurationAdapter.java b/android/src/main/java/com/pspdfkit/react/ConfigurationAdapter.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2017-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2017-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/MainActivity.java b/android/src/main/java/com/pspdfkit/react/MainActivity.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2017-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2017-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/MainApplication.java b/android/src/main/java/com/pspdfkit/react/MainApplication.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2017-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2017-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/PSPDFKitModule.java b/android/src/main/java/com/pspdfkit/react/PSPDFKitModule.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2017-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2017-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/PSPDFKitPackage.java b/android/src/main/java/com/pspdfkit/react/PSPDFKitPackage.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2017-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2017-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/RNProcessor.java b/android/src/main/java/com/pspdfkit/react/RNProcessor.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2017-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2017-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/ReactPdfViewManager.java b/android/src/main/java/com/pspdfkit/react/ReactPdfViewManager.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2021-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2021-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
@@ -60,10 +60,11 @@ public class ReactPdfViewManager extends ViewGroupManager<PdfView> {
     public static final int COMMAND_ADD_ANNOTATIONS = 7;
     public static final int COMMAND_GET_FORM_FIELD_VALUE = 8;
     public static final int COMMAND_SET_FORM_FIELD_VALUE = 9;
-    public static final int COMMAND_REMOVE_ANNOTATION = 10;
     public static final int COMMAND_GET_ALL_ANNOTATIONS = 11;
+    public static final int COMMAND_REMOVE_ANNOTATION = 10;
     public static final int COMMAND_REMOVE_FRAGMENT = 12;
     public static final int COMMAND_SET_TOOLBAR_MENU_ITEMS = 13;
+    public static final int COMMAND_REMOVE_ANNOTATIONS = 14;
 
     private CompositeDisposable annotationDisposables = new CompositeDisposable();
 
@@ -106,6 +107,7 @@ public Map<String, Integer> getCommandsMap() {
         commandMap.put("getFormFieldValue", COMMAND_GET_FORM_FIELD_VALUE);
         commandMap.put("setFormFieldValue", COMMAND_SET_FORM_FIELD_VALUE);
         commandMap.put("removeAnnotation", COMMAND_REMOVE_ANNOTATION);
+        commandMap.put("removeAnnotations", COMMAND_REMOVE_ANNOTATIONS);
         commandMap.put("getAllAnnotations", COMMAND_GET_ALL_ANNOTATIONS);
         commandMap.put("removeFragment", COMMAND_REMOVE_FRAGMENT);
         commandMap.put("setToolbarMenuItems", COMMAND_SET_TOOLBAR_MENU_ITEMS);
@@ -249,6 +251,17 @@ public void accept(List<Annotation> annotations) {
                     annotationDisposables.add(root.removeAnnotation(requestId, args.getMap(1)));
                 }
                 break;
+            case COMMAND_REMOVE_ANNOTATIONS:
+                if(args != null && args.size() == 2) {
+                    final int requestId = args.getInt(0);
+                    final ReadableArray annotations = args.getArray(1);
+                    final int length = annotations.size();
+                    for (int i = 0; i < length; i++) {
+                        ReadableMap annotation = annotations.getMap(i);
+                        annotationDisposables.add(root.removeAnnotation(requestId, annotation));
+                    }
+                }
+                break;
             case COMMAND_GET_ALL_UNSAVED_ANNOTATIONS:
                 if (args != null) {
                     final int requestId = args.getInt(0);
@@ -294,7 +307,7 @@ public void accept(JSONObject jsonObject) {
                 }
                 break;
             case COMMAND_REMOVE_FRAGMENT:
-                // Removing a fragment like this is not recommended, but it can be used as a workaround 
+                // Removing a fragment like this is not recommended, but it can be used as a workaround
                 // to stop `react-native-screens` from crashing the App when the back button is pressed.
                 root.removeFragment(true);
                 break;

diff --git a/android/src/main/java/com/pspdfkit/react/TestingModule.java b/android/src/main/java/com/pspdfkit/react/TestingModule.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2021-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2021-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/ToolbarMenuItemsAdapter.java b/android/src/main/java/com/pspdfkit/react/ToolbarMenuItemsAdapter.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2022-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/events/PdfViewAnnotationChangedEvent.java b/android/src/main/java/com/pspdfkit/react/events/PdfViewAnnotationChangedEvent.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2021-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2021-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/events/PdfViewAnnotationTappedEvent.java b/android/src/main/java/com/pspdfkit/react/events/PdfViewAnnotationTappedEvent.java
@@ -3,7 +3,7 @@
   *
  *   PSPDFKit
  *
- *   Copyright © 2021-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2021-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/events/PdfViewDataReturnedEvent.java b/android/src/main/java/com/pspdfkit/react/events/PdfViewDataReturnedEvent.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2021-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2021-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.
@@ -21,6 +21,7 @@
 import com.facebook.react.uimanager.events.Event;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.pspdfkit.annotations.Annotation;
+import com.pspdfkit.annotations.AnnotationType;
 import com.pspdfkit.react.helper.JsonUtilities;
 
 import org.json.JSONException;
@@ -46,6 +47,9 @@ public PdfViewDataReturnedEvent(@IdRes int viewId, int requestId, @NonNull List<
         try {
             List<Map<String, Object>> annotationsSerialized = new ArrayList<>();
             for (Annotation annotation : annotationsToSerialize) {
+                if (annotation.getType() == AnnotationType.POPUP) {
+                    continue;
+                }
                 JSONObject instantJson = new JSONObject(annotation.toInstantJson());
                 annotationsSerialized.add(JsonUtilities.jsonObjectToMap(instantJson));
             }

diff --git a/android/src/main/java/com/pspdfkit/react/events/PdfViewDocumentLoadFailedEvent.java b/android/src/main/java/com/pspdfkit/react/events/PdfViewDocumentLoadFailedEvent.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2021-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2021-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/events/PdfViewDocumentSaveFailedEvent.java b/android/src/main/java/com/pspdfkit/react/events/PdfViewDocumentSaveFailedEvent.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2021-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2021-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/events/PdfViewDocumentSavedEvent.java b/android/src/main/java/com/pspdfkit/react/events/PdfViewDocumentSavedEvent.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2021-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2021-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/events/PdfViewNavigationButtonClickedEvent.java b/android/src/main/java/com/pspdfkit/react/events/PdfViewNavigationButtonClickedEvent.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2021-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2021-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/events/PdfViewStateChangedEvent.java b/android/src/main/java/com/pspdfkit/react/events/PdfViewStateChangedEvent.java
@@ -3,7 +3,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2021-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2021-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.

diff --git a/android/src/main/java/com/pspdfkit/react/helper/ColorHelper.java b/android/src/main/java/com/pspdfkit/react/helper/ColorHelper.java
@@ -5,7 +5,7 @@
  *
  *   PSPDFKit
  *
- *   Copyright © 2017-2022 PSPDFKit GmbH. All rights reserved.
+ *   Copyright © 2017-2023 PSPDFKit GmbH. All rights reserved.
  *
  *   THIS SOURCE CODE AND ANY ACCOMPANYING DOCUMENTATION ARE PROTECTED BY INTERNATIONAL COPYRIGHT LAW
  *   AND MAY NOT BE RESOLD OR REDISTRIBUTED. USAGE IS BOUND TO THE PSPDFKIT LICENSE AGREEMENT.