Release 4.2.2

Author: PSPDFKit

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 4.2.2 - 24 Mar 2025
+
+- Updates for Nutrient Android SDK 10.1.1 - https://www.nutrient.io/guides/android/changelog/.
+- Updates Android bridging by moving `MethodCallHandler` from `PspdfkitPlugin` to `PspdfkitPluginMethodCallHandler`, preparing for a complete migration to Pigeon and proper deprecation path. (J#HYB-690)
+- Fixes issue on Android when adding an annotationDeleted event listener. (J#HYB-640)
+
 ## 4.2.1 - 10 Mar 2025
 
 - Adds `enterAnnotationCreationMode` and `exitAnnotationCreationMode` APIs to `PspdfkitWidgetController`.
@@ -12,7 +18,7 @@
 - Adds support for annotation flags. (J#HYB-683)
 - Adds support for custom stamps. (J#HYB-685)
 - Fixes issue where setting an iOS license key shows "PSPDFKit Licensing Issue" error. (J#HYB-658)
-- Fixes Annotation preset customizations not being set correctly. (J#HYB-686)
+- Fixes annotation preset customizations not being set correctly. (J#HYB-686)
 
 ## 4.1.1 - 17 Jan 2025
 

android/build.gradle

@@ -62,7 +62,7 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation "com.pspdfkit:$pspdfkitMavenModuleName:$pspdfkitVersion"
+    implementation "io.nutrient:$pspdfkitMavenModuleName:$pspdfkitVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation "androidx.compose.material:material:1.7.8"

android/config.gradle

@@ -38,10 +38,10 @@ if (pspdfkitMavenUrl == null || pspdfkitMavenUrl == '') {
 
 ext.pspdfkitVersion = localProperties.getProperty('pspdfkit.version')
 if (pspdfkitVersion == null || pspdfkitVersion == '') {
-    ext.pspdfkitVersion = '2024.9.1'
+    ext.pspdfkitVersion = '10.1.1'
 }
 
-ext.pspdfkitMavenModuleName = 'pspdfkit'
+ext.pspdfkitMavenModuleName = 'nutrient'
 
 // Get our library version from the top level pubspec.yaml file.
 def pubspecFilePath = '../pubspec.yaml'

android/src/main/AndroidManifest.xml

@@ -17,7 +17,7 @@
             android:windowSoftInputMode="adjustNothing" />
 
         <meta-data
-            android:name="pspdfkit_automatic_initialize"
+            android:name="nutrient_automatic_initialize"
             android:value="false" />
     </application>
 </manifest>

android/src/main/java/com/pspdfkit/flutter/pspdfkit/ConfigurationAdapter.java

@@ -125,11 +125,13 @@ class ConfigurationAdapter {
      * @deprecated This key word was deprecated with PSPDFKit for Fluttter 3.1.
      * Use {@code FIRST_PAGE_ALWAYS_SINGLE} instead, which replaces it.
      */
+    @Deprecated
     private static final String IS_FIRST_PAGE_ALWAYS_SINGLE = "isFirstPageAlwaysSingle";
     /**
      * @deprecated This key word was deprecated with PSPDFKit for Fluttter 3.1.
      * Use {@code SHOW_BOOKMARKS_ACTION} instead, which replaces it.
      */
+    @Deprecated
     private static final String ENABLE_BOOKMARK_LIST = "enableBookmarkList";
 
     // Document Interaction Values

android/src/main/java/com/pspdfkit/flutter/pspdfkit/FlutterInstantPdfActivity.kt

@@ -100,7 +100,7 @@ class FlutterInstantPdfActivity : InstantPdfActivity() {
 
     override fun onAttachFragment(fragment: Fragment) {
         super.onAttachFragment(fragment)
-        if(fragment.tag?.contains("PSPDFKit.Fragment") == true){
+        if(fragment.tag?.contains("Nutrient.Fragment") == true){
             EventDispatcher.getInstance().notifyPdfFragmentAdded()
         }
     }

android/src/main/java/com/pspdfkit/flutter/pspdfkit/FlutterPdfActivity.java

@@ -80,7 +80,7 @@ public void onDocumentLoaded(@NonNull PdfDocument pdfDocument) {
     @Override
     public void onAttachFragment(@NonNull Fragment fragment) {
         super.onAttachFragment(fragment);
-        if(fragment.getTag() !=null && fragment.getTag().contains("PSPDFKit.Fragment")){
+        if(fragment.getTag() !=null && fragment.getTag().contains("Nutrient.Fragment")){
             EventDispatcher.getInstance().notifyPdfFragmentAdded();
         }
     }

android/src/main/java/com/pspdfkit/flutter/pspdfkit/FlutterPdfUiFragmentCallbacks.kt

@@ -17,6 +17,7 @@ package com.pspdfkit.flutter.pspdfkit
 ///
 import android.content.Context
 import android.graphics.PointF
+import android.util.Log
 import android.view.MotionEvent
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
@@ -31,6 +32,8 @@ import com.pspdfkit.ui.PdfFragment
 import io.flutter.plugin.common.BinaryMessenger
 import io.flutter.plugin.common.MethodChannel
 
+private const val LOG_TAG = "FlutterPdfUiCallbacks"
+
 /**
  * Callbacks for the FlutterPdfUiFragment.
  * This class is responsible for notifying the Flutter side about document loading events.
@@ -41,8 +44,8 @@ import io.flutter.plugin.common.MethodChannel
  * @param flutterWidgetCallback The callback to notify the Flutter side about document loading events.
  */
 class FlutterPdfUiFragmentCallbacks(
-    private val methodChannel: MethodChannel, private val measurementConfigurations:
-    List<Map<String, Any>>?,
+    private val methodChannel: MethodChannel, 
+    private val measurementConfigurations: List<Map<String, Any>>?,
     private val binaryMessenger: BinaryMessenger,
     private val flutterWidgetCallback: FlutterWidgetCallback
 ) : FragmentManager.FragmentLifecycleCallbacks(), DocumentListener {
@@ -55,9 +58,10 @@ class FlutterPdfUiFragmentCallbacks(
         f: Fragment,
         context: Context
     ) {
-        if (f.tag?.contains("PSPDFKit.Fragment") == true) {
+        if (f.tag?.contains("Nutrient.Fragment") == true) {
             EventDispatcher.getInstance().notifyPdfFragmentAdded()
             if (f !is PdfFragment) {
+                Log.w(LOG_TAG, "Fragment is not a PdfFragment: ${f::class.java.simpleName}")
                 return
             }
             if (pdfFragment != null) {
@@ -69,45 +73,82 @@ class FlutterPdfUiFragmentCallbacks(
     }
 
     override fun onDocumentLoaded(document: PdfDocument) {
+        // Apply measurement configurations if available
         measurementConfigurations?.forEach {
-            MeasurementHelper.addMeasurementConfiguration(pdfFragment!!, it)
+            try {
+                MeasurementHelper.addMeasurementConfiguration(pdfFragment!!, it)
+            } catch (e: Exception) {
+                Log.e(LOG_TAG, "Failed to apply measurement configuration", e)
+            }
+        }
+
+        // Send event through method channel
+        try {
+            val eventData = mapOf("documentId" to document.uid)
+            methodChannel.invokeMethod("onDocumentLoaded", eventData)
+        } catch (e: Exception) {
+            Log.e(LOG_TAG, "Error sending onDocumentLoaded via method channel", e)
+        }
+
+        // Send event through widget callbacks
+        try {
+            flutterWidgetCallback.onDocumentLoaded(document)
+        } catch (e: Exception) {
+            Log.e(LOG_TAG, "Error sending onDocumentLoaded via widget callbacks", e)
+        }
+
+        // Set up document API for Flutter access
+        try {
+            flutterPdfDocument = FlutterPdfDocument(document)
+            PdfDocumentApi.setUp(binaryMessenger, flutterPdfDocument, document.uid)
+        } catch (e: Exception) {
+            Log.e(LOG_TAG, "Error setting up FlutterPdfDocument", e)
+        }
+
+        // Additional direct channel sending
+        try {
+            EventDispatcher.getInstance().notifyDocumentLoaded(document)
+        } catch (e: Exception) {
+            Log.e(LOG_TAG, "Error sending direct event notification", e)
         }
-        methodChannel.invokeMethod(
-            "onDocumentLoaded", mapOf(
-                "documentId" to document.uid
-            )
-        )
-        flutterWidgetCallback.onDocumentLoaded(document)
-        flutterPdfDocument =
-            FlutterPdfDocument(document);
-        PdfDocumentApi.setUp(binaryMessenger, flutterPdfDocument, document.uid)
     }
 
     override fun onPageChanged(document: PdfDocument, pageIndex: Int) {
         super.onPageChanged(document, pageIndex)
-        flutterWidgetCallback.onPageChanged(document, pageIndex)
-        methodChannel.invokeMethod(
-            "onPageChanged",
-            mapOf(
-                "documentId" to document.uid,
-                "pageIndex" to pageIndex
+        
+        try {
+            flutterWidgetCallback.onPageChanged(document, pageIndex)
+            methodChannel.invokeMethod(
+                "onPageChanged",
+                mapOf(
+                    "documentId" to document.uid,
+                    "pageIndex" to pageIndex
+                )
             )
-        )
+        } catch (e: Exception) {
+            Log.e(LOG_TAG, "Error sending onPageChanged event", e)
+        }
     }
 
     override fun onDocumentLoadFailed(exception: Throwable) {
         super.onDocumentLoadFailed(exception)
-        flutterWidgetCallback.onDocumentLoadFailed(exception)
-        methodChannel.invokeMethod(
-            "onDocumentLoadFailed",
-            mapOf(
-                "error" to exception.message
+        Log.e(LOG_TAG, "Document load failed", exception)
+        
+        try {
+            flutterWidgetCallback.onDocumentLoadFailed(exception)
+            methodChannel.invokeMethod(
+                "onDocumentLoadFailed",
+                mapOf(
+                    "error" to exception.message
+                )
             )
-        )
+        } catch (e: Exception) {
+            Log.e(LOG_TAG, "Error sending onDocumentLoadFailed event", e)
+        }
     }
 
     override fun onFragmentDetached(fm: FragmentManager, f: Fragment) {
-        if (f.tag?.contains("PSPDFKit.Fragment") == true) {
+        if (f.tag?.contains("Nutrient.Fragment") == true) {
             if (f !is PdfFragment) {
                 return
             }
@@ -126,12 +167,20 @@ class FlutterPdfUiFragmentCallbacks(
         pagePosition: PointF?,
         clickedAnnotation: Annotation?
     ): Boolean {
-        flutterWidgetCallback.onPageClick(document, pageIndex, event, pagePosition, clickedAnnotation)
+        try {
+            flutterWidgetCallback.onPageClick(document, pageIndex, event, pagePosition, clickedAnnotation)
+        } catch (e: Exception) {
+            Log.e(LOG_TAG, "Error sending onPageClick event", e)
+        }
         return true
     }
 
     override fun onDocumentSave(document: PdfDocument, saveOptions: DocumentSaveOptions): Boolean {
-        flutterWidgetCallback.onDocumentSave(document,saveOptions)
+        try {
+            flutterWidgetCallback.onDocumentSave(document, saveOptions)
+        } catch (e: Exception) {
+            Log.e(LOG_TAG, "Error sending onDocumentSave event", e)
+        }
         return true
     }
 }

android/src/main/java/com/pspdfkit/flutter/pspdfkit/FlutterWidgetCallback.kt

@@ -51,8 +51,8 @@ class FlutterWidgetCallback(
         var flutterPointF: com.pspdfkit.flutter.pspdfkit.api.PointF? = null
         pagePosition?.let {
             flutterPointF = com.pspdfkit.flutter.pspdfkit.api.PointF(
-                pagePosition.x.toDouble(),
-                pagePosition.x.toDouble()
+                it.x.toDouble(),
+                it.y.toDouble() 
             )
         }
         pspdfkitWidgetCallbacks?.onPageClick(