Merge pull request #20862 from wordpress-mobile/issue/20831-crash

Fix crash in GutenbergContainerFragment
wordpress-mobile · Jun 7, 2024 · 8f259b9 · 8f259b9
2 parents 11f13c8 + 5a36d78
commit 8f259b9
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/.../editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java b/.../editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java
@@ -680,6 +680,13 @@ public void onActivityResult(int requestCode, int resultCode, @Nullable Intent d
                 String blockId = data.getStringExtra(WPGutenbergWebViewActivity.ARG_BLOCK_ID);
                 String content = data.getStringExtra(WPGutenbergWebViewActivity.ARG_BLOCK_CONTENT);
                 getGutenbergContainerFragment().replaceUnsupportedBlock(content, blockId);
+                if (mCurrentGutenbergPropsBuilder == null) {
+                    SavedInstanceDatabase db = SavedInstanceDatabase.Companion.getDatabase(getContext());
+                    if (db != null) {
+                        mCurrentGutenbergPropsBuilder = db.getParcel(ARG_GUTENBERG_PROPS_BUILDER,
+                                GutenbergPropsBuilder.CREATOR);
+                    }
+                }
                 // We need to send latest capabilities as JS side clears them
                 getGutenbergContainerFragment().updateCapabilities(mCurrentGutenbergPropsBuilder);
                 trackWebViewClosed("save");