Merge pull request #272 from wordpress-mobile/issue/265-fixing-link-issue

Issue/265 fixing link issue

Author: theck13

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

@@ -428,7 +428,8 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
     }
 
     fun getSelectedText(): String {
-        if (selectionStart == -1 || selectionEnd == -1) return ""
+        if (selectionStart == -1 || selectionEnd == -1
+                || editableText.length < selectionEnd || editableText.length < selectionStart) return ""
         return editableText.substring(selectionStart, selectionEnd)
     }
 

aztec/src/main/kotlin/org/wordpress/aztec/formatting/BlockFormatter.kt

@@ -279,6 +279,14 @@ class BlockFormatter(editor: AztecText, listStyle: ListStyle, quoteStyle: QuoteS
             val spanStart = editableText.getSpanStart(it)
             var spanEnd = editableText.getSpanEnd(it)
 
+            //when removing empty span don't forget to delete ZWJ
+            if(spanEnd - spanStart == 1 && editableText[spanStart] == Constants.ZWJ_CHAR){
+                editableText.removeSpan(it)
+                editor.disableTextChangedListener()
+                editableText.delete(spanStart, spanStart + 1)
+                return@forEach
+            }
+
             //if splitting block set a range that would be excluded from it
             val boundsOfSelectedText = if (ignoreLineBounds) IntRange(start, end) else getSelectedTextBounds(editableText, start, end)
 

aztec/src/main/kotlin/org/wordpress/aztec/formatting/LinkFormatter.kt

@@ -5,6 +5,8 @@ import android.text.Spanned
 import android.text.TextUtils
 import android.util.Patterns
 import org.wordpress.aztec.AztecText
+import org.wordpress.aztec.Constants
+import org.wordpress.aztec.spans.AztecBlockSpan
 import org.wordpress.aztec.spans.AztecURLSpan
 
 
@@ -88,23 +90,39 @@ class LinkFormatter(editor: AztecText, linkStyle: LinkStyle):AztecFormatter(edit
 
     fun addLink(link: String, anchor: String, start: Int, end: Int) {
         val cleanLink = link.trim()
-        val newEnd: Int
 
         val actualAnchor = if (TextUtils.isEmpty(anchor)) cleanLink else anchor
 
+        var realStart = start
+        var realEnd = end
+
+
         if (start == end) {
+            val insertingIntoEmptyBlockElement = editableText.getSpans(realStart,realStart,AztecBlockSpan::class.java).any {
+                editableText.getSpanEnd(it) -  editableText.getSpanStart(it) == 1 &&
+                        editableText[editableText.getSpanStart(it)] == Constants.ZWJ_CHAR
+            }
+
             //insert anchor
-            editableText.insert(start, actualAnchor)
-            newEnd = start + actualAnchor.length
+            editableText.insert(realStart, actualAnchor)
+            realEnd = realStart + actualAnchor.length
+
+            //when anchor is inserted into empty block element, the Constants.ZWJ_CHAR at the beginning of it
+            // will be consumed, so we need to adjust index by 1
+            if(insertingIntoEmptyBlockElement){
+                realStart--
+                realEnd--
+
+            }
         } else {
             //apply span to text
             if (editor.getSelectedText() != anchor) {
-                editableText.replace(start, end, actualAnchor)
+                editableText.replace(realStart, realEnd, actualAnchor)
             }
-            newEnd = start + actualAnchor.length
+            realEnd = realStart + actualAnchor.length
         }
 
-        linkValid(link, start, newEnd)
+        linkValid(link, realStart, realEnd)
     }
 
     fun editLink(link: String, anchor: String?, start: Int = selectionStart, end: Int = selectionEnd) {

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

@@ -63,6 +63,25 @@ class LinkTest() {
         Assert.assertEquals("<a href=\"http://wordpress.com\">WordPress</a>", editText.toHtml())
     }
 
+    @Test
+    @Throws(Exception::class)
+    fun insertLinkIntoEmptyQuote() {
+        editText.toggleFormatting(TextFormat.FORMAT_QUOTE)
+        Assert.assertEquals("<blockquote></blockquote>", editText.toHtml())
+        editText.setSelection(editText.length())
+        editText.link("http://wordpress.com", "WordPress")
+        Assert.assertEquals("<blockquote><a href=\"http://wordpress.com\">WordPress</a></blockquote>", editText.toHtml())
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun insertLinkIntoEmptyList() {
+        editText.toggleFormatting(TextFormat.FORMAT_ORDERED_LIST)
+        Assert.assertEquals("<ol><li></li></ol>", editText.toHtml())
+        editText.setSelection(editText.length())
+        editText.link("http://wordpress.com", "WordPress")
+        Assert.assertEquals("<ol><li><a href=\"http://wordpress.com\">WordPress</a></li></ol>", editText.toHtml())
+    }
 
     @Test
     @Throws(Exception::class)

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

@@ -110,6 +110,11 @@ class ListTest(listTextFormat: TextFormat, listHtmlTag: String) {
     fun emptyList() {
         editText.toggleFormatting(listType)
         Assert.assertEquals("<$listTag><li></li></$listTag>", editText.toHtml())
+
+        //remove list
+        editText.toggleFormatting(listType)
+        Assert.assertEquals(0, editText.length())
+        Assert.assertEquals("", editText.toHtml())
     }
 
     @Test

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

@@ -94,6 +94,11 @@ class QuoteTest() {
     fun emptyQuote() {
         editText.toggleFormatting(formattingType)
         Assert.assertEquals("<$quoteTag></$quoteTag>", editText.toHtml())
+
+        //remove quote
+        editText.toggleFormatting(formattingType)
+        Assert.assertEquals(0, editText.length())
+        Assert.assertEquals("", editText.toHtml())
     }
 
     @Test