From 7eb1f1c7bfef5612e773b66a65612bab0e4f30c1 Mon Sep 17 00:00:00 2001 From: Jorge Martin Espinosa Date: Wed, 23 Aug 2023 14:50:22 +0200 Subject: [PATCH] When event has no id, just cancel parsing the latest room message (#1126) --- changelog.d/1125.bugfix | 1 + .../libraries/matrix/impl/room/message/RoomMessageFactory.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 changelog.d/1125.bugfix diff --git a/changelog.d/1125.bugfix b/changelog.d/1125.bugfix new file mode 100644 index 0000000000..85ebb87033 --- /dev/null +++ b/changelog.d/1125.bugfix @@ -0,0 +1 @@ +When event has no id, just cancel parsing the latest room message for a room. diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/message/RoomMessageFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/message/RoomMessageFactory.kt index 3c298b5ec6..6f46f73351 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/message/RoomMessageFactory.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/message/RoomMessageFactory.kt @@ -25,7 +25,7 @@ class RoomMessageFactory { eventTimelineItem ?: return null val mappedTimelineItem = EventTimelineItemMapper().map(eventTimelineItem) return RoomMessage( - eventId = mappedTimelineItem.eventId!!, + eventId = mappedTimelineItem.eventId ?: return null, event = mappedTimelineItem, sender = mappedTimelineItem.sender, originServerTs = mappedTimelineItem.timestamp,