Create MessageContentWithFormattedBody interface

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContentWithFormattedBody.kt

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2020 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.session.room.model.message
+
+interface MessageContentWithFormattedBody : MessageContent {
+    /**
+     * The format used in the formatted_body. Currently only "org.matrix.custom.html" is supported.
+     */
+    val format: String?
+
+    /**
+     * The formatted version of the body. This is required if format is specified.
+     */
+    val formattedBody: String?
+
+    /**
+     * Get the formattedBody, only if the format is equal to "org.matrix.custom.html"
+     */
+    val matrixFormattedBody: String?
+        get() = formattedBody?.takeIf { format == MessageFormat.FORMAT_MATRIX_HTML }
+}

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageEmoteContent.kt

@@ -34,15 +34,15 @@ data class MessageEmoteContent(
         @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") override val format: String? = null,
 
         /**
          * The formatted version of the body. This is required if format is specified.
          */
-        @Json(name = "formatted_body") val formattedBody: String? = null,
+        @Json(name = "formatted_body") override val formattedBody: String? = null,
 
         @Json(name = "m.relates_to") override val relatesTo: RelationDefaultContent? = null,
         @Json(name = "m.new_content") override val newContent: Content? = null
-) : MessageContent
+) : MessageContentWithFormattedBody

matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageNoticeContent.kt

@@ -34,15 +34,15 @@ data class MessageNoticeContent(
         @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") override val format: String? = null,
 
         /**
          * The formatted version of the body. This is required if format is specified.
          */
-        @Json(name = "formatted_body") val formattedBody: String? = null,
+        @Json(name = "formatted_body") override val formattedBody: String? = null,
 
         @Json(name = "m.relates_to") override val relatesTo: RelationDefaultContent? = null,
         @Json(name = "m.new_content") override val newContent: Content? = null
-) : MessageContent
+) : MessageContentWithFormattedBody

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

@@ -36,13 +36,13 @@ data class MessageTextContent(
         /**
          * 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") override val format: String? = null,
 
         /**
          * The formatted version of the body. This is required if format is specified.
          */
-        @Json(name = "formatted_body") val formattedBody: String? = null,
+        @Json(name = "formatted_body") override val formattedBody: String? = null,
 
         @Json(name = "m.relates_to") override val relatesTo: RelationDefaultContent? = null,
         @Json(name = "m.new_content") override val newContent: Content? = null
-) : MessageContent
+) : MessageContentWithFormattedBody

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

@@ -35,6 +35,7 @@ import im.vector.matrix.android.api.session.room.model.message.FileInfo
 import im.vector.matrix.android.api.session.room.model.message.ImageInfo
 import im.vector.matrix.android.api.session.room.model.message.MessageAudioContent
 import im.vector.matrix.android.api.session.room.model.message.MessageContent
+import im.vector.matrix.android.api.session.room.model.message.MessageContentWithFormattedBody
 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.MessageImageContent
@@ -442,10 +443,8 @@ internal class LocalEchoEventFactory @Inject constructor(
             MessageType.MSGTYPE_TEXT,
             MessageType.MSGTYPE_NOTICE -> {
                 var formattedText: String? = null
-                if (content is MessageTextContent) {
-                    if (content.format == MessageFormat.FORMAT_MATRIX_HTML) {
-                        formattedText = content.formattedBody
-                    }
+                if (content is MessageContentWithFormattedBody) {
+                    formattedText = content.matrixFormattedBody
                 }
                 val isReply = content.isReply() || originalContent.isReply()
                 return if (isReply) {

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

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