From d5fb71b63f857bcb1f4550b41ca79f5db895313b Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 12 Jan 2021 11:39:23 -0500
Subject: [PATCH] Prevent creating threads for remapped users.

Fixes #10538
---
 .../securesms/contacts/sync/DirectoryHelper.java           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java
index ff8466d67..dbf701595 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java
@@ -402,8 +402,11 @@ public class DirectoryHelper {
 
     for (RecipientId newUser: newUsers) {
       Recipient recipient = Recipient.resolved(newUser);
-      if (!SessionUtil.hasSession(context, recipient.getId()) && !recipient.isSelf()) {
-        IncomingJoinedMessage  message      = new IncomingJoinedMessage(newUser);
+      if (!SessionUtil.hasSession(context, recipient.getId()) &&
+          !recipient.isSelf()                                 &&
+          recipient.hasAUserSetDisplayName(context))
+      {
+        IncomingJoinedMessage  message      = new IncomingJoinedMessage(recipient.getId());
         Optional<InsertResult> insertResult = DatabaseFactory.getSmsDatabase(context).insertMessageInbox(message);
 
         if (insertResult.isPresent()) {