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

CR: extract method, remove scheduling unnecessary DM pass

Browse Source
This commit is contained in:
Michael Kirk 2019-09-17 16:13:57 -07:00
parent 0a45ceee92
commit caa9773639
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
SignalServiceKit/src/Messages/Attachments/OWSAttachmentDownloads.m
View File

@ -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