Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 15:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
ismailgulek 2022-07-05 10:26:51 +03:00
commit 8e456298e8
No known key found for this signature in database
GPG key ID: E96336D42D9470A9
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
View file

@ -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
View file

@ -0,0 +1 @@
Display fallback when replied event content is partially missing