Add SignalAccount class.

// FREEBIE
pull/1/head
Matthew Chen 9 years ago
parent e3c9598122
commit cd9e1fb574

@ -28,6 +28,7 @@ typedef NS_ENUM(NSUInteger, OWSPhoneNumberType) {
@class CNContact; @class CNContact;
@class PhoneNumber; @class PhoneNumber;
@class UIImage; @class UIImage;
@class SignalRecipient;
@interface Contact : NSObject @interface Contact : NSObject
@ -47,6 +48,8 @@ typedef NS_ENUM(NSUInteger, OWSPhoneNumberType) {
#endif // TARGET_OS_IOS #endif // TARGET_OS_IOS
- (BOOL)isSignalContact; - (BOOL)isSignalContact;
- (NSArray<SignalRecipient *> *)signalRecipients;
// TODO: Remove this method.
- (NSArray<NSString *> *)textSecureIdentifiers; - (NSArray<NSString *> *)textSecureIdentifiers;
#if TARGET_OS_IOS #if TARGET_OS_IOS

@ -202,6 +202,22 @@ NS_ASSUME_NONNULL_BEGIN
return [identifiers count] > 0; return [identifiers count] > 0;
} }
- (NSArray<SignalRecipient *> *)signalRecipients
{
__block NSMutableArray *result = [NSMutableArray array];
[[TSStorageManager sharedManager].dbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
for (PhoneNumber *number in [self.parsedPhoneNumbers sortedArrayUsingSelector:@selector(compare:)]) {
SignalRecipient *signalRecipient =
[SignalRecipient recipientWithTextSecureIdentifier:number.toE164 withTransaction:transaction];
if (signalRecipient) {
[result addObject:signalRecipient];
}
}
}];
return [result copy];
}
- (NSArray<NSString *> *)textSecureIdentifiers { - (NSArray<NSString *> *)textSecureIdentifiers {
__block NSMutableArray *identifiers = [NSMutableArray array]; __block NSMutableArray *identifiers = [NSMutableArray array];

@ -50,4 +50,6 @@
- (BOOL)isValid; - (BOOL)isValid;
- (BOOL)resolvesInternationallyTo:(PhoneNumber *)otherPhoneNumber; - (BOOL)resolvesInternationallyTo:(PhoneNumber *)otherPhoneNumber;
- (NSComparisonResult)compare:(PhoneNumber *)other;
@end @end

@ -257,4 +257,9 @@ static NSString *const RPDefaultsKeyPhoneNumberCanonical = @"RPDefaultsKeyPhoneN
return self; return self;
} }
- (NSComparisonResult)compare:(PhoneNumber *)other
{
return [self.toE164 compare:other.toE164];
}
@end @end

@ -1,6 +1,5 @@
// // Created by Frederic Jacobs on 28/10/14.
// Copyright (c) 2017 Open Whisper Systems. All rights reserved. // Copyright (c) 2014 Open Whisper Systems. All rights reserved.
//
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
@class TSNumberVerifier; @class TSNumberVerifier;
@ -22,11 +21,11 @@ typedef enum { kSMSVerification, kPhoneNumberVerification } VerificationTranspor
#define textSecureHTTPTimeOut 10 #define textSecureHTTPTimeOut 10
//#define textSecureWebSocketAPI @"wss://textsecure-service.whispersystems.org/v1/websocket/" #define textSecureWebSocketAPI @"wss://textsecure-service.whispersystems.org/v1/websocket/"
//#define textSecureServerURL @"https://textsecure-service.whispersystems.org/" #define textSecureServerURL @"https://textsecure-service.whispersystems.org/"
#define textSecureWebSocketAPI @"wss://textsecure-service-staging.whispersystems.org/v1/websocket/" //#define textSecureWebSocketAPI @"wss://textsecure-service-staging.whispersystems.org/v1/websocket/"
#define textSecureServerURL @"https://textsecure-service-staging.whispersystems.org/" //#define textSecureServerURL @"https://textsecure-service-staging.whispersystems.org/"
#define textSecureGeneralAPI @"v1" #define textSecureGeneralAPI @"v1"
#define textSecureAccountsAPI @"v1/accounts" #define textSecureAccountsAPI @"v1/accounts"

Loading…
Cancel
Save