Release 5.6.0

Author: mutumbakato

ACKNOWLEDGEMENTS.md

@@ -987,7 +987,7 @@ THE SOFTWARE.
 ## Expat (https://libexpat.github.io/)
 
 Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
-Copyright (c) 2001-2017 Expat maintainers
+Copyright (c) 2001-2026 Expat maintainers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -2315,16 +2315,16 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
 PNG Reference Library License version 2
 ---------------------------------------
 
- * Copyright (c) 1995-2018 The PNG Reference Library Authors.
- * Copyright (c) 2018 Cosmin Truta.
+ * Copyright (c) 1995-2026 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2026 Cosmin Truta.
  * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
  * Copyright (c) 1996-1997 Andreas Dilger.
  * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
 
 The software is supplied "as is", without warranty of any kind,
 express or implied, including, without limitation, the warranties
 of merchantability, fitness for a particular purpose, title, and
-non-infringement.  In no even shall the Copyright owners, or
+non-infringement.  In no event shall the Copyright owners, or
 anyone distributing the software, be liable 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
@@ -4192,23 +4192,6 @@ This Source Code Form is subject to the terms of the Mozilla Public
 License, v. 2.0. If a copy of the MPL was not distributed with this
 file, You can obtain one at http://mozilla.org/MPL/2.0/
 
---------------------------------------------------------------------------------
-## ReLinker (https://github.com/KeepSafe/ReLinker)
-
-Copyright 2015 - 2016 Keepsafe Software Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
 --------------------------------------------------------------------------------
 ## RxAndroid (https://github.com/ReactiveX/RxAndroid)
 
