From 8fb38f57dcab7f30f9c781bde42165bbb0dff797 Mon Sep 17 00:00:00 2001
From: Maxime NATUREL <46314705+mnaturel@users.noreply.github.com>
Date: Tue, 31 Jan 2023 17:15:26 +0100
Subject: [PATCH] Fallback to message content of end message if no event found
 for start message

---
 .../sdk/internal/session/room/send/LocalEchoEventFactory.kt      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
index 1d6586c266..642b13a6fe 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
@@ -731,6 +731,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                 localEchoRepository
                         .getRelatedPollEvent(timelineEvent)
                         ?.getLastMessageContent()
+                        ?: timelineEvent.getLastMessageContent()
             }
             else -> timelineEvent.getLastMessageContent()
         }