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

Remove legacy call message fields

Browse Source
This commit is contained in:
Jim Gustafson
2024-01-04 16:19:43 -08:00
committed by Alex Hart
parent 5022d81d9a
commit 78b714e019
10 changed files with 40 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1294,10 +1294,6 @@ public class SignalServiceMessageSender {
offerBuilder.opaque(ByteString.of(offer.getOpaque()));
}
if (offer.getSdp() != null) {
offerBuilder.sdp(offer.getSdp());
}
builder.offer(offerBuilder.build());
} else if (callMessage.getAnswerMessage().isPresent()) {
AnswerMessage answer = callMessage.getAnswerMessage().get();
@@ -1308,28 +1304,18 @@ public class SignalServiceMessageSender {
answerBuilder.opaque(ByteString.of(answer.getOpaque()));
}
if (answer.getSdp() != null) {
answerBuilder.sdp(answer.getSdp());
}
builder.answer(answerBuilder.build());
} else if (callMessage.getIceUpdateMessages().isPresent()) {
List<IceUpdateMessage> updates = callMessage.getIceUpdateMessages().get();
List<CallMessage.IceUpdate> iceUpdates = new ArrayList<>(updates.size());
for (IceUpdateMessage update : updates) {
CallMessage.IceUpdate.Builder iceBuilder = new CallMessage.IceUpdate.Builder()
.id(update.getId())
.mid("audio")
.line(0);
.id(update.getId());
if (update.getOpaque() != null) {
iceBuilder.opaque(ByteString.of(update.getOpaque()));
}
if (update.getSdp() != null) {
iceBuilder.sdp(update.getSdp());
}
iceUpdates.add(iceBuilder.build());
}
builder.iceUpdate(iceUpdates);

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

@@ -4,19 +4,13 @@ package org.whispersystems.signalservice.api.messages.calls;
public class AnswerMessage {
private final long id;
private final String sdp;
private final byte[] opaque;
public AnswerMessage(long id, String sdp, byte[] opaque) {
public AnswerMessage(long id, byte[] opaque) {
this.id = id;
this.sdp = sdp;
this.opaque = opaque;
}
public String getSdp() {
return sdp;
}
public long getId() {
return id;
}

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

@@ -5,12 +5,10 @@ public class IceUpdateMessage {
private final long id;
private final byte[] opaque;
private final String sdp;
public IceUpdateMessage(long id, byte[] opaque, String sdp) {
public IceUpdateMessage(long id, byte[] opaque) {
this.id = id;
this.opaque = opaque;
this.sdp = sdp;
}
public long getId() {
@@ -20,8 +18,4 @@ public class IceUpdateMessage {
public byte[] getOpaque() {
return opaque;
}
public String getSdp() {
return sdp;
}
}

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

@@ -5,21 +5,15 @@ import org.whispersystems.signalservice.internal.push.CallMessage;
public class OfferMessage {
private final long id;
private final String sdp;
private final Type type;
private final byte[] opaque;
public OfferMessage(long id, String sdp, Type type, byte[] opaque) {
public OfferMessage(long id, Type type, byte[] opaque) {
this.id = id;
this.sdp = sdp;
this.type = type;
this.opaque = opaque;
}
public String getSdp() {
return sdp;
}
public long getId() {
return id;
}

35
libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/SignalServiceCallMessage.java
View File

@@ -15,7 +15,6 @@ public class SignalServiceCallMessage {
private final Optional<List<IceUpdateMessage>> iceUpdateMessages;
private final Optional<OpaqueMessage> opaqueMessage;
private final Optional<Integer> destinationDeviceId;
private final boolean isMultiRing;
private final Optional<byte[]> groupId;
private final Optional<Long> timestamp;
@@ -25,10 +24,9 @@ public class SignalServiceCallMessage {
Optional<HangupMessage> hangupMessage,
Optional<BusyMessage> busyMessage,
Optional<OpaqueMessage> opaqueMessage,
boolean isMultiRing,
Optional<Integer> destinationDeviceId)
{
this(offerMessage, answerMessage, iceUpdateMessages, hangupMessage, busyMessage, opaqueMessage, isMultiRing, destinationDeviceId, Optional.empty(), Optional.empty());
this(offerMessage, answerMessage, iceUpdateMessages, hangupMessage, busyMessage, opaqueMessage, destinationDeviceId, Optional.empty(), Optional.empty());
}
private SignalServiceCallMessage(Optional<OfferMessage> offerMessage,
@@ -37,7 +35,6 @@ public class SignalServiceCallMessage {
Optional<HangupMessage> hangupMessage,
Optional<BusyMessage> busyMessage,
Optional<OpaqueMessage> opaqueMessage,
boolean isMultiRing,
Optional<Integer> destinationDeviceId,
Optional<byte[]> groupId,
Optional<Long> timestamp)
@@ -48,46 +45,42 @@ public class SignalServiceCallMessage {
this.hangupMessage = hangupMessage;
this.busyMessage = busyMessage;
this.opaqueMessage = opaqueMessage;
this.isMultiRing = isMultiRing;
this.destinationDeviceId = destinationDeviceId;
this.groupId = groupId;
this.timestamp = timestamp;
}
public static SignalServiceCallMessage forOffer(OfferMessage offerMessage, boolean isMultiRing, Integer destinationDeviceId) {
public static SignalServiceCallMessage forOffer(OfferMessage offerMessage, Integer destinationDeviceId) {
return new SignalServiceCallMessage(Optional.of(offerMessage),
Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.empty(),
isMultiRing,
Optional.ofNullable(destinationDeviceId));
}
public static SignalServiceCallMessage forAnswer(AnswerMessage answerMessage, boolean isMultiRing, Integer destinationDeviceId) {
public static SignalServiceCallMessage forAnswer(AnswerMessage answerMessage, Integer destinationDeviceId) {
return new SignalServiceCallMessage(Optional.empty(),
Optional.of(answerMessage),
Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.empty(),
isMultiRing,
Optional.ofNullable(destinationDeviceId));
}
public static SignalServiceCallMessage forIceUpdates(List<IceUpdateMessage> iceUpdateMessages, boolean isMultiRing, Integer destinationDeviceId) {
public static SignalServiceCallMessage forIceUpdates(List<IceUpdateMessage> iceUpdateMessages, Integer destinationDeviceId) {
return new SignalServiceCallMessage(Optional.empty(),
Optional.empty(),
Optional.of(iceUpdateMessages),
Optional.empty(),
Optional.empty(),
Optional.empty(),
isMultiRing,
Optional.ofNullable(destinationDeviceId));
}
public static SignalServiceCallMessage forIceUpdate(final IceUpdateMessage iceUpdateMessage, boolean isMultiRing, Integer destinationDeviceId) {
public static SignalServiceCallMessage forIceUpdate(final IceUpdateMessage iceUpdateMessage, Integer destinationDeviceId) {
List<IceUpdateMessage> iceUpdateMessages = new LinkedList<>();
iceUpdateMessages.add(iceUpdateMessage);
@@ -97,51 +90,46 @@ public class SignalServiceCallMessage {
Optional.empty(),
Optional.empty(),
Optional.empty(),
isMultiRing,
Optional.ofNullable(destinationDeviceId));
}
public static SignalServiceCallMessage forHangup(HangupMessage hangupMessage, boolean isMultiRing, Integer destinationDeviceId) {
public static SignalServiceCallMessage forHangup(HangupMessage hangupMessage, Integer destinationDeviceId) {
return new SignalServiceCallMessage(Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.of(hangupMessage),
Optional.empty(),
Optional.empty(),
isMultiRing,
Optional.ofNullable(destinationDeviceId));
}
public static SignalServiceCallMessage forBusy(BusyMessage busyMessage, boolean isMultiRing, Integer destinationDeviceId) {
public static SignalServiceCallMessage forBusy(BusyMessage busyMessage, Integer destinationDeviceId) {
return new SignalServiceCallMessage(Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.of(busyMessage),
Optional.empty(),
isMultiRing,
Optional.ofNullable(destinationDeviceId));
}
public static SignalServiceCallMessage forOpaque(OpaqueMessage opaqueMessage, boolean isMultiRing, Integer destinationDeviceId) {
public static SignalServiceCallMessage forOpaque(OpaqueMessage opaqueMessage, Integer destinationDeviceId) {
return new SignalServiceCallMessage(Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.of(opaqueMessage),
isMultiRing,
Optional.ofNullable(destinationDeviceId));
}
public static SignalServiceCallMessage forOutgoingGroupOpaque(byte[] groupId, long timestamp, OpaqueMessage opaqueMessage, boolean isMultiRing, Integer destinationDeviceId) {
public static SignalServiceCallMessage forOutgoingGroupOpaque(byte[] groupId, long timestamp, OpaqueMessage opaqueMessage, Integer destinationDeviceId) {
return new SignalServiceCallMessage(Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.empty(),
Optional.of(opaqueMessage),
isMultiRing,
Optional.ofNullable(destinationDeviceId),
Optional.of(groupId),
Optional.of(timestamp));
@@ -155,7 +143,6 @@ public class SignalServiceCallMessage {
Optional.empty(),
Optional.empty(),
Optional.empty(),
false,
Optional.empty());
}
@@ -183,10 +170,6 @@ public class SignalServiceCallMessage {
return opaqueMessage;
}
public boolean isMultiRing() {
return isMultiRing;
}
public Optional<Integer> getDestinationDeviceId() {
return destinationDeviceId;
}