signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'nt/little-fixes16' into release/3.0.0

Browse Source
This commit is contained in:
Nora Trapp 2019-11-19 17:07:31 -08:00
commit 211b3258f9
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
SignalServiceKit/src/Messages/OWSMessageSender.m
View File

@ -2001,14 +2001,22 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
}
if (message.quotedMessage) {
// Though we currently only ever expect at most one thumbnail, the proto data model
// suggests this could change. The logic is intended to work with multiple, but
// if we ever actually want to send multiple, we should do more testing.
NSArray<TSAttachmentStream *> *quotedThumbnailAttachments =
[message.quotedMessage createThumbnailAttachmentsIfNecessaryWithTransaction:transaction];
for (TSAttachmentStream *attachment in quotedThumbnailAttachments) {
[attachmentIds addObject:attachment.uniqueId];
}
// We need to update the message record here to reflect the new attachments we may create.
[message
anyUpdateOutgoingMessageWithTransaction:transaction
block:^(TSOutgoingMessage *message) {
// Though we currently only ever expect at most one thumbnail, the
// proto data model suggests this could change. The logic is intended
// to work with multiple, but if we ever actually want to send
// multiple, we should do more testing.
NSArray<TSAttachmentStream *> *quotedThumbnailAttachments =
[message.quotedMessage
createThumbnailAttachmentsIfNecessaryWithTransaction:
transaction];
for (TSAttachmentStream *attachment in quotedThumbnailAttachments) {
[attachmentIds addObject:attachment.uniqueId];
}
}];
}
if (message.contactShare.avatarAttachmentId != nil) {
@ -2042,14 +2050,6 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
}
}
// All outgoing messages should be saved at the time they are enqueued.
// GRDB TODO: Remove; this should be redundant.
if (message.shouldBeSaved && [TSInteraction anyFetchWithUniqueId:message.uniqueId transaction:transaction] == nil) {
OWSFailDebug(@"Message not saved.");
[message anyInsertWithTransaction:transaction];
}
// When we start a message send, all "failed" recipients should be marked as "sending".
[message updateAllUnsentRecipientsAsSendingWithTransaction:transaction];