X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/a54fc92c05c5c8b532e029e82eedd73f9440e138..cb70209c603e9e1b1c88ee6eefcd64ea6aff9f9d:/src/main/java/org/asamk/signal/json/JsonSyncMessage.java diff --git a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java index 31c39a3f..2628844f 100644 --- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java +++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java @@ -1,12 +1,15 @@ package org.asamk.signal.json; +import com.fasterxml.jackson.annotation.JsonInclude; + import org.asamk.Signal; -import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage; +import org.asamk.signal.manager.Manager; +import org.asamk.signal.util.Util; import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage; -import org.whispersystems.signalservice.api.push.SignalServiceAddress; -import java.util.ArrayList; +import java.util.Base64; import java.util.List; +import java.util.stream.Collectors; enum JsonSyncMessageType { CONTACTS_SYNC, @@ -14,37 +17,72 @@ enum JsonSyncMessageType { REQUEST_SYNC } -class JsonSyncMessage { +record JsonSyncMessage( + @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncDataMessage sentMessage, + @JsonInclude(JsonInclude.Include.NON_NULL) List blockedNumbers, + @JsonInclude(JsonInclude.Include.NON_NULL) List blockedGroupIds, + @JsonInclude(JsonInclude.Include.NON_NULL) List readMessages, + @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncMessageType type +) { - JsonSyncDataMessage sentMessage; - List blockedNumbers; - List readMessages; - JsonSyncMessageType type; + JsonSyncMessage( + final JsonSyncDataMessage sentMessage, + final List blockedNumbers, + final List blockedGroupIds, + final List readMessages, + final JsonSyncMessageType type + ) { + this.sentMessage = sentMessage; + this.blockedNumbers = blockedNumbers; + this.blockedGroupIds = blockedGroupIds; + this.readMessages = readMessages; + this.type = type; + } - JsonSyncMessage(SignalServiceSyncMessage syncMessage) { - if (syncMessage.getSent().isPresent()) { - this.sentMessage = new JsonSyncDataMessage(syncMessage.getSent().get()); - } + static JsonSyncMessage from(SignalServiceSyncMessage syncMessage, Manager m) { + final var sentMessage = syncMessage.getSent().isPresent() ? JsonSyncDataMessage.from(syncMessage.getSent() + .get(), m) : null; + final List blockedNumbers; + final List blockedGroupIds; if (syncMessage.getBlockedList().isPresent()) { - this.blockedNumbers = new ArrayList<>(syncMessage.getBlockedList().get().getAddresses().size()); - for (SignalServiceAddress address : syncMessage.getBlockedList().get().getAddresses()) { - this.blockedNumbers.add(address.getLegacyIdentifier()); - } - } - if (syncMessage.getRead().isPresent()) { - this.readMessages = syncMessage.getRead().get(); + final var base64 = Base64.getEncoder(); + blockedNumbers = syncMessage.getBlockedList() + .get() + .getAddresses() + .stream() + .map(Util::getLegacyIdentifier) + .collect(Collectors.toList()); + blockedGroupIds = syncMessage.getBlockedList() + .get() + .getGroupIds() + .stream() + .map(base64::encodeToString) + .collect(Collectors.toList()); + } else { + blockedNumbers = null; + blockedGroupIds = null; } + final var readMessages = syncMessage.getRead().isPresent() ? syncMessage.getRead() + .get() + .stream() + .map(JsonSyncReadMessage::from) + .collect(Collectors.toList()) : null; + + final JsonSyncMessageType type; if (syncMessage.getContacts().isPresent()) { - this.type = JsonSyncMessageType.CONTACTS_SYNC; + type = JsonSyncMessageType.CONTACTS_SYNC; } else if (syncMessage.getGroups().isPresent()) { - this.type = JsonSyncMessageType.GROUPS_SYNC; + type = JsonSyncMessageType.GROUPS_SYNC; } else if (syncMessage.getRequest().isPresent()) { - this.type = JsonSyncMessageType.REQUEST_SYNC; + type = JsonSyncMessageType.REQUEST_SYNC; + } else { + type = null; } + return new JsonSyncMessage(sentMessage, blockedNumbers, blockedGroupIds, readMessages, type); } - JsonSyncMessage(Signal.SyncMessageReceived messageReceived) { - sentMessage = new JsonSyncDataMessage(messageReceived); + static JsonSyncMessage from(Signal.SyncMessageReceived messageReceived) { + return new JsonSyncMessage(JsonSyncDataMessage.from(messageReceived), null, null, null, null); } }