From 19ba564f80c478d0808eedd54a787bc75a178a8a Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Wed, 15 Nov 2017 13:21:31 -0500 Subject: [PATCH] Respond to CR. // FREEBIE --- .../src/MultiDeviceProfileKeyUpdateJob.swift | 2 +- Signal/src/Profiles/OWSProfileManager.m | 2 +- .../ConversationViewController.m | 6 +-- .../ViewControllers/DebugUI/DebugUIMessages.m | 12 +++--- .../ViewControllers/DebugUI/DebugUIStress.m | 2 +- .../src/ViewControllers/HomeViewController.m | 2 +- .../ViewControllers/NewGroupViewController.m | 16 ++++--- .../OWSConversationSettingsViewController.m | 2 +- Signal/src/util/OWSContactsSyncing.m | 2 +- Signal/src/util/ThreadUtil.m | 4 +- .../src/Messages/OWSBlockingManager.m | 2 +- .../src/Messages/OWSIdentityManager.m | 4 +- .../src/Messages/OWSMessageManager.m | 12 +++--- .../src/Messages/OWSMessageSender.h | 32 +++++++------- .../src/Messages/OWSMessageSender.m | 42 +++++++++---------- ...oteOfUpdatedDisappearingConfigurationJob.m | 2 +- .../src/Messages/OWSReadReceiptManager.m | 6 +-- .../src/Storage/TSYapDatabaseObject.h | 3 +- 18 files changed, 75 insertions(+), 78 deletions(-) diff --git a/Signal/src/MultiDeviceProfileKeyUpdateJob.swift b/Signal/src/MultiDeviceProfileKeyUpdateJob.swift index a48ff8a36..406e662a4 100644 --- a/Signal/src/MultiDeviceProfileKeyUpdateJob.swift +++ b/Signal/src/MultiDeviceProfileKeyUpdateJob.swift @@ -44,7 +44,7 @@ import PromiseKit profileManager: self.profileManager) let dataSource = DataSourceValue.dataSource(withSyncMessage: syncContactsMessage.buildPlainTextAttachmentData()) - self.messageSender.enqueueOutgoingTemporaryAttachment(dataSource, + self.messageSender.enqueueTemporaryAttachment(dataSource, contentType: OWSMimeTypeApplicationOctetStream, in: syncContactsMessage, success: { diff --git a/Signal/src/Profiles/OWSProfileManager.m b/Signal/src/Profiles/OWSProfileManager.m index c2aa31baa..57bdbf215 100644 --- a/Signal/src/Profiles/OWSProfileManager.m +++ b/Signal/src/Profiles/OWSProfileManager.m @@ -1465,7 +1465,7 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640; return; } - [self.messageSender enqueueOutgoingMessage:message + [self.messageSender enqueueMessage:message success:^{ DDLogInfo(@"%@ Successfully sent profile key message to thread: %@", self.logTag, thread); [OWSProfileManager.sharedManager addThreadToProfileWhitelist:thread]; diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m index d1425ec6c..d735a6a04 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m @@ -1654,7 +1654,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { [UIAlertAction actionWithTitle:NSLocalizedString(@"SEND_AGAIN_BUTTON", @"") style:UIAlertActionStyleDefault handler:^(UIAlertAction *_Nonnull action) { - [self.messageSender enqueueOutgoingMessage:message + [self.messageSender enqueueMessage:message success:^{ DDLogInfo(@"%@ Successfully resent failed message.", self.logTag); } @@ -3391,7 +3391,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { if (newGroupModel.groupImage) { NSData *data = UIImagePNGRepresentation(newGroupModel.groupImage); DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithData:data fileExtension:@"png"]; - [self.messageSender enqueueOutgoingAttachment:dataSource + [self.messageSender enqueueAttachment:dataSource contentType:OWSMimeTypeImagePng sourceFilename:nil inMessage:message @@ -3405,7 +3405,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { DDLogError(@"%@ Failed to send group avatar update with error: %@", self.logTag, error); }]; } else { - [self.messageSender enqueueOutgoingMessage:message + [self.messageSender enqueueMessage:message success:^{ DDLogDebug(@"%@ Successfully sent group update", self.logTag); if (successCompletion) { diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m index b70a2278e..ca9f92063 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIMessages.m @@ -219,7 +219,7 @@ NS_ASSUME_NONNULL_BEGIN OWSSyncGroupsRequestMessage *syncGroupsRequestMessage = [[OWSSyncGroupsRequestMessage alloc] initWithThread:thread groupId:[Randomness generateRandomBytes:16]]; - [[Environment getCurrent].messageSender enqueueOutgoingMessage:syncGroupsRequestMessage + [[Environment getCurrent].messageSender enqueueMessage:syncGroupsRequestMessage success:^{ DDLogWarn(@"%@ Successfully sent Request Group Info message.", self.logTag); } @@ -1066,11 +1066,11 @@ NS_ASSUME_NONNULL_BEGIN }); }); }; - [messageSender enqueueOutgoingMessage:message - success:completion - failure:^(NSError *error) { - completion(); - }]; + [messageSender enqueueMessage:message + success:completion + failure:^(NSError *error) { + completion(); + }]; } + (void)injectFakeIncomingMessages:(int)counter thread:(TSThread *)thread diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIStress.m b/Signal/src/ViewControllers/DebugUI/DebugUIStress.m index 68284d7ca..bf318a8cf 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIStress.m +++ b/Signal/src/ViewControllers/DebugUI/DebugUIStress.m @@ -437,7 +437,7 @@ NS_ASSUME_NONNULL_BEGIN OWSAssert(message); OWSMessageSender *messageSender = [Environment getCurrent].messageSender; - [messageSender enqueueOutgoingMessage:message + [messageSender enqueueMessage:message success:^{ DDLogInfo(@"%@ Successfully sent message.", self.logTag); } diff --git a/Signal/src/ViewControllers/HomeViewController.m b/Signal/src/ViewControllers/HomeViewController.m index a05ccabaf..182caeb6f 100644 --- a/Signal/src/ViewControllers/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeViewController.m @@ -679,7 +679,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState }; TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp] inThread:thread groupMetaMessage:TSGroupMessageQuit]; - [self.messageSender enqueueOutgoingMessage:message + [self.messageSender enqueueMessage:message success:^{ [self dismissViewControllerAnimated:YES completion:^{ diff --git a/Signal/src/ViewControllers/NewGroupViewController.m b/Signal/src/ViewControllers/NewGroupViewController.m index 016861e6c..87c4b3544 100644 --- a/Signal/src/ViewControllers/NewGroupViewController.m +++ b/Signal/src/ViewControllers/NewGroupViewController.m @@ -500,16 +500,14 @@ const NSUInteger kNewGroupViewControllerAvatarWidth = 68; NSData *data = UIImagePNGRepresentation(model.groupImage); DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithData:data fileExtension:@"png"]; - [self.messageSender enqueueOutgoingAttachment:dataSource - contentType:OWSMimeTypeImagePng - sourceFilename:nil - inMessage:message - success:successHandler - failure:failureHandler]; + [self.messageSender enqueueAttachment:dataSource + contentType:OWSMimeTypeImagePng + sourceFilename:nil + inMessage:message + success:successHandler + failure:failureHandler]; } else { - [self.messageSender enqueueOutgoingMessage:message - success:successHandler - failure:failureHandler]; + [self.messageSender enqueueMessage:message success:successHandler failure:failureHandler]; } }); }]; diff --git a/Signal/src/ViewControllers/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsViewController.m index 29e732a43..73e7b1ee7 100644 --- a/Signal/src/ViewControllers/OWSConversationSettingsViewController.m +++ b/Signal/src/ViewControllers/OWSConversationSettingsViewController.m @@ -885,7 +885,7 @@ NS_ASSUME_NONNULL_BEGIN TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp] inThread:gThread groupMetaMessage:TSGroupMessageQuit]; - [self.messageSender enqueueOutgoingMessage:message + [self.messageSender enqueueMessage:message success:^{ DDLogInfo(@"%@ Successfully left group.", self.logTag); } diff --git a/Signal/src/util/OWSContactsSyncing.m b/Signal/src/util/OWSContactsSyncing.m index 80dce55ff..4f778ccd5 100644 --- a/Signal/src/util/OWSContactsSyncing.m +++ b/Signal/src/util/OWSContactsSyncing.m @@ -115,7 +115,7 @@ NSString *const kTSStorageManagerOWSContactsSyncingLastMessageKey = DataSource *dataSource = [DataSourceValue dataSourceWithSyncMessage:[syncContactsMessage buildPlainTextAttachmentData]]; - [self.messageSender enqueueOutgoingTemporaryAttachment:dataSource + [self.messageSender enqueueTemporaryAttachment:dataSource contentType:OWSMimeTypeApplicationOctetStream inMessage:syncContactsMessage success:^{ diff --git a/Signal/src/util/ThreadUtil.m b/Signal/src/util/ThreadUtil.m index 8cd63f65f..00b6638ee 100644 --- a/Signal/src/util/ThreadUtil.m +++ b/Signal/src/util/ThreadUtil.m @@ -86,7 +86,7 @@ NS_ASSUME_NONNULL_BEGIN attachmentIds:[NSMutableArray new] expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)]; - [messageSender enqueueOutgoingMessage:message success:successHandler failure:failureHandler]; + [messageSender enqueueMessage:message success:successHandler failure:failureHandler]; return message; } @@ -117,7 +117,7 @@ NS_ASSUME_NONNULL_BEGIN inThread:thread isVoiceMessage:[attachment isVoiceMessage] expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)]; - [messageSender enqueueOutgoingAttachment:attachment.dataSource + [messageSender enqueueAttachment:attachment.dataSource contentType:attachment.mimeType sourceFilename:attachment.filenameOrDefault inMessage:message diff --git a/SignalServiceKit/src/Messages/OWSBlockingManager.m b/SignalServiceKit/src/Messages/OWSBlockingManager.m index c09bb10b5..050f75763 100644 --- a/SignalServiceKit/src/Messages/OWSBlockingManager.m +++ b/SignalServiceKit/src/Messages/OWSBlockingManager.m @@ -258,7 +258,7 @@ NSString *const kOWSBlockingManager_SyncedBlockedPhoneNumbersKey = @"kOWSBlockin OWSBlockedPhoneNumbersMessage *message = [[OWSBlockedPhoneNumbersMessage alloc] initWithPhoneNumbers:blockedPhoneNumbers]; - [self.messageSender enqueueOutgoingMessage:message + [self.messageSender enqueueMessage:message success:^{ DDLogInfo(@"%@ Successfully sent blocked phone numbers sync message", self.logTag); diff --git a/SignalServiceKit/src/Messages/OWSIdentityManager.m b/SignalServiceKit/src/Messages/OWSIdentityManager.m index 1ead01406..7f3abe158 100644 --- a/SignalServiceKit/src/Messages/OWSIdentityManager.m +++ b/SignalServiceKit/src/Messages/OWSIdentityManager.m @@ -517,10 +517,10 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa // subsequently OWSOutgoingNullMessage *nullMessage = [[OWSOutgoingNullMessage alloc] initWithContactThread:contactThread verificationStateSyncMessage:message]; - [self.messageSender enqueueOutgoingMessage:nullMessage + [self.messageSender enqueueMessage:nullMessage success:^{ DDLogInfo(@"%@ Successfully sent verification state NullMessage", self.logTag); - [self.messageSender enqueueOutgoingMessage:message + [self.messageSender enqueueMessage:message success:^{ DDLogInfo(@"%@ Successfully sent verification state sync message", self.logTag); diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index 1ca4b9366..e74e898ab 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -366,7 +366,7 @@ NS_ASSUME_NONNULL_BEGIN OWSSyncGroupsRequestMessage *syncGroupsRequestMessage = [[OWSSyncGroupsRequestMessage alloc] initWithThread:thread groupId:groupId]; - [self.messageSender enqueueOutgoingMessage:syncGroupsRequestMessage + [self.messageSender enqueueMessage:syncGroupsRequestMessage success:^{ DDLogWarn(@"%@ Successfully sent Request Group Info message.", self.logTag); } @@ -609,7 +609,7 @@ NS_ASSUME_NONNULL_BEGIN profileManager:self.profileManager]; DataSource *dataSource = [DataSourceValue dataSourceWithSyncMessage:[syncContactsMessage buildPlainTextAttachmentData]]; - [self.messageSender enqueueOutgoingTemporaryAttachment:dataSource + [self.messageSender enqueueTemporaryAttachment:dataSource contentType:OWSMimeTypeApplicationOctetStream inMessage:syncContactsMessage success:^{ @@ -622,7 +622,7 @@ NS_ASSUME_NONNULL_BEGIN OWSSyncGroupsMessage *syncGroupsMessage = [[OWSSyncGroupsMessage alloc] init]; DataSource *dataSource = [DataSourceValue dataSourceWithSyncMessage:[syncGroupsMessage buildPlainTextAttachmentDataWithTransaction:transaction]]; - [self.messageSender enqueueOutgoingTemporaryAttachment:dataSource + [self.messageSender enqueueTemporaryAttachment:dataSource contentType:OWSMimeTypeApplicationOctetStream inMessage:syncGroupsMessage success:^{ @@ -639,7 +639,7 @@ NS_ASSUME_NONNULL_BEGIN [[OWSReadReceiptManager sharedManager] areReadReceiptsEnabledWithTransaction:transaction]; OWSSyncConfigurationMessage *syncConfigurationMessage = [[OWSSyncConfigurationMessage alloc] initWithReadReceiptsEnabled:areReadReceiptsEnabled]; - [self.messageSender enqueueOutgoingMessage:syncConfigurationMessage + [self.messageSender enqueueMessage:syncConfigurationMessage success:^{ DDLogInfo(@"%@ Successfully sent Configuration response syncMessage.", self.logTag); } @@ -774,7 +774,7 @@ NS_ASSUME_NONNULL_BEGIN if (gThread.groupModel.groupImage) { NSData *data = UIImagePNGRepresentation(gThread.groupModel.groupImage); DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithData:data fileExtension:@"png"]; - [self.messageSender enqueueOutgoingAttachment:dataSource + [self.messageSender enqueueAttachment:dataSource contentType:OWSMimeTypeImagePng sourceFilename:nil inMessage:message @@ -785,7 +785,7 @@ NS_ASSUME_NONNULL_BEGIN DDLogError(@"%@ Failed to send group avatar update with error: %@", self.logTag, error); }]; } else { - [self.messageSender enqueueOutgoingMessage:message + [self.messageSender enqueueMessage:message success:^{ DDLogDebug(@"%@ Successfully sent group update", self.logTag); } diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.h b/SignalServiceKit/src/Messages/OWSMessageSender.h index df17fa883..601a5828b 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.h +++ b/SignalServiceKit/src/Messages/OWSMessageSender.h @@ -63,33 +63,33 @@ NS_SWIFT_NAME(MessageSender) /** * Send and resend text messages or resend messages with existing attachments. - * If you haven't yet created the attachment, see the ` enqueueOutgoingAttachment:` variants. + * If you haven't yet created the attachment, see the ` enqueueAttachment:` variants. */ // TODO: make transaction nonnull and remove `sendMessage:success:failure` -- (void)enqueueOutgoingMessage:(TSOutgoingMessage *)message - success:(void (^)(void))successHandler - failure:(void (^)(NSError *error))failureHandler; +- (void)enqueueMessage:(TSOutgoingMessage *)message + success:(void (^)(void))successHandler + failure:(void (^)(NSError *error))failureHandler; /** * Takes care of allocating and uploading the attachment, then sends the message. * Only necessary to call once. If sending fails, retry with `sendMessage:`. */ -- (void)enqueueOutgoingAttachment:(DataSource *)dataSource - contentType:(NSString *)contentType - sourceFilename:(nullable NSString *)sourceFilename - inMessage:(TSOutgoingMessage *)outgoingMessage - success:(void (^)(void))successHandler - failure:(void (^)(NSError *error))failureHandler; +- (void)enqueueAttachment:(DataSource *)dataSource + contentType:(NSString *)contentType + sourceFilename:(nullable NSString *)sourceFilename + inMessage:(TSOutgoingMessage *)outgoingMessage + success:(void (^)(void))successHandler + failure:(void (^)(NSError *error))failureHandler; /** - * Same as ` enqueueOutgoingAttachment:`, but deletes the local copy of the attachment after sending. + * Same as ` enqueueAttachment:`, but deletes the local copy of the attachment after sending. * Used for sending sync request data, not for user visible attachments. */ -- (void)enqueueOutgoingTemporaryAttachment:(DataSource *)dataSource - contentType:(NSString *)contentType - inMessage:(TSOutgoingMessage *)outgoingMessage - success:(void (^)(void))successHandler - failure:(void (^)(NSError *error))failureHandler; +- (void)enqueueTemporaryAttachment:(DataSource *)dataSource + contentType:(NSString *)contentType + inMessage:(TSOutgoingMessage *)outgoingMessage + success:(void (^)(void))successHandler + failure:(void (^)(NSError *error))failureHandler; /** * Set local configuration to match that of the of `outgoingMessage`'s sender diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m index 84cba896f..f26bfa33e 100644 --- a/SignalServiceKit/src/Messages/OWSMessageSender.m +++ b/SignalServiceKit/src/Messages/OWSMessageSender.m @@ -419,9 +419,9 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; } } -- (void)enqueueOutgoingMessage:(TSOutgoingMessage *)message - success:(void (^)(void))successHandler - failure:(void (^)(NSError *error))failureHandler +- (void)enqueueMessage:(TSOutgoingMessage *)message + success:(void (^)(void))successHandler + failure:(void (^)(NSError *error))failureHandler { OWSAssert(message); @@ -509,11 +509,11 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; failure:failureHandler]; } -- (void)enqueueOutgoingTemporaryAttachment:(DataSource *)dataSource - contentType:(NSString *)contentType - inMessage:(TSOutgoingMessage *)message - success:(void (^)(void))successHandler - failure:(void (^)(NSError *error))failureHandler +- (void)enqueueTemporaryAttachment:(DataSource *)dataSource + contentType:(NSString *)contentType + inMessage:(TSOutgoingMessage *)message + success:(void (^)(void))successHandler + failure:(void (^)(NSError *error))failureHandler { OWSAssert(dataSource); @@ -531,20 +531,20 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; [message remove]; }; - [self enqueueOutgoingAttachment:dataSource - contentType:contentType - sourceFilename:nil - inMessage:message - success:successWithDeleteHandler - failure:failureWithDeleteHandler]; + [self enqueueAttachment:dataSource + contentType:contentType + sourceFilename:nil + inMessage:message + success:successWithDeleteHandler + failure:failureWithDeleteHandler]; } -- (void)enqueueOutgoingAttachment:(DataSource *)dataSource - contentType:(NSString *)contentType - sourceFilename:(nullable NSString *)sourceFilename - inMessage:(TSOutgoingMessage *)message - success:(void (^)(void))successHandler - failure:(void (^)(NSError *error))failureHandler +- (void)enqueueAttachment:(DataSource *)dataSource + contentType:(NSString *)contentType + sourceFilename:(nullable NSString *)sourceFilename + inMessage:(TSOutgoingMessage *)message + success:(void (^)(void))successHandler + failure:(void (^)(NSError *error))failureHandler { OWSAssert(dataSource); @@ -569,7 +569,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; message.attachmentFilenameMap[attachmentStream.uniqueId] = sourceFilename; } - [self enqueueOutgoingMessage:message success:successHandler failure:failureHandler]; + [self enqueueMessage:message success:successHandler failure:failureHandler]; }); } diff --git a/SignalServiceKit/src/Messages/OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m b/SignalServiceKit/src/Messages/OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m index ca9e0edf6..152deba75 100644 --- a/SignalServiceKit/src/Messages/OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m +++ b/SignalServiceKit/src/Messages/OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m @@ -49,7 +49,7 @@ NS_ASSUME_NONNULL_BEGIN [[OWSDisappearingMessagesConfigurationMessage alloc] initWithConfiguration:self.configuration thread:self.thread]; - [self.messageSender enqueueOutgoingMessage:message + [self.messageSender enqueueMessage:message success:^{ DDLogDebug( @"%@ Successfully notified %@ of new disappearing messages configuration", self.logTag, self.thread); diff --git a/SignalServiceKit/src/Messages/OWSReadReceiptManager.m b/SignalServiceKit/src/Messages/OWSReadReceiptManager.m index 5f95d2997..3b94df19e 100644 --- a/SignalServiceKit/src/Messages/OWSReadReceiptManager.m +++ b/SignalServiceKit/src/Messages/OWSReadReceiptManager.m @@ -229,7 +229,7 @@ NSString *const OWSReadReceiptManagerAreReadReceiptsEnabled = @"areReadReceiptsE OWSReadReceiptsForLinkedDevicesMessage *message = [[OWSReadReceiptsForLinkedDevicesMessage alloc] initWithReadReceipts:readReceiptsForLinkedDevices]; - [self.messageSender enqueueOutgoingMessage:message + [self.messageSender enqueueMessage:message success:^{ DDLogInfo(@"%@ Successfully sent %zd read receipt to linked devices.", self.logTag, @@ -253,7 +253,7 @@ NSString *const OWSReadReceiptManagerAreReadReceiptsEnabled = @"areReadReceiptsE [[OWSReadReceiptsForSenderMessage alloc] initWithThread:thread messageTimestamps:timestamps.allObjects]; - [self.messageSender enqueueOutgoingMessage:message + [self.messageSender enqueueMessage:message success:^{ DDLogInfo(@"%@ Successfully sent %zd read receipts to sender.", self.logTag, timestamps.count); } @@ -590,7 +590,7 @@ NSString *const OWSReadReceiptManagerAreReadReceiptsEnabled = @"areReadReceiptsE OWSSyncConfigurationMessage *syncConfigurationMessage = [[OWSSyncConfigurationMessage alloc] initWithReadReceiptsEnabled:value]; - [self.messageSender enqueueOutgoingMessage:syncConfigurationMessage + [self.messageSender enqueueMessage:syncConfigurationMessage success:^{ DDLogInfo(@"%@ Successfully sent Configuration syncMessage.", self.logTag); } diff --git a/SignalServiceKit/src/Storage/TSYapDatabaseObject.h b/SignalServiceKit/src/Storage/TSYapDatabaseObject.h index 1e47a8ca7..03f8f115c 100644 --- a/SignalServiceKit/src/Storage/TSYapDatabaseObject.h +++ b/SignalServiceKit/src/Storage/TSYapDatabaseObject.h @@ -81,8 +81,7 @@ NS_ASSUME_NONNULL_BEGIN */ + (nullable instancetype)fetchObjectWithUniqueID:(NSString *)uniqueID transaction:(YapDatabaseReadTransaction *)transaction - NS_SWIFT_NAME(fetch(uniqueId:transaction -:)); + NS_SWIFT_NAME(fetch(uniqueId:transaction:)); + (nullable instancetype)fetchObjectWithUniqueID:(NSString *)uniqueID NS_SWIFT_NAME(fetch(uniqueId:)); /**