From 2763fbb496b73033110fd87943c5ea239fbc46a1 Mon Sep 17 00:00:00 2001 From: Dante Issaias Date: Tue, 30 Jul 2019 13:57:04 +0100 Subject: [PATCH 1/2] fix #447 Signed-off-by: Dante Issaias --- .../android/api/session/room/model/message/MessageContent.kt | 4 ++-- .../android/api/session/room/model/relation/ReplyToContent.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt index bd32a75a..c116c6b3 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/message/MessageContent.kt @@ -29,5 +29,5 @@ interface MessageContent { fun MessageContent?.isReply(): Boolean { - return this?.relatesTo?.inReplyTo != null -} \ No newline at end of file + return this?.relatesTo?.inReplyTo?.eventId != null +} diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReplyToContent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReplyToContent.kt index 3df8a534..9ed629ac 100644 --- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReplyToContent.kt +++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/model/relation/ReplyToContent.kt @@ -21,5 +21,5 @@ import com.squareup.moshi.JsonClass @JsonClass(generateAdapter = true) data class ReplyToContent( - @Json(name = "event_id") val eventId: String -) \ No newline at end of file + @Json(name = "event_id") val eventId: String? = null +) From 77b402ce7003fb4f10c4b44cca412be371ccced0 Mon Sep 17 00:00:00 2001 From: Dante Issaias Date: Tue, 30 Jul 2019 14:01:41 +0100 Subject: [PATCH 2/2] updates CHANGES.md Signed-off-by: Dante Issaias --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index f96588e5..2f54d1c2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,7 @@ Bugfix: - Edited message: link confusion when (edited) appears in body (#398) - Close detail room screen when the room is left with another client (#256) - Clear notification for a room left on another client + - Fix messages with empty `in_reply_to` not rendering (#447) Translations: -