Refactor receive api

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

diff --git a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
index bc3e7e0eca35326cb4f013576d8247e1caea543f..f00ace993a76654ae12ea5e514b3ec10fd7e9a6c 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
+++ b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
@@ -1,41 +1,17 @@
 package org.asamk.signal.json;
 
-import org.asamk.signal.manager.groups.GroupUtils;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.asamk.signal.manager.api.MessageEnvelope;
 
-import java.util.ArrayList;
 import java.util.Base64;
-import java.util.List;
 
-class JsonGroupInfo {
+record JsonGroupInfo(String groupId, String type) {
 
-    String groupId;
-    List<String> members;
-    String name;
-    String type;
-
-    JsonGroupInfo(SignalServiceGroup groupInfo) {
-        this.groupId = Base64.getEncoder().encodeToString(groupInfo.getGroupId());
-        if (groupInfo.getMembers().isPresent()) {
-            this.members = new ArrayList<>(groupInfo.getMembers().get().size());
-            for (SignalServiceAddress address : groupInfo.getMembers().get()) {
-                this.members.add(address.getLegacyIdentifier());
-            }
-        }
-        if (groupInfo.getName().isPresent()) {
-            this.name = groupInfo.getName().get();
-        }
-        this.type = groupInfo.getType().toString();
-    }
-
-    JsonGroupInfo(SignalServiceGroupV2 groupInfo) {
-        this.groupId = GroupUtils.getGroupIdV2(groupInfo.getMasterKey()).toBase64();
-        this.type = groupInfo.hasSignedGroupChange() ? "UPDATE" : "DELIVER";
+    static JsonGroupInfo from(MessageEnvelope.Data.GroupContext groupContext) {
+        return new JsonGroupInfo(groupContext.groupId().toBase64(),
+                groupContext.isGroupUpdate() ? "UPDATE" : "DELIVER");
     }
 
-    JsonGroupInfo(byte[] groupId) {
-        this.groupId = Base64.getEncoder().encodeToString(groupId);
+    static JsonGroupInfo from(byte[] groupId) {
+        return new JsonGroupInfo(Base64.getEncoder().encodeToString(groupId), "DELIVER");
     }
 }