Merge pull request #811 from wordpress-mobile/release/1.3.25

Merge Release/1.3.25 into master
wordpress-mobile · Apr 16, 2019 · 608c9f2 · 608c9f2
2 parents 40cde2f + b4c079b
commit 608c9f2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # Changelog
+## [v1.3.25](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.25)
+### Changed
+- Remove some unneeded logging #806
+### Fixed
+- Don't bail when ZWJ cleanup found end-of-text marker #807
+- Prevent execution of InputFilter for new lines #809
+
 ## [v1.3.24](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.3.24)
 ### Changed
 - Improvement to how clickable URL spans are handled #793

diff --git a/README.md b/README.md
@@ -105,7 +105,7 @@ repositories {
 ```
 ```gradle
 dependencies {
-    api ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.24')
+    api ('com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:v1.3.25')
 }
 ```
 

diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecParser.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecParser.kt
@@ -335,8 +335,9 @@ class AztecParser @JvmOverloads constructor(val plugins: List<IAztecPlugin> = li
         do {
             lastIndex = text.lastIndexOf(Constants.ZWJ_CHAR, lastIndex)
             if (lastIndex == text.length - 1) {
-                // ZWJ at the end of text will serve as end-of-text marker so, let it be and finish.
-                return
+                // ZWJ at the end of text will serve as end-of-text marker so, let it be and continue cleaning up ZWJs
+                lastIndex--
+                continue
             }
 
             if (lastIndex > -1) {

diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt
@@ -462,8 +462,11 @@ 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) {
+            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 there are any images right after the destination position, hack the text
                 val spans = dest.getSpans(dstart, dend+1, AztecImageSpan::class.java)
                 if (spans.isNotEmpty()) {

diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/watchers/event/sequence/UserOperationEvent.kt b/aztec/src/main/kotlin/org/wordpress/aztec/watchers/event/sequence/UserOperationEvent.kt
@@ -1,6 +1,5 @@
 package org.wordpress.aztec.watchers.event.sequence
 
-import org.wordpress.android.util.AppLog
 import org.wordpress.aztec.spans.AztecCodeSpan
 import org.wordpress.aztec.spans.AztecHeadingSpan
 import org.wordpress.aztec.spans.AztecListItemSpan
@@ -78,9 +77,6 @@ abstract class UserOperationEvent(var sequence: EventSequence<TextWatcherEvent>
             insideHeading = false
         }
 
-        AppLog.d(AppLog.T.EDITOR, "SEQUENCE OBSERVED COMPLETELY, IS IT WITHIN BLOCK?: " +
-                (isInsideList || insideHeading || isInsidePre || isInsideCode))
-
         return isInsideList || insideHeading || isInsidePre || isInsideCode
     }
 

diff --git a/...ess/aztec/watchers/event/sequence/known/space/steps/TextWatcherEventInsertTextDelAfter.kt b/...ess/aztec/watchers/event/sequence/known/space/steps/TextWatcherEventInsertTextDelAfter.kt
@@ -1,6 +1,5 @@
 package org.wordpress.aztec.watchers.event.sequence.known.space.steps
 
-import org.wordpress.android.util.AppLog
 import org.wordpress.aztec.watchers.EndOfBufferMarkerAdder
 import org.wordpress.aztec.watchers.event.text.AfterTextChangedEventData
 import org.wordpress.aztec.watchers.event.text.BeforeTextChangedEventData
@@ -18,17 +17,14 @@ class TextWatcherEventInsertTextDelAfter(beforeEventData: BeforeTextChangedEvent
 
     private fun testBeforeTextChangedEventData(data: BeforeTextChangedEventData): Boolean {
         beforeText = data.textBefore
-        AppLog.d(AppLog.T.EDITOR, "INSERTSPECIAL testBeforeTextChangedEventData: " + (data.count == 0 && data.after > 0))
         return data.count == 0 && data.after > 0
     }
 
     private fun testOnTextChangedEventData(data: OnTextChangedEventData): Boolean {
-        AppLog.d(AppLog.T.EDITOR, "INSERTSPECIAL testOnTextChangedEventData: " + (data.start >= 0 && data.count > 0 && data.textOn!!.length > 0))
         return data.start >= 0 && data.count > 0 && data.textOn!!.length > 0
     }
 
     private fun testAfterTextChangedEventData(data: AfterTextChangedEventData): Boolean {
-        AppLog.d(AppLog.T.EDITOR, "INSERTSPECIAL testAfterTextChangedEventData: " + (EndOfBufferMarkerAdder.safeLength(beforeText!!) == EndOfBufferMarkerAdder.safeLength(data.textAfter!!)))
         return EndOfBufferMarkerAdder.safeLength(beforeText!!) == EndOfBufferMarkerAdder.safeLength(data.textAfter!!)
     }