Merge pull request #404 from wordpress-mobile/issue/363-fixing-quote-parsing-crash

Issue/363 fixing quote parsing crash

Author: 0nko

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

@@ -180,7 +180,7 @@ class AztecParser {
             val spanEnd = spanned.getSpanEnd(it)
 
             // block spans include a newline at the end, we need to account for that
-            val newlineExpected = if (it is AztecBlockSpan) spanEnd - 1 else spanEnd
+            val newlineExpected = if (it is AztecBlockSpan && spanEnd > 0) spanEnd - 1 else spanEnd
 
             if (spanEnd == spanned.length) {
                 // no visual newline if at text end

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

@@ -21,14 +21,14 @@ class TextDeleter private constructor(aztecText: AztecText) : TextWatcher {
             return
         }
 
-        aztecTextRef.get()?.text?.let { text ->
-            text.getSpans(0, text.length, MarkForDeletion::class.java).forEach {
-                val start = text.getSpanStart(it)
-                val end = text.getSpanEnd(it)
-
-                if (start > -1 && end > -1) {
-                    text.delete(text.getSpanStart(it), text.getSpanEnd(it))
-                }
+        text.getSpans(0, text.length, MarkForDeletion::class.java).forEach {
+            val start = text.getSpanStart(it)
+            val end = text.getSpanEnd(it)
+
+            if (start > -1 && end > -1) {
+                aztecTextRef.get()?.disableTextChangedListener()
+                text.delete(start, end)
+                aztecTextRef.get()?.enableTextChangedListener()
             }
         }
     }

aztec/src/test/kotlin/org/wordpress/aztec/BlockElementsTest.kt

@@ -92,4 +92,26 @@ class BlockElementsTest {
         Assert.assertTrue(safeEmpty(editText))
         Assert.assertEquals("", editText.toHtml())
     }
+
+    @Test
+    @Throws(Exception::class)
+    fun testCollapsingEmptyQuoteAboveNewline() {
+        safeAppend(editText, "\n")
+        editText.setSelection(0)
+        editText.toggleFormatting(TextFormat.FORMAT_QUOTE)
+        editText.text.insert(0,"\n")
+
+        Assert.assertEquals("<br>", editText.toHtml())
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun testCollapsingEmptyListAboveNewline() {
+        safeAppend(editText, "\n")
+        editText.setSelection(0)
+        editText.toggleFormatting(TextFormat.FORMAT_ORDERED_LIST)
+        editText.text.insert(0,"\n")
+
+        Assert.assertEquals("<br>", editText.toHtml())
+    }
 }