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

Do not send to blocked recipients.

Browse Source
This commit is contained in:
clauz9
2022-02-25 21:23:58 +02:00
committed by Alex Hart
parent 4b07da4978
commit eb12395b8e
13 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -312,26 +312,26 @@ data class CallParticipantsState(
@PluralsRes multipleParticipants: Int,
members: List<GroupMemberEntry.FullMember>
): String {
val membersWithoutYou: List<GroupMemberEntry.FullMember> = members.filterNot { it.member.isSelf }
val eligibleMembers: List<GroupMemberEntry.FullMember> = members.filterNot { it.member.isSelf || it.member.isBlocked }
return when (membersWithoutYou.size) {
return when (eligibleMembers.size) {
0 -> ""
1 -> context.getString(
oneParticipant,
membersWithoutYou[0].member.getShortDisplayName(context)
eligibleMembers[0].member.getShortDisplayName(context)
)
2 -> context.getString(
twoParticipants,
membersWithoutYou[0].member.getShortDisplayName(context),
membersWithoutYou[1].member.getShortDisplayName(context)
eligibleMembers[0].member.getShortDisplayName(context),
eligibleMembers[1].member.getShortDisplayName(context)
)
else -> {
val others = membersWithoutYou.size - 2
val others = eligibleMembers.size - 2
context.resources.getQuantityString(
multipleParticipants,
others,
membersWithoutYou[0].member.getShortDisplayName(context),
membersWithoutYou[1].member.getShortDisplayName(context),
eligibleMembers[0].member.getShortDisplayName(context),
eligibleMembers[1].member.getShortDisplayName(context),
others
)
}