From 1e0f0157c1ac4155497879e40c95326e84eed85f Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Mon, 27 Jun 2016 14:32:35 -0700 Subject: [PATCH] namespace ContactsManager -> OWSContactsManager rename test class ContactManager->OWSContact_s_Manager update docs // FREEBIE --- Signal.xcodeproj/project.pbxproj | 24 +++++++-------- Signal/src/AppDelegate.m | 2 +- Signal/src/call/RecentCall.h | 2 +- ...ContactsManager.h => OWSContactsManager.h} | 10 ++----- ...ContactsManager.m => OWSContactsManager.m} | 16 +++++----- Signal/src/environment/Environment.h | 6 ++-- Signal/src/environment/Environment.m | 2 +- Signal/src/environment/Release.m | 4 +-- Signal/src/network/PushManager.m | 2 +- .../number directory/GroupContactsResult.m | 4 +-- .../CodeVerificationViewController.m | 2 +- .../view controllers/MessagesViewController.m | 2 +- .../view controllers/NewGroupViewController.m | 2 +- .../SettingsTableViewController.m | 2 +- .../ShowGroupMembersViewController.m | 2 +- .../view controllers/SignalsViewController.m | 2 +- Signal/src/views/ContactTableViewCell.h | 2 +- Signal/test/contact/ContactManagerTest.m | 29 ------------------ Signal/test/contact/OWSContactsManagerTest.m | 30 +++++++++++++++++++ 19 files changed, 70 insertions(+), 75 deletions(-) rename Signal/src/contact/{ContactsManager.h => OWSContactsManager.h} (71%) rename Signal/src/contact/{ContactsManager.m => OWSContactsManager.m} (97%) delete mode 100644 Signal/test/contact/ContactManagerTest.m create mode 100644 Signal/test/contact/OWSContactsManagerTest.m diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index fd4595d24..2d1bf9616 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -24,7 +24,7 @@ 76EB054018170B33006006FC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB03C318170B33006006FC /* AppDelegate.m */; }; 76EB057218170B33006006FC /* RecentCall.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB040018170B33006006FC /* RecentCall.m */; }; 76EB057418170B33006006FC /* RecentCallManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB040218170B33006006FC /* RecentCallManager.m */; }; - 76EB057A18170B33006006FC /* ContactsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB040918170B33006006FC /* ContactsManager.m */; }; + 76EB057A18170B33006006FC /* OWSContactsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB040918170B33006006FC /* OWSContactsManager.m */; }; 76EB058218170B33006006FC /* Environment.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB041318170B33006006FC /* Environment.m */; }; 76EB058418170B33006006FC /* LocalizableText.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB041518170B33006006FC /* LocalizableText.m */; }; 76EB058618170B33006006FC /* PreferencesUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB041718170B33006006FC /* PreferencesUtil.m */; }; @@ -172,7 +172,7 @@ B660F6B81C29868000687D6E /* JitterQueueTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B660F6711C29867F00687D6E /* JitterQueueTest.m */; }; B660F6B91C29868000687D6E /* SpeexCodecTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B660F6721C29867F00687D6E /* SpeexCodecTest.m */; }; B660F6BA1C29868000687D6E /* RecentCallTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B660F6741C29867F00687D6E /* RecentCallTest.m */; }; - B660F6BB1C29868000687D6E /* ContactManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B660F6761C29867F00687D6E /* ContactManagerTest.m */; }; + B660F6BB1C29868000687D6E /* OWSContactsManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B660F6761C29867F00687D6E /* OWSContactsManagerTest.m */; }; B660F6BC1C29868000687D6E /* DnsManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B660F6791C29867F00687D6E /* DnsManagerTest.m */; }; B660F6BD1C29868000687D6E /* HttpRequestResponseTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B660F67B1C29867F00687D6E /* HttpRequestResponseTest.m */; }; B660F6BE1C29868000687D6E /* IpAddressTest.m in Sources */ = {isa = PBXBuildFile; fileRef = B660F67C1C29867F00687D6E /* IpAddressTest.m */; }; @@ -232,7 +232,7 @@ B660F7141C29988E00687D6E /* RecentCall.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB040018170B33006006FC /* RecentCall.m */; }; B660F7151C29988E00687D6E /* RecentCallManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB040218170B33006006FC /* RecentCallManager.m */; }; B660F7161C29988E00687D6E /* GroupContactsResult.m in Sources */ = {isa = PBXBuildFile; fileRef = B671B2451A93B238002BBD9D /* GroupContactsResult.m */; }; - B660F7171C29988E00687D6E /* ContactsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB040918170B33006006FC /* ContactsManager.m */; }; + B660F7171C29988E00687D6E /* OWSContactsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 76EB040918170B33006006FC /* OWSContactsManager.m */; }; B660F7181C29988E00687D6E /* CryptoTools.m in Sources */ = {isa = PBXBuildFile; fileRef = 7038632418F70C0700D4A43F /* CryptoTools.m */; }; B660F7191C29988E00687D6E /* EvpMessageDigest.m in Sources */ = {isa = PBXBuildFile; fileRef = 701231B418ECAA4500D456C4 /* EvpMessageDigest.m */; }; B660F71A1C29988E00687D6E /* EvpSymetricUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 7038632618F70C0700D4A43F /* EvpSymetricUtil.m */; }; @@ -515,8 +515,8 @@ 76EB040018170B33006006FC /* RecentCall.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RecentCall.m; sourceTree = ""; }; 76EB040118170B33006006FC /* RecentCallManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecentCallManager.h; sourceTree = ""; }; 76EB040218170B33006006FC /* RecentCallManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RecentCallManager.m; sourceTree = ""; }; - 76EB040818170B33006006FC /* ContactsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContactsManager.h; sourceTree = ""; }; - 76EB040918170B33006006FC /* ContactsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactsManager.m; sourceTree = ""; }; + 76EB040818170B33006006FC /* OWSContactsManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSContactsManager.h; sourceTree = ""; }; + 76EB040918170B33006006FC /* OWSContactsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSContactsManager.m; sourceTree = ""; }; 76EB041218170B33006006FC /* Environment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Environment.h; sourceTree = ""; }; 76EB041318170B33006006FC /* Environment.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Environment.m; sourceTree = ""; }; 76EB041418170B33006006FC /* LocalizableText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocalizableText.h; sourceTree = ""; }; @@ -786,7 +786,7 @@ B660F6711C29867F00687D6E /* JitterQueueTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JitterQueueTest.m; sourceTree = ""; }; B660F6721C29867F00687D6E /* SpeexCodecTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SpeexCodecTest.m; sourceTree = ""; }; B660F6741C29867F00687D6E /* RecentCallTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RecentCallTest.m; sourceTree = ""; }; - B660F6761C29867F00687D6E /* ContactManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ContactManagerTest.m; sourceTree = ""; }; + B660F6761C29867F00687D6E /* OWSContactsManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OWSContactsManagerTest.m; sourceTree = ""; }; B660F6791C29867F00687D6E /* DnsManagerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DnsManagerTest.m; sourceTree = ""; }; B660F67B1C29867F00687D6E /* HttpRequestResponseTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HttpRequestResponseTest.m; sourceTree = ""; }; B660F67C1C29867F00687D6E /* IpAddressTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IpAddressTest.m; sourceTree = ""; }; @@ -1180,8 +1180,8 @@ isa = PBXGroup; children = ( 76EB04A818170B33006006FC /* number directory */, - 76EB040818170B33006006FC /* ContactsManager.h */, - 76EB040918170B33006006FC /* ContactsManager.m */, + 76EB040818170B33006006FC /* OWSContactsManager.h */, + 76EB040918170B33006006FC /* OWSContactsManager.m */, ); path = contact; sourceTree = ""; @@ -1781,7 +1781,7 @@ B660F6751C29867F00687D6E /* contact */ = { isa = PBXGroup; children = ( - B660F6761C29867F00687D6E /* ContactManagerTest.m */, + B660F6761C29867F00687D6E /* OWSContactsManagerTest.m */, ); path = contact; sourceTree = ""; @@ -2587,7 +2587,7 @@ 76EB061018170B33006006FC /* EventWindow.m in Sources */, E197B62718BBF63B00F073E5 /* SoundBoard.m in Sources */, 76EB058418170B33006006FC /* LocalizableText.m in Sources */, - 76EB057A18170B33006006FC /* ContactsManager.m in Sources */, + 76EB057A18170B33006006FC /* OWSContactsManager.m in Sources */, E197B61918BBEC1A00F073E5 /* RemoteIOBufferListWrapper.m in Sources */, 76EB05A618170B33006006FC /* RtpPacket.m in Sources */, 76EB064218170B33006006FC /* StringUtil.m in Sources */, @@ -2743,7 +2743,7 @@ B660F7141C29988E00687D6E /* RecentCall.m in Sources */, B660F7151C29988E00687D6E /* RecentCallManager.m in Sources */, B660F7161C29988E00687D6E /* GroupContactsResult.m in Sources */, - B660F7171C29988E00687D6E /* ContactsManager.m in Sources */, + B660F7171C29988E00687D6E /* OWSContactsManager.m in Sources */, B660F7181C29988E00687D6E /* CryptoTools.m in Sources */, B660F7191C29988E00687D6E /* EvpMessageDigest.m in Sources */, B660F71A1C29988E00687D6E /* EvpSymetricUtil.m in Sources */, @@ -2893,7 +2893,7 @@ B660F6D51C29868000687D6E /* TestUtil.m in Sources */, B660F6B81C29868000687D6E /* JitterQueueTest.m in Sources */, B660F6DF1C29868000687D6E /* QueueTest.m in Sources */, - B660F6BB1C29868000687D6E /* ContactManagerTest.m in Sources */, + B660F6BB1C29868000687D6E /* OWSContactsManagerTest.m in Sources */, B660F6CE1C29868000687D6E /* PhoneNumberTest.m in Sources */, B660F6C41C29868000687D6E /* HandshakePacketTest.m in Sources */, B660F6CD1C29868000687D6E /* UdpSocketTest.m in Sources */, diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index 40fbe5520..f7552348c 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -2,7 +2,7 @@ #import "AppStoreRating.h" #import "CategorizingLogger.h" #import "CodeVerificationViewController.h" -#import "ContactsManager.h" +#import "OWSContactsManager.h" #import "DebugLogger.h" #import "Environment.h" #import "NotificationsManager.h" diff --git a/Signal/src/call/RecentCall.h b/Signal/src/call/RecentCall.h index 361857db0..968191c5a 100644 --- a/Signal/src/call/RecentCall.h +++ b/Signal/src/call/RecentCall.h @@ -2,7 +2,7 @@ #import #import #import "Contact.h" -#import "ContactsManager.h" +#import "OWSContactsManager.h" #import "PhoneNumber.h" /** diff --git a/Signal/src/contact/ContactsManager.h b/Signal/src/contact/OWSContactsManager.h similarity index 71% rename from Signal/src/contact/ContactsManager.h rename to Signal/src/contact/OWSContactsManager.h index 911f30d8e..a662a25bb 100644 --- a/Signal/src/contact/ContactsManager.h +++ b/Signal/src/contact/OWSContactsManager.h @@ -7,13 +7,7 @@ #import "ObservableValue.h" /** - * - * ContactsManager provides access to an updated list of contacts with optional categorizations - - * such as searching and favourite-attributed contacts (favourites are also managed through this class) - * Others can subscribe for contact and/or favourite updates - * Contacts can be grouped by first letter into an NSDictionary in order to display in individual sections- - * in the ContactBrowseViewController. - * + Get latest Signal contacts, and be notified when they change. */ #define SIGNAL_LIST_UPDATED @"Signal_AB_UPDATED" @@ -21,7 +15,7 @@ typedef void (^ABAccessRequestCompletionBlock)(BOOL hasAccess); typedef void (^ABReloadRequestCompletionBlock)(NSArray *contacts); -@interface ContactsManager : NSObject +@interface OWSContactsManager : NSObject @property CNContactStore *contactStore; diff --git a/Signal/src/contact/ContactsManager.m b/Signal/src/contact/OWSContactsManager.m similarity index 97% rename from Signal/src/contact/ContactsManager.m rename to Signal/src/contact/OWSContactsManager.m index af1b957b9..5295821f8 100644 --- a/Signal/src/contact/ContactsManager.m +++ b/Signal/src/contact/OWSContactsManager.m @@ -1,4 +1,4 @@ -#import "ContactsManager.h" +#import "OWSContactsManager.h" #import "ContactsUpdater.h" #import "Environment.h" #import "Util.h" @@ -7,7 +7,7 @@ typedef BOOL (^ContactSearchBlock)(id, NSUInteger, BOOL *); -@interface ContactsManager () +@interface OWSContactsManager () @property id addressBookReference; @property TOCFuture *futureAddressBook; @@ -17,7 +17,7 @@ typedef BOOL (^ContactSearchBlock)(id, NSUInteger, BOOL *); @end -@implementation ContactsManager +@implementation OWSContactsManager - (void)dealloc { [_life cancel]; @@ -65,7 +65,7 @@ typedef BOOL (^ContactSearchBlock)(id, NSUInteger, BOOL *); void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef info, void *context); void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef info, void *context) { - ContactsManager *contactsManager = (__bridge ContactsManager *)context; + OWSContactsManager *contactsManager = (__bridge OWSContactsManager *)context; dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ [contactsManager pullLatestAddressBook]; [contactsManager intersectContacts]; @@ -76,7 +76,7 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in - (void)setupAddressBook { dispatch_async(ADDRESSBOOK_QUEUE, ^{ - [[ContactsManager asyncGetAddressBook] thenDo:^(id addressBook) { + [[OWSContactsManager asyncGetAddressBook] thenDo:^(id addressBook) { self.addressBookReference = addressBook; ABAddressBookRef cfAddressBook = (__bridge ABAddressBookRef)addressBook; ABAddressBookRegisterExternalChangeCallback(cfAddressBook, onAddressBookChanged, (__bridge void *)self); @@ -107,7 +107,7 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in checkOperationDescribe(nil == creationError, [((__bridge NSError *)creationError)localizedDescription]); ABAddressBookRequestAccessWithCompletion(addressBookRef, ^(bool granted, CFErrorRef error) { if (!granted) { - [ContactsManager blockingContactDialog]; + [OWSContactsManager blockingContactDialog]; } }); [self.observableContactsController updateValue:[self getContactsFromAddressBook:addressBookRef]]; @@ -115,7 +115,7 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in - (void)setupLatestContacts:(NSArray *)contacts { if (contacts) { - self.latestContactsById = [ContactsManager keyContactsById:contacts]; + self.latestContactsById = [OWSContactsManager keyContactsById:contacts]; } } @@ -250,7 +250,7 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in - (NSArray *)latestContactsWithSearchString:(NSString *)searchString { return [self.latestContactsById.allValues filter:^int(Contact *contact) { - return searchString.length == 0 || [ContactsManager name:contact.fullName matchesQuery:searchString]; + return searchString.length == 0 || [OWSContactsManager name:contact.fullName matchesQuery:searchString]; }]; } diff --git a/Signal/src/environment/Environment.h b/Signal/src/environment/Environment.h index 806e67ddb..5779f06b8 100644 --- a/Signal/src/environment/Environment.h +++ b/Signal/src/environment/Environment.h @@ -25,7 +25,7 @@ static NSString *const kCallSegue = @"2.0_6.0_Call_Segue"; #define TESTING_OPTION_USE_DH_FOR_HANDSHAKE @"DhKeyAgreementOnly" @class RecentCallManager; -@class ContactsManager; +@class OWSContactsManager; @class PhoneManager; @class SignalsViewController; @class TSGroupThread; @@ -44,7 +44,7 @@ static NSString *const kCallSegue = @"2.0_6.0_Call_Segue"; @property (nonatomic, readonly) NSArray *testingAndLegacyOptions; @property (nonatomic, readonly) NSData *zrtpClientId; @property (nonatomic, readonly) NSData *zrtpVersionId; -@property (nonatomic, readonly) ContactsManager *contactsManager; +@property (nonatomic, readonly) OWSContactsManager *contactsManager; @property (nonatomic, readonly) SignalsViewController *signalsViewController; @property (nonatomic, readonly, weak) UINavigationController *signUpFlowNavigationController; @@ -66,7 +66,7 @@ static NSString *const kCallSegue = @"2.0_6.0_Call_Segue"; andTestingAndLegacyOptions:(NSArray *)testingAndLegacyOptions andZrtpClientId:(NSData *)zrtpClientId andZrtpVersionId:(NSData *)zrtpVersionId - andContactsManager:(ContactsManager *)contactsManager; + andContactsManager:(OWSContactsManager *)contactsManager; + (Environment *)getCurrent; + (void)setCurrent:(Environment *)curEnvironment; diff --git a/Signal/src/environment/Environment.m b/Signal/src/environment/Environment.m index 7c43fd6fd..01f1d00a9 100644 --- a/Signal/src/environment/Environment.m +++ b/Signal/src/environment/Environment.m @@ -67,7 +67,7 @@ static Environment *environment = nil; andTestingAndLegacyOptions:(NSArray *)testingAndLegacyOptions andZrtpClientId:(NSData *)zrtpClientId andZrtpVersionId:(NSData *)zrtpVersionId - andContactsManager:(ContactsManager *)contactsManager { + andContactsManager:(OWSContactsManager *)contactsManager { ows_require(errorNoter != nil); ows_require(zrtpClientId != nil); ows_require(zrtpVersionId != nil); diff --git a/Signal/src/environment/Release.m b/Signal/src/environment/Release.m index ef241cb8e..45ccb9c28 100644 --- a/Signal/src/environment/Release.m +++ b/Signal/src/environment/Release.m @@ -58,7 +58,7 @@ static unsigned char DH3K_PRIME[] = { ] andZrtpClientId:RELEASE_ZRTP_CLIENT_ID andZrtpVersionId:RELEASE_ZRTP_VERSION_ID - andContactsManager:[ContactsManager new]]; + andContactsManager:[OWSContactsManager new]]; } + (Environment *)stagingEnvironmentWithLogging:(id)logging { @@ -82,7 +82,7 @@ static unsigned char DH3K_PRIME[] = { ] andZrtpClientId:RELEASE_ZRTP_CLIENT_ID andZrtpVersionId:RELEASE_ZRTP_VERSION_ID - andContactsManager:[ContactsManager new]]; + andContactsManager:[OWSContactsManager new]]; } + (Environment *)unitTestEnvironment:(NSArray *)testingAndLegacyOptions { diff --git a/Signal/src/network/PushManager.m b/Signal/src/network/PushManager.m index 601be9791..0791ed3a3 100644 --- a/Signal/src/network/PushManager.m +++ b/Signal/src/network/PushManager.m @@ -9,7 +9,7 @@ #import #import "AppDelegate.h" -#import "ContactsManager.h" +#import "OWSContactsManager.h" #import "InCallViewController.h" #import "NSData+ows_StripToken.h" #import "NSDate+millisecondTimeStamp.h" diff --git a/Signal/src/phone/signaling/number directory/GroupContactsResult.m b/Signal/src/phone/signaling/number directory/GroupContactsResult.m index 159764233..4798cab53 100644 --- a/Signal/src/phone/signaling/number directory/GroupContactsResult.m +++ b/Signal/src/phone/signaling/number directory/GroupContactsResult.m @@ -10,7 +10,7 @@ #import #import "Contact.h" -#import "ContactsManager.h" +#import "OWSContactsManager.h" #import "Environment.h" #import "SignalKeyingStorage.h" @@ -28,7 +28,7 @@ - (instancetype)initWithMembersId:(NSArray *)memberIdentifiers without:(NSArray *)removeIds { self = [super init]; - ContactsManager *manager = [Environment.getCurrent contactsManager]; + OWSContactsManager *manager = [Environment.getCurrent contactsManager]; NSMutableSet *remainingNumbers = [NSMutableSet setWithArray:memberIdentifiers]; diff --git a/Signal/src/view controllers/CodeVerificationViewController.m b/Signal/src/view controllers/CodeVerificationViewController.m index 2564c694f..1a8a3524e 100644 --- a/Signal/src/view controllers/CodeVerificationViewController.m +++ b/Signal/src/view controllers/CodeVerificationViewController.m @@ -9,7 +9,7 @@ #import "CodeVerificationViewController.h" #import -#import "ContactsManager.h" +#import "OWSContactsManager.h" #import "Environment.h" #import "LocalizableText.h" #import "PushManager.h" diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m index 88e91352a..8ca7c919a 100644 --- a/Signal/src/view controllers/MessagesViewController.m +++ b/Signal/src/view controllers/MessagesViewController.m @@ -14,7 +14,7 @@ #import #import #import -#import "ContactsManager.h" +#import "OWSContactsManager.h" #import "DJWActionSheet+OWS.h" #import "Environment.h" #import "FingerprintViewController.h" diff --git a/Signal/src/view controllers/NewGroupViewController.m b/Signal/src/view controllers/NewGroupViewController.m index 62e10aeda..00e6d6b68 100644 --- a/Signal/src/view controllers/NewGroupViewController.m +++ b/Signal/src/view controllers/NewGroupViewController.m @@ -11,7 +11,7 @@ #import #import #import -#import "ContactsManager.h" +#import "OWSContactsManager.h" #import "DJWActionSheet+OWS.h" #import "Environment.h" #import "FunctionalUtil.h" diff --git a/Signal/src/view controllers/SettingsTableViewController.m b/Signal/src/view controllers/SettingsTableViewController.m index 319cb1c87..c38034960 100644 --- a/Signal/src/view controllers/SettingsTableViewController.m +++ b/Signal/src/view controllers/SettingsTableViewController.m @@ -17,7 +17,7 @@ #import "TSSocketManager.h" -#import "ContactsManager.h" +#import "OWSContactsManager.h" #import "AboutTableViewController.h" #import "AdvancedSettingsTableViewController.h" diff --git a/Signal/src/view controllers/ShowGroupMembersViewController.m b/Signal/src/view controllers/ShowGroupMembersViewController.m index 3fb083c49..14bc20476 100644 --- a/Signal/src/view controllers/ShowGroupMembersViewController.m +++ b/Signal/src/view controllers/ShowGroupMembersViewController.m @@ -11,7 +11,7 @@ #import "SignalsViewController.h" -#import "ContactsManager.h" +#import "OWSContactsManager.h" #import "Environment.h" #import "GroupContactsResult.h" diff --git a/Signal/src/view controllers/SignalsViewController.m b/Signal/src/view controllers/SignalsViewController.m index 3862eb04c..15116f40b 100644 --- a/Signal/src/view controllers/SignalsViewController.m +++ b/Signal/src/view controllers/SignalsViewController.m @@ -9,7 +9,7 @@ #import "InboxTableViewCell.h" #import "UIUtil.h" -#import "ContactsManager.h" +#import "OWSContactsManager.h" #import "InCallViewController.h" #import "MessagesViewController.h" #import "NSDate+millisecondTimeStamp.h" diff --git a/Signal/src/views/ContactTableViewCell.h b/Signal/src/views/ContactTableViewCell.h index d2c19873e..80e5fe842 100644 --- a/Signal/src/views/ContactTableViewCell.h +++ b/Signal/src/views/ContactTableViewCell.h @@ -1,5 +1,5 @@ #import -#import "ContactsManager.h" +#import "OWSContactsManager.h" /** * diff --git a/Signal/test/contact/ContactManagerTest.m b/Signal/test/contact/ContactManagerTest.m deleted file mode 100644 index c7740f248..000000000 --- a/Signal/test/contact/ContactManagerTest.m +++ /dev/null @@ -1,29 +0,0 @@ -#import -#import "TestUtil.h" -#import "ContactsManager.h" - -@interface ContactManagerTest : XCTestCase - -@end - -@implementation ContactManagerTest - -- (void)testQueryMatching { - test([ContactsManager name:@"big dave" matchesQuery:@"big dave"]); - test([ContactsManager name:@"big dave" matchesQuery:@"dave big"]); - test([ContactsManager name:@"big dave" matchesQuery:@"dave"]); - test([ContactsManager name:@"big dave" matchesQuery:@"big"]); - test([ContactsManager name:@"big dave" matchesQuery:@"big "]); - test([ContactsManager name:@"big dave" matchesQuery:@" big "]); - test([ContactsManager name:@"big dave" matchesQuery:@"dav"]); - test([ContactsManager name:@"big dave" matchesQuery:@"bi dav"]); - test([ContactsManager name:@"big dave" matchesQuery:@"big big big big big big big big big big dave dave dave dave dave"]); - - test(![ContactsManager name:@"big dave" matchesQuery:@"ave"]); - test(![ContactsManager name:@"big dave" matchesQuery:@"dare"]); - test(![ContactsManager name:@"big dave" matchesQuery:@"mike"]); - test(![ContactsManager name:@"big dave" matchesQuery:@"mike"]); - test(![ContactsManager name:@"dave" matchesQuery:@"big"]); -} - -@end diff --git a/Signal/test/contact/OWSContactsManagerTest.m b/Signal/test/contact/OWSContactsManagerTest.m new file mode 100644 index 000000000..9efc7ab55 --- /dev/null +++ b/Signal/test/contact/OWSContactsManagerTest.m @@ -0,0 +1,30 @@ +#import +#import "TestUtil.h" +#import "OWSContactsManager.h" + +@interface OWSContactsManagerTest : XCTestCase + +@end + + +@implementation OWSContactsManagerTest + +- (void)testQueryMatching { + test([OWSContactsManager name:@"big dave" matchesQuery:@"big dave"]); + test([OWSContactsManager name:@"big dave" matchesQuery:@"dave big"]); + test([OWSContactsManager name:@"big dave" matchesQuery:@"dave"]); + test([OWSContactsManager name:@"big dave" matchesQuery:@"big"]); + test([OWSContactsManager name:@"big dave" matchesQuery:@"big "]); + test([OWSContactsManager name:@"big dave" matchesQuery:@" big "]); + test([OWSContactsManager name:@"big dave" matchesQuery:@"dav"]); + test([OWSContactsManager name:@"big dave" matchesQuery:@"bi dav"]); + test([OWSContactsManager name:@"big dave" matchesQuery:@"big big big big big big big big big big dave dave dave dave dave"]); + + test(![OWSContactsManager name:@"big dave" matchesQuery:@"ave"]); + test(![OWSContactsManager name:@"big dave" matchesQuery:@"dare"]); + test(![OWSContactsManager name:@"big dave" matchesQuery:@"mike"]); + test(![OWSContactsManager name:@"big dave" matchesQuery:@"mike"]); + test(![OWSContactsManager name:@"dave" matchesQuery:@"big"]); +} + +@end