Merge branch 'charlesmchen/groupVsUserProfileWhitelist'

Signal/src/Profiles/OWSProfileManager.m

@@ -868,6 +868,14 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
         TSGroupThread *groupThread = (TSGroupThread *)thread;
         NSData *groupId = groupThread.groupModel.groupId;
         [self addGroupIdToProfileWhitelist:groupId];
+
+        // When we add a group to the profile whitelist, we might as well
+        // also add all current members to the profile whitelist
+        // individually as well just in case delivery of the profile key
+        // fails.
+        for (NSString *recipientId in groupThread.recipientIdentifiers) {
+            [self addUserToProfileWhitelist:recipientId];
+        }
     } else {
         NSString *recipientId = thread.contactIdentifier;
         [self addUserToProfileWhitelist:recipientId];