Fix the paragraph crash and prevent broken text insertion around imag…

…es with captions
wordpress-mobile · Nov 20, 2017 · 668dcfb · 668dcfb
1 parent 1f48e1e
commit 668dcfb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/...tcodes/src/main/java/org/wordpress/aztec/plugins/shortcodes/spans/CaptionShortcodeSpan.kt b/...tcodes/src/main/java/org/wordpress/aztec/plugins/shortcodes/spans/CaptionShortcodeSpan.kt
@@ -43,7 +43,7 @@ class CaptionShortcodeSpan @JvmOverloads constructor(override var attributes: Az
                     aztecText.text.insert(end, newValue)
 
                     val newEnd = Math.min(end + newValue.length + 1, aztecText.length())
-                    aztecText.text.setSpan(this, wrapper.start, newEnd, Spanned.SPAN_PARAGRAPH)
+                    aztecText.text.setSpan(this, wrapper.start, newEnd, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
                 } else {
                     aztecText.text.replace(start, end, value)
                 }

diff --git a/...hortcodes/src/main/java/org/wordpress/aztec/plugins/shortcodes/watchers/CaptionWatcher.kt b/...hortcodes/src/main/java/org/wordpress/aztec/plugins/shortcodes/watchers/CaptionWatcher.kt
@@ -9,28 +9,32 @@ import org.wordpress.aztec.watchers.BlockElementWatcher
 
 class CaptionWatcher(private val aztecText: AztecText) : BlockElementWatcher(aztecText) {
 
-    var blocks = arrayListOf<SpanWrapper<CaptionShortcodeSpan>>()
-    override fun beforeTextChanged(text: CharSequence, start: Int, count: Int, after: Int) {
-        super.beforeTextChanged(text, start, count, after)
-
-        // prevent moving the start of the caption beyond an image when a backspace is entered right before the
-        // image by making it non-paragraph
-        if (count > 0 && start + count < text.length && aztecText.text[start + count] == Constants.IMG_CHAR) {
-            val spans = SpanWrapper.getSpans<CaptionShortcodeSpan>(aztecText.text, start + count, start + count, CaptionShortcodeSpan::class.java)
-            spans.forEach { block ->
-                aztecText.text.setSpan(block.span, block.start, block.end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-                blocks.add(block)
-            }
-        }
-    }
-
     override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
         super.onTextChanged(s, start, before, count)
 
-        // we can make it a paragraph again now that everything is done
-        blocks.forEach { block ->
-            aztecText.text.setSpan(block.span, block.start, block.end, Spanned.SPAN_PARAGRAPH)
+        if (start + count < s.length && s[start + count] == Constants.IMG_CHAR) {
+            val spans = SpanWrapper.getSpans<CaptionShortcodeSpan>(aztecText.text, start + count, start + count,
+                    CaptionShortcodeSpan::class.java)
+            spans.forEach {
+
+                // if text is added right before an image, move it out of the caption
+                if (it.start < start + count && it.end > start + count) {
+                    aztecText.text.setSpan(it.span, start + count, it.end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+                }
+            }
+        } else if (count > 0) {
+            val spans = SpanWrapper.getSpans<CaptionShortcodeSpan>(aztecText.text, start, start, CaptionShortcodeSpan::class.java)
+            spans.forEach {
+
+                // if text is added right after an image, move it below the caption
+                if (start > 0 && s[start - 1] == Constants.IMG_CHAR && s[start] != Constants.NEWLINE) {
+                    val newText = "" + s.subSequence(start, start + count)
+                    aztecText.text.insert(it.end, Constants.NEWLINE_STRING)
+                    aztecText.text.delete(start, start + count)
+                    aztecText.text.insert(it.end, newText)
+                    aztecText.setSelection(it.end + newText.length)
+                }
+            }
         }
-        blocks.clear()
     }
 }