mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-28 23:32:41 +00:00
Merge branch 'master' into develop
This commit is contained in:
commit
8e456298e8
2 changed files with 9 additions and 1 deletions
|
@ -1867,6 +1867,13 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=(?:'|\")(.*?)(?:'|\")>(
|
|||
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 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=(?:'|\")(.*?)(?:'|\")>(
|
|||
}
|
||||
else
|
||||
{
|
||||
MXLogDebug(@"[MXKEventFormatter] Unable to build reply event %@", event.description)
|
||||
MXLogWarning(@"[MXKEventFormatter] Unable to build reply event %@", event.description)
|
||||
}
|
||||
|
||||
return html;
|
||||
|
|
1
changelog.d/6371.bugfix
Normal file
1
changelog.d/6371.bugfix
Normal file
|
@ -0,0 +1 @@
|
|||
Display fallback when replied event content is partially missing
|
Loading…
Reference in a new issue