Merge pull request #816 from wordpress-mobile/release/1.3.26

Merge Release/1.3.26 into master

Author: loremattei

CHANGELOG.md

@@ -1,4 +1,10 @@
 # Changelog
+## [v1.3.26](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.26)
+### Fixed
+- DynamicLayout Crash #813
+- List handling in Gutenberg #812
+
+
 ## [v1.3.25](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.25)
 ### Changed
 - Remove some unneeded logging #806

README.md

@@ -105,7 +105,7 @@ repositories {
 ```
 ```gradle
 dependencies {
-    api ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.25')
+    api ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.26')
 }
 ```
 

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

@@ -102,7 +102,6 @@ import org.wordpress.aztec.watchers.DeleteMediaElementWatcherAPI25AndHigher
 import org.wordpress.aztec.watchers.DeleteMediaElementWatcherPreAPI25
 import org.wordpress.aztec.watchers.EndOfBufferMarkerAdder
 import org.wordpress.aztec.watchers.EndOfParagraphMarkerAdder
-import org.wordpress.aztec.watchers.EnterPressedWatcher
 import org.wordpress.aztec.watchers.FullWidthImageElementWatcher
 import org.wordpress.aztec.watchers.InlineTextWatcher
 import org.wordpress.aztec.watchers.ParagraphBleedAdjuster
@@ -320,7 +319,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
     }
 
     interface OnAztecKeyListener {
-        fun onEnterKey() : Boolean
+        fun onEnterKey(text: Spannable, firedAfterTextChanged: Boolean, selStart: Int, selEnd: Int) : Boolean
         fun onBackspaceKey() : Boolean
     }
 
@@ -462,29 +461,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 && dend < dest.length && source != Constants.NEWLINE_STRING) {
+
                 // 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
+
+                    // prevent this filter from running recursively
                     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()
@@ -523,7 +520,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
         if (event.action == KeyEvent.ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_ENTER) {
             // Check if the external listener has consumed the enter pressed event
             // In that case stop the execution
-            if (onAztecKeyListener?.onEnterKey() == true) {
+            if (onAztecKeyListener?.onEnterKey(text, false, 0, 0) == true) {
                 return true
             }
         }
@@ -559,11 +556,6 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
     }
 
     private fun install() {
-        // Keep the enter pressed watcher at the beginning of the watchers list.
-        // We want to intercept Enter.key as soon as possible, and before other listeners start modifying the text.
-        // Also note that this Watchers, when the AztecKeyListener is set, keep hold a copy of the content in the editor.
-        EnterPressedWatcher.install(this)
-
         ParagraphBleedAdjuster.install(this)
         ParagraphCollapseAdjuster.install(this)
 
@@ -1239,8 +1231,15 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
     }
 
     // returns regular or "calypso" html depending on the mode
+    // default behavior returns HTML from this text
     fun toHtml(withCursorTag: Boolean = false): String {
-        val html = toPlainHtml(withCursorTag)
+        return toHtml(text, withCursorTag)
+    }
+
+    // general function accepts any Spannable and converts it to regular or "calypso" html
+    // depending on the mode
+    fun toHtml(content: Spannable, withCursorTag: Boolean = false): String {
+        val html = toPlainHtml(content, withCursorTag)
 
         if (isInCalypsoMode) {
             // calypso format is a mix of newline characters and html
@@ -1252,23 +1251,29 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
     }
 
     // platform agnostic HTML
+    // default behavior returns HTML from this text
     fun toPlainHtml(withCursorTag: Boolean = false): String {
+        return toPlainHtml(text, withCursorTag)
+    }
+
+    // general function accepts any Spannable and converts it to platform agnostic HTML
+    fun toPlainHtml(content: Spannable, withCursorTag: Boolean = false): String {
         return if (Looper.myLooper() != Looper.getMainLooper()) {
             runBlocking {
                 withContext(Dispatchers.Main) {
-                    parseHtml(withCursorTag)
+                    parseHtml(content, withCursorTag)
                 }
             }
         } else {
-            parseHtml(withCursorTag)
+            parseHtml(content, withCursorTag)
         }
     }
 
-    private fun parseHtml(withCursorTag: Boolean): String {
+    private fun parseHtml(content: Spannable, withCursorTag: Boolean): String {
         val parser = AztecParser(plugins)
         val output: SpannableStringBuilder
         try {
-            output = SpannableStringBuilder(text)
+            output = SpannableStringBuilder(content)
         } catch (e: Exception) {
             // FIXME: Remove this log once we've data to replicate the issue, and fix it in some way.
             AppLog.e(AppLog.T.EDITOR, "There was an error creating SpannableStringBuilder. See #452 and #582 for details.")
@@ -1292,8 +1297,14 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
         return EndOfBufferMarkerAdder.removeEndOfTextMarker(parser.toHtml(output, withCursorTag))
     }
 
+    // default behavior returns formatted HTML from this text
     fun toFormattedHtml(): String {
-        return Format.addSourceEditorFormatting(toHtml(), isInCalypsoMode)
+        return toFormattedHtml(text)
+    }
+
+    // general function accepts any Spannable and converts it to formatted HTML
+    fun toFormattedHtml(content: Spannable): String {
+        return Format.addSourceEditorFormatting(toHtml(content), isInCalypsoMode)
     }
 
     private fun switchToAztecStyle(editable: Editable, start: Int, end: Int) {
@@ -1548,8 +1559,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

aztec/src/main/kotlin/org/wordpress/aztec/util/Azteclog.kt

@@ -33,7 +33,7 @@ class AztecLog {
             }
         }
 
-        private fun logSpansDetails(text: Spanned): String {
+        @JvmStatic fun logSpansDetails(text: Spanned): String {
             val spans = text.getSpans(0, text.length, Any::class.java)
             val spansList = Arrays.asList<Any>(*spans)
 
@@ -117,4 +117,4 @@ class AztecLog {
             return TextUtils.join("", Collections.nCopies(count, char))
         }
     }
-}
+}