From 2763fbb496b73033110fd87943c5ea239fbc46a1 Mon Sep 17 00:00:00 2001 From: Dante Issaias Date: Tue, 30 Jul 2019 13:57:04 +0100 Subject: [PATCH] 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 bd32a75a47..c116c6b315 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 3df8a534a5..9ed629acda 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 +)