Refactor to use GroupId class to wrap the byte array

[signal-cli] / src / main / java / org / asamk / signal / manager / helper / GroupHelper.java

diff --git a/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java b/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
index d66831bba0775fed65217319d97377500b2045f1..6fd3500365177c5f0859095d9b10c86595f5bfe2 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
+++ b/src/main/java/org/asamk/signal/manager/helper/GroupHelper.java
@@ -2,7 +2,9 @@ package org.asamk.signal.manager.helper;
 
 import com.google.protobuf.InvalidProtocolBufferException;
 
+import org.asamk.signal.manager.GroupIdV2;
 import org.asamk.signal.manager.GroupLinkPassword;
+import org.asamk.signal.manager.GroupUtils;
 import org.asamk.signal.storage.groups.GroupInfoV2;
 import org.asamk.signal.util.IOUtils;
 import org.signal.storageservice.protos.groups.AccessControl;
@@ -117,7 +119,7 @@ public class GroupHelper {
             return null;
         }
 
-        final byte[] groupId = groupSecretParams.getPublicParams().getGroupIdentifier().serialize();
+        final GroupIdV2 groupId = GroupUtils.getGroupIdV2(groupSecretParams);
         final GroupMasterKey masterKey = groupSecretParams.getMasterKey();
         GroupInfoV2 g = new GroupInfoV2(groupId, masterKey);
         g.setGroup(decryptedGroup);