]> nmode's Git Repositories - signal-cli/blob - src/main/java/org/asamk/signal/JsonMessageEnvelope.java
Use correct sender device for receiving sealed messages
[signal-cli] / src / main / java / org / asamk / signal / JsonMessageEnvelope.java
1 package org.asamk.signal;
2
3 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
4 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
5 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
6
7 class JsonMessageEnvelope {
8
9 String source;
10 int sourceDevice;
11 String relay;
12 long timestamp;
13 boolean isReceipt;
14 JsonDataMessage dataMessage;
15 JsonSyncMessage syncMessage;
16 JsonCallMessage callMessage;
17 JsonReceiptMessage receiptMessage;
18
19 public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content) {
20 SignalServiceAddress source = envelope.getSourceAddress();
21 this.source = source.getNumber();
22 this.sourceDevice = envelope.getSourceDevice();
23 if (this.source.equals("")) {
24 this.source = content.getSender();
25 this.sourceDevice = content.getSenderDevice();
26 }
27 this.relay = source.getRelay().isPresent() ? source.getRelay().get() : null;
28 this.timestamp = envelope.getTimestamp();
29 this.isReceipt = envelope.isReceipt();
30 if (content != null) {
31 if (content.getDataMessage().isPresent()) {
32 this.dataMessage = new JsonDataMessage(content.getDataMessage().get());
33 }
34 if (content.getSyncMessage().isPresent()) {
35 this.syncMessage = new JsonSyncMessage(content.getSyncMessage().get());
36 }
37 if (content.getCallMessage().isPresent()) {
38 this.callMessage = new JsonCallMessage(content.getCallMessage().get());
39 }
40 if (content.getReceiptMessage().isPresent()) {
41 this.receiptMessage = new JsonReceiptMessage(content.getReceiptMessage().get());
42 }
43 }
44 }
45 }