Android: improve handling of line break chars in text nodes (#67)

Co-authored-by: Benoit Marty <[email protected]>

Author: jmartinesp

platforms/android/library/src/main/java/io/element/android/wysiwyg/utils/HtmlToSpansParser.kt

@@ -388,7 +388,7 @@ internal class HtmlToSpansParser(
                 } else if ((stripLeading && !reachedNonWhite) || lastWasWhite) {
                     i += Character.charCount(c)
                     continue
-                } else if (c == '\n'.code && i == text.length - 1) {
+                } else if (c == '\n'.code && (i == text.length - 1 || !reachedNonWhite)) {
                     // Do nothing, this is probably just an HTML formatting line break
                 } else {
                     result.append(' ')

platforms/android/library/src/test/kotlin/io/element/android/wysiwyg/utils/HtmlToSpansParserTest.kt

@@ -9,8 +9,8 @@
 package io.element.android.wysiwyg.utils
 
 import android.text.Spanned
-import io.element.android.wysiwyg.display.TextDisplay
 import io.element.android.wysiwyg.display.MentionDisplayHandler
+import io.element.android.wysiwyg.display.TextDisplay
 import io.element.android.wysiwyg.test.fakes.createFakeStyleConfig
 import io.element.android.wysiwyg.test.utils.dumpSpans
 import io.element.android.wysiwyg.view.spans.OrderedListSpan
@@ -270,6 +270,31 @@ class HtmlToSpansParserTest {
         )
     }
 
+    @Test
+    fun testLeadingLineBreakCharsInHtmlTextAreIgnored() {
+        val html = "<p>First Line</p>\n<p>Line after Empty Line<br />\nThird Line</p>\n"
+        val spanned = convertHtml(
+            html = html,
+            isEditor = false,
+        )
+        assertThat(
+            spanned.toString(), equalTo("First Line\n\nLine after Empty Line\nThird Line")
+        )
+    }
+
+    @Test
+    fun testLineBreakCharsInMiddleOrEndOfHtmlTextAreConvertedToWhitespace() {
+        val html = "<p>First Line\n</p><p>Line after Empty Line<br />Third\n\n\n\nWith more</p>"
+        val spanned = convertHtml(
+            html = html,
+            isEditor = false,
+        )
+        assertThat(
+            spanned.toString(),
+            equalTo("First Line\n\nLine after Empty Line\nThird With more")
+        )
+    }
+
     private fun convertHtml(
         html: String,
         isEditor: Boolean = true,