filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/aris/thread_live_thread_list' into feature/aris/threads_analytics

Browse Source
This commit is contained in:
ariskotsomitopoulos 2022-03-15 14:35:31 +01:00
commit 7db2ff2cfd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
View File

@ -216,14 +216,14 @@ class DisplayableEventFormatter @Inject constructor(
emojiSpanify.spanify(stringProvider.getString(R.string.sent_a_reaction, it.key)) emojiSpanify.spanify(stringProvider.getString(R.string.sent_a_reaction, it.key))
} ?: span { } } ?: span { }
} }
EventType.POLL_START -> { in EventType.POLL_START -> {
event.getClearContent().toModel<MessagePollContent>(catchError = true)?.pollCreationInfo?.question?.question event.getClearContent().toModel<MessagePollContent>(catchError = true)?.pollCreationInfo?.question?.question
?: stringProvider.getString(R.string.sent_a_poll) ?: stringProvider.getString(R.string.sent_a_poll)
} }
EventType.POLL_RESPONSE -> { in EventType.POLL_RESPONSE -> {
stringProvider.getString(R.string.poll_response_room_list_preview) stringProvider.getString(R.string.poll_response_room_list_preview)
} }
EventType.POLL_END -> { in EventType.POLL_END -> {
stringProvider.getString(R.string.poll_end_room_list_preview) stringProvider.getString(R.string.poll_end_room_list_preview)
} }
else -> { else -> {