From 209e79ce34c1d5bcc8629b688ad761b6c7093d6c Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Mon, 12 Nov 2018 16:22:12 -0600
Subject: [PATCH] Don't add blocked contact to your profile whitelist
---
SignalMessaging/profiles/OWSProfileManager.m | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/SignalMessaging/profiles/OWSProfileManager.m b/SignalMessaging/profiles/OWSProfileManager.m
index 917ca246f..e86fcf82d 100644
--- a/SignalMessaging/profiles/OWSProfileManager.m
+++ b/SignalMessaging/profiles/OWSProfileManager.m
@@ -859,6 +859,13 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
if (oldValue && oldValue.boolValue) {
continue;
}
+
+ // Normally we add all system contacts to the whitelist, but we don't want to do that for
+ // blocked contacts.
+ if ([self.blockingManager isRecipientIdBlocked:recipientId]) {
+ continue;
+ }
+
[transaction setObject:@(YES) forKey:recipientId inCollection:kOWSProfileManager_UserWhitelistCollection];
[newRecipientIds addObject:recipientId];
}