From: AsamK <asamk@gmx.de>
Date: Tue, 24 Mar 2020 13:34:00 +0000 (+0100)
Subject: Get uuids from contact store when resolving numbers
X-Git-Tag: v0.6.6~10
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/efa1c43b0bdeb6e7b12d252492194448543d70fb?ds=sidebyside

Get uuids from contact store when resolving numbers
---

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index caba52ac..c928ec17 100644
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -1138,8 +1138,11 @@ public class Manager implements Signal {
             if (canonicalizedNumber.equals(username)) {
                 signalServiceAddresses.add(account.getSelfAddress());
             } else {
-                // TODO get corresponding uuid
-                signalServiceAddresses.add(new SignalServiceAddress(null, canonicalizedNumber));
+                SignalServiceAddress address = new SignalServiceAddress(null, canonicalizedNumber);
+                ContactInfo contact = account.getContactStore().getContact(address);
+                signalServiceAddresses.add(contact == null
+                        ? address
+                        : contact.getAddress());
             }
         }
         return signalServiceAddresses;