Migrate local group to v2 if another member has migrated it

[signal-cli] / src / main / java / org / asamk / signal / storage / groups / GroupInfoV1.java

diff --git a/src/main/java/org/asamk/signal/storage/groups/GroupInfoV1.java b/src/main/java/org/asamk/signal/storage/groups/GroupInfoV1.java
index adf4f5553acc77a231a9ed337bbb658a5f0a5199..42c40e949226d1e4376cd4816b34ec3872469046 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/groups/GroupInfoV1.java
+++ b/src/main/java/org/asamk/signal/storage/groups/GroupInfoV1.java
@@ -25,6 +25,9 @@ public class GroupInfoV1 extends GroupInfo {
 
     private static final ObjectMapper jsonProcessor = new ObjectMapper();
 
+    @JsonProperty
+    public byte[] expectedV2Id;
+
     @JsonProperty
     public String name;
 
@@ -54,6 +57,7 @@ public class GroupInfoV1 extends GroupInfo {
 
     public GroupInfoV1(
             @JsonProperty("groupId") byte[] groupId,
+            @JsonProperty("expectedV2Id") byte[] expectedV2Id,
             @JsonProperty("name") String name,
             @JsonProperty("members") Collection<SignalServiceAddress> members,
             @JsonProperty("avatarId") long _ignored_avatarId,
@@ -65,6 +69,7 @@ public class GroupInfoV1 extends GroupInfo {
             @JsonProperty("active") boolean _ignored_active
     ) {
         super(groupId);
+        this.expectedV2Id = expectedV2Id;
         this.name = name;
         this.members.addAll(members);
         this.color = color;