Modify DynamicLayout crash preventer to address more cases.

Author: mkevins

aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt

@@ -455,29 +455,27 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
         // https://android-review.googlesource.com/c/platform/frameworks/base/+/634929
         val dynamicLayoutCrashPreventer = InputFilter { source, start, end, dest, dstart, dend ->
             var temp : CharSequence? = null
-            if (!bypassCrashPreventerInputFilter
-                    && dstart == dend && dest.length > dend+1
-                    && source != Constants.NEWLINE_STRING) {
-                // dstart == dend means this is an insertion
-                // avoid handling anything if it's a newline
+            if (!bypassCrashPreventerInputFilter) {
+
                 // if there are any images right after the destination position, hack the text
-                val spans = dest.getSpans(dstart, dend+1, AztecImageSpan::class.java)
+                val spans = dest.getSpans(dend, dend+1, AztecImageSpan::class.java)
                 if (spans.isNotEmpty()) {
+
                     // prevent this filter from running twice when `text.insert()` gets called a few lines below
                     disableCrashPreventerInputFilter()
                     // disable MediaDeleted listener before operating on content
                     disableMediaDeletedListener()
 
-                    // take the source (that is, what is being inserted), and append the Image to it. We will delete
-                    // the original Image later so to not have a duplicate.
-                    // use Spannable to copy / keep the current spans
-                    temp = SpannableStringBuilder(source).append(dest.subSequence(dend, dend+1))
+                    // create a new Spannable to perform the text change here
+                    var newText = SpannableStringBuilder(dest.subSequence(0, dstart))
+                            .append(source.subSequence(start, end))
+                            .append(dest.subSequence(dend, dest.length));
+
+                    // force a history update to ensure the change is recorded
+                    history.beforeTextChanged(this@AztecText)
 
-                    // delete the original AztecImageSpan
-                    text.delete(dend, dend+1)
-                    // now insert both the new insertion _and_ the original AztecImageSpan
-                    text.insert(dend, temp)
-                    temp = "" // discard the original source parameter as an ouput from this InputFilter
+                    // use HTML from the new text to set the state of the editText directly
+                    fromHtml(toFormattedHtml(newText), false)
 
                     // re-enable MediaDeleted listener
                     enableMediaDeletedListener()
@@ -1577,8 +1575,11 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
                     (max == length || (length == 1 && text.toString() == Constants.END_OF_BUFFER_MARKER_STRING))) {
                 setText(Constants.REPLACEMENT_MARKER_STRING)
             } else {
+                // prevent changes here from triggering the crash preventer
+                disableCrashPreventerInputFilter()
                 editable.delete(min, max)
                 editable.insert(min, Constants.REPLACEMENT_MARKER_STRING)
+                enableCrashPreventerInputFilter()
             }
 
             // don't let the pasted text be included in any existing style