Merge pull request #739 from wordpress-mobile/feature/paste-as-plain-text

Feature / Android8 / Paste as plain text

Author: mzorz

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

@@ -1310,8 +1310,8 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
         }
 
         when (id) {
-            android.R.id.paste,
-            android.R.id.pasteAsPlainText -> paste(text, min, max)
+            android.R.id.paste -> paste(text, min, max)
+            android.R.id.pasteAsPlainText -> paste(text, min, max, true)
             android.R.id.copy -> {
                 copy(text, min, max)
                 setSelection(max) // dismiss the selection to make the action menu hide
@@ -1364,7 +1364,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
     }
 
     // copied from TextView with some changes
-    fun paste(editable: Editable, min: Int, max: Int) {
+    fun paste(editable: Editable, min: Int, max: Int, asPlainText: Boolean = false) {
         val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
         val clip = clipboard.primaryClip
 
@@ -1394,7 +1394,8 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
             enableTextChangedListener()
 
             if (clip.itemCount > 0) {
-                val textToPaste = clip.getItemAt(0).coerceToHtmlText(AztecParser(plugins))
+                val textToPaste = if (asPlainText) clip.getItemAt(0).coerceToText(context).toString()
+                else clip.getItemAt(0).coerceToHtmlText(AztecParser(plugins))
 
                 val oldHtml = toPlainHtml().replace("<aztec_cursor>", "")
                 val newHtml = oldHtml.replace(Constants.REPLACEMENT_MARKER_STRING, textToPaste + "<" + AztecCursorSpan.AZTEC_CURSOR_TAG + ">")

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

@@ -310,4 +310,32 @@ class ClipboardTest {
 
         editText.setCalypsoMode(false)
     }
+
+    @Test
+    @Throws(Exception::class)
+    fun copyAndPasteAsPlainTextSameInlineStyle() {
+        editText.fromHtml("<b>Bold</b>")
+
+        editText.setSelection(0, editText.length())
+        TestUtils.copyToClipboard(editText)
+
+        editText.setSelection(editText.length())
+        TestUtils.pasteFromClipboardAsPlainText(editText)
+
+        Assert.assertEquals("<b>Bold</b>Bold", editText.toHtml())
+    }
+
+    @Test
+    @Throws(Exception::class)
+    fun copyAndReplaceAsPlainText() {
+        editText.fromHtml(LONG_TEXT)
+
+        editText.setSelection(0, editText.length())
+        TestUtils.copyToClipboard(editText)
+
+        editText.setSelection(0, editText.length())
+        TestUtils.pasteFromClipboardAsPlainText(editText)
+
+        Assert.assertEquals(LONG_TEXT_EXPECTED, editText.toHtml())
+    }
 }

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

@@ -64,6 +64,15 @@ object TestUtils {
         text.paste(text.text, text.selectionStart, text.selectionEnd)
     }
 
+    /**
+     * Issue a copy as plain text to clipboard key event
+     *
+     * @param text The EditText to issue the key event to
+     */
+    fun pasteFromClipboardAsPlainText(text: AztecText) {
+        text.paste(text.text, text.selectionStart, text.selectionEnd, true)
+    }
+
     /**
      * Helper for calculating the EditText's length *without* counting the the end-of-text marker char if present
      *