fix / strip reply prefix on history

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/util/ContentUtils.kt

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2019 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.matrix.android.api.util
+
+
+object ContentUtils {
+    fun extractUsefulTextFromReply(repliedBody: String): String {
+        val lines = repliedBody.lines()
+        var wellFormed = repliedBody.startsWith(">")
+        var endOfPreviousFound = false
+        val usefullines = ArrayList<String>()
+        lines.forEach {
+            if (it == "") {
+                endOfPreviousFound = true
+                return@forEach
+            }
+            if (!endOfPreviousFound) {
+                wellFormed = wellFormed && it.startsWith(">")
+            } else {
+                usefullines.add(it)
+            }
+        }
+        return usefullines.joinToString("\n").takeIf { wellFormed } ?: repliedBody
+    }
+
+    fun extractUsefulTextFromHtmlReply(repliedBody: String): String {
+        if (repliedBody.startsWith("<mx-reply>")) {
+            return repliedBody.substring(repliedBody.lastIndexOf("</mx-reply>") + "</mx-reply>".length).trim()
+        }
+        return repliedBody
+    }
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/TextContent.kt

@@ -18,6 +18,8 @@ package im.vector.matrix.android.internal.session.room.send
 
 import im.vector.matrix.android.api.session.room.model.message.MessageTextContent
 import im.vector.matrix.android.api.session.room.model.message.MessageType
+import im.vector.matrix.android.api.util.ContentUtils.extractUsefulTextFromHtmlReply
+import im.vector.matrix.android.api.util.ContentUtils.extractUsefulTextFromReply
 
 /**
  * Contains a text and eventually a formatted text
@@ -47,28 +49,4 @@ fun TextContent.removeInReplyFallbacks(): TextContent {
     )
 }
 
-fun extractUsefulTextFromReply(repliedBody: String): String {
-    val lines = repliedBody.lines()
-    var wellFormed = repliedBody.startsWith(">")
-    var endOfPreviousFound = false
-    val usefullines = ArrayList<String>()
-    lines.forEach {
-        if (it == "") {
-            endOfPreviousFound = true
-            return@forEach
-        }
-        if (!endOfPreviousFound) {
-            wellFormed = wellFormed && it.startsWith(">")
-        } else {
-            usefullines.add(it)
-        }
-    }
-    return usefullines.joinToString("\n").takeIf { wellFormed } ?: repliedBody
-}
 
-fun extractUsefulTextFromHtmlReply(repliedBody: String): String {
-    if (repliedBody.startsWith("<mx-reply>")) {
-        return repliedBody.substring(repliedBody.lastIndexOf("</mx-reply>") + "</mx-reply>".length).trim()
-    }
-    return repliedBody
-}