From 71ea1c5f9ba2d4ac6aa28c222f321b55d6983dd1 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 27 May 2019 18:21:59 +0200
Subject: [PATCH] Fix / avoid newlines and ws in reply event representations

---
 .../session/room/send/LocalEchoEventFactory.kt       | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt
index a7b261de82..96237a06d4 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt
@@ -231,16 +231,8 @@ internal class LocalEchoEventFactory(private val credentials: Credentials, priva
 //        This is where the reply goes.
         val body = bodyForReply(eventReplied.content.toModel<MessageContent>())
         val replyFallbackTemplateFormatted = """
-           <mx-reply>
-              <blockquote>
-                <a href="%s">${stringProvider.getString(R.string.in_reply_to)}</a>
-                <a href="%s">%s</a>
-                <br />
-                %s
-              </blockquote>
-            </mx-reply>
-            %s
-        """.trim().format(permalink, userLink, userId, body.second ?: body.first, replyText)
+           <mx-reply><blockquote><a href="%s">${stringProvider.getString(R.string.in_reply_to)}</a><a href="%s">%s</a><br />%s</blockquote></mx-reply>%s
+        """.trimIndent().format(permalink, userLink, userId, body.second ?: body.first, replyText)
 //
 //        > <@alice:example.org> This is the original body
 //