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

Merge branch 'develop' into ismail/5068_start_thread

Browse Source
This commit is contained in:
ismailgulek
2022-01-17 11:35:10 +03:00
parent ac1b79ff92 a8165d23a4
commit a314deb7a1
300 changed files with 6253 additions and 924 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/MatrixKit/Controllers/MXKRoomViewController.m
+2 -5
View File
@@ -2179,12 +2179,12 @@
if (event && event.eventType == MXEventTypeRoomMessage)
{
NSString *msgtype = event.content[@"msgtype"];
NSString *msgtype = event.content[kMXMessageTypeKey];
NSString* textMessage;
if ([msgtype isEqualToString:kMXMessageTypeText])
{
textMessage = event.content[@"body"];
textMessage = event.content[kMXMessageBodyKey];
}
// Show a confirmation popup to the end user
@@ -3668,9 +3668,6 @@
MXLogDebug(@"[MXKRoomVC] showAttachmentInCell on an unsent media");
}
}
else if (selectedAttachment.type == MXKAttachmentTypeLocation)
{
}
else if (selectedAttachment.type == MXKAttachmentTypeFile || selectedAttachment.type == MXKAttachmentTypeAudio)
{
// Start activity indicator as feedback on file selection.