X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/9075cc1a309fbc90276d2878d480d1e9e9c81887..be9efb9a25ab99bf28371dbbf91e9223cd2eaf92:/src/main/java/org/asamk/signal/json/JsonCallMessage.java diff --git a/src/main/java/org/asamk/signal/json/JsonCallMessage.java b/src/main/java/org/asamk/signal/json/JsonCallMessage.java index a1a5d8df..1b1bc2ba 100644 --- a/src/main/java/org/asamk/signal/json/JsonCallMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonCallMessage.java @@ -6,7 +6,6 @@ import org.asamk.signal.manager.api.MessageEnvelope; import java.util.Base64; import java.util.List; -import java.util.stream.Collectors; record JsonCallMessage( @JsonInclude(JsonInclude.Include.NON_NULL) Offer offerMessage, @@ -21,23 +20,20 @@ record JsonCallMessage( callMessage.answer().map(Answer::from).orElse(null), callMessage.busy().map(Busy::from).orElse(null), callMessage.hangup().map(Hangup::from).orElse(null), - callMessage.iceUpdate().stream().map(IceUpdate::from).collect(Collectors.toList())); + callMessage.iceUpdate().stream().map(IceUpdate::from).toList()); } - record Offer(long id, String sdp, String type, String opaque) { + record Offer(long id, String type, String opaque) { public static Offer from(final MessageEnvelope.Call.Offer offer) { - return new Offer(offer.id(), - offer.sdp(), - offer.type().name(), - Base64.getEncoder().encodeToString(offer.opaque())); + return new Offer(offer.id(), offer.type().name(), Base64.getEncoder().encodeToString(offer.opaque())); } } - public record Answer(long id, String sdp, String opaque) { + public record Answer(long id, String opaque) { public static Answer from(final MessageEnvelope.Call.Answer answer) { - return new Answer(answer.id(), answer.sdp(), Base64.getEncoder().encodeToString(answer.opaque())); + return new Answer(answer.id(), Base64.getEncoder().encodeToString(answer.opaque())); } } @@ -48,19 +44,17 @@ record JsonCallMessage( } } - public record Hangup(long id, String type, int deviceId, boolean isLegacy) { + public record Hangup(long id, String type, int deviceId) { public static Hangup from(final MessageEnvelope.Call.Hangup hangup) { - return new Hangup(hangup.id(), hangup.type().name(), hangup.deviceId(), hangup.isLegacy()); + return new Hangup(hangup.id(), hangup.type().name(), hangup.deviceId()); } } - public record IceUpdate(long id, String sdp, String opaque) { + public record IceUpdate(long id, String opaque) { public static IceUpdate from(final MessageEnvelope.Call.IceUpdate iceUpdate) { - return new IceUpdate(iceUpdate.id(), - iceUpdate.sdp(), - Base64.getEncoder().encodeToString(iceUpdate.opaque())); + return new IceUpdate(iceUpdate.id(), Base64.getEncoder().encodeToString(iceUpdate.opaque())); } } }