filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only "org.matrix.custom.html" is supported

This commit is contained in:
Benoit Marty 2020-05-21 00:41:36 +02:00
parent 0e110b0794
commit 7c59bcc928
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageTextContent.kt
View File

@ -34,7 +34,7 @@ data class MessageTextContent(
@Json(name = "body") override val body: String, @Json(name = "body") override val body: String,
/** /**
* The format used in the formatted_body. Currently only org.matrix.custom.html is supported. * The format used in the formatted_body. Currently only "org.matrix.custom.html" is supported.
*/ */
@Json(name = "format") val format: String? = null, @Json(name = "format") val format: String? = null,

3
vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt
View File

@ -31,6 +31,7 @@ import im.vector.matrix.android.api.session.room.model.message.MessageAudioConte
import im.vector.matrix.android.api.session.room.model.message.MessageContent import im.vector.matrix.android.api.session.room.model.message.MessageContent
import im.vector.matrix.android.api.session.room.model.message.MessageEmoteContent import im.vector.matrix.android.api.session.room.model.message.MessageEmoteContent
import im.vector.matrix.android.api.session.room.model.message.MessageFileContent import im.vector.matrix.android.api.session.room.model.message.MessageFileContent
import im.vector.matrix.android.api.session.room.model.message.MessageFormat
import im.vector.matrix.android.api.session.room.model.message.MessageImageInfoContent import im.vector.matrix.android.api.session.room.model.message.MessageImageInfoContent
import im.vector.matrix.android.api.session.room.model.message.MessageNoticeContent import im.vector.matrix.android.api.session.room.model.message.MessageNoticeContent
import im.vector.matrix.android.api.session.room.model.message.MessageOptionsContent import im.vector.matrix.android.api.session.room.model.message.MessageOptionsContent
@ -350,7 +351,7 @@ class MessageItemFactory @Inject constructor(
highlight: Boolean, highlight: Boolean,
callback: TimelineEventController.Callback?, callback: TimelineEventController.Callback?,
attributes: AbsMessageItem.Attributes): VectorEpoxyModel<*>? { attributes: AbsMessageItem.Attributes): VectorEpoxyModel<*>? {
val isFormatted = messageContent.formattedBody.isNullOrBlank().not() val isFormatted = messageContent.formattedBody.takeIf { messageContent.format == MessageFormat.FORMAT_MATRIX_HTML }.isNullOrBlank().not()
return if (isFormatted) { return if (isFormatted) {
// First detect if the message contains some code block(s) or inline code // First detect if the message contains some code block(s) or inline code
val localFormattedBody = htmlRenderer.get().parse(messageContent.body) as Document val localFormattedBody = htmlRenderer.get().parse(messageContent.body) as Document