keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rework handling of phone number names.

Browse Source 
// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent d82afb8bb7
commit 1b93cd29c2
2 changed files with 47 additions and 50 deletions
Show Stats Download Patch File Download Diff File

17
src/Contacts/Contact.h
Unescape Escape View File

@ -7,20 +7,6 @@
NS_ASSUME_NONNULL_BEGIN
typedef NS_ENUM(NSUInteger, OWSPhoneNumberType) {
OWSPhoneNumberTypeUnknown,
OWSPhoneNumberTypeMobile,
OWSPhoneNumberTypeIPhone,
OWSPhoneNumberTypeMain,
OWSPhoneNumberTypeHomeFAX,
OWSPhoneNumberTypeWorkFAX,
OWSPhoneNumberTypeOtherFAX,
OWSPhoneNumberTypePager,
OWSPhoneNumberTypeHome,
OWSPhoneNumberTypeWork,
OWSPhoneNumberTypeOther
};
/**
*
* Contact represents relevant information related to a contact from the user's
@ -61,13 +47,12 @@ typedef NS_ENUM(NSUInteger, OWSPhoneNumberType) {
- (instancetype)initWithContactWithFirstName:(nullable NSString *)firstName
andLastName:(nullable NSString *)lastName
andUserTextPhoneNumbers:(NSArray<NSString *> *)phoneNumbers
phoneNumberTypeMap:(nullable NSDictionary<NSString *, NSNumber *> *)phoneNumberTypeMap
andImage:(nullable UIImage *)image
andContactID:(ABRecordID)record;
- (instancetype)initWithSystemContact:(CNContact *)contact;
- (OWSPhoneNumberType)phoneNumberTypeForPhoneNumber:(NSString *)recipientId;
- (NSString *)nameForPhoneNumber:(NSString *)recipientId;
#endif // TARGET_OS_IOS

80
src/Contacts/Contact.m
Unescape Escape View File

@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface Contact ()
@property (readonly, nonatomic) NSMutableDictionary<NSString *, NSNumber *> *phoneNumberTypeMap;
@property (readonly, nonatomic) NSMutableDictionary<NSString *, NSString *> *phoneNumberNameMap;
@end
@ -30,7 +30,6 @@ NS_ASSUME_NONNULL_BEGIN
- (instancetype)initWithContactWithFirstName:(nullable NSString *)firstName
andLastName:(nullable NSString *)lastName
andUserTextPhoneNumbers:(NSArray *)phoneNumbers
phoneNumberTypeMap:(nullable NSDictionary<NSString *, NSNumber *> *)phoneNumberTypeMap
andImage:(nullable UIImage *)image
andContactID:(ABRecordID)record
{
@ -44,9 +43,8 @@ NS_ASSUME_NONNULL_BEGIN
_uniqueId = [self.class uniqueIdFromABRecordId:record];
_recordID = record;
_userTextPhoneNumbers = phoneNumbers;
_phoneNumberTypeMap = [NSMutableDictionary new];
_parsedPhoneNumbers =
[self parsedPhoneNumbersFromUserTextPhoneNumbers:phoneNumbers phoneNumberTypeMap:phoneNumberTypeMap];
_phoneNumberNameMap = [NSMutableDictionary new];
_parsedPhoneNumbers = [self parsedPhoneNumbersFromUserTextPhoneNumbers:phoneNumbers phoneNumberNameMap:@{}];
_image = image;
// Not using emails for old AB style contacts.
_emails = [NSMutableArray new];
@ -67,45 +65,58 @@ NS_ASSUME_NONNULL_BEGIN
_uniqueId = contact.identifier;
NSMutableArray<NSString *> *phoneNumbers = [NSMutableArray new];
NSMutableDictionary<NSString *, NSNumber *> *phoneNumberTypeMap = [NSMutableDictionary new];
NSMutableDictionary<NSString *, NSString *> *phoneNumberNameMap = [NSMutableDictionary new];
for (CNLabeledValue *phoneNumberField in contact.phoneNumbers) {
if ([phoneNumberField.value isKindOfClass:[CNPhoneNumber class]]) {
CNPhoneNumber *phoneNumber = (CNPhoneNumber *)phoneNumberField.value;
[phoneNumbers addObject:phoneNumber.stringValue];
if ([phoneNumberField.label isEqualToString:CNLabelHome]) {
phoneNumberTypeMap[phoneNumber.stringValue] = @(OWSPhoneNumberTypeHome);
phoneNumberNameMap[phoneNumber.stringValue]
= NSLocalizedString(@"PHONE_NUMBER_TYPE_HOME", @"Label for 'Home' phone numbers.");
} else if ([phoneNumberField.label isEqualToString:CNLabelWork]) {
phoneNumberTypeMap[phoneNumber.stringValue] = @(OWSPhoneNumberTypeWork);
phoneNumberNameMap[phoneNumber.stringValue]
= NSLocalizedString(@"PHONE_NUMBER_TYPE_WORK", @"Label for 'Work' phone numbers.");
} else if ([phoneNumberField.label isEqualToString:CNLabelPhoneNumberiPhone]) {
phoneNumberTypeMap[phoneNumber.stringValue] = @(OWSPhoneNumberTypeIPhone);
phoneNumberNameMap[phoneNumber.stringValue]
= NSLocalizedString(@"PHONE_NUMBER_TYPE_IPHONE", @"Label for 'IPhone' phone numbers.");
;
} else if ([phoneNumberField.label isEqualToString:CNLabelPhoneNumberMobile]) {
phoneNumberTypeMap[phoneNumber.stringValue] = @(OWSPhoneNumberTypeMobile);
phoneNumberNameMap[phoneNumber.stringValue]
= NSLocalizedString(@"PHONE_NUMBER_TYPE_MOBILE", @"Label for 'Mobile' phone numbers.");
} else if ([phoneNumberField.label isEqualToString:CNLabelPhoneNumberMain]) {
phoneNumberTypeMap[phoneNumber.stringValue] = @(OWSPhoneNumberTypeMain);
phoneNumberNameMap[phoneNumber.stringValue]
= NSLocalizedString(@"PHONE_NUMBER_TYPE_MAIN", @"Label for 'Main' phone numbers.");
} else if ([phoneNumberField.label isEqualToString:CNLabelPhoneNumberHomeFax]) {
phoneNumberTypeMap[phoneNumber.stringValue] = @(OWSPhoneNumberTypeHomeFAX);
phoneNumberNameMap[phoneNumber.stringValue]
= NSLocalizedString(@"PHONE_NUMBER_TYPE_HOME_FAX", @"Label for 'HomeFAX' phone numbers.");
} else if ([phoneNumberField.label isEqualToString:CNLabelPhoneNumberWorkFax]) {
phoneNumberTypeMap[phoneNumber.stringValue] = @(OWSPhoneNumberTypeWorkFAX);
phoneNumberNameMap[phoneNumber.stringValue]
= NSLocalizedString(@"PHONE_NUMBER_TYPE_WORK_FAX", @"Label for 'Work FAX' phone numbers.");
} else if ([phoneNumberField.label isEqualToString:CNLabelPhoneNumberOtherFax]) {
phoneNumberTypeMap[phoneNumber.stringValue] = @(OWSPhoneNumberTypeOtherFAX);
phoneNumberNameMap[phoneNumber.stringValue]
= NSLocalizedString(@"PHONE_NUMBER_TYPE_OTHER_FAX", @"Label for 'Other FAX' phone numbers.");
} else if ([phoneNumberField.label isEqualToString:CNLabelPhoneNumberPager]) {
phoneNumberTypeMap[phoneNumber.stringValue] = @(OWSPhoneNumberTypePager);
phoneNumberNameMap[phoneNumber.stringValue]
= NSLocalizedString(@"PHONE_NUMBER_TYPE_PAGER", @"Label for 'Pager' phone numbers.");
} else if ([phoneNumberField.label isEqualToString:CNLabelOther]) {
phoneNumberTypeMap[phoneNumber.stringValue] = @(OWSPhoneNumberTypeOther);
} else {
// TODO this should only be hit if the user has a custom label, which ideally we'd expose rather than
// unknown. I think the thing to do is to get rid of OWSPhoneNumberType*, and simply localize the label
// in this method - uising the custom label when available.
// Maybe that means adding a "label" to PhoneNumber class and parsing the numbers in this class.
phoneNumberTypeMap[phoneNumber.stringValue] = @(OWSPhoneNumberTypeUnknown);
phoneNumberNameMap[phoneNumber.stringValue]
= NSLocalizedString(@"PHONE_NUMBER_TYPE_OTHER", @"Label for 'Other' phone numbers.");
} else if (phoneNumberField.label.length > 0 && ![phoneNumberField.label hasPrefix:@"_$"]) {
// We'll reach this case for:
//
// * User-defined custom labels, which we want to display.
// * Labels like "_$!<CompanyMain>!$_", which I'm guessing are synced from other platforms.
// We don't want to display these labels. Even some of iOS' default labels (like Radio) show
// up this way.
phoneNumberNameMap[phoneNumber.stringValue] = phoneNumberField.label;
}
}
}
_userTextPhoneNumbers = [phoneNumbers copy];
_phoneNumberTypeMap = [NSMutableDictionary new];
_phoneNumberNameMap = [NSMutableDictionary new];
_parsedPhoneNumbers =
[self parsedPhoneNumbersFromUserTextPhoneNumbers:phoneNumbers phoneNumberTypeMap:phoneNumberTypeMap];
[self parsedPhoneNumbersFromUserTextPhoneNumbers:phoneNumbers phoneNumberNameMap:phoneNumberNameMap];
NSMutableArray<NSString *> *emailAddresses = [NSMutableArray new];
for (CNLabeledValue *emailField in contact.emailAddresses) {
@ -135,10 +146,10 @@ NS_ASSUME_NONNULL_BEGIN
#endif // TARGET_OS_IOS
- (NSArray<PhoneNumber *> *)parsedPhoneNumbersFromUserTextPhoneNumbers:(NSArray<NSString *> *)userTextPhoneNumbers
phoneNumberTypeMap:(nullable NSDictionary<NSString *, NSNumber *> *)
phoneNumberTypeMap
phoneNumberNameMap:(nullable NSDictionary<NSString *, NSString *> *)
phoneNumberNameMap
{
OWSAssert(self.phoneNumberTypeMap);
OWSAssert(self.phoneNumberNameMap);
NSMutableDictionary<NSString *, PhoneNumber *> *parsedPhoneNumberMap = [NSMutableDictionary new];
for (NSString *phoneNumberString in userTextPhoneNumbers) {
@ -146,9 +157,9 @@ NS_ASSUME_NONNULL_BEGIN
[PhoneNumber tryParsePhoneNumbersFromsUserSpecifiedText:phoneNumberString
clientPhoneNumber:[TSAccountManager localNumber]]) {
parsedPhoneNumberMap[phoneNumber.toE164] = phoneNumber;
NSNumber *phoneNumberType = phoneNumberTypeMap[phoneNumberString];
if (phoneNumberType) {
self.phoneNumberTypeMap[phoneNumber.toE164] = phoneNumberType;
NSString *phoneNumberName = phoneNumberNameMap[phoneNumberString];
if (phoneNumberName) {
self.phoneNumberNameMap[phoneNumber.toE164] = phoneNumberName;
}
}
}
@ -254,17 +265,18 @@ NS_ASSUME_NONNULL_BEGIN
};
}
- (OWSPhoneNumberType)phoneNumberTypeForPhoneNumber:(NSString *)recipientId
- (NSString *)nameForPhoneNumber:(NSString *)recipientId
{
OWSAssert(recipientId.length > 0);
OWSAssert([self.textSecureIdentifiers containsObject:recipientId]);
NSNumber *value = self.phoneNumberTypeMap[recipientId];
NSString *value = self.phoneNumberNameMap[recipientId];
OWSAssert(value);
if (!value) {
return OWSPhoneNumberTypeUnknown;
return NSLocalizedString(@"PHONE_NUMBER_TYPE_UNKNOWN",
@"Label used when we don't what kind of phone number it is (e.g. mobile/work/home).");
}
return (OWSPhoneNumberType)value.intValue;
return value;
}
@end

Write Preview
Loading…
Cancel
Save