Skip to content

Commit

Permalink
Show correct details when a poll is ended.
Browse files Browse the repository at this point in the history
Previously, the "end poll" timeline item always showed the title
and options from the start event, regardless of whether any edits
had been made.

Now we show the latest edit, if available, falling back to the
original otherwise.
  • Loading branch information
csmith committed May 26, 2023
1 parent 8f69e41 commit 37429c2
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog.d/8471.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The correct title and options are now displayed When a poll that was edited is ended.
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 37429c2

Please sign in to comment.