From a01164e8b1b925b93e9aeeeeb79224bdf2cdbd91 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Fri, 4 May 2018 10:40:33 -0400 Subject: [PATCH] Add canary assert // FREEBIE --- .../src/Messages/OWSDisappearingMessagesFinder.m | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m b/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m index 2ab6229f4..4260ab6c1 100644 --- a/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m +++ b/SignalServiceKit/src/Messages/OWSDisappearingMessagesFinder.m @@ -7,6 +7,7 @@ #import "OWSPrimaryStorage.h" #import "TSIncomingMessage.h" #import "TSMessage.h" +#import "TSOutgoingMessage.h" #import "TSThread.h" #import #import @@ -60,6 +61,10 @@ static NSString *const OWSDisappearingMessageFinderExpiresAtIndex = @"index_mess object); return; } + + // We'll need to update if we ever support expiring other message types + OWSAssert([object isKindOfClass:[TSOutgoingMessage class]] || [object isKindOfClass:[TSIncomingMessage class]]); + TSMessage *message = (TSMessage *)object; if ([message shouldStartExpireTimerWithTransaction:transaction]) { if ([message isKindOfClass:[TSIncomingMessage class]]) { @@ -67,9 +72,6 @@ static NSString *const OWSDisappearingMessageFinderExpiresAtIndex = @"index_mess if (!incomingMessage.wasRead) { return; } - } else { - // update if we ever support other disappearing message types - OWSProdLogAndFail([message isKindOfClass:[TSOutgoingMessage class]]); } [messageIds addObject:key]; }