Cleanup

diff --git a/src/main/java/org/asamk/signal/JsonContactsStore.java b/src/main/java/org/asamk/signal/JsonContactsStore.java
index e288eca63974f97dc1326373de23a1b286dfebee..500684fe2974b46c9215160d88c30410d12d1409 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonContactsStore.java
+++ b/src/main/java/org/asamk/signal/JsonContactsStore.java
@@ -26,8 +26,7 @@ public class JsonContactsStore {
     }
 
     ContactInfo getContact(String number) {
-        ContactInfo c = contacts.get(number);
-        return c;
+        return contacts.get(number);
     }
 
     List<ContactInfo> getContacts() {

diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index 6c73d2c489d9cc6678b0ba0789407f52bf99e940..42f5ba859a8cebd3ba62367afa2fb5aa2bbe3bc8 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -1041,8 +1041,11 @@ class Manager implements Signal {
                         DeviceContactsInputStream s = new DeviceContactsInputStream(retrieveAttachmentAsStream(syncMessage.getContacts().get().asPointer()));
                         DeviceContact c;
                         while ((c = s.read()) != null) {
-                            ContactInfo contact = new ContactInfo();
-                            contact.number = c.getNumber();
+                            ContactInfo contact = contactStore.getContact(c.getNumber());
+                            if (contact == null) {
+                                contact = new ContactInfo();
+                                contact.number = c.getNumber();
+                            }
                             if (c.getName().isPresent()) {
                                 contact.name = c.getName().get();
                             }