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

Remove use of legacy hangup in sending flow.

Browse Source
This commit is contained in:
Cody Henthorne
2023-09-13 12:07:54 -04:00
committed by Alex Hart
parent ff5b024074
commit 11e0dd18d3
6 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -720,7 +720,7 @@ private void processStateless(@NonNull Function1<WebRtcEphemeralState, WebRtcEph
Log.i(TAG, "onSendHangup: id: " + remotePeer.getCallId().format(remoteDevice) + " type: " + hangupType.name());
WebRtcData.CallMetadata callMetadata = new WebRtcData.CallMetadata(remotePeer, remoteDevice);
WebRtcData.HangupMetadata hangupMetadata = new WebRtcData.HangupMetadata(WebRtcUtil.getHangupTypeFromCallHangupType(hangupType), false, deviceId);
WebRtcData.HangupMetadata hangupMetadata = new WebRtcData.HangupMetadata(WebRtcUtil.getHangupTypeFromCallHangupType(hangupType), deviceId);
process((s, p) -> p.handleSendHangup(s, callMetadata, hangupMetadata, broadcast));
}

8
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcActionProcessor.java
View File

@@ -404,13 +404,13 @@ public abstract class WebRtcActionProcessor {
}
protected final @NonNull WebRtcServiceState handleSendHangup(@NonNull WebRtcServiceState currentState,
@NonNull CallMetadata callMetadata,
@NonNull HangupMetadata hangupMetadata,
boolean broadcast)
@NonNull CallMetadata callMetadata,
@NonNull HangupMetadata hangupMetadata,
boolean broadcast)
{
Log.i(tag, "handleSendHangup(): id: " + callMetadata.getCallId().format(callMetadata.getRemoteDevice()));
HangupMessage hangupMessage = new HangupMessage(callMetadata.getCallId().longValue(), hangupMetadata.getType(), hangupMetadata.getDeviceId(), hangupMetadata.isLegacy());
HangupMessage hangupMessage = new HangupMessage(callMetadata.getCallId().longValue(), hangupMetadata.getType(), hangupMetadata.getDeviceId());
Integer destinationDeviceId = broadcast ? null : callMetadata.getRemoteDevice();
SignalServiceCallMessage callMessage = SignalServiceCallMessage.forHangup(hangupMessage, true, destinationDeviceId);

10
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcData.java
View File

@@ -148,16 +148,14 @@ public class WebRtcData {
*/
public static class HangupMetadata {
private final @NonNull HangupMessage.Type type;
private final boolean isLegacy;
private final int deviceId;
static @NonNull HangupMetadata fromType(@NonNull HangupMessage.Type type) {
return new HangupMetadata(type, true, 0);
return new HangupMetadata(type, 0);
}
public HangupMetadata(@NonNull HangupMessage.Type type, boolean isLegacy, int deviceId) {
public HangupMetadata(@NonNull HangupMessage.Type type, int deviceId) {
this.type = type;
this.isLegacy = isLegacy;
this.deviceId = deviceId;
}
@@ -176,10 +174,6 @@ public class WebRtcData {
}
}
boolean isLegacy() {
return isLegacy;
}
int getDeviceId() {
return deviceId;
}