6543
/
BayernMessenger
forked from GitHub-Mirror/riotX-android
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Fix actually done TODO

This commit is contained in:
Benoit Marty 2019-07-10 14:19:59 +02:00
parent 1918302297
commit e5082f662c
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt
View File

@ -98,24 +98,27 @@ internal class LocalEchoEventFactory @Inject constructor(private val credentials
newBodyAutoMarkdown: Boolean,
msgType: String,
compatibilityText: String): Event {
// TODO Format newBodyText
var newContent = MessageTextContent(
type = MessageType.MSGTYPE_TEXT,
body = newBodyText
)
if (newBodyAutoMarkdown) {
val parser = Parser.builder().build()
val newContent = if (newBodyAutoMarkdown) {
val document = parser.parse(newBodyText)
val renderer = HtmlRenderer.builder().build()
val htmlText = renderer.render(document)
if (isFormattedTextPertinent(newBodyText, htmlText)) {
newContent = MessageTextContent(
MessageTextContent(
type = MessageType.MSGTYPE_TEXT,
format = MessageType.FORMAT_MATRIX_HTML,
body = newBodyText,
formattedBody = htmlText
)
} else {
MessageTextContent(
type = MessageType.MSGTYPE_TEXT,
body = newBodyText
)
}
} else {
MessageTextContent(
type = MessageType.MSGTYPE_TEXT,
body = newBodyText
)
}

val content = MessageTextContent(
@ -226,7 +229,7 @@ internal class LocalEchoEventFactory @Inject constructor(private val credentials
type = MessageType.MSGTYPE_FILE,
body = attachment.name ?: "file",
info = FileInfo(
mimeType = attachment.mimeType.takeIf { it.isNotBlank() } ?: "application/octet-stream",
mimeType = attachment.mimeType.takeIf { it.isNotBlank() } ?: "application/octet-stream",
size = attachment.size
),
url = attachment.path