diff --git a/Signal/src/Jobs/SessionResetJob.swift b/Signal/src/Jobs/SessionResetJob.swift index 50d7ddc927..94e10145c7 100644 --- a/Signal/src/Jobs/SessionResetJob.swift +++ b/Signal/src/Jobs/SessionResetJob.swift @@ -111,7 +111,7 @@ public class SessionResetOperation: OWSOperation, DurableOperation { if firstAttempt { self.dbConnection.readWrite { transaction in Logger.info("deleting sessions for recipient: \(self.recipientId)") - self.primaryStorage.deleteAllSessions(forContact: self.recipientId, protocolContext: transaction) + self.primaryStorage.deleteAllSessions(forContact: self.recipientId, transaction: transaction) } firstAttempt = false } @@ -126,7 +126,7 @@ public class SessionResetOperation: OWSOperation, DurableOperation { // Archive the just-created session since the recipient should delete their corresponding // session upon receiving and decrypting our EndSession message. // Otherwise if we send another message before them, they wont have the session to decrypt it. - self.primaryStorage.archiveAllSessions(forContact: self.recipientId, protocolContext: transaction) + self.primaryStorage.archiveAllSessions(forContact: self.recipientId, transaction: transaction) let message = TSInfoMessage(timestamp: NSDate.ows_millisecondTimeStamp(), in: self.contactThread, @@ -184,7 +184,7 @@ public class SessionResetOperation: OWSOperation, DurableOperation { // Archive the just-created session since the recipient should delete their corresponding // session upon receiving and decrypting our EndSession message. // Otherwise if we send another message before them, they wont have the session to decrypt it. - self.primaryStorage.archiveAllSessions(forContact: self.recipientId, protocolContext: transaction) + self.primaryStorage.archiveAllSessions(forContact: self.recipientId, transaction: transaction) } } } diff --git a/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m b/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m index 91856eac5c..2c419515ce 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUISessionState.m @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // #import "DebugUISessionState.h" @@ -54,17 +54,16 @@ NS_ASSUME_NONNULL_BEGIN [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { [[OWSPrimaryStorage sharedManager] deleteAllSessionsForContact:thread.contactIdentifier - protocolContext:transaction]; + transaction:transaction]; }]; }], [OWSTableItem itemWithTitle:@"Archive all sessions" actionBlock:^{ - [self.dbConnection - readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { - [[OWSPrimaryStorage sharedManager] - archiveAllSessionsForContact:thread.contactIdentifier - protocolContext:transaction]; - }]; + [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { + [[OWSPrimaryStorage sharedManager] + archiveAllSessionsForContact:thread.contactIdentifier + transaction:transaction]; + }]; }], [OWSTableItem itemWithTitle:@"Send session reset" actionBlock:^{ diff --git a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m index cb59ecb377..6bbf4df777 100644 --- a/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m +++ b/SignalMessaging/ViewControllers/SharingThreadPickerViewController.m @@ -569,8 +569,8 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion); } case OWSVerificationStateNoLongerVerified: { OWSLogInfo(@"marked recipient: %@ as default verification status.", recipientId); - NSData *identityKey = [[OWSIdentityManager sharedManager] identityKeyForRecipientId:recipientId - protocolContext:transaction]; + NSData *identityKey = + [[OWSIdentityManager sharedManager] identityKeyForRecipientId:recipientId transaction:transaction]; OWSAssertDebug(identityKey); [[OWSIdentityManager sharedManager] setVerificationState:OWSVerificationStateDefault identityKey:identityKey diff --git a/SignalMessaging/profiles/ProfileFetcherJob.swift b/SignalMessaging/profiles/ProfileFetcherJob.swift index f54539a42e..e6c38cfbe1 100644 --- a/SignalMessaging/profiles/ProfileFetcherJob.swift +++ b/SignalMessaging/profiles/ProfileFetcherJob.swift @@ -227,9 +227,9 @@ public class ProfileFetcherJob: NSObject { private func verifyIdentityUpToDateAsync(recipientId: String, latestIdentityKey: Data) { primaryStorage.newDatabaseConnection().asyncReadWrite { (transaction) in - if self.identityManager.saveRemoteIdentity(latestIdentityKey, recipientId: recipientId, protocolContext: transaction) { + if self.identityManager.saveRemoteIdentity(latestIdentityKey, recipientId: recipientId, transaction: transaction) { Logger.info("updated identity key with fetched profile for recipient: \(recipientId)") - self.primaryStorage.archiveAllSessions(forContact: recipientId, protocolContext: transaction) + self.primaryStorage.archiveAllSessions(forContact: recipientId, transaction: transaction) } else { // no change in identity. } diff --git a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m index 2ee29d4e84..da6486d011 100644 --- a/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m +++ b/SignalServiceKit/src/Devices/OWSRecordTranscriptJob.m @@ -78,7 +78,7 @@ NS_ASSUME_NONNULL_BEGIN if (transcript.isEndSessionMessage) { OWSLogInfo(@"EndSession was sent to recipient: %@.", transcript.recipientId); - [self.primaryStorage deleteAllSessionsForContact:transcript.recipientId protocolContext:transaction]; + [self.primaryStorage deleteAllSessionsForContact:transcript.recipientId transaction:transaction]; // MJK TODO - we don't use this timestamp, safe to remove [[[TSInfoMessage alloc] initWithTimestamp:transcript.timestamp diff --git a/SignalServiceKit/src/Messages/OWSIdentityManager.m b/SignalServiceKit/src/Messages/OWSIdentityManager.m index 7e1a5c1edb..4b18bfc4f9 100644 --- a/SignalServiceKit/src/Messages/OWSIdentityManager.m +++ b/SignalServiceKit/src/Messages/OWSIdentityManager.m @@ -200,7 +200,7 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa __block BOOL result; [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { - result = [self saveRemoteIdentity:identityKey recipientId:recipientId protocolContext:transaction]; + result = [self saveRemoteIdentity:identityKey recipientId:recipientId transaction:transaction]; }]; return result; @@ -273,7 +273,7 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa createdAt:[NSDate new] verificationState:verificationState] saveWithTransaction:transaction]; - [self.primaryStorage archiveAllSessionsForContact:recipientId protocolContext:transaction]; + [self.primaryStorage archiveAllSessionsForContact:recipientId transaction:transaction]; // Cancel any pending verification state sync messages for this recipient. [self clearSyncMessageForRecipientId:recipientId transaction:transaction]; @@ -334,7 +334,7 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa // Ensure a remote identity exists for this key. We may be learning about // it for the first time. - [self saveRemoteIdentity:identityKey recipientId:recipientId protocolContext:transaction]; + [self saveRemoteIdentity:identityKey recipientId:recipientId transaction:transaction]; OWSRecipientIdentity *recipientIdentity = [OWSRecipientIdentity fetchObjectWithUniqueID:recipientId transaction:transaction]; @@ -772,8 +772,8 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa // Ensure a remote identity exists for this key. We may be learning about // it for the first time. - [self saveRemoteIdentity:identityKey recipientId:recipientId protocolContext:transaction]; - + [self saveRemoteIdentity:identityKey recipientId:recipientId transaction:transaction]; + recipientIdentity = [OWSRecipientIdentity fetchObjectWithUniqueID:recipientId transaction:transaction]; @@ -824,8 +824,8 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa } OWSLogWarn(@"recipientIdentity has non-matching identityKey; overwriting: %@", recipientId); - [self saveRemoteIdentity:identityKey recipientId:recipientId protocolContext:transaction]; - + [self saveRemoteIdentity:identityKey recipientId:recipientId transaction:transaction]; + recipientIdentity = [OWSRecipientIdentity fetchObjectWithUniqueID:recipientId transaction:transaction]; diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index 76c2cdb153..f0f026e03a 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -993,7 +993,7 @@ NS_ASSUME_NONNULL_BEGIN inThread:thread messageType:TSInfoMessageTypeSessionDidEnd] saveWithTransaction:transaction]; - [self.primaryStorage deleteAllSessionsForContact:envelope.source protocolContext:transaction]; + [self.primaryStorage deleteAllSessionsForContact:envelope.source transaction:transaction]; } - (void)handleExpirationTimerUpdateMessageWithEnvelope:(SSKProtoEnvelope *)envelope diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index b29dfb6245..d0f7567b9d 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -1349,7 +1349,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; for (NSNumber *extraDeviceId in extraDevices) { [self.primaryStorage deleteSessionForContact:recipient.uniqueId deviceId:extraDeviceId.intValue - protocolContext:transaction]; + transaction:transaction]; } } @@ -1530,7 +1530,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; __block BOOL hasSession; [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { - hasSession = [storage containsSession:recipientId deviceId:[deviceId intValue] protocolContext:transaction]; + hasSession = [storage containsSession:recipientId deviceId:[deviceId intValue] transaction:transaction]; }]; if (hasSession) { return; @@ -1668,7 +1668,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; OWSAssertDebug(recipientId.length > 0); // This may throw an exception. - if (![storage containsSession:recipientId deviceId:[deviceId intValue] protocolContext:transaction]) { + if (![storage containsSession:recipientId deviceId:[deviceId intValue] transaction:transaction]) { NSString *missingSessionException = @"missingSessionException"; OWSRaiseException(missingSessionException, @"Unexpectedly missing session for recipient: %@, device: %@", @@ -1791,7 +1791,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; int deviceNumber = [devices[i] intValue]; [[OWSPrimaryStorage sharedManager] deleteSessionForContact:identifier deviceId:deviceNumber - protocolContext:transaction]; + transaction:transaction]; } }]; completionHandler();