From 51cec20c50ba6450de46ffe5e030074c05800b47 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 31 Jan 2018 11:44:51 -0500 Subject: [PATCH] Clean up ahead of PR. --- SignalServiceKit/src/Messages/OWSMessageDecrypter.m | 6 ++---- SignalServiceKit/src/Messages/OWSMessageSender.m | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m index 8193b885f..4d9b4d5a2 100644 --- a/SignalServiceKit/src/Messages/OWSMessageDecrypter.m +++ b/SignalServiceKit/src/Messages/OWSMessageDecrypter.m @@ -236,9 +236,8 @@ NS_ASSUME_NONNULL_BEGIN return; } - dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ - [TSStorageManager.protocolStoreDBConnection readWriteWithBlock:^( - YapDatabaseReadWriteTransaction *_Nonnull transaction) { + [TSStorageManager.protocolStoreDBConnection + asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) { @try { id cipherMessage = cipherMessageBlock(encryptedData); SessionCipher *cipher = [[SessionCipher alloc] initWithSessionStore:storageManager @@ -260,7 +259,6 @@ NS_ASSUME_NONNULL_BEGIN }); } }]; - }); } - (void)processException:(NSException *)exception envelope:(OWSSignalServiceProtosEnvelope *)envelope diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index c34865b71..a7f6485c2 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -1105,7 +1105,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; } [TSStorageManager.protocolStoreDBConnection - readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) { + asyncReadWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) { if (extraDevices.count < 1 && missingDevices.count < 1) { OWSProdFail([OWSAnalyticsEvents messageSenderErrorNoMissingOrExtraDevices]); } @@ -1436,7 +1436,8 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; return; } - [TSStorageManager.protocolStoreDBConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) { + [TSStorageManager.protocolStoreDBConnection asyncReadWriteWithBlock:^( + YapDatabaseReadWriteTransaction *transaction) { for (NSUInteger i = 0; i < [devices count]; i++) { int deviceNumber = [devices[i] intValue]; [[TSStorageManager sharedManager] deleteSessionForContact:identifier