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

cleanup ahead of PR

Browse Source 
synchronize/dispatch when dequeuing verification sync messages

// FREEBIE
pull/1/head
Michael Kirk 8 years ago
parent d927cba5ce
commit a5660f4db4
7 changed files with 13 additions and 142 deletions
Show Stats Download Patch File Download Diff File

3
src/Devices/OWSVerificationStateSyncMessage.h
Unescape Escape View File

@ -13,9 +13,6 @@ NS_ASSUME_NONNULL_BEGIN
identityKey:(NSData *)identityKey
verificationForRecipientId:(NSString *)recipientId;
//// Returns the list of recipient ids referenced in this message.
//- (NSArray<NSString *> *)recipientIds;
// This is a clunky name, but we want to differentiate it from `recipientIdentifier` inherited from `TSOutgoingMessage`
@property (nonatomic, readonly) NSString *verificationForRecipientId;

60
src/Devices/OWSVerificationStateSyncMessage.m
Unescape Escape View File

@ -9,25 +9,10 @@
NS_ASSUME_NONNULL_BEGIN
//@interface OWSVerificationStateTuple : NSObject
//
//@property (nonatomic) OWSVerificationState verificationState;
//@property (nonatomic) NSData *identityKey;
//@property (nonatomic) NSString *recipientId;
//
//@end
//
//#pragma mark -
//
//@implementation OWSVerificationStateTuple
//
//@end
#pragma mark -
@interface OWSVerificationStateSyncMessage ()
//@property (nonatomic, readonly) NSMutableArray<OWSVerificationStateTuple *> *tuples;
@property (nonatomic, readonly) OWSVerificationState verificationState;
@property (nonatomic, readonly) NSData *identityKey;
@ -36,18 +21,6 @@ NS_ASSUME_NONNULL_BEGIN
#pragma mark -
@implementation OWSVerificationStateSyncMessage
//
//- (instancetype)init
//{
// self = [super init];
// if (!self) {
// return self;
// }
//
// _tuples = [NSMutableArray new];
//
// return self;
//}
- (instancetype)initWithVerificationState:(OWSVerificationState)verificationState
identityKey:(NSData *)identityKey
@ -78,31 +51,9 @@ NS_ASSUME_NONNULL_BEGIN
- (OWSSignalServiceProtosSyncMessageBuilder *)syncMessageBuilder
{
// OWSAssert(self.tuples.count > 0);
OWSSignalServiceProtosSyncMessageBuilder *syncMessageBuilder = [OWSSignalServiceProtosSyncMessageBuilder new];
// for (OWSVerificationStateTuple *tuple in self.tuples) {
// OWSSignalServiceProtosVerifiedBuilder *verifiedBuilder = [OWSSignalServiceProtosVerifiedBuilder new];
// verifiedBuilder.destination = tuple.recipientId;
// verifiedBuilder.identityKey = tuple.identityKey;
// switch (tuple.verificationState) {
// case OWSVerificationStateDefault:
// verifiedBuilder.state = OWSSignalServiceProtosVerifiedStateDefault;
// break;
// case OWSVerificationStateVerified:
// verifiedBuilder.state = OWSSignalServiceProtosVerifiedStateVerified;
// break;
// case OWSVerificationStateNoLongerVerified:
// verifiedBuilder.state = OWSSignalServiceProtosVerifiedStateUnverified;
// break;
// }
// [syncMessageBuilder addVerified:[verifiedBuilder build]];
// }
//
OWSSignalServiceProtosVerifiedBuilder *verifiedBuilder = [OWSSignalServiceProtosVerifiedBuilder new];
verifiedBuilder.destination = self.verificationForRecipientId;
verifiedBuilder.identityKey = self.identityKey;
verifiedBuilder.state = OWSVerificationStateToProtoState(self.verificationState);
@ -115,17 +66,6 @@ NS_ASSUME_NONNULL_BEGIN
return syncMessageBuilder;
}
//- (NSArray<NSString *> *)recipientIds
//{
// NSMutableArray<NSString *> *result = [NSMutableArray new];
// for (OWSVerificationStateTuple *tuple in self.tuples) {
// OWSAssert(tuple.recipientId.length > 0);
// [result addObject:tuple.recipientId];
// }
//
// return [result copy];
//}
@end
NS_ASSUME_NONNULL_END

3
src/Messages/DeviceSyncing/OWSOutgoingSyncMessage.m
Unescape Escape View File

@ -43,8 +43,7 @@ NS_ASSUME_NONNULL_BEGIN
- (NSData *)buildPlainTextData
{
OWSSignalServiceProtosContentBuilder *contentBuilder = [OWSSignalServiceProtosContentBuilder new];
contentBuilder.syncMessage = [self buildSyncMessage];
[contentBuilder setSyncMessage:[self buildSyncMessage]];
return [[contentBuilder build] data];
}

3
src/Messages/OWSIdentityManager.h
Unescape Escape View File

@ -46,9 +46,6 @@ extern const NSUInteger kIdentityKeyLength;
*/
- (nullable OWSRecipientIdentity *)untrustedIdentityForSendingToRecipientId:(NSString *)recipientId;
// Will try to send a sync message with all verification states.
//- (void)syncAllVerificationStates;
- (void)processIncomingSyncMessage:(OWSSignalServiceProtosVerified *)verified;
@end

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

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

14
src/Messages/OWSMessageSender.m
Unescape Escape View File

@ -1089,16 +1089,10 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
- (void)handleMessageSentLocally:(TSOutgoingMessage *)message
{
if (message.shouldSyncTranscript) {
__block BOOL hasSecondaryDevices = NO;
[self.dbConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
hasSecondaryDevices = [OWSDevice hasSecondaryDevicesWithTransaction:transaction];
}];
if (hasSecondaryDevices) {
// TODO: I suspect we shouldn't optimistically set hasSyncedTranscript.
// We could set this in a success handler for [sendSyncTranscriptForMessage:].
[message updateWithHasSyncedTranscript:YES];
[self sendSyncTranscriptForMessage:message];
}
// TODO: I suspect we shouldn't optimistically set hasSyncedTranscript.
// We could set this in a success handler for [sendSyncTranscriptForMessage:].
[message updateWithHasSyncedTranscript:YES];
[self sendSyncTranscriptForMessage:message];
}
[OWSDisappearingMessagesJob setExpirationForMessage:message];

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

@ -671,9 +671,6 @@ NS_ASSUME_NONNULL_BEGIN
failure:^(NSError *error) {
DDLogError(@"%@ Failed to send Contacts response syncMessage with error: %@", self.tag, error);
}];
// // Also sync all verification state after syncing contacts.
// [[OWSIdentityManager sharedManager] syncAllVerificationStates];
} else if (syncMessage.request.type == OWSSignalServiceProtosSyncMessageRequestTypeGroups) {
OWSSyncGroupsMessage *syncGroupsMessage = [[OWSSyncGroupsMessage alloc] init];

Write Preview
Loading…
Cancel
Save