From 76e55156101e58600274da3fbd8a92c7565de955 Mon Sep 17 00:00:00 2001
From: Niels Andriesse <andriesseniels@gmail.com>
Date: Fri, 5 Mar 2021 13:06:35 +1100
Subject: [PATCH] Quick fix missing username bug

---
 SessionMessagingKit/Database/Storage+Shared.swift | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/SessionMessagingKit/Database/Storage+Shared.swift b/SessionMessagingKit/Database/Storage+Shared.swift
index 17de9059d..4562f4abf 100644
--- a/SessionMessagingKit/Database/Storage+Shared.swift
+++ b/SessionMessagingKit/Database/Storage+Shared.swift
@@ -40,6 +40,16 @@ extension Storage {
         var result: Contact?
         Storage.read { transaction in
             result = Storage.shared.getContact(with: userPublicKey)
+            // HACK: Apparently it's still possible for the user's contact info to be missing
+            if result == nil, let profile = OWSUserProfile.fetch(uniqueId: kLocalProfileUniqueId, transaction: transaction),
+                let userPublicKey = Storage.shared.getUserPublicKey() {
+                let user = Contact(sessionID: userPublicKey)
+                user.name = profile.profileName
+                user.profilePictureURL = profile.avatarUrlPath
+                user.profilePictureFileName = profile.avatarFileName
+                user.profilePictureEncryptionKey = profile.profileKey
+                result = user
+            }
         }
         return result
     }