X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/e04c45766d50d6a4e2d3c084145e2115b38bef5c..ae41d0c5026fe868c6198e1005344fc78b6e0a2c:/src/main/java/org/asamk/signal/JsonMessageEnvelope.java diff --git a/src/main/java/org/asamk/signal/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/JsonMessageEnvelope.java deleted file mode 100644 index 9a275970..00000000 --- a/src/main/java/org/asamk/signal/JsonMessageEnvelope.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.asamk.signal; - -import org.whispersystems.signalservice.api.messages.SignalServiceContent; -import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope; -import org.whispersystems.signalservice.api.push.SignalServiceAddress; - -class JsonMessageEnvelope { - - String source; - int sourceDevice; - String relay; - long timestamp; - boolean isReceipt; - JsonDataMessage dataMessage; - JsonSyncMessage syncMessage; - JsonCallMessage callMessage; - JsonReceiptMessage receiptMessage; - - public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content) { - if (!envelope.isUnidentifiedSender() && envelope.hasSource()) { - SignalServiceAddress source = envelope.getSourceAddress(); - this.source = source.getNumber().get(); - this.relay = source.getRelay().isPresent() ? source.getRelay().get() : null; - } - this.sourceDevice = envelope.getSourceDevice(); - this.timestamp = envelope.getTimestamp(); - this.isReceipt = envelope.isReceipt(); - if (content != null) { - if (envelope.isUnidentifiedSender()) { - this.source = content.getSender().getNumber().get(); - this.sourceDevice = content.getSenderDevice(); - } - if (content.getDataMessage().isPresent()) { - this.dataMessage = new JsonDataMessage(content.getDataMessage().get()); - } - if (content.getSyncMessage().isPresent()) { - this.syncMessage = new JsonSyncMessage(content.getSyncMessage().get()); - } - if (content.getCallMessage().isPresent()) { - this.callMessage = new JsonCallMessage(content.getCallMessage().get()); - } - if (content.getReceiptMessage().isPresent()) { - this.receiptMessage = new JsonReceiptMessage(content.getReceiptMessage().get()); - } - } - } -}