From: AsamK <asamk@gmx.de>
Date: Fri, 22 May 2020 10:30:36 +0000 (+0200)
Subject: Store number/uuid in recipient store after receiving a message
X-Git-Tag: v0.6.8~3
X-Git-Url: https://git.nmode.ca/signal-cli/commitdiff_plain/e048b1886d4858050125c4a341df9a8987c2dcb8

Store number/uuid in recipient store after receiving a message

Necessary to find the correct session if the sender send the next message
with only the uuid.

Fixes #309
---

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index b88e1a9f..81f870cd 100644
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -1411,6 +1411,11 @@ public class Manager implements Closeable {
                 System.err.println("Ignoring error: " + e.getMessage());
                 continue;
             }
+            if (envelope.hasSource()) {
+                // Store uuid if we don't have it already
+                SignalServiceAddress source = envelope.getSourceAddress();
+                resolveSignalServiceAddress(source);
+            }
             if (!envelope.isReceipt()) {
                 try {
                     content = decryptMessage(envelope);
@@ -1472,6 +1477,9 @@ public class Manager implements Closeable {
             } else {
                 sender = content.getSender();
             }
+            // Store uuid if we don't have it already
+            resolveSignalServiceAddress(sender);
+
             if (content.getDataMessage().isPresent()) {
                 SignalServiceDataMessage message = content.getDataMessage().get();