From aad93d2d897d74ed5809e611d720346090136ce2 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 16 Nov 2017 13:23:47 -0500 Subject: [PATCH] Fix broken assert in conversation view item. --- .../ConversationView/ConversationViewItem.m | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m index f9ddeebc5..b41dc85c3 100644 --- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m +++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m @@ -358,8 +358,11 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType) OWSAssert(transaction); OWSAssert(!self.hasViewState); - OWSAssert([self.interaction isKindOfClass:[TSOutgoingMessage class]] || - [self.interaction isKindOfClass:[TSIncomingMessage class]]); + if (![self.interaction isKindOfClass:[TSOutgoingMessage class]] + && ![self.interaction isKindOfClass:[TSIncomingMessage class]]) { + // Only text & attachment messages have "view state". + return; + } self.hasViewState = YES;