Release 5.2.0

Author: mutumbakato

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 5.2.0 - 13 Oct 2025
+
+- Introduces `AnnotationProperties` class to manage and update annotation properties such as color, opacity, line width, flags, and custom data. (J#HYB-879)
+- Updates Android SDK configuration (minSdk 24, compileSdk/targetSdk 36) to support Nutrient Android SDK 10.7.0.
+- Updates iOS deployment target to 16 to support Nutrient iOS SDK 14.12.0.
+- Updates AI Assistant implementation to use new `createAiAssistant` API with `AiAssistantProvider` interface support. (J#HYB-886)
+- Fixes issue where getPageInfo throws an error if not page labels are set on Android. (J#HYB-882)
+- Fixes issue where updating annotation flags results into unexpected behavior. (J#HYB-880,J#HYB-879)
+
 ## 5.1.0 - 04 Sep 2025
 
 - Adds the `androidShowAnnotationCreationAction` configuration option to hide the default annotation creation button while keeping annotation editing functionality enabled on Android. (J#HYB-864)

android/config.gradle

@@ -38,7 +38,7 @@ if (pspdfkitMavenUrl == null || pspdfkitMavenUrl == '') {
 
 ext.pspdfkitVersion = localProperties.getProperty('pspdfkit.version')
 if (pspdfkitVersion == null || pspdfkitVersion == '') {
-    ext.pspdfkitVersion = '10.5.0'
+    ext.pspdfkitVersion = '10.7.0'
 }
 
 ext.pspdfkitMavenModuleName = 'nutrient'
@@ -52,8 +52,8 @@ if (!pubspecFile.exists()) {
 def pubspecYaml = new Yaml().load(pubspecFile.newInputStream())
 ext.pspdfkitFlutterVersion = pubspecYaml.version
 
-ext.androidCompileSdkVersion = 35
-ext.androidMinSdkVersion = 21
-ext.androidTargetSdkVersion = 35
+ext.androidCompileSdkVersion = 36
+ext.androidMinSdkVersion = 24
+ext.androidTargetSdkVersion = 36
 ext.androidGradlePluginVersion = '8.9.2'
 ext.kotlinVersion = "2.1.20"

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

@@ -25,7 +25,9 @@ import com.pspdfkit.annotations.Annotation
 import com.pspdfkit.document.DocumentSaveOptions
 import com.pspdfkit.document.PdfDocument
 import com.pspdfkit.flutter.pspdfkit.api.PdfDocumentApi
+import com.pspdfkit.flutter.pspdfkit.api.AnnotationManagerApi
 import com.pspdfkit.flutter.pspdfkit.document.FlutterPdfDocument
+import com.pspdfkit.flutter.pspdfkit.document.AnnotationManagerImpl
 import com.pspdfkit.flutter.pspdfkit.util.MeasurementHelper
 import com.pspdfkit.listeners.DocumentListener
 import com.pspdfkit.ui.PdfFragment
@@ -49,7 +51,6 @@ class FlutterPdfUiFragmentCallbacks(
     private val measurementConfigurations: List<Map<String, Any>>?,
     private val binaryMessenger: BinaryMessenger,
     private val flutterWidgetCallback: FlutterWidgetCallback,
-    private val aiAssistant: AiAssistant?
 
 ) : FragmentManager.FragmentLifecycleCallbacks(), DocumentListener {
 
@@ -88,7 +89,16 @@ class FlutterPdfUiFragmentCallbacks(
         // Set up document API for Flutter access FIRST - before sending callbacks
         try {
             flutterPdfDocument = FlutterPdfDocument(document)
+
+            // Register document instance for AnnotationManager access
+            FlutterPdfDocument.registerDocument(document.uid, flutterPdfDocument!!)
+
+            // Set up PdfDocumentApi
             PdfDocumentApi.setUp(binaryMessenger, flutterPdfDocument, document.uid)
+
+            // Set up AnnotationManagerApi with documentId_annotation_manager as channel suffix
+            val annotationManager = AnnotationManagerImpl(document)
+            AnnotationManagerApi.setUp(binaryMessenger, annotationManager, "${document.uid}_annotation_manager")
         } catch (e: Exception) {
             Log.e(LOG_TAG, "Error setting up FlutterPdfDocument", e)
         }
@@ -114,13 +124,6 @@ class FlutterPdfUiFragmentCallbacks(
         } catch (e: Exception) {
             Log.e(LOG_TAG, "Error sending direct event notification", e)
         }
-         aiAssistant?.let {
-             try {
-                 document.setAiAssistant(it)
-             } catch (e: Exception) {
-                 Log.e(LOG_TAG, "Error setting AiAssistant on loaded document", e)
-             }
-         }
     }
 
     override fun onPageChanged(document: PdfDocument, pageIndex: Int) {
@@ -164,6 +167,12 @@ class FlutterPdfUiFragmentCallbacks(
             }
             if (pdfFragment == f) {
                 pdfFragment?.removeDocumentListener(this)
+
+                // Cleanup document registration
+                flutterPdfDocument?.let { doc ->
+                    FlutterPdfDocument.unregisterDocument(doc.pdfDocument.uid)
+                }
+
                 pdfFragment = null
                 flutterPdfDocument = null
             }

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

@@ -20,6 +20,7 @@ import androidx.fragment.app.FragmentContainerView
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.commit
 import androidx.fragment.app.commitNow
+import com.pspdfkit.ai.createAiAssistant
 import com.pspdfkit.flutter.pspdfkit.annotations.AnnotationMenuHandler
 import com.pspdfkit.flutter.pspdfkit.api.CustomToolbarCallbacks
 import com.pspdfkit.flutter.pspdfkit.api.NutrientEventsCallbacks
@@ -39,9 +40,8 @@ import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.StandardMessageCodec
 import io.flutter.plugin.platform.PlatformView
 import io.flutter.plugin.platform.PlatformViewFactory
-import io.nutrient.data.models.AiAssistantConfiguration
 import io.nutrient.domain.ai.AiAssistant
-import io.nutrient.domain.ai.standaloneAiAssistant
+
 
 internal class PSPDFKitView(
     val context: Context,
@@ -66,7 +66,6 @@ internal class PSPDFKitView(
     private var annotationMenuHandler: AnnotationMenuHandler? = null
     private var isFragmentAttached = false
     private var methodCallHandler: PSPDFKitWidgetMethodCallHandler? = null
-    private var aiAssistant: AiAssistant? = null
 
     init {
         fragmentContainerView?.id = View.generateViewId()
@@ -128,11 +127,14 @@ internal class PSPDFKitView(
                         .build()
                 }
             }
-            setupAiAssistant(context, aiAssistantConfigurationMap)
+
+            aiAssistantConfigurationMap?.let {
+                setupAiAssistant(context, it)
+            }
 
             fragmentCallbacks = FlutterPdfUiFragmentCallbacks(
                 methodChannel, measurementValueConfigurations,
-                messenger, FlutterWidgetCallback(widgetCallbacks), aiAssistant
+                messenger, FlutterWidgetCallback(widgetCallbacks)
             )
 
             fragmentCallbacks?.let { callbacks ->
@@ -308,6 +310,7 @@ internal class PSPDFKitView(
             // Null out references
             fragmentCallbacks = null
             fragmentContainerView = null
+            aiAssistant = null
 
             // Unregister method channel
             NutrientViewControllerApi.setUp(messenger, null, id.toString())
@@ -386,22 +389,28 @@ internal class PSPDFKitView(
         val jwt = configuration?.get("jwt") as String?
         val sessionId = configuration?.get("sessionId") as String?
         val userId = configuration?.get("userId") as String?
-
-        if (serverUrl != null && jwt != null) {
-            val aiAssistantConfiguration = AiAssistantConfiguration(
-                serverUrl = serverUrl,
-                jwt = jwt,
-                sessionId = sessionId ?: "",
-                userId = userId ?: ""
-            )
-             aiAssistant = standaloneAiAssistant(context, aiAssistantConfiguration)
+        
+        if (serverUrl != null && jwt != null && sessionId != null) {
+            try {
+                // Create AI Assistant with new 10.6+ API and store in companion object
+                aiAssistant = createAiAssistant(
+                    context = context,
+                    documentsDescriptors = emptyList(),
+                    ipAddress = serverUrl,
+                    sessionId = sessionId,
+                    jwtToken = { _ -> jwt }
+                )
+            } catch (e: Exception) {
+                Log.e(LOG_TAG, "Error creating AI Assistant", e)
+            }
         } else {
-            Log.e(LOG_TAG, "Invalid AI Assistant configuration")
+            Log.e(LOG_TAG, "Invalid AI Assistant configuration - serverUrl, jwt, and sessionId are required")
         }
     }
 
     companion object {
         private const val LOG_TAG = "PSPDFKitPlugin"
+        var  aiAssistant: AiAssistant? = null
     }
 }