From 128df565458284a1a491af3402e7687d67d72767 Mon Sep 17 00:00:00 2001
From: 0x330a <92654767+0x330a@users.noreply.github.com>
Date: Wed, 23 Aug 2023 09:39:58 +1000
Subject: [PATCH] fix: use contact information as opposed to active
 conversations

---
 .../thoughtcrime/securesms/database/Storage.kt   | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
index 37c65ff69..e6b92c1f8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
@@ -1533,16 +1533,12 @@ open class Storage(context: Context, helper: SQLCipherOpenHelper, private val co
         if (mapping.sessionId != null) {
             return mapping
         }
-        val threadDb = DatabaseComponent.get(context).threadDatabase()
-        threadDb.readerFor(threadDb.conversationList).use { reader ->
-            while (reader.next != null) {
-                val recipient = reader.current.recipient
-                val sessionId = recipient.address.serialize()
-                if (!recipient.isGroupRecipient && SodiumUtilities.sessionId(sessionId, blindedId, serverPublicKey)) {
-                    val contactMapping = mapping.copy(sessionId = sessionId)
-                    db.addBlindedIdMapping(contactMapping)
-                    return contactMapping
-                }
+        getAllContacts().forEach { contact ->
+            val sessionId = SessionId(contact.sessionID)
+            if (sessionId.prefix == IdPrefix.STANDARD && SodiumUtilities.sessionId(sessionId.hexString, blindedId, serverPublicKey)) {
+                val contactMapping = mapping.copy(sessionId = sessionId.hexString)
+                db.addBlindedIdMapping(contactMapping)
+                return contactMapping
             }
         }
         db.getBlindedIdMappingsExceptFor(server).forEach {