Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 18:30:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate call participants in call info screen..

Browse Source
This commit is contained in:
Nicholas Tinsley
2024-01-22 15:59:28 -05:00
committed by Greyson Parrelli
parent 8c9b668cd7
commit 3a314c565c
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.kt
View File

@@ -53,7 +53,12 @@ data class CallParticipantsState(
val raisedHands: List<GroupCallRaiseHandEvent>
get() {
val results = allRemoteParticipants.filter { it.isHandRaised }.map { GroupCallRaiseHandEvent(it.recipient, it.handRaisedTimestamp) }.toMutableList()
val results = allRemoteParticipants.asSequence()
.filter { it.isHandRaised }
.distinctBy { it.recipient }
.map { GroupCallRaiseHandEvent(it.recipient, it.handRaisedTimestamp) }
.sortedBy { it.timestamp }
.toMutableList()
if (localParticipant.isHandRaised) {
results.add(GroupCallRaiseHandEvent(localParticipant.recipient, localParticipant.handRaisedTimestamp))
}

2
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/CallInfoView.kt
View File

@@ -246,7 +246,7 @@ private fun CallInfo(
if (!participantsState.inCallLobby || participantsState.isOngoing()) {
items(
items = participantsState.participantsForList,
items = participantsState.participantsForList.distinctBy { it.callParticipantId },
key = { it.callParticipantId },
contentType = { null }
) {