From ea60858a070836a066a10e72c99aa434049999f4 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 26 Jan 2024 13:10:47 -0500
Subject: [PATCH] Improve logging around 'contact joined' messages.

---
 .../securesms/contacts/sync/ContactDiscovery.kt          | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
index 04eb95c69b..32aad8cba7 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
@@ -198,9 +198,12 @@ object ContactDiscovery {
     if (!SignalStore.settings().isNotifyWhenContactJoinsSignal) return
 
     Recipient.resolvedList(newUserIds)
-      .filter { !it.isSelf && it.hasAUserSetDisplayName(context) && !hasSession(it.id) }
-      .map { IncomingMessage.contactJoined(it.id, System.currentTimeMillis()) }
-      .map { SignalDatabase.messages.insertMessageInbox(it) }
+      .filter { !it.isSelf && it.hasAUserSetDisplayName(context) && !hasSession(it.id) && it.hasE164() }
+      .map {
+        Log.i(TAG, "Inserting 'contact joined' message for ${it.id}. E164: ${it.e164}")
+        val message = IncomingMessage.contactJoined(it.id, System.currentTimeMillis())
+        SignalDatabase.messages.insertMessageInbox(message)
+      }
       .filter { it.isPresent }
       .map { it.get() }
       .forEach { result ->