Update libsignal-service-java

[signal-cli] / 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 7ba277d54d840105f83d4fe0f7464feb9074b3db..5c951f0f16c0f60623c962215600cb7f6b99a596 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncMessage.java
@@ -5,8 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
 
 import org.asamk.Signal;
 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.messages.multidevice.SignalServiceSyncMessage;

-import org.whispersystems.signalservice.api.push.SignalServiceAddress;

 
 import java.util.Base64;
 import java.util.List;
 
 import java.util.Base64;
 import java.util.List;


@@ -50,7 +50,7 @@ class JsonSyncMessage {
                     .get()
                     .getAddresses()
                     .stream()
                     .get()
                     .getAddresses()
                     .stream()

-                    .map(SignalServiceAddress::getLegacyIdentifier)
+                    .map(Util::getLegacyIdentifier)

                     .collect(Collectors.toList());
             this.blockedGroupIds = syncMessage.getBlockedList()
                     .get()
                     .collect(Collectors.toList());
             this.blockedGroupIds = syncMessage.getBlockedList()
                     .get()


@@ -66,8 +66,7 @@ class JsonSyncMessage {
             this.readMessages = syncMessage.getRead()
                     .get()
                     .stream()
             this.readMessages = syncMessage.getRead()
                     .get()
                     .stream()

-                    .map(message -> new JsonSyncReadMessage(message.getSender().getLegacyIdentifier(),
-                            message.getTimestamp()))
+                    .map(JsonSyncReadMessage::new)

                     .collect(Collectors.toList());
         } else {
             this.readMessages = null;
                     .collect(Collectors.toList());
         } else {
             this.readMessages = null;