Merge pull request #310 from wordpress-mobile/issue/improve-text-watcher

Don't disable text-change listener in image text watcher

Author: hypest

aztec/src/main/kotlin/org/wordpress/aztec/spans/FullWidthImageProcessingMarker.kt

@@ -0,0 +1,3 @@
+package org.wordpress.aztec.spans
+
+class FullWidthImageProcessingMarker

aztec/src/main/kotlin/org/wordpress/aztec/watchers/FullWidthImageElementWatcher.kt

@@ -1,12 +1,17 @@
 package org.wordpress.aztec.watchers
 
 import android.text.Editable
+import android.text.Spanned
 import android.text.TextWatcher
 import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.Constants
 import org.wordpress.aztec.spans.AztecFullWidthImageSpan
+import org.wordpress.aztec.spans.FullWidthImageProcessingMarker
+import java.lang.ref.WeakReference
 
-class FullWidthImageElementWatcher(val aztecText: AztecText) : TextWatcher {
+class FullWidthImageElementWatcher(aztecText: AztecText) : TextWatcher {
+
+    private val aztecTextRef: WeakReference<AztecText?> = WeakReference(aztecText)
 
     private var deletedNewline: Boolean = false
     private var changeCount: Int = 0
@@ -26,11 +31,14 @@ class FullWidthImageElementWatcher(val aztecText: AztecText) : TextWatcher {
     }
 
     private fun insertVisualNewline(position: Int) {
-        aztecText.text.insert(position, Constants.NEWLINE_STRING)
+        aztecTextRef.get()?.text?.insert(position, Constants.NEWLINE_STRING)
     }
 
     private fun normalizeEditingAroundImageSpans(count: Int, start: Int) {
-        if (!aztecText.isTextChangedListenerDisabled()) {
+        val aztecText = aztecTextRef.get()
+        if (aztecText != null && !aztecText.isTextChangedListenerDisabled() &&
+                aztecText.text.getSpans(0, 0, FullWidthImageProcessingMarker::class.java).isEmpty()) {
+
             val end = start + count
             var lines = aztecText.text.getSpans(start, start, AztecFullWidthImageSpan::class.java)
             lines += aztecText.text.getSpans(end, end, AztecFullWidthImageSpan::class.java)
@@ -41,7 +49,8 @@ class FullWidthImageElementWatcher(val aztecText: AztecText) : TextWatcher {
                 val changedLineEnd = aztecText.text.getSpanEnd(it) == start && start < aztecText.length() &&
                         aztecText.text[start] != Constants.NEWLINE
 
-                aztecText.disableTextChangedListener()
+                val marker = FullWidthImageProcessingMarker()
+                aztecText.text.setSpan(marker, 0, 0, Spanned.SPAN_MARK_MARK)
 
                 if (changedLineBeginning) {
                     // if characters added, insert a newline before the line
@@ -70,7 +79,7 @@ class FullWidthImageElementWatcher(val aztecText: AztecText) : TextWatcher {
                     }
                 }
 
-                aztecText.enableTextChangedListener()
+                aztecText.text.removeSpan(marker)
             }
         }
     }