aljaz/signal-cli
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli.git synced 2026-01-09 08:54:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Extend json output with number and uuid fields

Browse Source
This commit is contained in:
AsamK
2021-08-22 11:28:09 +02:00
parent 73e137137d
commit 5bbfd32598
9 changed files with 148 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
View File

@@ -10,14 +10,22 @@ import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
import org.whispersystems.signalservice.api.util.InvalidNumberException;
import java.util.List;
import java.util.UUID;
import static org.asamk.signal.util.Util.getLegacyIdentifier;
public class JsonMessageEnvelope {
@JsonProperty
@Deprecated
final String source;
@JsonProperty
final String sourceNumber;
@JsonProperty
final String sourceUuid;
@JsonProperty
final String sourceName;
@@ -55,14 +63,21 @@ public class JsonMessageEnvelope {
if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
var source = envelope.getSourceAddress();
this.source = getLegacyIdentifier(source);
this.sourceNumber = source.getNumber().orNull();
this.sourceUuid = source.getUuid().transform(UUID::toString).orNull();
this.sourceDevice = envelope.getSourceDevice();
this.relay = source.getRelay().orNull();
} else if (envelope.isUnidentifiedSender() && content != null) {
this.source = getLegacyIdentifier(content.getSender());
final var source = content.getSender();
this.source = getLegacyIdentifier(source);
this.sourceNumber = source.getNumber().orNull();
this.sourceUuid = source.getUuid().transform(UUID::toString).orNull();
this.sourceDevice = content.getSenderDevice();
this.relay = null;
} else {
this.source = null;
this.sourceNumber = null;
this.sourceUuid = null;
this.sourceDevice = null;
this.relay = null;
}
@@ -98,6 +113,8 @@ public class JsonMessageEnvelope {
public JsonMessageEnvelope(Signal.MessageReceived messageReceived) {
source = messageReceived.getSender();
sourceNumber = null;
sourceUuid = null;
sourceName = null;
sourceDevice = null;
relay = null;
@@ -111,6 +128,8 @@ public class JsonMessageEnvelope {
public JsonMessageEnvelope(Signal.ReceiptReceived receiptReceived) {
source = receiptReceived.getSender();
sourceNumber = null;
sourceUuid = null;
sourceName = null;
sourceDevice = null;
relay = null;
@@ -124,6 +143,8 @@ public class JsonMessageEnvelope {
public JsonMessageEnvelope(Signal.SyncMessageReceived messageReceived) {
source = messageReceived.getSource();
sourceNumber = null;
sourceUuid = null;
sourceName = null;
sourceDevice = null;
relay = null;