Store contact uuids in contact store

[signal-cli] / src / main / java / org / asamk / signal / storage / contacts / ContactInfo.java

diff --git a/src/main/java/org/asamk/signal/storage/contacts/ContactInfo.java b/src/main/java/org/asamk/signal/storage/contacts/ContactInfo.java
index 2ab2a515e69299959fdb77e44aee178eaf9eb25a..b5dadd1ad364272ebbd8bd2ba0ff4f25059d7714 100644 (file)
--- a/src/main/java/org/asamk/signal/storage/contacts/ContactInfo.java
+++ b/src/main/java/org/asamk/signal/storage/contacts/ContactInfo.java
@@ -5,6 +5,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
+import java.util.UUID;
+
 public class ContactInfo {
 
     @JsonProperty
@@ -13,6 +15,9 @@ public class ContactInfo {
     @JsonProperty
     public String number;
 
+    @JsonProperty
+    public UUID uuid;
+
     @JsonProperty
     public String color;
 
@@ -28,8 +33,16 @@ public class ContactInfo {
     @JsonProperty(defaultValue = "false")
     public boolean archived;
 
+    public ContactInfo() {
+    }
+
+    public ContactInfo(SignalServiceAddress address) {
+        this.number = address.getNumber().orNull();
+        this.uuid = address.getUuid().orNull();
+    }
+
     @JsonIgnore
     public SignalServiceAddress getAddress() {
-        return new SignalServiceAddress(null, number);
+        return new SignalServiceAddress(uuid, number);
     }
 }