Display fallback when replied event content is partially missing

element-hq · Jul 4, 2022 · 6a63546 · 6a63546
1 parent 67249ac
commit 6a63546
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m b/Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
@@ -1867,6 +1867,13 @@ - (NSString*)buildHTMLStringForEvent:(MXEvent*)event inReplyToEvent:(MXEvent*)re
                 MXJSONModelSetString(repliedEventContent, repliedEvent.content[kMXMessageBodyKey]);
             }
         }
+
+        // No message content in a non-redacted event. Formatter should use fallback.
+        if (!repliedEventContent)
+        {
+            MXLogWarning(@"[MXKEventFormatter] Unable to retrieve content from replied event %@", repliedEvent.description)
+            return nil;
+        }
     }
 
     if (event.content[kMXMessageContentKeyNewContent])
@@ -1899,7 +1906,7 @@ - (NSString*)buildHTMLStringForEvent:(MXEvent*)event inReplyToEvent:(MXEvent*)re
     }
     else
     {
-        MXLogDebug(@"[MXKEventFormatter] Unable to build reply event %@", event.description)
+        MXLogWarning(@"[MXKEventFormatter] Unable to build reply event %@", event.description)
     }
 
     return html;

diff --git a/changelog.d/6371.bugfix b/changelog.d/6371.bugfix
@@ -0,0 +1 @@
+Display fallback when replied event content is partially missing