Merge pull request #364 from PSPDFKit/reinhard/android-6.3

Update PSPDFKit Version to 6.3.0

Author: Reinhard Hafenscher

android/build.gradle

@@ -2,7 +2,7 @@
 *   Contains gradle configuration constants
 */
 ext {
-    PSPDFKIT_VERSION = '6.2.0'
+    PSPDFKIT_VERSION = '6.3.0'
 }
 
 buildscript {

android/src/main/java/com/pspdfkit/views/PdfView.java

@@ -286,7 +286,7 @@ private void setupFragment() {
                     .build();
                 // We put our internal id so we can track if this fragment belongs to us, used to handle orphaned fragments after hot reloads.
                 pdfFragment.getArguments().putInt(ARG_ROOT_ID, internalId);
-                prepareFragment(pdfFragment);
+                prepareFragment(pdfFragment, true);
             } else {
                 View fragmentView = pdfFragment.getView();
                 if (pdfFragment.getDocument() != null && !pdfFragment.getDocument().getUid().equals(document.getUid())) {
@@ -298,13 +298,13 @@ private void setupFragment() {
                         .configuration(configuration)
                         .fragmentClass(ReactPdfUiFragment.class)
                         .build();
-                    prepareFragment(pdfFragment);
+                    prepareFragment(pdfFragment, true);
                 } else if (fragmentView != null && fragmentView.getParent() != this) {
                     // We only need to detach the fragment if the parent view changed.
                     fragmentManager.beginTransaction()
                         .remove(pdfFragment)
                         .commitNow();
-                    prepareFragment(pdfFragment);
+                    prepareFragment(pdfFragment, true);
                 }
             }
 
@@ -317,20 +317,24 @@ private void setupFragment() {
         }
     }
 
-    private void prepareFragment(final PdfUiFragment pdfUiFragment) {
-        fragmentManager.beginTransaction()
-            .add(pdfUiFragment, fragmentTag)
-            .commitNow();
-        View fragmentView = pdfUiFragment.getView();
-        addView(fragmentView, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+    private void prepareFragment(final PdfUiFragment pdfUiFragment, final boolean attachFragment) {
+        if (attachFragment) {
+            fragmentManager.beginTransaction()
+                .add(pdfUiFragment, fragmentTag)
+                .commitNow();
+            View fragmentView = pdfUiFragment.getView();
+            addView(fragmentView, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        }
 
         pdfUiFragment.setOnContextualToolbarLifecycleListener(pdfViewModeController);
         pdfUiFragment.getPSPDFKitViews().getFormEditingBarView().addOnFormEditingBarLifecycleListener(pdfViewModeController);
         ((ReactPdfUiFragment) pdfUiFragment).setReactPdfUiFragmentListener(new ReactPdfUiFragment.ReactPdfUiFragmentListener() {
             @Override
             public void onConfigurationChanged(@NonNull PdfUiFragment pdfUiFragment) {
                 // If the configuration was changed from the UI a new fragment will be created, reattach our listeners.
-                preparePdfFragment(pdfUiFragment.getPdfFragment());
+                prepareFragment(pdfUiFragment, false);
+                // Also notify other places that might want to reattach their listeners.
+                pdfUiFragmentGetter.onNext(Collections.singletonList(pdfUiFragment));
             }
 
             @Override

android/src/main/java/com/pspdfkit/views/ReactPdfUiFragment.java

@@ -1,11 +1,15 @@
 package com.pspdfkit.views;
 
+import android.os.Bundle;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 
-import com.pspdfkit.configuration.activity.PdfActivityConfiguration;
 import com.pspdfkit.react.R;
+import com.pspdfkit.ui.PdfFragment;
 import com.pspdfkit.ui.PdfUiFragment;
 
 /**
@@ -20,19 +24,23 @@ public class ReactPdfUiFragment extends PdfUiFragment {
 
     @Nullable private ReactPdfUiFragmentListener reactPdfUiFragmentListener;
 
+    private final FragmentManager.FragmentLifecycleCallbacks fragmentLifecycleCallbacks = new FragmentManager.FragmentLifecycleCallbacks() {
+        @Override
+        public void onFragmentCreated(@NonNull FragmentManager fm, @NonNull Fragment f, @Nullable Bundle savedInstanceState) {
+            super.onFragmentCreated(fm, f, savedInstanceState);
+            // Whenever a new PdfFragment is created that means the configuration has changed.
+            if (f instanceof PdfFragment) {
+                if (reactPdfUiFragmentListener != null) {
+                    reactPdfUiFragmentListener.onConfigurationChanged(ReactPdfUiFragment.this);
+                }
+            }
+        }
+    };
+
     void setReactPdfUiFragmentListener(@Nullable ReactPdfUiFragmentListener listener) {
         this.reactPdfUiFragmentListener = listener;
     }
 
-    @Override
-    public void performApplyConfiguration(@NonNull PdfActivityConfiguration configuration) {
-        super.performApplyConfiguration(configuration);
-
-        if (this.reactPdfUiFragmentListener != null) {
-            reactPdfUiFragmentListener.onConfigurationChanged(this);
-        }
-    }
-
     /** When set to true will add a navigation arrow to the toolbar. */
     void setShowNavigationButtonInToolbar(final boolean showNavigationButtonInToolbar) {
         if (getView() == null) {
@@ -52,12 +60,25 @@ void setShowNavigationButtonInToolbar(final boolean showNavigationButtonInToolba
         }
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        // We want to get notified when a child PdfFragment is created so we can reattach our listeners.
+        getChildFragmentManager().registerFragmentLifecycleCallbacks(fragmentLifecycleCallbacks, false);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        getChildFragmentManager().unregisterFragmentLifecycleCallbacks(fragmentLifecycleCallbacks);
+    }
+
     /**
      * Listener that notifies of actions taken directly in the PdfUiFragment.
      */
     public interface ReactPdfUiFragmentListener {
 
-        /** Called when the configuration changed, reset your {@link com.pspdfkit.ui.PdfFragment} listeners in here. */
+        /** Called when the configuration changed, reset your {@link com.pspdfkit.ui.PdfFragment} and {@link PdfUiFragment} listeners in here. */
         void onConfigurationChanged(@NonNull PdfUiFragment pdfUiFragment);
 
         /** Called when the back navigation button was clicked. */

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-pspdfkit",
-  "version": "1.28.7",
+  "version": "1.29.0",
   "description": "A React Native module for the PSPDFKit library.",
   "keywords": [
     "react native",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Catalog",
-  "version": "1.28.7",
+  "version": "1.29.0",
   "private": true,
   "scripts": {
     "start": "react-native start",

samples/Catalog/package.json

@@ -1,6 +1,6 @@
 {
   "name": "NativeCatalog",
-  "version": "1.28.7",
+  "version": "1.29.0",
   "private": true,
   "scripts": {
     "android": "react-native run-android",