Refactor NoteToSelf to singleton class

[signal-cli] / src / main / java / org / asamk / signal / json / JsonDataMessage.java

diff --git a/src/main/java/org/asamk/signal/json/JsonDataMessage.java b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
index 57facc99e6b87720ed4e2df024990bc1c174a345..6dbda9783e5b081eac7533e94b6c2b8cc7b5beb2 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonDataMessage.java
@@ -6,9 +6,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;

-import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;

 
 import java.util.List;
 import java.util.stream.Collectors;
 
 import java.util.List;
 import java.util.stream.Collectors;


@@ -63,12 +60,12 @@ class JsonDataMessage {
     JsonDataMessage(SignalServiceDataMessage dataMessage, Manager m) {
         this.timestamp = dataMessage.getTimestamp();
         if (dataMessage.getGroupContext().isPresent()) {
     JsonDataMessage(SignalServiceDataMessage dataMessage, Manager m) {
         this.timestamp = dataMessage.getTimestamp();
         if (dataMessage.getGroupContext().isPresent()) {

-            final SignalServiceGroupContext groupContext = dataMessage.getGroupContext().get();
+            final var groupContext = dataMessage.getGroupContext().get();

             if (groupContext.getGroupV1().isPresent()) {
             if (groupContext.getGroupV1().isPresent()) {

-                SignalServiceGroup groupInfo = groupContext.getGroupV1().get();
+                var groupInfo = groupContext.getGroupV1().get();

                 this.groupInfo = new JsonGroupInfo(groupInfo);
             } else if (groupContext.getGroupV2().isPresent()) {
                 this.groupInfo = new JsonGroupInfo(groupInfo);
             } else if (groupContext.getGroupV2().isPresent()) {

-                SignalServiceGroupV2 groupInfo = groupContext.getGroupV2().get();
+                var groupInfo = groupContext.getGroupV2().get();

                 this.groupInfo = new JsonGroupInfo(groupInfo);
             } else {
                 this.groupInfo = null;
                 this.groupInfo = new JsonGroupInfo(groupInfo);
             } else {
                 this.groupInfo = null;