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

Convert CallParticipantId to Kotlin.

Browse Source
This commit is contained in:
Alex Hart
2025-11-07 14:39:30 -04:00
committed by Michelle Tang
parent dd8f36f280
commit ad0b240550
5 changed files with 28 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupActionProcessor.java
View File

@@ -204,7 +204,7 @@ public class GroupActionProcessor extends DeviceAwareActionProcessor {
BroadcastVideoSink videoSink = entry.getValue().getVideoSink();
BroadcastVideoSink.RequestedSize maxSize = videoSink.getMaxRequestingSize();
resolutionRequests.add(new GroupCall.VideoRequest(entry.getKey().getDemuxId(), maxSize.getWidth(), maxSize.getHeight(), null));
resolutionRequests.add(new GroupCall.VideoRequest(entry.getKey().demuxId, maxSize.getWidth(), maxSize.getHeight(), null));
videoSink.setCurrentlyRequestedMaxSize(maxSize);
}

12
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/GroupConnectedActionProcessor.java
View File

@@ -135,7 +135,7 @@ public class GroupConnectedActionProcessor extends GroupActionProcessor {
}
for (Map.Entry<CallParticipantId, CallParticipant> entry : participants.entrySet()) {
if (entry.getKey().getDemuxId() == sourceDemuxId) {
if (entry.getKey().demuxId == sourceDemuxId) {
try {
groupCall.setOutgoingAudioMutedRemotely(sourceDemuxId);
} catch (CallException e) {
@@ -161,7 +161,7 @@ public class GroupConnectedActionProcessor extends GroupActionProcessor {
source = Recipient.self();
} else {
for (Map.Entry<CallParticipantId, CallParticipant> entry : participants.entrySet()) {
if (entry.getKey().getDemuxId() == sourceDemuxId) {
if (entry.getKey().demuxId == sourceDemuxId) {
source = entry.getValue().getRecipient();
}
}
@@ -172,7 +172,7 @@ public class GroupConnectedActionProcessor extends GroupActionProcessor {
}
for (Map.Entry<CallParticipantId, CallParticipant> entry : participants.entrySet()) {
if (entry.getKey().getDemuxId() == targetDemuxId) {
if (entry.getKey().demuxId == targetDemuxId) {
WebRtcServiceStateBuilder.CallInfoStateBuilder builder = currentState.builder().changeCallInfoState().putParticipant(entry.getKey(), entry.getValue().withRemotelyMutedBy(source));
return builder.build();
}
@@ -193,7 +193,7 @@ public class GroupConnectedActionProcessor extends GroupActionProcessor {
CallParticipantId callParticipantId = participant.getCallParticipantId();
if (remoteDeviceStates != null) {
GroupCall.RemoteDeviceState state = remoteDeviceStates.get(callParticipantId.getDemuxId());
GroupCall.RemoteDeviceState state = remoteDeviceStates.get(callParticipantId.demuxId);
if (state != null) {
remoteAudioLevels.put(callParticipantId, CallParticipant.AudioLevel.fromRawAudioLevel(state.getAudioLevel()));
}
@@ -308,7 +308,7 @@ public class GroupConnectedActionProcessor extends GroupActionProcessor {
@Nullable
private GroupCallReactionEvent createGroupCallReaction(Collection<CallParticipant> participants, final GroupCall.Reaction reaction) {
CallParticipant participant = participants.stream().filter(it -> it.getCallParticipantId().getDemuxId() == reaction.demuxId).findFirst().orElse(null);
CallParticipant participant = participants.stream().filter(it -> it.getCallParticipantId().demuxId == reaction.demuxId).findFirst().orElse(null);
if (participant == null) {
Log.v(TAG, "Could not find CallParticipantId in list of call participants based on demuxId for reaction.");
return null;
@@ -329,7 +329,7 @@ public class GroupConnectedActionProcessor extends GroupActionProcessor {
List<CallParticipant> participants = currentState.getCallInfoState().getRemoteCallParticipants();
for (CallParticipant updatedParticipant : participants) {
int raisedHandIndex = raisedHands.indexOf(updatedParticipant.getCallParticipantId().getDemuxId());
int raisedHandIndex = raisedHands.indexOf(updatedParticipant.getCallParticipantId().demuxId);
boolean wasHandAlreadyRaised = updatedParticipant.isHandRaised();
if (wasHandAlreadyRaised) {