@@ -4741,32 +4724,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
---------------------------------------------------------------------------------
-## swift-perception (https://github.com/pointfreeco/swift-perception)
-
-MIT License
-
-Copyright (c) 2023 Point-Free
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
 --------------------------------------------------------------------------------
 ## Tesseract (https://tesseract-ocr.github.io/)
 

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 5.6.0 — 22 Jun 2026
+
+- Adds AI Assistant support to `NutrientInstantView` on Android and iOS via the new `aiAssistantConfiguration` field on `NutrientViewConfiguration`. (#53210)
+- Adds `enableInstantComments` to `NutrientViewConfiguration` to enable Instant Comments on `NutrientInstantView` on Android and iOS. (#53271)
+- Updates the minimum iOS deployment target to iOS 17. (J#IOS-1103)
+- Updates Nutrient iOS SDK to 26.7.0. (#54611)
+- Updates Nutrient Android SDK to 11.5.1. (#54079)
+- Fixes an Android issue where AI Assistant citations didn’t navigate to the referenced page. (#53210)
+- Fixes an Android crash that occurred when opening AI Assistant before the document finished loading. (#53210)
+- Fixes an issue where calling `Nutrient.presentInstant(...)` with a `PdfConfiguration` caused a crash. (#53271)
+- Fixes an Android crash that occurred when opening a `NutrientView` with `startPage` set. (#54611)
+- Fixes an iOS issue where the “Add Comment” item was missing from Instant document menus when `enableInstantComments` was set. (#53271)
+- Fixes an iOS issue where the signature editor could get stuck after adding an image to a signature from the camera. (J#HYB-1001)
+
 ## 5.5.1 - 16 Apr 2026
 
 - Fixes `Nutrient.present(...)` failing on iOS apps using the `UIScene` lifecycle. (J#HYB-992)

README.md

@@ -2,6 +2,8 @@
 
 Add powerful PDF functionality to your Flutter apps with the Nutrient Flutter SDK. View, annotate, and edit PDFs seamlessly across Android, iOS, and Web platforms.
 
+![Nutrient Flutter SDK](screenshots/flutter.png)
+
 ## Requirements
 
 - Flutter SDK (latest stable version)
@@ -11,7 +13,7 @@ Add powerful PDF functionality to your Flutter apps with the Nutrient Flutter SD
   - Android Virtual Device or physical device
 - For iOS:
   - Xcode 16 or later
-  - iOS 16.0 or later
+  - iOS 17.0 or later
 - For Web:
   - Modern web browser with WebAssembly support
 
@@ -77,10 +79,10 @@ class MainActivity: FlutterAppCompatActivity() {
 
 ### iOS Setup
 
-Make sure to set the minimum iOS version to 16.0 in your `ios/Podfile`:
+Make sure to set the minimum iOS version to 17.0 in your `ios/Podfile`:
 
 ```ruby
-platform :ios, '16.0'
+platform :ios, '17.0'
 ```
 
 ### Web Setup

android/config.gradle

@@ -38,7 +38,11 @@ if (nutrientMavenUrl == null || nutrientMavenUrl == '') {
 
 ext.nutrientVersion = localProperties.getProperty('pspdfkit.version')
 if (nutrientVersion == null || nutrientVersion == '') {
-    ext.nutrientVersion = '11.2.1'
+    // Pinned to the released Nutrient Android SDK for this release. The plugin uses
+    // 11.5 APIs (AnnotationToolbar / AnnotationPopupToolbar /
+    // OnPreparePopupToolbarListener). Override via pspdfkit.version in
+    // local.properties to build against a nightly/SNAPSHOT.
+    ext.nutrientVersion = '11.5.1'
 }
 
 ext.nutrientMavenModuleName = 'nutrient'

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

@@ -276,9 +276,14 @@ class ConfigurationAdapter {
             if (key != null) {
                 configureUserInterfaceViewMode((String) configurationMap.get(key));
             }
-            key = getKeyOfType(configurationMap, START_PAGE, Long.class);
-            if (key != null) {
-                configureStartPage(((Long) configurationMap.get(key)).intValue());
+            // Flutter's StandardMessageCodec encodes small ints as Integer and large
+            // ones as Long, so accept any Number rather than strictly Long.
+            Object startPageValue = configurationMap.get(START_PAGE);
+            if (startPageValue == null) {
+                startPageValue = configurationMap.get(addAndroidPrefix(START_PAGE));
+            }
+            if (startPageValue instanceof Number) {
+                configureStartPage(((Number) startPageValue).intValue());
             }
             key = getKeyOfType(configurationMap, SHOW_SEARCH_ACTION, Boolean.class);
             if (key != null) {
@@ -1058,27 +1063,27 @@ private <T> String getKeyOfType(@NonNull HashMap<String, Object> configurationMa
     private static <T> String javaToDartTypeConverted(Class<T> clazz) {
         if (clazz == null) {
             return "null";
-        } else if (clazz.isInstance(Boolean.class)) {
+        } else if (Boolean.class.isAssignableFrom(clazz)) {
             return "bool";
-        } else if (clazz.isInstance(Integer.class)) {
+        } else if (Integer.class.isAssignableFrom(clazz)) {
             return "int";
-        } else if (clazz.isInstance(Long.class)) {
+        } else if (Long.class.isAssignableFrom(clazz)) {
             return "int";
-        } else if (clazz.isInstance(Double.class)) {
+        } else if (Double.class.isAssignableFrom(clazz)) {
             return "double";
-        } else if (clazz.isInstance(String.class)) {
+        } else if (String.class.isAssignableFrom(clazz)) {
             return "String";
-        } else if (clazz.isInstance(byte[].class)) {
+        } else if (byte[].class.isAssignableFrom(clazz)) {
             return "Uint8List";
-        } else if (clazz.isInstance(int[].class)) {
+        } else if (int[].class.isAssignableFrom(clazz)) {
             return "Int32List";
-        } else if (clazz.isInstance(long[].class)) {
+        } else if (long[].class.isAssignableFrom(clazz)) {
             return "Int64List";
-        } else if (clazz.isInstance(double[].class)) {
+        } else if (double[].class.isAssignableFrom(clazz)) {
             return "Float64List";
-        } else if (clazz.isInstance(ArrayList.class)) {
+        } else if (ArrayList.class.isAssignableFrom(clazz)) {
             return "List";
-        } else if (clazz.isInstance(HashMap.class)) {
+        } else if (HashMap.class.isAssignableFrom(clazz)) {
             return "Map";
         }
         throw new IllegalArgumentException("Undefined dart type conversion for " + clazz.getName());

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

@@ -9,21 +9,47 @@
 
 package com.pspdfkit.flutter.pspdfkit
 
+import android.graphics.RectF
 import android.os.Bundle
+import android.util.Log
 import androidx.fragment.app.Fragment
+import com.pspdfkit.ai.createAiAssistantForInstant
 import com.pspdfkit.document.PdfDocument
+import com.pspdfkit.flutter.pspdfkit.ai.FlutterAiAssistantRegistry
 import com.pspdfkit.flutter.pspdfkit.util.MeasurementHelper
 import com.pspdfkit.instant.document.InstantPdfDocument
 import com.pspdfkit.instant.exceptions.InstantException
 import com.pspdfkit.instant.ui.InstantPdfActivity
 import io.flutter.plugin.common.MethodChannel
+import io.nutrient.domain.ai.AiAssistant
+import io.nutrient.domain.ai.AiAssistantProvider
 import java.util.concurrent.atomic.AtomicReference
 
+// Activities don't have a meaningful "view id" the way platform views do. We
+// pick a sentinel that won't collide with real Flutter platform view ids
+// (those start at 0 and grow positive).
+private const val INSTANT_ACTIVITY_VIEW_ID = -1
+
 /**
  * For communication with the PSPDFKit plugin, we keep a static reference to the current
  * activity.
  */
-class FlutterInstantPdfActivity : InstantPdfActivity() {
+class FlutterInstantPdfActivity : InstantPdfActivity(), AiAssistantProvider {
+
+    override fun getAiAssistant(): AiAssistant? =
+        FlutterAiAssistantRegistry.get(INSTANT_ACTIVITY_VIEW_ID)
+            ?: FlutterAiAssistantRegistry.getActive()
+
+    override fun navigateTo(documentRect: List<RectF>, pageIndex: Int, documentIndex: Int) {
+        try {
+            pdfFragment?.let { fragment ->
+                fragment.setPageIndex(pageIndex, true)
+                fragment.highlight(this, documentRect, pageIndex)
+            }
+        } catch (t: Throwable) {
+            Log.e(LOG_TAG, "AI Assistant navigateTo failed", t)
+        }
+    }
 
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -40,6 +66,10 @@ class FlutterInstantPdfActivity : InstantPdfActivity() {
     override fun onDestroy() {
         super.onDestroy()
         releaseActivity()
+        // Release the AI Assistant socket so it doesn't outlive the activity.
+        FlutterAiAssistantRegistry.unregister(INSTANT_ACTIVITY_VIEW_ID)
+        // No static state to clear — config now lives in this activity's
+        // Intent extras and is garbage-collected with the activity instance.
     }
 
     override fun onDocumentLoaded(pdfDocument: PdfDocument) {
@@ -51,6 +81,40 @@ class FlutterInstantPdfActivity : InstantPdfActivity() {
                 MeasurementHelper.addMeasurementConfiguration(fragment, it)
             }
         }
+        setupAiAssistantForInstant(pdfDocument)
+    }
+
+    private fun setupAiAssistantForInstant(pdfDocument: PdfDocument) {
+        val aiServerUrl = intent.getStringExtra(EXTRA_AI_SERVER_URL) ?: return
+        val aiJwt = intent.getStringExtra(EXTRA_AI_JWT) ?: return
+        val sessionId = intent.getStringExtra(EXTRA_AI_SESSION_ID) ?: return
+        val instantServerUrl = intent.getStringExtra(EXTRA_INSTANT_SERVER_URL) ?: run {
+            Log.e(LOG_TAG, "AI Assistant: missing Instant server URL in Intent extras")
+            return
+        }
+        val instantDoc = pdfDocument as? InstantPdfDocument ?: run {
+            Log.w(LOG_TAG, "AI Assistant: expected InstantPdfDocument, got ${pdfDocument::class.java.simpleName}")
+            return
+        }
+        val layerJwt = instantDoc.instantDocumentDescriptor.jwt
+        if (layerJwt == null) {
+            Log.e(LOG_TAG, "AI Assistant: missing Instant layer JWT")
+            return
+        }
+        try {
+            val assistant = createAiAssistantForInstant(
+                context = this,
+                instantServerUrl = instantServerUrl,
+                documentLayerJwts = listOf(layerJwt),
+                aiAssistantServerUrl = aiServerUrl,
+                sessionId = sessionId,
+                jwtToken = { _ -> aiJwt }
+            )
+            FlutterAiAssistantRegistry.register(INSTANT_ACTIVITY_VIEW_ID, assistant)
+            Log.d(LOG_TAG, "AI Assistant (Instant) created for document ${instantDoc.uid}")
+        } catch (e: Exception) {
+            Log.e(LOG_TAG, "Error creating AI Assistant for Instant document", e)
+        }
     }
 
     override fun onDocumentLoadFailed(throwable: Throwable) {
@@ -116,8 +180,18 @@ class FlutterInstantPdfActivity : InstantPdfActivity() {
     }
 
     companion object {
+        private const val LOG_TAG = "PSPDFKitPlugin"
         private  var measurementValueConfigurations:List<Map<String,Any>>? = null
 
+        // Intent extras: each FlutterInstantPdfActivity instance owns its own
+        // AI Assistant configuration via these keys, so a rapid sequence of
+        // presentInstant() calls can no longer race on a shared static slot.
+        // See PR #53248 review comment on the static-config race.
+        const val EXTRA_AI_SERVER_URL = "com.pspdfkit.flutter.AI_SERVER_URL"
+        const val EXTRA_AI_JWT = "com.pspdfkit.flutter.AI_JWT"
+        const val EXTRA_AI_SESSION_ID = "com.pspdfkit.flutter.AI_SESSION_ID"
+        const val EXTRA_INSTANT_SERVER_URL = "com.pspdfkit.flutter.INSTANT_SERVER_URL"
+
         @JvmStatic
         var currentActivity: FlutterInstantPdfActivity? = null
             private set

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

@@ -44,20 +44,20 @@ public static void setMeasurementValueConfigurations(@Nullable final List<Map<St
     }
 
     @Override
-    protected void onCreate(Bundle bundle) {
+    public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         bindActivity();
     }
 
     @Override
-    protected void onPause() {
+    public void onPause() {
         // Notify the Flutter PSPDFKit plugin that the activity is going to enter the onPause state.
         EventDispatcher.getInstance().notifyActivityOnPause();
         super.onPause();
     }
 
     @Override
-    protected void onDestroy() {
+    public void onDestroy() {
         super.onDestroy();
         releaseActivity();
     }