Skip missing and invalid interactions in conversation view.

8 years ago · 2c0ba1cbd9
parent aa2480c9a3
commit 2c0ba1cbd9
1 changed files with 12 additions and 1 deletions
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@ -4719,7 +4719,18 @@ typedef enum : NSUInteger {
        for (NSUInteger row = 0; row < count; row++) {
            TSInteraction *interaction =
                [viewTransaction objectAtRow:row inSection:0 withMappings:self.messageMappings];
-            OWSAssert(interaction);
+            if (!interaction) {
+                OWSFail(@"%@ missing interaction in message mappings: %zd / %zd.", self.logTag, row, count);
+                continue;
+            }
+            if (!interaction.uniqueId) {
+                OWSFail(@"%@ invalid interaction in message mappings: %zd / %zd: %@.",
+                    self.logTag,
+                    row,
+                    count,
+                    interaction.description);
+                continue;
+            }

            ConversationViewItem *_Nullable viewItem = self.viewItemCache[interaction.uniqueId];
            if (viewItem) {