Merge pull request #8471 from vector-im/bugfix/cjs/poll-finish-contents

Show correct details when a poll is ended.
element-hq · Jun 9, 2023 · 48df113 · 48df113
2 parents 7d084f1 + 37429c2
commit 48df113
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/changelog.d/8471.bugfix b/changelog.d/8471.bugfix
@@ -0,0 +1 @@
+The correct title and options are now displayed When a poll that was edited is ended.
diff --git a/.../main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/.../main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -286,7 +286,10 @@ class MessageItemFactory @Inject constructor(
         } else {
             null
         }
-        val pollContent = pollStartEvent?.root?.getClearContent()?.toModel<MessagePollContent>()
+
+        val editedContent = pollStartEvent?.annotations?.editSummary?.latestEdit?.getClearContent()?.toModel<MessagePollContent>()?.newContent
+        val latestContent = editedContent ?: pollStartEvent?.root?.getClearContent()
+        val pollContent = latestContent?.toModel<MessagePollContent>()
 
         return if (pollContent == null) {
             val title = stringProvider.getString(R.string.message_reply_to_ended_poll_preview).toEpoxyCharSequence()