[Android] Potential fix for lifecycle issue (#681)

* Potential fix for lifecycle issue * Updating package version --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ApryseSDK · Feb 20, 2024 · 16504cf · 16504cf
1 parent 16afa4a
commit 16504cf
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/android/src/main/java/com/pdftron/reactnative/views/DocumentView.java b/android/src/main/java/com/pdftron/reactnative/views/DocumentView.java
@@ -20,6 +20,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.Lifecycle;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
@@ -2218,7 +2219,41 @@ public void requestLayout() {
 
     @Override
     protected void prepView() {
-        super.prepView();
+        // Create a viewer builder with the specified parameters
+        buildViewer();
+        if (mViewerBuilder == null) {
+            return;
+        }
+
+        Context context = getContext();
+        Activity activity = null;
+        if (context instanceof ThemedReactContext) {
+            activity = ((ThemedReactContext) context).getCurrentActivity();
+        }
+        if (activity instanceof AppCompatActivity) {
+            if (activity.isFinishing() || !((AppCompatActivity) activity).getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) {
+                return;
+            }
+        }
+
+        if (mPdfViewCtrlTabHostFragment != null) {
+            mPdfViewCtrlTabHostFragment.onOpenAddNewTab(mViewerBuilder.createBundle(getContext()));
+        } else {
+            mPdfViewCtrlTabHostFragment = getViewer();
+            mPdfViewCtrlTabHostFragment.addHostListener(this);
+
+            if (mFragmentManager != null) {
+                mFragmentManager.beginTransaction()
+                        .add(mPdfViewCtrlTabHostFragment, String.valueOf(getId()))
+                        .commitNowAllowingStateLoss();
+
+                View fragmentView = mPdfViewCtrlTabHostFragment.getView();
+                if (fragmentView != null) {
+                    fragmentView.clearFocus(); // work around issue where somehow new ui obtains focus
+                    addView(fragmentView, LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+                }
+            }
+        }
 
         if (mPdfViewCtrlTabHostFragment != null && mPdfViewCtrlTabHostFragment.getView() == null) {
             if (mPdfViewCtrlTabHostFragment instanceof RNPdfViewCtrlTabHostFragment) {
@@ -3105,6 +3140,10 @@ public void onTabDocumentLoaded(String tag) {
             fragment.setReactContext((ReactContext) getContext(), getId());
         }
 
+        if (getPdfViewCtrl() == null || getToolManager() == null) {
+            return;
+        }
+
         // Hide add page annotation toolbar button
         if (!mShowAddPageToolbarButton) {
             mPdfViewCtrlTabHostFragment.toolbarButtonVisibility(ToolbarButtonType.ADD_PAGE, false);

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-native-pdftron",
   "title": "React Native Pdftron",
-  "version": "3.0.3-35",
+  "version": "3.0.3-36",
   "description": "React Native Pdftron",
   "main": "./lib/index.js",
   "typings": "index.ts",