From 8cdb75d52a74a449c74c9cfc31b39715215076e8 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Thu, 10 May 2018 13:38:39 -0400
Subject: [PATCH] Respond to CR.

---
 SignalServiceKit/src/Contacts/Contact.m | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/SignalServiceKit/src/Contacts/Contact.m b/SignalServiceKit/src/Contacts/Contact.m
index 5726b0aae..d2c76272d 100644
--- a/SignalServiceKit/src/Contacts/Contact.m
+++ b/SignalServiceKit/src/Contacts/Contact.m
@@ -351,18 +351,18 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     // Phone Numbers
-    NSMutableSet<PhoneNumber *> *existingPhoneNumberSet = [NSMutableSet setWithArray:self.parsedPhoneNumbers];
-    [existingPhoneNumberSet addObjectsFromArray:self.userTextPhoneNumbers];
+    NSSet<PhoneNumber *> *existingParsedPhoneNumberSet = [NSSet setWithArray:self.parsedPhoneNumbers];
+    NSSet<NSString *> *existingUnparsedPhoneNumberSet = [NSSet setWithArray:self.userTextPhoneNumbers];
 
     NSMutableArray<CNLabeledValue<CNPhoneNumber *> *> *mergedPhoneNumbers = [mergedCNContact.phoneNumbers mutableCopy];
     for (CNLabeledValue<CNPhoneNumber *> *labeledPhoneNumber in newCNContact.phoneNumbers) {
         NSString *_Nullable unparsedPhoneNumber = labeledPhoneNumber.value.stringValue;
-        if ([existingPhoneNumberSet containsObject:unparsedPhoneNumber]) {
+        if ([existingUnparsedPhoneNumberSet containsObject:unparsedPhoneNumber]) {
             // Skip phone number if "unparsed" form is a duplicate.
             continue;
         }
         PhoneNumber *_Nullable parsedPhoneNumber = [PhoneNumber tryParsePhoneNumberFromUserSpecifiedText:labeledPhoneNumber.value.stringValue];
-        if (parsedPhoneNumber && [existingPhoneNumberSet containsObject:parsedPhoneNumber]) {
+        if (parsedPhoneNumber && [existingParsedPhoneNumberSet containsObject:parsedPhoneNumber]) {
             // Skip phone number if "parsed" form is a duplicate.
             continue;
         }