felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-18 23:48:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

vector-im/element-ios/issues/5298 - Replaced "msgtype" strings with new kMXMessageTypeKey.

Browse Source
This commit is contained in:
Stefan Ceriu
2021-12-13 10:04:30 +02:00
committed by Stefan Ceriu
parent 7f9e294d82
commit 5e3542a3dc
12 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Riot/Modules/MatrixKit/Utils/EventFormatter/MXKEventFormatter.m
View File

@@ -139,7 +139,7 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=\"(.*?)\">([^<]*)</a>";
if (event.eventType == MXEventTypeRoomMessage)
{
NSString *msgtype;
MXJSONModelSetString(msgtype, event.content[@"msgtype"]);
MXJSONModelSetString(msgtype, event.content[kMXMessageTypeKey]);
NSString *urlField;
NSDictionary *fileField;
@@ -1248,7 +1248,7 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=\"(.*?)\">([^<]*)</a>";
else
{
NSString *msgtype;
MXJSONModelSetString(msgtype, event.content[@"msgtype"]);
MXJSONModelSetString(msgtype, event.content[kMXMessageTypeKey]);
NSString *body;
BOOL isHTML = NO;
@@ -1979,7 +1979,7 @@ static NSString *const kHTMLATagRegexPattern = @"<a href=\"(.*?)\">([^<]*)</a>";
if (event.eventType == MXEventTypeRoomMessage)
{
NSString *msgtype = event.content[@"msgtype"];
NSString *msgtype = event.content[kMXMessageTypeKey];
if ([msgtype isEqualToString:kMXMessageTypeEmote] == NO)
{
NSString *senderDisplayName = [self senderDisplayNameForEvent:event withRoomState:roomState];