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

[EventFormatter] Update room create event type processing when content has room predecessor info.

Browse source
This commit is contained in:
SBiOSoftWhare 2018-08-07 11:23:03 +02:00
parent 62a443f6b0
commit eb9892704f
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Riot/Utils/EventFormatter.m
View file

@ -115,9 +115,20 @@ NSString *const kEventFormatterOnReRequestKeysLinkActionSeparator = @"/";
}
}
if (event.eventType == MXEventTypeRoomCreate && roomState.hasRoomPredecessor)
if (event.eventType == MXEventTypeRoomCreate)
{
return [self roomCreatePredecessorAttributedStringFromRoomCreateContent:roomState.roomCreateContent];
MXRoomCreateContent *createContent = [MXRoomCreateContent modelFromJSON:event.content];
NSString *roomPredecessorId = createContent.roomPredecessorInfo.roomId;
if (roomPredecessorId)
{
return [self roomCreatePredecessorAttributedStringWithPredecessorRoomId:roomPredecessorId];
}
else
{
return nil;
}
}
NSAttributedString *attributedString = [super attributedStringFromEvent:event withRoomState:roomState error:error];
@ -559,14 +570,8 @@ NSString *const kEventFormatterOnReRequestKeysLinkActionSeparator = @"/";
#pragma mark - Room create predecessor
- (NSAttributedString*)roomCreatePredecessorAttributedStringFromRoomCreateContent:(MXRoomCreateContent*)roomCreateContent
- (NSAttributedString*)roomCreatePredecessorAttributedStringWithPredecessorRoomId:(NSString*)predecessorRoomId
{
if (!roomCreateContent)
{
return nil;
}
NSString *predecessorRoomId = roomCreateContent.roomPredecessorInfo.roomId;
NSString *predecessorRoomPermalink = [MXTools permalinkToRoom:predecessorRoomId];
NSDictionary *roomPredecessorReasonAttributes = @{