Refactor NoteToSelf to singleton class

[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 11ecbbc805daaba9300ce338d1749aef86cf0fa1..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.util.Util;
 import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.util.Base64;
 import java.util.List;
@@ -45,12 +45,12 @@ class JsonSyncMessage {
                 ? new JsonSyncDataMessage(syncMessage.getSent().get(), m)
                 : null;
         if (syncMessage.getBlockedList().isPresent()) {
-            final Base64.Encoder base64 = Base64.getEncoder();
+            final var base64 = Base64.getEncoder();
             this.blockedNumbers = syncMessage.getBlockedList()
                     .get()
                     .getAddresses()
                     .stream()
-                    .map(SignalServiceAddress::getLegacyIdentifier)
+                    .map(Util::getLegacyIdentifier)
                     .collect(Collectors.toList());
             this.blockedGroupIds = syncMessage.getBlockedList()
                     .get()
@@ -66,8 +66,7 @@ class JsonSyncMessage {
             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;