fix: Mitigate GutenbergKit text composition oddities

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.kt

@@ -1947,13 +1947,13 @@ class EditPostActivity : BaseAppCompatActivity(), EditorFragmentActivity, Editor
         )
     }
 
-    private fun updateAndSavePostAsync(listener: OnPostUpdatedFromUIListener?) {
+    private fun updateAndSavePostAsync(listener: OnPostUpdatedFromUIListener?, isFinishing: Boolean = false) {
         if (editorFragment == null) {
             AppLog.e(AppLog.T.POSTS, "Fragment not initialized")
             return
         }
         storePostViewModel.updatePostObjectWithUIAsync(
-            (editPostRepository), { oldContent: String -> updateFromEditor(oldContent) }
+            (editPostRepository), { oldContent: String -> updateFromEditor(oldContent, isFinishing) }
         ) { _: PostImmutableModel?, result: UpdatePostResult ->
             storePostViewModel.isSavingPostOnEditorExit = false
             // Ignore the result as we want to invoke the listener even when the PostModel was up-to-date
@@ -1967,20 +1967,25 @@ class EditPostActivity : BaseAppCompatActivity(), EditorFragmentActivity, Editor
      * 2. Saves the post via [EditPostActivity.updateAndSavePostAsync];
      * 3. Invokes the listener method parameter
      */
-    private fun updateAndSavePostAsyncOnEditorExit(listener: OnPostUpdatedFromUIListener?) {
+    private fun updateAndSavePostAsyncOnEditorExit(listener: OnPostUpdatedFromUIListener?,
+                                                   isFinishing: Boolean = false) {
         if (editorFragment == null) {
             return
         }
         storePostViewModel.isSavingPostOnEditorExit = true
         storePostViewModel.showSavingProgressDialog()
-        updateAndSavePostAsync(listener)
+        updateAndSavePostAsync(listener, isFinishing)
     }
 
-    private fun updateFromEditor(oldContent: String): UpdateFromEditor {
+    private fun updateFromEditor(oldContent: String, isFinishing: Boolean = false): UpdateFromEditor {
         editorFragment?.let {
             return try {
                 // To reduce redundant bridge events emitted to the Gutenberg editor, we get title and content at once
-                val titleAndContent: Pair<CharSequence, CharSequence> = it.getTitleAndContent(oldContent)
+                val titleAndContent: Pair<CharSequence, CharSequence> = if (it is GutenbergKitEditorFragment) {
+                    it.getTitleAndContent(oldContent, isFinishing)
+                } else {
+                    it.getTitleAndContent(oldContent)
+                }
                 val title = titleAndContent.first as String
                 val content = titleAndContent.second as String
                 PostFields(title, content)
@@ -2416,7 +2421,7 @@ class EditPostActivity : BaseAppCompatActivity(), EditorFragmentActivity, Editor
         }
 
         // Convert the lambda to OnPostUpdatedFromUIListener and pass it to the method
-        updateAndSavePostAsyncOnEditorExit(lambdaToListener(lambda))
+        updateAndSavePostAsyncOnEditorExit(lambdaToListener(lambda), doFinish)
     }
 
     // Helper function to convert a lambda to OnPostUpdatedFromUIListener

gradle/libs.versions.toml

@@ -72,7 +72,7 @@ google-play-services-auth = '20.4.1'
 google-services = '4.4.2'
 gravatar = '2.4.1'
 greenrobot-eventbus = '3.3.1'
-gutenberg-kit = 'trunk-fdfe788530bbff864ce7147b5a68608d7025e078'
+gutenberg-kit = 'trunk-1b19fef4cb557afb9727497a441bb411cdb8895a'
 gutenberg-mobile = 'v1.121.0'
 indexos-media-for-mobile = '43a9026f0973a2f0a74fa813132f6a16f7499c3a'
 jackson-databind = '2.12.7.1'

libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergKitEditorFragment.java

@@ -334,8 +334,13 @@ private void toggleHtmlMode() {
     }
 
     @Override
-    public Pair<CharSequence, CharSequence> getTitleAndContent(CharSequence originalContent) throws
-            EditorFragmentNotAddedException {
+    public @NonNull Pair<CharSequence, CharSequence> getTitleAndContent(@NonNull CharSequence originalContent)
+            throws EditorFragmentNotAddedException {
+        return getTitleAndContent(originalContent, false);
+    }
+
+    public @NonNull Pair<CharSequence, CharSequence> getTitleAndContent(@NonNull CharSequence originalContent,
+            boolean completeComposition) throws EditorFragmentNotAddedException {
         final Pair<CharSequence, CharSequence>[] result = new Pair[1];
         final CountDownLatch latch = new CountDownLatch(1);
 
@@ -345,7 +350,7 @@ public void onResult(@NonNull CharSequence title, @NonNull CharSequence content)
                 result[0] = new Pair<>(title, content);
                 latch.countDown();
             }
-        }, true);
+        }, completeComposition);
 
         try {
             latch.await();