Respond to CR.

pull/1/head
Matthew Chen 8 years ago
parent 8337c3bd68
commit 8cdb75d52a

@ -351,18 +351,18 @@ NS_ASSUME_NONNULL_BEGIN
} }
// Phone Numbers // Phone Numbers
NSMutableSet<PhoneNumber *> *existingPhoneNumberSet = [NSMutableSet setWithArray:self.parsedPhoneNumbers]; NSSet<PhoneNumber *> *existingParsedPhoneNumberSet = [NSSet setWithArray:self.parsedPhoneNumbers];
[existingPhoneNumberSet addObjectsFromArray:self.userTextPhoneNumbers]; NSSet<NSString *> *existingUnparsedPhoneNumberSet = [NSSet setWithArray:self.userTextPhoneNumbers];
NSMutableArray<CNLabeledValue<CNPhoneNumber *> *> *mergedPhoneNumbers = [mergedCNContact.phoneNumbers mutableCopy]; NSMutableArray<CNLabeledValue<CNPhoneNumber *> *> *mergedPhoneNumbers = [mergedCNContact.phoneNumbers mutableCopy];
for (CNLabeledValue<CNPhoneNumber *> *labeledPhoneNumber in newCNContact.phoneNumbers) { for (CNLabeledValue<CNPhoneNumber *> *labeledPhoneNumber in newCNContact.phoneNumbers) {
NSString *_Nullable unparsedPhoneNumber = labeledPhoneNumber.value.stringValue; NSString *_Nullable unparsedPhoneNumber = labeledPhoneNumber.value.stringValue;
if ([existingPhoneNumberSet containsObject:unparsedPhoneNumber]) { if ([existingUnparsedPhoneNumberSet containsObject:unparsedPhoneNumber]) {
// Skip phone number if "unparsed" form is a duplicate. // Skip phone number if "unparsed" form is a duplicate.
continue; continue;
} }
PhoneNumber *_Nullable parsedPhoneNumber = [PhoneNumber tryParsePhoneNumberFromUserSpecifiedText:labeledPhoneNumber.value.stringValue]; 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. // Skip phone number if "parsed" form is a duplicate.
continue; continue;
} }

Loading…
Cancel
Save