From ee300590e307174d79670e9aca68b8af62fff842 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Fri, 8 Dec 2017 13:27:53 -0500
Subject: [PATCH] Rework thread safety in profile manager.

---
 SignalMessaging/profiles/OWSProfileManager.m | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SignalMessaging/profiles/OWSProfileManager.m b/SignalMessaging/profiles/OWSProfileManager.m
index f0f0910fe..d59085e11 100644
--- a/SignalMessaging/profiles/OWSProfileManager.m
+++ b/SignalMessaging/profiles/OWSProfileManager.m
@@ -845,7 +845,7 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
         NSString *fileName = [[NSUUID UUID].UUIDString stringByAppendingPathExtension:@"jpg"];
         NSString *filePath = [self.profileAvatarsDirPath stringByAppendingPathComponent:fileName];
 
-        @synchronized(self)
+        @synchronized(self.currentAvatarDownloads)
         {
             if ([self.currentAvatarDownloads containsObject:userProfile.recipientId]) {
                 // Download already in flight; ignore.
@@ -871,7 +871,7 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
                     }
                 }
 
-                @synchronized(self)
+                @synchronized(self.currentAvatarDownloads)
                 {
                     [self.currentAvatarDownloads removeObject:userProfile.recipientId];
                 }
@@ -1153,7 +1153,7 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
     }
 
     UIImage *_Nullable image = nil;
-    @synchronized(self)
+    @synchronized(self.profileAvatarImageCache)
     {
         image = [self.profileAvatarImageCache objectForKey:filename];
     }
@@ -1175,7 +1175,7 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
     OWSAssert(filename.length > 0);
     OWSAssert(image);
 
-    @synchronized(self)
+    @synchronized(self.profileAvatarImageCache)
     {
         if (image) {
             [self.profileAvatarImageCache setObject:image forKey:filename];