From caa9773639bbc836584c4e7ca29f199656100472 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Tue, 17 Sep 2019 16:13:57 -0700 Subject: [PATCH] CR: extract method, remove scheduling unnecessary DM pass --- .../Attachments/OWSAttachmentDownloads.m | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/SignalServiceKit/src/Messages/Attachments/OWSAttachmentDownloads.m b/SignalServiceKit/src/Messages/Attachments/OWSAttachmentDownloads.m index d83ee30bc8..dcb8accfcc 100644 --- a/SignalServiceKit/src/Messages/Attachments/OWSAttachmentDownloads.m +++ b/SignalServiceKit/src/Messages/Attachments/OWSAttachmentDownloads.m @@ -348,9 +348,7 @@ typedef void (^AttachmentDownloadFailure)(NSError *error); }]; if (job.message != nil) { - // Ensure relevant sortId is loaded for touch to succeed. - [job.message anyReloadWithTransaction:transaction]; - [self.databaseStorage touchInteraction:job.message transaction:transaction]; + [self reloadAndTouchLatestVersionOfMessage:job.message transaction:transaction]; } }]; @@ -377,14 +375,7 @@ typedef void (^AttachmentDownloadFailure)(NSError *error); [attachmentStream anyInsertWithTransaction:transaction]; if (job.message != nil) { - // Ensure relevant sortId is loaded for touch to succeed. - [job.message anyReloadWithTransaction:transaction]; - [self.databaseStorage touchInteraction:job.message transaction:transaction]; - [transaction - addCompletionWithQueue:dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0) - block:^{ - [OWSDisappearingMessagesJob.sharedJob schedulePass]; - }]; + [self reloadAndTouchLatestVersionOfMessage:job.message transaction:transaction]; } }]; @@ -417,9 +408,7 @@ typedef void (^AttachmentDownloadFailure)(NSError *error); }]; if (job.message != nil) { - // Ensure relevant sortId is loaded for touch to succeed. - [job.message anyReloadWithTransaction:transaction]; - [self.databaseStorage touchInteraction:job.message transaction:transaction]; + [self reloadAndTouchLatestVersionOfMessage:job.message transaction:transaction]; } }]; @@ -434,6 +423,13 @@ typedef void (^AttachmentDownloadFailure)(NSError *error); }); } +- (void)reloadAndTouchLatestVersionOfMessage:(TSMessage *)message transaction:(SDSAnyWriteTransaction *)transaction +{ + // Ensure relevant sortId is loaded for touch to succeed. + [message anyReloadWithTransaction:transaction]; + [self.databaseStorage touchInteraction:message transaction:transaction]; +} + #pragma mark - - (void)retrieveAttachmentForJob:(OWSAttachmentDownloadJob *)job