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

Fix bug in OWSDisappearingMessageJob

Browse Source
This commit is contained in:
Nora Trapp 2022-03-14 12:11:37 -07:00
parent c02c6b1d13
commit bc05399421
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SignalServiceKit/src/Messages/OWSDisappearingMessagesJob.m
View File

@ -168,16 +168,22 @@ void AssertIsOnDisappearingMessagesQueue()
function:__FUNCTION__
line:__LINE__];
if (!nextMessageExpirationTimestampNumber && !nextStoryExpirationTimestampNumber) {
uint64_t nextExpirationAt;
if (nextMessageExpirationTimestampNumber && nextStoryExpirationTimestampNumber) {
uint64_t nextMessageExpirationAt = nextMessageExpirationTimestampNumber.unsignedLongLongValue;
uint64_t nextStoryExpirationAt = nextStoryExpirationTimestampNumber.unsignedLongLongValue;
nextExpirationAt = MIN(nextMessageExpirationAt, nextStoryExpirationAt);
} else if (nextMessageExpirationTimestampNumber) {
nextExpirationAt = nextMessageExpirationTimestampNumber.unsignedLongLongValue;
} else if (nextStoryExpirationTimestampNumber) {
nextExpirationAt = nextStoryExpirationTimestampNumber.unsignedLongLongValue;
} else {
OWSLogDebug(@"No more expiring messages.");
return deletedCount;
}
uint64_t nextMessageExpirationAt = nextMessageExpirationTimestampNumber.unsignedLongLongValue;
uint64_t nextStoryExpirationAt = nextStoryExpirationTimestampNumber.unsignedLongLongValue;
uint64_t nextExpirationAt = MIN(nextMessageExpirationAt, nextStoryExpirationAt);
NSDate *nextEpirationDate = [NSDate ows_dateWithMillisecondsSince1970:nextExpirationAt];
[self scheduleRunByDate:nextEpirationDate];
NSDate *nextExpirationDate = [NSDate ows_dateWithMillisecondsSince1970:nextExpirationAt];
[self scheduleRunByDate:nextExpirationDate];
return deletedCount;
}