mirror of
https://github.com/oxen-io/session-ios.git
synced 2023-12-13 21:30:14 +01:00
remove unused code
// FREEBIE dot notation is only for property access // FREEBIE remove unused code
This commit is contained in:
parent
1e0f0157c1
commit
62633ff7f4
3 changed files with 5 additions and 92 deletions
|
@ -25,8 +25,6 @@ typedef void (^ABReloadRequestCompletionBlock)(NSArray *contacts);
|
||||||
- (Contact *)latestContactForPhoneNumber:(PhoneNumber *)phoneNumber;
|
- (Contact *)latestContactForPhoneNumber:(PhoneNumber *)phoneNumber;
|
||||||
- (NSArray *)latestContactsWithSearchString:(NSString *)searchString;
|
- (NSArray *)latestContactsWithSearchString:(NSString *)searchString;
|
||||||
|
|
||||||
+ (NSDictionary *)groupContactsByFirstLetter:(NSArray *)contacts matchingSearchString:(NSString *)optionalSearchString;
|
|
||||||
|
|
||||||
- (void)verifyABPermission;
|
- (void)verifyABPermission;
|
||||||
|
|
||||||
- (NSArray<Contact *> *)allContacts;
|
- (NSArray<Contact *> *)allContacts;
|
||||||
|
|
|
@ -335,58 +335,6 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+ (NSArray *)emailsForRecord:(ABRecordRef)record {
|
|
||||||
ABMultiValueRef emailRefs = ABRecordCopyValue(record, kABPersonEmailProperty);
|
|
||||||
|
|
||||||
@try {
|
|
||||||
NSArray *emails = (__bridge_transfer NSArray *)ABMultiValueCopyArrayOfAllValues(emailRefs);
|
|
||||||
|
|
||||||
if (emails == nil)
|
|
||||||
emails = @[];
|
|
||||||
|
|
||||||
return emails;
|
|
||||||
|
|
||||||
} @finally {
|
|
||||||
if (emailRefs) {
|
|
||||||
CFRelease(emailRefs);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ (NSDictionary *)groupContactsByFirstLetter:(NSArray *)contacts matchingSearchString:(NSString *)optionalSearchString {
|
|
||||||
assert(contacts != nil);
|
|
||||||
|
|
||||||
NSArray *matchingContacts = [contacts filter:^int(Contact *contact) {
|
|
||||||
return optionalSearchString.length == 0 || [self name:contact.fullName matchesQuery:optionalSearchString];
|
|
||||||
}];
|
|
||||||
|
|
||||||
return [matchingContacts groupBy:^id(Contact *contact) {
|
|
||||||
NSString *nameToUse = @"";
|
|
||||||
|
|
||||||
BOOL firstNameOrdering = ABPersonGetSortOrdering() == kABPersonCompositeNameFormatFirstNameFirst ? YES : NO;
|
|
||||||
|
|
||||||
if (firstNameOrdering && contact.firstName != nil && contact.firstName.length > 0) {
|
|
||||||
nameToUse = contact.firstName;
|
|
||||||
} else if (!firstNameOrdering && contact.lastName != nil && contact.lastName.length > 0) {
|
|
||||||
nameToUse = contact.lastName;
|
|
||||||
} else if (contact.lastName == nil) {
|
|
||||||
if (contact.fullName.length > 0) {
|
|
||||||
nameToUse = contact.fullName;
|
|
||||||
} else {
|
|
||||||
return nameToUse;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
nameToUse = contact.lastName;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (nameToUse.length >= 1) {
|
|
||||||
return [[[nameToUse substringToIndex:1] uppercaseString] decomposedStringWithCompatibilityMapping];
|
|
||||||
} else {
|
|
||||||
return @" ";
|
|
||||||
}
|
|
||||||
}];
|
|
||||||
}
|
|
||||||
|
|
||||||
+ (NSDictionary *)keyContactsById:(NSArray *)contacts {
|
+ (NSDictionary *)keyContactsById:(NSArray *)contacts {
|
||||||
return [contacts keyedBy:^id(Contact *contact) {
|
return [contacts keyedBy:^id(Contact *contact) {
|
||||||
return @((int)contact.recordID);
|
return @((int)contact.recordID);
|
||||||
|
@ -406,11 +354,6 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in
|
||||||
return allContacts;
|
return allContacts;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSArray *)recordsForContacts:(NSArray *)contacts {
|
|
||||||
return [contacts map:^id(Contact *contact) {
|
|
||||||
return @([contact recordID]);
|
|
||||||
}];
|
|
||||||
}
|
|
||||||
|
|
||||||
+ (BOOL)name:(NSString *)nameString matchesQuery:(NSString *)queryString {
|
+ (BOOL)name:(NSString *)nameString matchesQuery:(NSString *)queryString {
|
||||||
NSCharacterSet *whitespaceSet = NSCharacterSet.whitespaceCharacterSet;
|
NSCharacterSet *whitespaceSet = NSCharacterSet.whitespaceCharacterSet;
|
||||||
|
@ -427,16 +370,6 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in
|
||||||
}];
|
}];
|
||||||
}
|
}
|
||||||
|
|
||||||
+ (BOOL)phoneNumber:(PhoneNumber *)phoneNumber matchesQuery:(NSString *)queryString {
|
|
||||||
NSString *phoneNumberString = phoneNumber.localizedDescriptionForUser;
|
|
||||||
NSString *searchString = phoneNumberString.digitsOnly;
|
|
||||||
|
|
||||||
if (queryString.length == 0)
|
|
||||||
return YES;
|
|
||||||
NSStringCompareOptions searchOpts = NSCaseInsensitiveSearch | NSAnchoredSearch;
|
|
||||||
return [searchString rangeOfString:queryString options:searchOpts].location != NSNotFound;
|
|
||||||
}
|
|
||||||
|
|
||||||
#pragma mark - Whisper User Management
|
#pragma mark - Whisper User Management
|
||||||
|
|
||||||
- (NSArray *)getSignalUsersFromContactsArray:(NSArray *)contacts {
|
- (NSArray *)getSignalUsersFromContactsArray:(NSArray *)contacts {
|
||||||
|
@ -461,7 +394,7 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSArray *)signalContacts {
|
- (NSArray *)signalContacts {
|
||||||
return [self getSignalUsersFromContactsArray:self.allContacts];
|
return [self getSignalUsersFromContactsArray:[self allContacts]];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSArray *)textSecureContacts {
|
- (NSArray *)textSecureContacts {
|
||||||
|
@ -470,15 +403,6 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in
|
||||||
}] sortedArrayUsingComparator:[[self class] contactComparator]];
|
}] sortedArrayUsingComparator:[[self class] contactComparator]];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSArray *)getNewItemsFrom:(NSArray *)newArray comparedTo:(NSArray *)oldArray {
|
|
||||||
NSMutableSet *newSet = [NSMutableSet setWithArray:newArray];
|
|
||||||
NSSet *oldSet = [NSSet setWithArray:oldArray];
|
|
||||||
|
|
||||||
[newSet minusSet:oldSet];
|
|
||||||
return newSet.allObjects;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
- (NSString *)nameStringForPhoneIdentifier:(NSString *)identifier {
|
- (NSString *)nameStringForPhoneIdentifier:(NSString *)identifier {
|
||||||
for (Contact *contact in self.allContacts) {
|
for (Contact *contact in self.allContacts) {
|
||||||
for (PhoneNumber *phoneNumber in contact.parsedPhoneNumbers) {
|
for (PhoneNumber *phoneNumber in contact.parsedPhoneNumbers) {
|
||||||
|
|
|
@ -4,11 +4,10 @@
|
||||||
#import "Environment.h"
|
#import "Environment.h"
|
||||||
#import "PhoneManager.h"
|
#import "PhoneManager.h"
|
||||||
|
|
||||||
#define CONTACT_TABLE_CELL_BORDER_WIDTH 1.0f
|
@interface ContactTableViewCell ()
|
||||||
|
|
||||||
@interface ContactTableViewCell () {
|
|
||||||
}
|
|
||||||
@property (strong, nonatomic) Contact *associatedContact;
|
@property (strong, nonatomic) Contact *associatedContact;
|
||||||
|
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@implementation ContactTableViewCell
|
@implementation ContactTableViewCell
|
||||||
|
@ -22,17 +21,9 @@
|
||||||
return NSStringFromClass(self.class);
|
return NSStringFromClass(self.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
- (void)configureWithContact:(Contact *)contact {
|
- (void)configureWithContact:(Contact *)contact {
|
||||||
if (!contact.isTextSecureContact) {
|
self.associatedContact = contact;
|
||||||
self.selectionStyle = UITableViewCellSelectionStyleNone;
|
self.nameLabel.attributedText = [self attributedStringForContact:contact];
|
||||||
}
|
|
||||||
_associatedContact = contact;
|
|
||||||
|
|
||||||
_nameLabel.attributedText = [self attributedStringForContact:contact];
|
|
||||||
if (!contact.isTextSecureContact) {
|
|
||||||
_nameLabel.textColor = [UIColor lightGrayColor];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (NSAttributedString *)attributedStringForContact:(Contact *)contact {
|
- (NSAttributedString *)attributedStringForContact:(Contact *)contact {
|
||||||
|
|
Loading…
Reference in a new issue