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

Global messages search: Display correctly formatted messages

Browse source 
https://github.com/vector-im/vector-ios/issues/361
This commit is contained in:
giomfo 2016-09-28 09:35:53 +02:00
parent 7e8b7a5f1d
commit 4d44881838
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Vector/Model/RoomList/HomeSearchCellData.m
View file

@ -30,7 +30,7 @@
// We are displaying a search over all user's rooms
// As title, display the room name of this search result
MXRoom *room = [searchDataSource.mxSession roomWithRoomId:searchResult2.result.roomId];
MXRoom *room = [searchDataSource.mxSession roomWithRoomId:searchResult.result.roomId];
if (room)
{
title = room.vectorDisplayname;
@ -41,13 +41,26 @@
}
else
{
title = searchResult2.result.roomId;
title = searchResult.result.roomId;
}
date = [searchDataSource.eventFormatter dateStringFromEvent:searchResult2.result withTime:YES];
date = [searchDataSource.eventFormatter dateStringFromEvent:searchResult.result withTime:YES];
// Code from [MXEventFormatter stringFromEvent] for the particular case of a text message
message = [searchResult2.result.content[@"body"] isKindOfClass:[NSString class]] ? searchResult2.result.content[@"body"] : nil;
// Use the event formatter to display correctly the message in case of formatted body.
if (searchResult.result.eventType == MXEventTypeRoomMessage)
{
MXKEventFormatterError error;
message = [searchDataSource.eventFormatter stringFromEvent:searchResult.result withRoomState:nil error:&error];
if (error != MXKEventFormatterErrorNone)
{
message = nil;
}
}
if (!message.length)
{
message = [searchResult.result.content[@"body"] isKindOfClass:[NSString class]] ? searchResult.result.content[@"body"] : nil;
}
}
return self;
}