Merge pull request #985 from wordpress-mobile/feature/insert-pasted-text-when-text-is-empty

Insert text when current text is empty to preserve formatting when pasting to empty edit text

Author: AmandaRiu

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

@@ -1814,8 +1814,9 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
             disableTextChangedListener()
 
             val length = text.length
-            if (min == 0 &&
-                    (max == length || (length == 1 && text.toString() == Constants.END_OF_BUFFER_MARKER_STRING))) {
+            if (min == 0 && max == 0 && length == 1 && text.toString() == Constants.END_OF_BUFFER_MARKER_STRING) {
+                editable.insert(min, Constants.REPLACEMENT_MARKER_STRING)
+            } else if (min == 0 && max == length) {
                 setText(Constants.REPLACEMENT_MARKER_STRING)
             } else {
                 // prevent changes here from triggering the crash preventer

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

@@ -2,6 +2,8 @@ package org.wordpress.aztec
 
 import android.annotation.SuppressLint
 import android.app.Activity
+import android.content.ClipData
+import android.content.Context
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
@@ -338,4 +340,18 @@ class ClipboardTest {
 
         Assert.assertEquals(LONG_TEXT_EXPECTED, editText.toHtml())
     }
+
+    @Test
+    @Throws(Exception::class)
+    fun pasteIntoEmptyTextPreservesFormatting() {
+        editText.fromHtml("<h1></h1>")
+
+        editText.setSelection(0)
+        val clipboard = editText.context.getSystemService(Context.CLIPBOARD_SERVICE) as android.content.ClipboardManager
+        clipboard.primaryClip = ClipData.newPlainText("aztec", "Heading")
+
+        TestUtils.pasteFromClipboard(editText)
+
+        Assert.assertEquals("<h1>Heading</h1>", editText.toHtml())
+    }
 }