Refactor AztecText html methods to accept a general Spannable.

Author: mkevins

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

@@ -36,14 +36,7 @@ import android.support.graphics.drawable.VectorDrawableCompat
 import android.support.v4.content.ContextCompat
 import android.support.v7.app.AlertDialog
 import android.support.v7.widget.AppCompatEditText
-import android.text.Editable
-import android.text.InputFilter
-import android.text.InputType
-import android.text.Spannable
-import android.text.SpannableStringBuilder
-import android.text.Spanned
-import android.text.TextUtils
-import android.text.TextWatcher
+import android.text.*
 import android.text.style.SuggestionSpan
 import android.util.AttributeSet
 import android.util.DisplayMetrics
@@ -1239,6 +1232,7 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
     }
 
     // returns regular or "calypso" html depending on the mode
+    // default behavior returns HTML from this text
     fun toHtml(withCursorTag: Boolean = false): String {
         val html = toPlainHtml(withCursorTag)
 
@@ -1251,24 +1245,53 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
         }
     }
 
+    // general function accepts any Spannable and converts it to regular or "calypso" html
+    // depending on the mode
+    fun toHtml(content: Spannable, withCursorTag: Boolean = false): String {
+        val html = toPlainHtml(content, withCursorTag)
+
+        if (isInCalypsoMode) {
+            // calypso format is a mix of newline characters and html
+            // paragraphs and line breaks are added on server, from newline characters
+            return Format.addSourceEditorFormatting(html, true)
+        } else {
+            return html
+        }
+    }
+
     // platform agnostic HTML
+    // default behavior returns HTML from this text
     fun toPlainHtml(withCursorTag: Boolean = false): String {
         return if (Looper.myLooper() != Looper.getMainLooper()) {
             runBlocking {
                 withContext(Dispatchers.Main) {
-                    parseHtml(withCursorTag)
+                    parseHtml(text, withCursorTag)
                 }
             }
         } else {
-            parseHtml(withCursorTag)
+            parseHtml(text, withCursorTag)
         }
     }
 
-    private fun parseHtml(withCursorTag: Boolean): String {
+    // general function accepts any Spannable and converts it to platform agnostic HTML
+    fun toPlainHtml(content: Spannable, withCursorTag: Boolean = false): String {
+        return if (Looper.myLooper() != Looper.getMainLooper()) {
+            runBlocking {
+                withContext(Dispatchers.Main) {
+                    parseHtml(content, withCursorTag)
+                }
+            }
+        } else {
+            parseHtml(content, withCursorTag)
+        }
+    }
+
+    private fun parseHtml(content: Spannable, withCursorTag: Boolean): String {
         val parser = AztecParser(plugins)
         val output: SpannableStringBuilder
         try {
-            output = SpannableStringBuilder(text)
+            //output = SpannableStringBuilder(text)
+            output = SpannableStringBuilder(content)
         } catch (e: Exception) {
             // FIXME: Remove this log once we've data to replicate the issue, and fix it in some way.
             AppLog.e(AppLog.T.EDITOR, "There was an error creating SpannableStringBuilder. See #452 and #582 for details.")
@@ -1292,8 +1315,14 @@ open class AztecText : AppCompatEditText, TextWatcher, UnknownHtmlSpan.OnUnknown
         return EndOfBufferMarkerAdder.removeEndOfTextMarker(parser.toHtml(output, withCursorTag))
     }
 
+    // default behavior returns formatted HTML from this text
     fun toFormattedHtml(): String {
-        return Format.addSourceEditorFormatting(toHtml(), isInCalypsoMode)
+        return toFormattedHtml(text)
+    }
+
+    // general function accepts any Spannable and converts it to formatted HTML
+    fun toFormattedHtml(content: Spannable): String {
+        return Format.addSourceEditorFormatting(toHtml(content), isInCalypsoMode)
     }
 
     private fun switchToAztecStyle(editable: Editable, start: Int, end: Int) {