From 3729398507048db795178f5634d2b7c2a893e3d4 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Wed, 31 Oct 2018 15:01:33 -0400
Subject: [PATCH] Request profile fetches on main thread.

---
 SignalServiceKit/src/Messages/OWSMessageManager.m      | 4 +++-
 SignalServiceKit/src/Messages/UD/OWSRequestMaker.swift | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m
index 1247a4a20..8e2180790 100644
--- a/SignalServiceKit/src/Messages/OWSMessageManager.m
+++ b/SignalServiceKit/src/Messages/OWSMessageManager.m
@@ -1483,7 +1483,9 @@ NS_ASSUME_NONNULL_BEGIN
                    (unsigned long) envelope.sourceDevice);
 
         [OWSDevicesService refreshDevices];
-        [self.profileManager fetchLocalUsersProfile];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self.profileManager fetchLocalUsersProfile];
+        });
     }
 }
 
diff --git a/SignalServiceKit/src/Messages/UD/OWSRequestMaker.swift b/SignalServiceKit/src/Messages/UD/OWSRequestMaker.swift
index 6a9b7b88b..8f3e87f4d 100644
--- a/SignalServiceKit/src/Messages/UD/OWSRequestMaker.swift
+++ b/SignalServiceKit/src/Messages/UD/OWSRequestMaker.swift
@@ -225,6 +225,8 @@ public class RequestMaker: NSObject {
             // mark recipient as .enabled.
             udManager.setUnidentifiedAccessMode(.enabled, recipientId: recipientId)
         }
-        profileManager.fetchProfile(forRecipientId: recipientId)
+        DispatchQueue.main.async {
+            self.profileManager.fetchProfile(forRecipientId: self.recipientId)
+        }
     }
 }