mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-19 16:19:33 +01:00
Prevent remove from call button from displaying in group calls.
Co-authored-by: Greyson Parrelli <greyson@signal.org>
This commit is contained in:
@@ -276,6 +276,7 @@ private fun CallInfo(
|
||||
CallParticipantRow(
|
||||
callParticipant = it,
|
||||
isSelfAdmin = controlAndInfoState.isSelfAdmin() && !participantsState.inCallLobby,
|
||||
isCallLink = controlAndInfoState.callLink != null,
|
||||
onBlockClicked = onBlock,
|
||||
onParticipantClicked = if (isInternalUser) {
|
||||
{ participant ->
|
||||
@@ -405,6 +406,7 @@ private fun HandRaisedRowPreview() {
|
||||
private fun CallParticipantRow(
|
||||
callParticipant: CallParticipant,
|
||||
isSelfAdmin: Boolean,
|
||||
isCallLink: Boolean = false,
|
||||
onBlockClicked: (CallParticipant) -> Unit,
|
||||
onParticipantClicked: ((CallParticipant) -> Unit)? = null
|
||||
) {
|
||||
@@ -417,6 +419,7 @@ private fun CallParticipantRow(
|
||||
showHandRaised = false,
|
||||
canLowerHand = false,
|
||||
isSelfAdmin = isSelfAdmin,
|
||||
isCallLink = isCallLink,
|
||||
onBlockClicked = { onBlockClicked(callParticipant) },
|
||||
onRowClicked = if (onParticipantClicked != null && !callParticipant.recipient.isSelf) {
|
||||
{ onParticipantClicked(callParticipant) }
|
||||
@@ -451,6 +454,7 @@ private fun CallParticipantRow(
|
||||
showHandRaised: Boolean,
|
||||
canLowerHand: Boolean,
|
||||
isSelfAdmin: Boolean = false,
|
||||
isCallLink: Boolean = false,
|
||||
onBlockClicked: () -> Unit = {},
|
||||
onRowClicked: (() -> Unit)? = null
|
||||
) {
|
||||
@@ -535,7 +539,7 @@ private fun CallParticipantRow(
|
||||
)
|
||||
}
|
||||
|
||||
if (showIcons && isSelfAdmin && !recipient.isSelf) {
|
||||
if (showIcons && isSelfAdmin && isCallLink && !recipient.isSelf) {
|
||||
if (!isMicrophoneEnabled) {
|
||||
Spacer(modifier = Modifier.width(16.dp))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user