Close IO editor after adding/updating note

Author: abdnh

AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.kt

@@ -733,6 +733,8 @@ abstract class AbstractFlashcardViewer :
             } else if (resultCode == RESULT_CANCELED && !reloadRequired) {
                 // nothing was changed by the note editor so just redraw the card
                 redrawCard()
+            } else if (resultCode == NoteEditor.RESULT_IO_EDITOR_UPDATED_NOTE) {
+                displayCardQuestion(true)
             }
         }
     }

AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.kt

@@ -255,6 +255,19 @@ class NoteEditor : AnkiActivity(), DeckSelectionListener, SubtitleListener, Tags
         }
     )
 
+    private val requestIOEditorCloser = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult(),
+        NoteEditorActivityResultCallback { result ->
+            if (result.resultCode != RESULT_CANCELED) {
+                changed = true
+                if (!addNote) {
+                    mReloadRequired = true
+                    closeNoteEditor(RESULT_UPDATED_IO_NOTE, null)
+                }
+            }
+        }
+    )
+
     private inner class NoteEditorActivityResultCallback(private val callback: (result: ActivityResult) -> Unit) : ActivityResultCallback<ActivityResult> {
         override fun onActivityResult(result: ActivityResult) {
             Timber.d("onActivityResult() with result: %s", result.resultCode)
@@ -1999,7 +2012,7 @@ class NoteEditor : AnkiActivity(), DeckSelectionListener, SubtitleListener, Tags
             id = mEditorNote?.id!!
         }
         val intent = ImageOcclusion.getIntent(this@NoteEditor, kind, id, imagePath)
-        startActivity(intent)
+        launchActivityForResultWithAnimation(intent, requestIOEditorCloser, START)
     }
 
     // ----------------------------------------------------------------------------
@@ -2268,6 +2281,8 @@ class NoteEditor : AnkiActivity(), DeckSelectionListener, SubtitleListener, Tags
         const val CALLER_NOTEEDITOR = 8
         const val CALLER_NOTEEDITOR_INTENT_ADD = 10
 
+        const val RESULT_UPDATED_IO_NOTE = 11
+
         // preferences keys
         const val PREF_NOTE_EDITOR_SCROLL_TOOLBAR = "noteEditorScrollToolbar"
         private const val PREF_NOTE_EDITOR_SHOW_TOOLBAR = "noteEditorShowToolbar"

AnkiDroid/src/main/java/com/ichi2/anki/pages/AnkiServer.kt

@@ -17,11 +17,14 @@
 
 package com.ichi2.anki.pages
 
+import android.app.Activity
 import androidx.fragment.app.FragmentActivity
 import com.ichi2.anki.CollectionManager
 import com.ichi2.anki.CollectionManager.withCol
+import com.ichi2.anki.NoteEditor
 import com.ichi2.anki.importCsvRaw
 import com.ichi2.anki.importJsonFileRaw
+import com.ichi2.anki.launchCatchingTask
 import com.ichi2.anki.searchInBrowser
 import com.ichi2.libanki.*
 import com.ichi2.libanki.sched.computeFsrsWeightsRaw
@@ -30,6 +33,7 @@ import com.ichi2.libanki.sched.evaluateWeightsRaw
 import com.ichi2.libanki.stats.*
 import fi.iki.elonen.NanoHTTPD
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import timber.log.Timber
 import java.io.ByteArrayInputStream
@@ -96,8 +100,22 @@ open class AnkiServer(
             "getImageForOcclusion" -> withCol { getImageForOcclusionRaw(bytes) }
             "getImageOcclusionNote" -> withCol { getImageOcclusionNoteRaw(bytes) }
             "getImageForOcclusionFields" -> withCol { getImageOcclusionFieldsRaw(bytes) }
-            "addImageOcclusionNote" -> withCol { addImageOcclusionNoteRaw(bytes) }
-            "updateImageOcclusionNote" -> withCol { updateImageOcclusionNoteRaw(bytes) }
+            "addImageOcclusionNote" -> withCol { addImageOcclusionNoteRaw(bytes) }.also {
+                activity.launchCatchingTask {
+                    // Allow time for toast message to appear before closing editor
+                    delay(1000)
+                    activity.setResult(Activity.RESULT_OK)
+                    activity.finish()
+                }
+            }
+            "updateImageOcclusionNote" -> withCol { updateImageOcclusionNoteRaw(bytes) }.also {
+                activity.launchCatchingTask {
+                    // Allow time for toast message to appear before closing editor
+                    delay(1000)
+                    activity.setResult(NoteEditor.RESULT_UPDATED_IO_NOTE)
+                    activity.finish()
+                }
+            }
             else -> { throw Exception("unhandled request: $methodName") }
         }
     }