Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix string conversion from attributed

Browse source
This commit is contained in:
aringenbach 2022-05-09 10:31:42 +02:00
parent 0bfd86804d
commit 7112b7d523
1 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Riot/Utils/EventFormatter.m
View file

@ -63,7 +63,25 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
[timeFormatter setDateFormat:kEventFormatterTimeFormat];
}
- (NSAttributedString *)attributedStringFromEvent:(MXEvent *)event withRoomState:(MXRoomState *)roomState error:(MXKEventFormatterError *)error
- (NSString *)stringFromEvent:(MXEvent *)event withRoomState:(MXRoomState *)roomState error:(MXKEventFormatterError *)error
{
NSString *stringFromEvent;
NSAttributedString *attributedStringFromEvent = [self attributedStringFromEvent:event
withRoomState:roomState
displayPills:NO
error:error];
if (*error == MXKEventFormatterErrorNone)
{
stringFromEvent = attributedStringFromEvent.string;
}
return stringFromEvent;
}
- (NSAttributedString *)attributedStringFromEvent:(MXEvent *)event
withRoomState:(MXRoomState *)roomState
displayPills:(BOOL)displayPills
error:(MXKEventFormatterError *)error
{
NSAttributedString *string = [self unsafeAttributedStringFromEvent:event withRoomState:roomState error:error];
if (!string)
@ -75,7 +93,7 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
roomState != nil,
roomState.membersCount.members,
*error);
// If we cannot create attributed string, but the message is nevertheless meant for display, show generic error
// instead of a missing message on a timeline.
if ([self shouldDisplayEvent:event]) {
@ -85,10 +103,10 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
}];
}
}
if (@available(iOS 15.0, *))
{
if (roomState && [self shouldDisplayEvent:event])
if (displayPills && roomState && [self shouldDisplayEvent:event])
{
string = [StringPillsUtils insertPillsIn:string withSession:mxSession event:event andRoomState:roomState isEditMode:NO];
}
@ -97,6 +115,11 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
return string;
}
- (NSAttributedString *)attributedStringFromEvent:(MXEvent *)event withRoomState:(MXRoomState *)roomState error:(MXKEventFormatterError *)error
{
return [self attributedStringFromEvent:event withRoomState:roomState displayPills:YES error:error];
}
- (BOOL)shouldDisplayEvent:(MXEvent *)event {
return event.eventType == MXEventTypeRoomMessage
&& !event.isEditEvent