X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/9075cc1a309fbc90276d2878d480d1e9e9c81887..32818a8608f5bddc46ad5c7dc442f509c939791c:/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java index 04340d0f..b7e1cf2a 100644 --- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java +++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java @@ -2,14 +2,12 @@ package org.asamk.signal.json; import com.fasterxml.jackson.annotation.JsonInclude; -import org.asamk.Signal; import org.asamk.signal.manager.Manager; import org.asamk.signal.manager.UntrustedIdentityException; +import org.asamk.signal.manager.api.InvalidNumberException; import org.asamk.signal.manager.api.MessageEnvelope; import org.asamk.signal.manager.api.RecipientIdentifier; -import org.whispersystems.signalservice.api.util.InvalidNumberException; -import java.util.List; import java.util.UUID; public record JsonMessageEnvelope( @@ -78,47 +76,4 @@ public record JsonMessageEnvelope( receiptMessage, typingMessage); } - - public static JsonMessageEnvelope from(Signal.MessageReceived messageReceived) { - return new JsonMessageEnvelope(messageReceived.getSource(), - null, - null, - null, - null, - messageReceived.getTimestamp(), - JsonDataMessage.from(messageReceived), - null, - null, - null, - null); - } - - public static JsonMessageEnvelope from(Signal.ReceiptReceived receiptReceived) { - return new JsonMessageEnvelope(receiptReceived.getSender(), - null, - null, - null, - null, - receiptReceived.getTimestamp(), - null, - null, - null, - JsonReceiptMessage.deliveryReceipt(receiptReceived.getTimestamp(), - List.of(receiptReceived.getTimestamp())), - null); - } - - public static JsonMessageEnvelope from(Signal.SyncMessageReceived messageReceived) { - return new JsonMessageEnvelope(messageReceived.getSource(), - null, - null, - null, - null, - messageReceived.getTimestamp(), - null, - JsonSyncMessage.from(messageReceived), - null, - null, - null); - } }