Move group classes to separate package

[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 970cde52d7011434c2a932985447fc1c38874d08..79967955352a1d547909e75e0aec71fae929e92b 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
+++ b/src/main/java/org/asamk/signal/json/JsonGroupInfo.java
@@ -1,6 +1,6 @@
 package org.asamk.signal.json;
 
-import org.asamk.signal.manager.GroupUtils;
+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;
@@ -31,7 +31,7 @@ class JsonGroupInfo {
     }
 
     JsonGroupInfo(SignalServiceGroupV2 groupInfo) {
-        this.groupId = Base64.encodeBytes(GroupUtils.getGroupId(groupInfo.getMasterKey()));
+        this.groupId = GroupUtils.getGroupIdV2(groupInfo.getMasterKey()).toBase64();
         this.type = groupInfo.hasSignedGroupChange() ? "UPDATE" : "DELIVER";
     }