Don’t ignore “unnamed” phone numbers.

// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent 279e25c1df
commit 587d035019

@ -152,10 +152,12 @@ NS_ASSUME_NONNULL_BEGIN
OWSAssert(self.phoneNumberNameMap); OWSAssert(self.phoneNumberNameMap);
NSMutableDictionary<NSString *, PhoneNumber *> *parsedPhoneNumberMap = [NSMutableDictionary new]; NSMutableDictionary<NSString *, PhoneNumber *> *parsedPhoneNumberMap = [NSMutableDictionary new];
NSMutableArray<PhoneNumber *> *parsedPhoneNumbers = [NSMutableArray new];
for (NSString *phoneNumberString in userTextPhoneNumbers) { for (NSString *phoneNumberString in userTextPhoneNumbers) {
for (PhoneNumber *phoneNumber in for (PhoneNumber *phoneNumber in
[PhoneNumber tryParsePhoneNumbersFromsUserSpecifiedText:phoneNumberString [PhoneNumber tryParsePhoneNumbersFromsUserSpecifiedText:phoneNumberString
clientPhoneNumber:[TSAccountManager localNumber]]) { clientPhoneNumber:[TSAccountManager localNumber]]) {
[parsedPhoneNumbers addObject:phoneNumber];
parsedPhoneNumberMap[phoneNumber.toE164] = phoneNumber; parsedPhoneNumberMap[phoneNumber.toE164] = phoneNumber;
NSString *phoneNumberName = phoneNumberNameMap[phoneNumberString]; NSString *phoneNumberName = phoneNumberNameMap[phoneNumberString];
if (phoneNumberName) { if (phoneNumberName) {
@ -163,7 +165,7 @@ NS_ASSUME_NONNULL_BEGIN
} }
} }
} }
return [parsedPhoneNumberMap.allValues sortedArrayUsingSelector:@selector(compare:)]; return [parsedPhoneNumbers sortedArrayUsingSelector:@selector(compare:)];
} }
- (NSString *)fullName { - (NSString *)fullName {

Loading…
Cancel
Save