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

Respond to CR.

Browse Source 
// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent 00feb14b10
commit 19ba564f80
18 changed files with 75 additions and 78 deletions
Show Stats Download Patch File Download Diff File

2
Signal/src/MultiDeviceProfileKeyUpdateJob.swift
Unescape Escape View File

@ -44,7 +44,7 @@ import PromiseKit
profileManager: self.profileManager) profileManager: self.profileManager)
let dataSource = DataSourceValue.dataSource(withSyncMessage: syncContactsMessage.buildPlainTextAttachmentData()) let dataSource = DataSourceValue.dataSource(withSyncMessage: syncContactsMessage.buildPlainTextAttachmentData())
self.messageSender.enqueueOutgoingTemporaryAttachment(dataSource, self.messageSender.enqueueTemporaryAttachment(dataSource,
contentType: OWSMimeTypeApplicationOctetStream, contentType: OWSMimeTypeApplicationOctetStream,
in: syncContactsMessage, in: syncContactsMessage,
success: { success: {

2
Signal/src/Profiles/OWSProfileManager.m
Unescape Escape View File

@ -1465,7 +1465,7 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
return; return;
} }
[self.messageSender enqueueOutgoingMessage:message [self.messageSender enqueueMessage:message
success:^{ success:^{
DDLogInfo(@"%@ Successfully sent profile key message to thread: %@", self.logTag, thread); DDLogInfo(@"%@ Successfully sent profile key message to thread: %@", self.logTag, thread);
[OWSProfileManager.sharedManager addThreadToProfileWhitelist:thread]; [OWSProfileManager.sharedManager addThreadToProfileWhitelist:thread];

6
Signal/src/ViewControllers/ConversationView/ConversationViewController.m
Unescape Escape View File

@ -1654,7 +1654,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
[UIAlertAction actionWithTitle:NSLocalizedString(@"SEND_AGAIN_BUTTON", @"") [UIAlertAction actionWithTitle:NSLocalizedString(@"SEND_AGAIN_BUTTON", @"")
style:UIAlertActionStyleDefault style:UIAlertActionStyleDefault
handler:^(UIAlertAction *_Nonnull action) { handler:^(UIAlertAction *_Nonnull action) {
[self.messageSender enqueueOutgoingMessage:message [self.messageSender enqueueMessage:message
success:^{ success:^{
DDLogInfo(@"%@ Successfully resent failed message.", self.logTag); DDLogInfo(@"%@ Successfully resent failed message.", self.logTag);
} }
@ -3391,7 +3391,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
if (newGroupModel.groupImage) { if (newGroupModel.groupImage) {
NSData *data = UIImagePNGRepresentation(newGroupModel.groupImage); NSData *data = UIImagePNGRepresentation(newGroupModel.groupImage);
DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithData:data fileExtension:@"png"]; DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithData:data fileExtension:@"png"];
[self.messageSender enqueueOutgoingAttachment:dataSource [self.messageSender enqueueAttachment:dataSource
contentType:OWSMimeTypeImagePng contentType:OWSMimeTypeImagePng
sourceFilename:nil sourceFilename:nil
inMessage:message inMessage:message
@ -3405,7 +3405,7 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
DDLogError(@"%@ Failed to send group avatar update with error: %@", self.logTag, error); DDLogError(@"%@ Failed to send group avatar update with error: %@", self.logTag, error);
}]; }];
} else { } else {
[self.messageSender enqueueOutgoingMessage:message [self.messageSender enqueueMessage:message
success:^{ success:^{
DDLogDebug(@"%@ Successfully sent group update", self.logTag); DDLogDebug(@"%@ Successfully sent group update", self.logTag);
if (successCompletion) { if (successCompletion) {

4
Signal/src/ViewControllers/DebugUI/DebugUIMessages.m
Unescape Escape View File

@ -219,7 +219,7 @@ NS_ASSUME_NONNULL_BEGIN
OWSSyncGroupsRequestMessage *syncGroupsRequestMessage = OWSSyncGroupsRequestMessage *syncGroupsRequestMessage =
[[OWSSyncGroupsRequestMessage alloc] initWithThread:thread [[OWSSyncGroupsRequestMessage alloc] initWithThread:thread
groupId:[Randomness generateRandomBytes:16]]; groupId:[Randomness generateRandomBytes:16]];
[[Environment getCurrent].messageSender enqueueOutgoingMessage:syncGroupsRequestMessage [[Environment getCurrent].messageSender enqueueMessage:syncGroupsRequestMessage
success:^{ success:^{
DDLogWarn(@"%@ Successfully sent Request Group Info message.", self.logTag); DDLogWarn(@"%@ Successfully sent Request Group Info message.", self.logTag);
} }
@ -1066,7 +1066,7 @@ NS_ASSUME_NONNULL_BEGIN
}); });
}); });
}; };
[messageSender enqueueOutgoingMessage:message [messageSender enqueueMessage:message
success:completion success:completion
failure:^(NSError *error) { failure:^(NSError *error) {
completion(); completion();

2
Signal/src/ViewControllers/DebugUI/DebugUIStress.m
Unescape Escape View File

@ -437,7 +437,7 @@ NS_ASSUME_NONNULL_BEGIN
OWSAssert(message); OWSAssert(message);
OWSMessageSender *messageSender = [Environment getCurrent].messageSender; OWSMessageSender *messageSender = [Environment getCurrent].messageSender;
[messageSender enqueueOutgoingMessage:message [messageSender enqueueMessage:message
success:^{ success:^{
DDLogInfo(@"%@ Successfully sent message.", self.logTag); DDLogInfo(@"%@ Successfully sent message.", self.logTag);
} }

2
Signal/src/ViewControllers/HomeViewController.m
Unescape Escape View File

@ -679,7 +679,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp] TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
inThread:thread inThread:thread
groupMetaMessage:TSGroupMessageQuit]; groupMetaMessage:TSGroupMessageQuit];
[self.messageSender enqueueOutgoingMessage:message [self.messageSender enqueueMessage:message
success:^{ success:^{
[self dismissViewControllerAnimated:YES [self dismissViewControllerAnimated:YES
completion:^{ completion:^{

6
Signal/src/ViewControllers/NewGroupViewController.m
Unescape Escape View File

@ -500,16 +500,14 @@ const NSUInteger kNewGroupViewControllerAvatarWidth = 68;
NSData *data = UIImagePNGRepresentation(model.groupImage); NSData *data = UIImagePNGRepresentation(model.groupImage);
DataSource *_Nullable dataSource = DataSource *_Nullable dataSource =
[DataSourceValue dataSourceWithData:data fileExtension:@"png"]; [DataSourceValue dataSourceWithData:data fileExtension:@"png"];
[self.messageSender enqueueOutgoingAttachment:dataSource [self.messageSender enqueueAttachment:dataSource
contentType:OWSMimeTypeImagePng contentType:OWSMimeTypeImagePng
sourceFilename:nil sourceFilename:nil
inMessage:message inMessage:message
success:successHandler success:successHandler
failure:failureHandler]; failure:failureHandler];
} else { } else {
[self.messageSender enqueueOutgoingMessage:message [self.messageSender enqueueMessage:message success:successHandler failure:failureHandler];
success:successHandler
failure:failureHandler];
} }
}); });
}]; }];

2
Signal/src/ViewControllers/OWSConversationSettingsViewController.m
Unescape Escape View File

@ -885,7 +885,7 @@ NS_ASSUME_NONNULL_BEGIN
TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp] TSOutgoingMessage *message = [[TSOutgoingMessage alloc] initWithTimestamp:[NSDate ows_millisecondTimeStamp]
inThread:gThread inThread:gThread
groupMetaMessage:TSGroupMessageQuit]; groupMetaMessage:TSGroupMessageQuit];
[self.messageSender enqueueOutgoingMessage:message [self.messageSender enqueueMessage:message
success:^{ success:^{
DDLogInfo(@"%@ Successfully left group.", self.logTag); DDLogInfo(@"%@ Successfully left group.", self.logTag);
} }

2
Signal/src/util/OWSContactsSyncing.m
Unescape Escape View File

@ -115,7 +115,7 @@ NSString *const kTSStorageManagerOWSContactsSyncingLastMessageKey =
DataSource *dataSource = DataSource *dataSource =
[DataSourceValue dataSourceWithSyncMessage:[syncContactsMessage buildPlainTextAttachmentData]]; [DataSourceValue dataSourceWithSyncMessage:[syncContactsMessage buildPlainTextAttachmentData]];
[self.messageSender enqueueOutgoingTemporaryAttachment:dataSource [self.messageSender enqueueTemporaryAttachment:dataSource
contentType:OWSMimeTypeApplicationOctetStream contentType:OWSMimeTypeApplicationOctetStream
inMessage:syncContactsMessage inMessage:syncContactsMessage
success:^{ success:^{

4
Signal/src/util/ThreadUtil.m
Unescape Escape View File

@ -86,7 +86,7 @@ NS_ASSUME_NONNULL_BEGIN
attachmentIds:[NSMutableArray new] attachmentIds:[NSMutableArray new]
expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)]; expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)];
[messageSender enqueueOutgoingMessage:message success:successHandler failure:failureHandler]; [messageSender enqueueMessage:message success:successHandler failure:failureHandler];
return message; return message;
} }
@ -117,7 +117,7 @@ NS_ASSUME_NONNULL_BEGIN
inThread:thread inThread:thread
isVoiceMessage:[attachment isVoiceMessage] isVoiceMessage:[attachment isVoiceMessage]
expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)]; expiresInSeconds:(configuration.isEnabled ? configuration.durationSeconds : 0)];
[messageSender enqueueOutgoingAttachment:attachment.dataSource [messageSender enqueueAttachment:attachment.dataSource
contentType:attachment.mimeType contentType:attachment.mimeType
sourceFilename:attachment.filenameOrDefault sourceFilename:attachment.filenameOrDefault
inMessage:message inMessage:message

2
SignalServiceKit/src/Messages/OWSBlockingManager.m
Unescape Escape View File

@ -258,7 +258,7 @@ NSString *const kOWSBlockingManager_SyncedBlockedPhoneNumbersKey = @"kOWSBlockin
OWSBlockedPhoneNumbersMessage *message = OWSBlockedPhoneNumbersMessage *message =
[[OWSBlockedPhoneNumbersMessage alloc] initWithPhoneNumbers:blockedPhoneNumbers]; [[OWSBlockedPhoneNumbersMessage alloc] initWithPhoneNumbers:blockedPhoneNumbers];
[self.messageSender enqueueOutgoingMessage:message [self.messageSender enqueueMessage:message
success:^{ success:^{
DDLogInfo(@"%@ Successfully sent blocked phone numbers sync message", self.logTag); DDLogInfo(@"%@ Successfully sent blocked phone numbers sync message", self.logTag);

4
SignalServiceKit/src/Messages/OWSIdentityManager.m
Unescape Escape View File

@ -517,10 +517,10 @@ NSString *const kNSNotificationName_IdentityStateDidChange = @"kNSNotificationNa
// subsequently // subsequently
OWSOutgoingNullMessage *nullMessage = [[OWSOutgoingNullMessage alloc] initWithContactThread:contactThread OWSOutgoingNullMessage *nullMessage = [[OWSOutgoingNullMessage alloc] initWithContactThread:contactThread
verificationStateSyncMessage:message]; verificationStateSyncMessage:message];
[self.messageSender enqueueOutgoingMessage:nullMessage [self.messageSender enqueueMessage:nullMessage
success:^{ success:^{
DDLogInfo(@"%@ Successfully sent verification state NullMessage", self.logTag); DDLogInfo(@"%@ Successfully sent verification state NullMessage", self.logTag);
[self.messageSender enqueueOutgoingMessage:message [self.messageSender enqueueMessage:message
success:^{ success:^{
DDLogInfo(@"%@ Successfully sent verification state sync message", self.logTag); DDLogInfo(@"%@ Successfully sent verification state sync message", self.logTag);

12
SignalServiceKit/src/Messages/OWSMessageManager.m
Unescape Escape View File

@ -366,7 +366,7 @@ NS_ASSUME_NONNULL_BEGIN
OWSSyncGroupsRequestMessage *syncGroupsRequestMessage = OWSSyncGroupsRequestMessage *syncGroupsRequestMessage =
[[OWSSyncGroupsRequestMessage alloc] initWithThread:thread groupId:groupId]; [[OWSSyncGroupsRequestMessage alloc] initWithThread:thread groupId:groupId];
[self.messageSender enqueueOutgoingMessage:syncGroupsRequestMessage [self.messageSender enqueueMessage:syncGroupsRequestMessage
success:^{ success:^{
DDLogWarn(@"%@ Successfully sent Request Group Info message.", self.logTag); DDLogWarn(@"%@ Successfully sent Request Group Info message.", self.logTag);
} }
@ -609,7 +609,7 @@ NS_ASSUME_NONNULL_BEGIN
profileManager:self.profileManager]; profileManager:self.profileManager];
DataSource *dataSource = DataSource *dataSource =
[DataSourceValue dataSourceWithSyncMessage:[syncContactsMessage buildPlainTextAttachmentData]]; [DataSourceValue dataSourceWithSyncMessage:[syncContactsMessage buildPlainTextAttachmentData]];
[self.messageSender enqueueOutgoingTemporaryAttachment:dataSource [self.messageSender enqueueTemporaryAttachment:dataSource
contentType:OWSMimeTypeApplicationOctetStream contentType:OWSMimeTypeApplicationOctetStream
inMessage:syncContactsMessage inMessage:syncContactsMessage
success:^{ success:^{
@ -622,7 +622,7 @@ NS_ASSUME_NONNULL_BEGIN
OWSSyncGroupsMessage *syncGroupsMessage = [[OWSSyncGroupsMessage alloc] init]; OWSSyncGroupsMessage *syncGroupsMessage = [[OWSSyncGroupsMessage alloc] init];
DataSource *dataSource = [DataSourceValue DataSource *dataSource = [DataSourceValue
dataSourceWithSyncMessage:[syncGroupsMessage buildPlainTextAttachmentDataWithTransaction:transaction]]; dataSourceWithSyncMessage:[syncGroupsMessage buildPlainTextAttachmentDataWithTransaction:transaction]];
[self.messageSender enqueueOutgoingTemporaryAttachment:dataSource [self.messageSender enqueueTemporaryAttachment:dataSource
contentType:OWSMimeTypeApplicationOctetStream contentType:OWSMimeTypeApplicationOctetStream
inMessage:syncGroupsMessage inMessage:syncGroupsMessage
success:^{ success:^{
@ -639,7 +639,7 @@ NS_ASSUME_NONNULL_BEGIN
[[OWSReadReceiptManager sharedManager] areReadReceiptsEnabledWithTransaction:transaction]; [[OWSReadReceiptManager sharedManager] areReadReceiptsEnabledWithTransaction:transaction];
OWSSyncConfigurationMessage *syncConfigurationMessage = OWSSyncConfigurationMessage *syncConfigurationMessage =
[[OWSSyncConfigurationMessage alloc] initWithReadReceiptsEnabled:areReadReceiptsEnabled]; [[OWSSyncConfigurationMessage alloc] initWithReadReceiptsEnabled:areReadReceiptsEnabled];
[self.messageSender enqueueOutgoingMessage:syncConfigurationMessage [self.messageSender enqueueMessage:syncConfigurationMessage
success:^{ success:^{
DDLogInfo(@"%@ Successfully sent Configuration response syncMessage.", self.logTag); DDLogInfo(@"%@ Successfully sent Configuration response syncMessage.", self.logTag);
} }
@ -774,7 +774,7 @@ NS_ASSUME_NONNULL_BEGIN
if (gThread.groupModel.groupImage) { if (gThread.groupModel.groupImage) {
NSData *data = UIImagePNGRepresentation(gThread.groupModel.groupImage); NSData *data = UIImagePNGRepresentation(gThread.groupModel.groupImage);
DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithData:data fileExtension:@"png"]; DataSource *_Nullable dataSource = [DataSourceValue dataSourceWithData:data fileExtension:@"png"];
[self.messageSender enqueueOutgoingAttachment:dataSource [self.messageSender enqueueAttachment:dataSource
contentType:OWSMimeTypeImagePng contentType:OWSMimeTypeImagePng
sourceFilename:nil sourceFilename:nil
inMessage:message inMessage:message
@ -785,7 +785,7 @@ NS_ASSUME_NONNULL_BEGIN
DDLogError(@"%@ Failed to send group avatar update with error: %@", self.logTag, error); DDLogError(@"%@ Failed to send group avatar update with error: %@", self.logTag, error);
}]; }];
} else { } else {
[self.messageSender enqueueOutgoingMessage:message [self.messageSender enqueueMessage:message
success:^{ success:^{
DDLogDebug(@"%@ Successfully sent group update", self.logTag); DDLogDebug(@"%@ Successfully sent group update", self.logTag);
} }

10
SignalServiceKit/src/Messages/OWSMessageSender.h
Unescape Escape View File

@ -63,10 +63,10 @@ NS_SWIFT_NAME(MessageSender)
/** /**
* Send and resend text messages or resend messages with existing attachments. * 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` // TODO: make transaction nonnull and remove `sendMessage:success:failure`
- (void)enqueueOutgoingMessage:(TSOutgoingMessage *)message - (void)enqueueMessage:(TSOutgoingMessage *)message
success:(void (^)(void))successHandler success:(void (^)(void))successHandler
failure:(void (^)(NSError *error))failureHandler; failure:(void (^)(NSError *error))failureHandler;
@ -74,7 +74,7 @@ NS_SWIFT_NAME(MessageSender)
* Takes care of allocating and uploading the attachment, then sends the message. * Takes care of allocating and uploading the attachment, then sends the message.
* Only necessary to call once. If sending fails, retry with `sendMessage:`. * Only necessary to call once. If sending fails, retry with `sendMessage:`.
*/ */
- (void)enqueueOutgoingAttachment:(DataSource *)dataSource - (void)enqueueAttachment:(DataSource *)dataSource
contentType:(NSString *)contentType contentType:(NSString *)contentType
sourceFilename:(nullable NSString *)sourceFilename sourceFilename:(nullable NSString *)sourceFilename
inMessage:(TSOutgoingMessage *)outgoingMessage inMessage:(TSOutgoingMessage *)outgoingMessage
@ -82,10 +82,10 @@ NS_SWIFT_NAME(MessageSender)
failure:(void (^)(NSError *error))failureHandler; 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. * Used for sending sync request data, not for user visible attachments.
*/ */
- (void)enqueueOutgoingTemporaryAttachment:(DataSource *)dataSource - (void)enqueueTemporaryAttachment:(DataSource *)dataSource
contentType:(NSString *)contentType contentType:(NSString *)contentType
inMessage:(TSOutgoingMessage *)outgoingMessage inMessage:(TSOutgoingMessage *)outgoingMessage
success:(void (^)(void))successHandler success:(void (^)(void))successHandler

10
SignalServiceKit/src/Messages/OWSMessageSender.m
Unescape Escape View File

@ -419,7 +419,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
} }
} }
- (void)enqueueOutgoingMessage:(TSOutgoingMessage *)message - (void)enqueueMessage:(TSOutgoingMessage *)message
success:(void (^)(void))successHandler success:(void (^)(void))successHandler
failure:(void (^)(NSError *error))failureHandler failure:(void (^)(NSError *error))failureHandler
{ {
@ -509,7 +509,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
failure:failureHandler]; failure:failureHandler];
} }
- (void)enqueueOutgoingTemporaryAttachment:(DataSource *)dataSource - (void)enqueueTemporaryAttachment:(DataSource *)dataSource
contentType:(NSString *)contentType contentType:(NSString *)contentType
inMessage:(TSOutgoingMessage *)message inMessage:(TSOutgoingMessage *)message
success:(void (^)(void))successHandler success:(void (^)(void))successHandler
@ -531,7 +531,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
[message remove]; [message remove];
}; };
[self enqueueOutgoingAttachment:dataSource [self enqueueAttachment:dataSource
contentType:contentType contentType:contentType
sourceFilename:nil sourceFilename:nil
inMessage:message inMessage:message
@ -539,7 +539,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
failure:failureWithDeleteHandler]; failure:failureWithDeleteHandler];
} }
- (void)enqueueOutgoingAttachment:(DataSource *)dataSource - (void)enqueueAttachment:(DataSource *)dataSource
contentType:(NSString *)contentType contentType:(NSString *)contentType
sourceFilename:(nullable NSString *)sourceFilename sourceFilename:(nullable NSString *)sourceFilename
inMessage:(TSOutgoingMessage *)message inMessage:(TSOutgoingMessage *)message
@ -569,7 +569,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
message.attachmentFilenameMap[attachmentStream.uniqueId] = sourceFilename; message.attachmentFilenameMap[attachmentStream.uniqueId] = sourceFilename;
} }
[self enqueueOutgoingMessage:message success:successHandler failure:failureHandler]; [self enqueueMessage:message success:successHandler failure:failureHandler];
}); });
} }

2
SignalServiceKit/src/Messages/OWSNotifyRemoteOfUpdatedDisappearingConfigurationJob.m
Unescape Escape View File

@ -49,7 +49,7 @@ NS_ASSUME_NONNULL_BEGIN
[[OWSDisappearingMessagesConfigurationMessage alloc] initWithConfiguration:self.configuration [[OWSDisappearingMessagesConfigurationMessage alloc] initWithConfiguration:self.configuration
thread:self.thread]; thread:self.thread];
[self.messageSender enqueueOutgoingMessage:message [self.messageSender enqueueMessage:message
success:^{ success:^{
DDLogDebug( DDLogDebug(
@"%@ Successfully notified %@ of new disappearing messages configuration", self.logTag, self.thread); @"%@ Successfully notified %@ of new disappearing messages configuration", self.logTag, self.thread);

6
SignalServiceKit/src/Messages/OWSReadReceiptManager.m
Unescape Escape View File

@ -229,7 +229,7 @@ NSString *const OWSReadReceiptManagerAreReadReceiptsEnabled = @"areReadReceiptsE
OWSReadReceiptsForLinkedDevicesMessage *message = OWSReadReceiptsForLinkedDevicesMessage *message =
[[OWSReadReceiptsForLinkedDevicesMessage alloc] initWithReadReceipts:readReceiptsForLinkedDevices]; [[OWSReadReceiptsForLinkedDevicesMessage alloc] initWithReadReceipts:readReceiptsForLinkedDevices];
[self.messageSender enqueueOutgoingMessage:message [self.messageSender enqueueMessage:message
success:^{ success:^{
DDLogInfo(@"%@ Successfully sent %zd read receipt to linked devices.", DDLogInfo(@"%@ Successfully sent %zd read receipt to linked devices.",
self.logTag, self.logTag,
@ -253,7 +253,7 @@ NSString *const OWSReadReceiptManagerAreReadReceiptsEnabled = @"areReadReceiptsE
[[OWSReadReceiptsForSenderMessage alloc] initWithThread:thread [[OWSReadReceiptsForSenderMessage alloc] initWithThread:thread
messageTimestamps:timestamps.allObjects]; messageTimestamps:timestamps.allObjects];
[self.messageSender enqueueOutgoingMessage:message [self.messageSender enqueueMessage:message
success:^{ success:^{
DDLogInfo(@"%@ Successfully sent %zd read receipts to sender.", self.logTag, timestamps.count); DDLogInfo(@"%@ Successfully sent %zd read receipts to sender.", self.logTag, timestamps.count);
} }
@ -590,7 +590,7 @@ NSString *const OWSReadReceiptManagerAreReadReceiptsEnabled = @"areReadReceiptsE
OWSSyncConfigurationMessage *syncConfigurationMessage = OWSSyncConfigurationMessage *syncConfigurationMessage =
[[OWSSyncConfigurationMessage alloc] initWithReadReceiptsEnabled:value]; [[OWSSyncConfigurationMessage alloc] initWithReadReceiptsEnabled:value];
[self.messageSender enqueueOutgoingMessage:syncConfigurationMessage [self.messageSender enqueueMessage:syncConfigurationMessage
success:^{ success:^{
DDLogInfo(@"%@ Successfully sent Configuration syncMessage.", self.logTag); DDLogInfo(@"%@ Successfully sent Configuration syncMessage.", self.logTag);
} }

3
SignalServiceKit/src/Storage/TSYapDatabaseObject.h
Unescape Escape View File

@ -81,8 +81,7 @@ NS_ASSUME_NONNULL_BEGIN
*/ */
+ (nullable instancetype)fetchObjectWithUniqueID:(NSString *)uniqueID + (nullable instancetype)fetchObjectWithUniqueID:(NSString *)uniqueID
transaction:(YapDatabaseReadTransaction *)transaction 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:)); + (nullable instancetype)fetchObjectWithUniqueID:(NSString *)uniqueID NS_SWIFT_NAME(fetch(uniqueId:));
/** /**

Write Preview
Loading…
Cancel
Save