From a4e22539a3d87262f43d399fbd79823c4dc2fde0 Mon Sep 17 00:00:00 2001
From: AsamK <asamk@gmx.de>
Date: Mon, 31 Oct 2016 20:52:32 +0100
Subject: [PATCH] Cleanup

---
 src/main/java/org/asamk/signal/JsonContactsStore.java | 3 +--
 src/main/java/org/asamk/signal/Manager.java           | 7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/asamk/signal/JsonContactsStore.java b/src/main/java/org/asamk/signal/JsonContactsStore.java
index e288eca6..500684fe 100644
--- 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 6c73d2c4..42f5ba85 100644
--- 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();
                             }
-- 
2.50.1