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

sync verification state with contacts

Browse Source 
// FREEBIE
pull/1/head
Michael Kirk 8 years ago
parent 48b3f498a9
commit f653bc36a8
6 changed files with 87 additions and 55 deletions
Show Stats Download Patch File Download Diff File

4
src/Devices/OWSContactsOutputStream.h
Unescape Escape View File

@ -7,10 +7,12 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@class SignalAccount; @class SignalAccount;
@class OWSRecipientIdentity;
@interface OWSContactsOutputStream : OWSChunkedOutputStream @interface OWSContactsOutputStream : OWSChunkedOutputStream
- (void)writeSignalAccount:(SignalAccount *)signalAccount; - (void)writeSignalAccount:(SignalAccount *)signalAccount
recipientIdentity:(OWSRecipientIdentity *)recipientIdentity;
@end @end

14
src/Devices/OWSContactsOutputStream.m
Unescape Escape View File

@ -7,6 +7,7 @@
#import "MIMETypeUtil.h" #import "MIMETypeUtil.h"
#import "OWSSignalServiceProtos.pb.h" #import "OWSSignalServiceProtos.pb.h"
#import "SignalAccount.h" #import "SignalAccount.h"
#import "OWSRecipientIdentity.h"
#import <ProtocolBuffers/CodedOutputStream.h> #import <ProtocolBuffers/CodedOutputStream.h>
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@ -14,6 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
@implementation OWSContactsOutputStream @implementation OWSContactsOutputStream
- (void)writeSignalAccount:(SignalAccount *)signalAccount - (void)writeSignalAccount:(SignalAccount *)signalAccount
recipientIdentity:(OWSRecipientIdentity *)recipientIdentity
{ {
OWSAssert(signalAccount); OWSAssert(signalAccount);
OWSAssert(signalAccount.contact); OWSAssert(signalAccount.contact);
@ -21,7 +23,17 @@ NS_ASSUME_NONNULL_BEGIN
OWSSignalServiceProtosContactDetailsBuilder *contactBuilder = [OWSSignalServiceProtosContactDetailsBuilder new]; OWSSignalServiceProtosContactDetailsBuilder *contactBuilder = [OWSSignalServiceProtosContactDetailsBuilder new];
[contactBuilder setName:signalAccount.contact.fullName]; [contactBuilder setName:signalAccount.contact.fullName];
[contactBuilder setNumber:signalAccount.recipientId]; [contactBuilder setNumber:signalAccount.recipientId];
// Don't sync default or no-longer-verified state in contact sync.
if (recipientIdentity.verificationState == OWSVerificationStateVerified) {
OWSSignalServiceProtosVerifiedBuilder *verifiedBuilder = [OWSSignalServiceProtosVerifiedBuilder new];
verifiedBuilder.state = OWSSignalServiceProtosVerifiedStateVerified;
verifiedBuilder.destination = recipientIdentity.recipientId;
verifiedBuilder.identityKey = recipientIdentity.identityKey;
// TODO do we need to set null message here?
contactBuilder.verified = [verifiedBuilder build];
}
NSData *avatarPng; NSData *avatarPng;
if (signalAccount.contact.image) { if (signalAccount.contact.image) {
OWSSignalServiceProtosContactDetailsAvatarBuilder *avatarBuilder = OWSSignalServiceProtosContactDetailsAvatarBuilder *avatarBuilder =

9
src/Messages/DeviceSyncing/OWSSyncContactsMessage.h
Unescape Escape View File

@ -1,4 +1,6 @@
// Copyright © 2016 Open Whisper Systems. All rights reserved. //
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
//
#import "OWSOutgoingSyncMessage.h" #import "OWSOutgoingSyncMessage.h"
@ -6,10 +8,13 @@ NS_ASSUME_NONNULL_BEGIN
@class YapDatabaseReadWriteTransaction; @class YapDatabaseReadWriteTransaction;
@protocol ContactsManagerProtocol; @protocol ContactsManagerProtocol;
@class OWSIdentityManager;
@interface OWSSyncContactsMessage : OWSOutgoingSyncMessage @interface OWSSyncContactsMessage : OWSOutgoingSyncMessage
- (instancetype)initWithContactsManager:(id<ContactsManagerProtocol>)contactsManager; - (instancetype)initWithContactsManager:(id<ContactsManagerProtocol>)contactsManager
identityManager:(OWSIdentityManager *)identityManager;
- (NSData *)buildPlainTextAttachmentData; - (NSData *)buildPlainTextAttachmentData;
@end @end

8
src/Messages/DeviceSyncing/OWSSyncContactsMessage.m
Unescape Escape View File

@ -8,6 +8,7 @@
#import "NSDate+millisecondTimeStamp.h" #import "NSDate+millisecondTimeStamp.h"
#import "OWSContactsOutputStream.h" #import "OWSContactsOutputStream.h"
#import "OWSSignalServiceProtos.pb.h" #import "OWSSignalServiceProtos.pb.h"
#import "OWSIdentityManager.h"
#import "SignalAccount.h" #import "SignalAccount.h"
#import "TSAttachment.h" #import "TSAttachment.h"
#import "TSAttachmentStream.h" #import "TSAttachmentStream.h"
@ -17,12 +18,14 @@ NS_ASSUME_NONNULL_BEGIN
@interface OWSSyncContactsMessage () @interface OWSSyncContactsMessage ()
@property (nonatomic, readonly) id<ContactsManagerProtocol> contactsManager; @property (nonatomic, readonly) id<ContactsManagerProtocol> contactsManager;
@property (nonatomic, readonly) OWSIdentityManager *identityManager;
@end @end
@implementation OWSSyncContactsMessage @implementation OWSSyncContactsMessage
- (instancetype)initWithContactsManager:(id<ContactsManagerProtocol>)contactsManager - (instancetype)initWithContactsManager:(id<ContactsManagerProtocol>)contactsManager
identityManager:(OWSIdentityManager *)identityManager
{ {
self = [super initWithTimestamp:[NSDate ows_millisecondTimeStamp]]; self = [super initWithTimestamp:[NSDate ows_millisecondTimeStamp]];
if (!self) { if (!self) {
@ -30,6 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
} }
_contactsManager = contactsManager; _contactsManager = contactsManager;
_identityManager = identityManager;
return self; return self;
} }
@ -66,7 +70,9 @@ NS_ASSUME_NONNULL_BEGIN
OWSContactsOutputStream *contactsOutputStream = [OWSContactsOutputStream streamWithOutputStream:dataOutputStream]; OWSContactsOutputStream *contactsOutputStream = [OWSContactsOutputStream streamWithOutputStream:dataOutputStream];
for (SignalAccount *signalAccount in self.contactsManager.signalAccounts) { for (SignalAccount *signalAccount in self.contactsManager.signalAccounts) {
[contactsOutputStream writeSignalAccount:signalAccount]; OWSRecipientIdentity *recipientIdentity = [self.identityManager recipientIdentityForRecipientId:signalAccount.recipientId];
[contactsOutputStream writeSignalAccount:signalAccount recipientIdentity:recipientIdentity];
} }
[contactsOutputStream flush]; [contactsOutputStream flush];

86
src/Messages/OWSIdentityManager.m
Unescape Escape View File

@ -500,49 +500,49 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
}); });
} }
- (void)syncAllVerificationStates //- (void)syncAllVerificationStates
{ //{
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ // dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
@synchronized(self) // @synchronized(self)
{ // {
//
NSMutableArray<OWSVerificationStateSyncMessage *> *messages = [NSMutableArray new]; // NSMutableArray<OWSVerificationStateSyncMessage *> *messages = [NSMutableArray new];
[OWSRecipientIdentity enumerateCollectionObjectsUsingBlock:^(OWSRecipientIdentity *recipientIdentity, BOOL *stop) { // [OWSRecipientIdentity enumerateCollectionObjectsUsingBlock:^(OWSRecipientIdentity *recipientIdentity, BOOL *stop) {
OWSAssert(recipientIdentity); // OWSAssert(recipientIdentity);
OWSAssert(recipientIdentity.recipientId.length > 0); // OWSAssert(recipientIdentity.recipientId.length > 0);
OWSAssert(recipientIdentity.identityKey.length == kStoredIdentityKeyLength); // OWSAssert(recipientIdentity.identityKey.length == kStoredIdentityKeyLength);
//
if (recipientIdentity.recipientId.length < 1) { // if (recipientIdentity.recipientId.length < 1) {
OWSFail(@"Invalid recipient identity for recipientId: %@", recipientIdentity.recipientId); // OWSFail(@"Invalid recipient identity for recipientId: %@", recipientIdentity.recipientId);
return; // return;
} // }
//
// Prepend key type for transit. // // Prepend key type for transit.
// TODO we should just be storing the key type so we don't have to juggle re-adding it. // // TODO we should just be storing the key type so we don't have to juggle re-adding it.
NSData *identityKey = [recipientIdentity.identityKey prependKeyType]; // NSData *identityKey = [recipientIdentity.identityKey prependKeyType];
if (identityKey.length != kIdentityKeyLength) { // if (identityKey.length != kIdentityKeyLength) {
OWSFail(@"Invalid recipient identitykey for recipientId: %@ key: %@", // OWSFail(@"Invalid recipient identitykey for recipientId: %@ key: %@",
recipientIdentity.recipientId, // recipientIdentity.recipientId,
identityKey); // identityKey);
return; // return;
} // }
//
OWSVerificationStateSyncMessage *message = [[OWSVerificationStateSyncMessage alloc] // OWSVerificationStateSyncMessage *message = [[OWSVerificationStateSyncMessage alloc]
initWithVerificationState:recipientIdentity.verificationState // initWithVerificationState:recipientIdentity.verificationState
identityKey:identityKey // identityKey:identityKey
verificationForRecipientId:recipientIdentity.recipientId]; // verificationForRecipientId:recipientIdentity.recipientId];
[messages addObject:message]; // [messages addObject:message];
}]; // }];
if (messages.count > 0) { // if (messages.count > 0) {
dispatch_async(dispatch_get_main_queue(), ^{ // dispatch_async(dispatch_get_main_queue(), ^{
for (OWSVerificationStateSyncMessage *message in messages) { // for (OWSVerificationStateSyncMessage *message in messages) {
[self sendSyncVerificationStateMessage:message]; // [self sendSyncVerificationStateMessage:message];
} // }
}); // });
} // }
} // }
}); // });
} //}
- (void)sendSyncVerificationStateMessage:(OWSVerificationStateSyncMessage *)message - (void)sendSyncVerificationStateMessage:(OWSVerificationStateSyncMessage *)message
{ {

21
src/Messages/TSMessagesManager.m
Unescape Escape View File

@ -50,6 +50,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, readonly) OWSMessageSender *messageSender; @property (nonatomic, readonly) OWSMessageSender *messageSender;
@property (nonatomic, readonly) OWSIncomingMessageFinder *incomingMessageFinder; @property (nonatomic, readonly) OWSIncomingMessageFinder *incomingMessageFinder;
@property (nonatomic, readonly) OWSBlockingManager *blockingManager; @property (nonatomic, readonly) OWSBlockingManager *blockingManager;
@property (nonatomic, readonly) OWSIdentityManager *identityManager;
@end @end
@ -73,13 +74,16 @@ NS_ASSUME_NONNULL_BEGIN
id<ContactsManagerProtocol> contactsManager = [TextSecureKitEnv sharedEnv].contactsManager; id<ContactsManagerProtocol> contactsManager = [TextSecureKitEnv sharedEnv].contactsManager;
id<OWSCallMessageHandler> callMessageHandler = [TextSecureKitEnv sharedEnv].callMessageHandler; id<OWSCallMessageHandler> callMessageHandler = [TextSecureKitEnv sharedEnv].callMessageHandler;
ContactsUpdater *contactsUpdater = [ContactsUpdater sharedUpdater]; ContactsUpdater *contactsUpdater = [ContactsUpdater sharedUpdater];
OWSIdentityManager *identityManager = [OWSIdentityManager sharedManager];
OWSMessageSender *messageSender = [TextSecureKitEnv sharedEnv].messageSender; OWSMessageSender *messageSender = [TextSecureKitEnv sharedEnv].messageSender;
return [self initWithNetworkManager:networkManager return [self initWithNetworkManager:networkManager
storageManager:storageManager storageManager:storageManager
callMessageHandler:callMessageHandler callMessageHandler:callMessageHandler
contactsManager:contactsManager contactsManager:contactsManager
contactsUpdater:contactsUpdater contactsUpdater:contactsUpdater
identityManager:identityManager
messageSender:messageSender]; messageSender:messageSender];
} }
@ -88,6 +92,7 @@ NS_ASSUME_NONNULL_BEGIN
callMessageHandler:(id<OWSCallMessageHandler>)callMessageHandler callMessageHandler:(id<OWSCallMessageHandler>)callMessageHandler
contactsManager:(id<ContactsManagerProtocol>)contactsManager contactsManager:(id<ContactsManagerProtocol>)contactsManager
contactsUpdater:(ContactsUpdater *)contactsUpdater contactsUpdater:(ContactsUpdater *)contactsUpdater
identityManager:(OWSIdentityManager *)identityManager
messageSender:(OWSMessageSender *)messageSender messageSender:(OWSMessageSender *)messageSender
{ {
self = [super init]; self = [super init];
@ -101,6 +106,7 @@ NS_ASSUME_NONNULL_BEGIN
_callMessageHandler = callMessageHandler; _callMessageHandler = callMessageHandler;
_contactsManager = contactsManager; _contactsManager = contactsManager;
_contactsUpdater = contactsUpdater; _contactsUpdater = contactsUpdater;
_identityManager = identityManager;
_messageSender = messageSender; _messageSender = messageSender;
_dbConnection = storageManager.newDatabaseConnection; _dbConnection = storageManager.newDatabaseConnection;
@ -364,7 +370,7 @@ NS_ASSUME_NONNULL_BEGIN
SessionCipher *cipher = [[SessionCipher alloc] initWithSessionStore:storageManager SessionCipher *cipher = [[SessionCipher alloc] initWithSessionStore:storageManager
preKeyStore:storageManager preKeyStore:storageManager
signedPreKeyStore:storageManager signedPreKeyStore:storageManager
identityKeyStore:[OWSIdentityManager sharedManager] identityKeyStore:self.identityManager
recipientId:recipientId recipientId:recipientId
deviceId:deviceId]; deviceId:deviceId];
@ -416,7 +422,7 @@ NS_ASSUME_NONNULL_BEGIN
SessionCipher *cipher = [[SessionCipher alloc] initWithSessionStore:storageManager SessionCipher *cipher = [[SessionCipher alloc] initWithSessionStore:storageManager
preKeyStore:storageManager preKeyStore:storageManager
signedPreKeyStore:storageManager signedPreKeyStore:storageManager
identityKeyStore:[OWSIdentityManager sharedManager] identityKeyStore:self.identityManager
recipientId:recipientId recipientId:recipientId
deviceId:deviceId]; deviceId:deviceId];
@ -450,7 +456,7 @@ NS_ASSUME_NONNULL_BEGIN
sourceId:envelope.source sourceId:envelope.source
sourceDeviceId:envelope.sourceDevice]; sourceDeviceId:envelope.sourceDevice];
if (duplicateEnvelope) { if (duplicateEnvelope) {
DDLogInfo(@"%@ Ignoring previously received envelope with timestamp: %llu", self.tag, envelope.timestamp); DDLogInfo(@"%@ Ignoring previously received envelope from %@.%d with timestamp: %llu", self.tag, envelope.source, (unsigned int)envelope.sourceDevice, envelope.timestamp);
return; return;
} }
@ -649,7 +655,8 @@ NS_ASSUME_NONNULL_BEGIN
} else if (syncMessage.hasRequest) { } else if (syncMessage.hasRequest) {
if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeContacts) { if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeContacts) {
OWSSyncContactsMessage *syncContactsMessage = OWSSyncContactsMessage *syncContactsMessage =
[[OWSSyncContactsMessage alloc] initWithContactsManager:self.contactsManager]; [[OWSSyncContactsMessage alloc] initWithContactsManager:self.contactsManager
identityManager:self.identityManager];
[self.messageSender sendTemporaryAttachmentData:[syncContactsMessage buildPlainTextAttachmentData] [self.messageSender sendTemporaryAttachmentData:[syncContactsMessage buildPlainTextAttachmentData]
contentType:OWSMimeTypeApplicationOctetStream contentType:OWSMimeTypeApplicationOctetStream
@ -661,8 +668,8 @@ NS_ASSUME_NONNULL_BEGIN
DDLogError(@"%@ Failed to send Contacts response syncMessage with error: %@", self.tag, error); DDLogError(@"%@ Failed to send Contacts response syncMessage with error: %@", self.tag, error);
}]; }];
// Also sync all verification state after syncing contacts. // // Also sync all verification state after syncing contacts.
[[OWSIdentityManager sharedManager] syncAllVerificationStates]; // [[OWSIdentityManager sharedManager] syncAllVerificationStates];
} else if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeGroups) { } else if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeGroups) {
OWSSyncGroupsMessage *syncGroupsMessage = [[OWSSyncGroupsMessage alloc] init]; OWSSyncGroupsMessage *syncGroupsMessage = [[OWSSyncGroupsMessage alloc] init];
@ -690,7 +697,7 @@ NS_ASSUME_NONNULL_BEGIN
[readReceiptsProcessor process]; [readReceiptsProcessor process];
} else if (syncMessage.hasVerified) { } else if (syncMessage.hasVerified) {
DDLogInfo(@"%@ Received verification state for %@", self.tag, syncMessage.verified.destination); DDLogInfo(@"%@ Received verification state for %@", self.tag, syncMessage.verified.destination);
[[OWSIdentityManager sharedManager] processIncomingSyncMessage:syncMessage.verified]; [self.identityManager processIncomingSyncMessage:syncMessage.verified];
} else { } else {
DDLogWarn(@"%@ Ignoring unsupported sync message.", self.tag); DDLogWarn(@"%@ Ignoring unsupported sync message.", self.tag);
} }

Write Preview
Loading…
Cancel
Save