Remove ThreadStore and store message expiration time in group/contact store

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

diff --git a/src/main/java/org/asamk/signal/storage/groups/GroupInfo.java b/src/main/java/org/asamk/signal/storage/groups/GroupInfo.java
index 21ba910f485b80fc9773da05ca0c8fe5518d6cff..e3a45420450d834c3b0c0bb815296ba1f587497f 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/groups/GroupInfo.java
+++ b/src/main/java/org/asamk/signal/storage/groups/GroupInfo.java
@@ -37,6 +37,8 @@ public class GroupInfo {
     public Set<SignalServiceAddress> members = new HashSet<>();
     @JsonProperty
     public String color;
+    @JsonProperty(defaultValue = "0")
+    public int messageExpirationTime;
     @JsonProperty(defaultValue = "false")
     public boolean blocked;
     @JsonProperty
@@ -54,7 +56,7 @@ public class GroupInfo {
         this.groupId = groupId;
     }
 
-    public GroupInfo(@JsonProperty("groupId") byte[] groupId, @JsonProperty("name") String name, @JsonProperty("members") Collection<SignalServiceAddress> members, @JsonProperty("avatarId") long avatarId, @JsonProperty("color") String color, @JsonProperty("blocked") boolean blocked, @JsonProperty("inboxPosition") Integer inboxPosition, @JsonProperty("archived") boolean archived) {
+    public GroupInfo(@JsonProperty("groupId") byte[] groupId, @JsonProperty("name") String name, @JsonProperty("members") Collection<SignalServiceAddress> members, @JsonProperty("avatarId") long avatarId, @JsonProperty("color") String color, @JsonProperty("blocked") boolean blocked, @JsonProperty("inboxPosition") Integer inboxPosition, @JsonProperty("archived") boolean archived, @JsonProperty("messageExpirationTime") int messageExpirationTime) {
         this.groupId = groupId;
         this.name = name;
         this.members.addAll(members);
@@ -63,6 +65,7 @@ public class GroupInfo {
         this.blocked = blocked;
         this.inboxPosition = inboxPosition;
         this.archived = archived;
+        this.messageExpirationTime = messageExpirationTime;
     }
 
     @JsonIgnore