Fix creating builder from contact

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / api / Contact.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
index f84c667b9d3ddcfa1dd58059962c1b0753544bd4..3eef0117023ce8e2ca8ecff8075bb26a9544ea37 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
+++ b/lib/src/main/java/org/asamk/signal/manager/api/Contact.java
@@ -5,23 +5,39 @@ import org.whispersystems.signalservice.internal.util.Util;
 public record Contact(
         String givenName,
         String familyName,
+        String nickName,
+        String nickNameGivenName,
+        String nickNameFamilyName,
+        String note,
         String color,
         int messageExpirationTime,
+        int messageExpirationTimeVersion,
+        long muteUntil,
+        boolean hideStory,
         boolean isBlocked,
         boolean isArchived,
         boolean isProfileSharingEnabled,
-        boolean isHidden
+        boolean isHidden,
+        Long unregisteredTimestamp
 ) {
 
     private Contact(final Builder builder) {
         this(builder.givenName,
                 builder.familyName,
+                builder.nickName,
+                builder.nickNameGivenName,
+                builder.nickNameFamilyName,
+                builder.note,
                 builder.color,
                 builder.messageExpirationTime,
+                builder.messageExpirationTimeVersion,
+                builder.muteUntil,
+                builder.hideStory,
                 builder.isBlocked,
                 builder.isArchived,
                 builder.isProfileSharingEnabled,
-                builder.isHidden);
+                builder.isHidden,
+                builder.unregisteredTimestamp);
     }
 
     public static Builder newBuilder() {
@@ -32,12 +48,20 @@ public record Contact(
         Builder builder = new Builder();
         builder.givenName = copy.givenName();
         builder.familyName = copy.familyName();
+        builder.nickName = copy.nickName();
+        builder.nickNameGivenName = copy.nickNameGivenName();
+        builder.nickNameFamilyName = copy.nickNameFamilyName();
+        builder.note = copy.note();
         builder.color = copy.color();
         builder.messageExpirationTime = copy.messageExpirationTime();
+        builder.messageExpirationTimeVersion = copy.messageExpirationTimeVersion();
+        builder.muteUntil = copy.muteUntil();
+        builder.hideStory = copy.hideStory();
         builder.isBlocked = copy.isBlocked();
         builder.isArchived = copy.isArchived();
         builder.isProfileSharingEnabled = copy.isProfileSharingEnabled();
         builder.isHidden = copy.isHidden();
+        builder.unregisteredTimestamp = copy.unregisteredTimestamp();
         return builder;
     }
 
@@ -60,12 +84,20 @@ public record Contact(
 
         private String givenName;
         private String familyName;
+        private String nickName;
+        private String nickNameGivenName;
+        private String nickNameFamilyName;
+        private String note;
         private String color;
         private int messageExpirationTime;
+        private int messageExpirationTimeVersion = 1;
+        private long muteUntil;
+        private boolean hideStory;
         private boolean isBlocked;
         private boolean isArchived;
         private boolean isProfileSharingEnabled;
         private boolean isHidden;
+        private Long unregisteredTimestamp;
 
         private Builder() {
         }
@@ -84,6 +116,26 @@ public record Contact(
             return this;
         }
 
+        public Builder withNickName(final String val) {
+            nickName = val;
+            return this;
+        }
+
+        public Builder withNickNameGivenName(final String val) {
+            nickNameGivenName = val;
+            return this;
+        }
+
+        public Builder withNickNameFamilyName(final String val) {
+            nickNameFamilyName = val;
+            return this;
+        }
+
+        public Builder withNote(final String val) {
+            note = val;
+            return this;
+        }
+
         public Builder withColor(final String val) {
             color = val;
             return this;
@@ -94,6 +146,21 @@ public record Contact(
             return this;
         }
 
+        public Builder withMessageExpirationTimeVersion(final int val) {
+            messageExpirationTimeVersion = val;
+            return this;
+        }
+
+        public Builder withMuteUntil(final long val) {
+            muteUntil = val;
+            return this;
+        }
+
+        public Builder withHideStory(final boolean val) {
+            hideStory = val;
+            return this;
+        }
+
         public Builder withIsBlocked(final boolean val) {
             isBlocked = val;
             return this;
@@ -114,6 +181,11 @@ public record Contact(
             return this;
         }
 
+        public Builder withUnregisteredTimestamp(final Long val) {
+            unregisteredTimestamp = val;
+            return this;
+        }
+
         public Contact build() {
             return new Contact(this);
         }