Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 13:08:46 +00: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

6
libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
View File

@@ -1320,11 +1320,7 @@ public class SignalServiceMessageSender {
builderForHangup.setDeviceId(callMessage.getHangupMessage().get().getDeviceId());
}
if (callMessage.getHangupMessage().get().isLegacy()) {
builder.setLegacyHangup(builderForHangup);
} else {
builder.setHangup(builderForHangup);
}
builder.setHangup(builderForHangup);
} else if (callMessage.getBusyMessage().isPresent()) {
builder.setBusy(CallMessage.Busy.newBuilder().setId(callMessage.getBusyMessage().get().getId()));
} else if (callMessage.getOpaqueMessage().isPresent()) {

8
libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/calls/HangupMessage.java
View File

@@ -8,13 +8,11 @@ public class HangupMessage {
private final long id;
private final Type type;
private final int deviceId;
private final boolean isLegacy;
public HangupMessage(long id, Type type, int deviceId, boolean isLegacy) {
public HangupMessage(long id, Type type, int deviceId) {
this.id = id;
this.type = type;
this.deviceId = deviceId;
this.isLegacy = isLegacy;
}
public long getId() {
@@ -29,10 +27,6 @@ public class HangupMessage {
return deviceId;
}
public boolean isLegacy() {
return isLegacy;
}
public enum Type {
NORMAL("normal", SignalServiceProtos.CallMessage.Hangup.Type.HANGUP_NORMAL),
ACCEPTED("accepted", SignalServiceProtos.CallMessage.Hangup.Type.HANGUP_ACCEPTED),