mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-02-16 12:00:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

[merge] Fix room summary preview mismerge

Browse source 
Change-Id: I7a1511fc0c6adc1a98cea4a0517835efae83e069
This commit is contained in:
SpiritCroc 2023-02-11 08:36:41 +01:00
parent 6a2f318c1d
commit 98b98c069d
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomSummaryConstants.kt
View file

@ -35,6 +35,7 @@ object RoomSummaryConstants {
EventType.REACTION,
) +
EventType.POLL_START.values +
EventType.POLL_END.values +
EventType.STATE_ROOM_BEACON_INFO.values
// SC addition | this is the Element behaviour previous to Element v1.0.7
@ -57,6 +58,7 @@ object RoomSummaryConstants {
EventType.STATE_ROOM_CREATE
) +
EventType.POLL_START.values +
EventType.POLL_END.values +
EventType.STATE_ROOM_BEACON_INFO.values
// SC addition | no reactions in here

2
vector/src/main/java/im/vector/app/features/home/room/list/usecase/GetLatestPreviewableEventUseCase.kt
View file

@ -49,7 +49,7 @@ class GetLatestPreviewableEventUseCase @Inject constructor(
?: getLiveVoiceBroadcastEvent(room)
?: getDefaultLatestEvent(room, roomSummary)
} else {
roomSummary.latestPreviewableEvent
roomSummary.scLatestPreviewableEvent()
}
}