Merge pull request #8471 from vector-im/bugfix/cjs/poll-finish-contents
Show correct details when a poll is ended.
This commit is contained in:
commit
48df1136ca
|
@ -0,0 +1 @@
|
|||
The correct title and options are now displayed When a poll that was edited is ended.
|
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue