signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Fix build warnings.

Browse Source
This commit is contained in:
Matthew Chen 2018-05-11 10:50:11 -04:00
parent 9a08afae28
commit 6f0c1a975b
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SignalMessaging/contacts/OWSContactsManager.m
View File

@ -19,7 +19,6 @@
#import <SignalServiceKit/PhoneNumber.h>
#import <SignalServiceKit/SignalAccount.h>
@import AddressBook;
@import Contacts;
NSString *const OWSContactsManagerSignalAccountsDidChangeNotification
@ -570,9 +569,9 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification
NSDictionary<NSString *, id> *normalFontAttributes =
@{ NSFontAttributeName : font, NSForegroundColorAttributeName : [UIColor ows_darkGrayColor] };
NSDictionary<NSString *, id> *firstNameAttributes
= (ABPersonGetSortOrdering() == kABPersonSortByFirstName ? boldFontAttributes : normalFontAttributes);
= (self.shouldSortByGivenName ? boldFontAttributes : normalFontAttributes);
NSDictionary<NSString *, id> *lastNameAttributes
= (ABPersonGetSortOrdering() == kABPersonSortByFirstName ? normalFontAttributes : boldFontAttributes);
= (self.shouldSortByGivenName ? normalFontAttributes : boldFontAttributes);
NSString *cachedFirstName = [self cachedFirstNameForRecipientId:recipientId];
NSString *cachedLastName = [self cachedLastNameForRecipientId:recipientId];
@ -585,8 +584,12 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification
NSAttributedString *lastName =
[[NSAttributedString alloc] initWithString:cachedLastName attributes:lastNameAttributes];
CNMutableContact *formatContact = [CNMutableContact new];
formatContact.givenName = firstName.string;
formatContact.familyName = lastName.string;
CNContactDisplayNameOrder nameOrder = [CNContactFormatter nameOrderForContact:formatContact];
NSAttributedString *_Nullable leftName, *_Nullable rightName;
if (ABPersonGetCompositeNameFormat() == kABPersonCompositeNameFormatFirstNameFirst) {
if (nameOrder == CNContactDisplayNameOrderGivenNameFirst) {
leftName = firstName;
rightName = lastName;
} else {
@ -812,11 +815,16 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification
};
}
- (BOOL)shouldSortByGivenName
{
return [[CNContactsUserDefaults sharedDefaults] sortOrder] == CNContactSortOrderGivenName;
}
- (NSString *)comparableNameForSignalAccount:(SignalAccount *)signalAccount
{
NSString *_Nullable name;
if (signalAccount.contact) {
if (ABPersonGetSortOrdering() == kABPersonSortByFirstName) {
if (self.shouldSortByGivenName) {
name = signalAccount.contact.comparableNameFirstLast;
} else {
name = signalAccount.contact.comparableNameLastFirst;