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

Merge branch 'develop' of https://github.com/vector-im/element-ios into langleyd/5292_refresh_tokens

Browse Source
This commit is contained in:
David Langley
2022-01-06 22:43:20 +00:00
parent fb6dede930 11beed22c6
commit 6df4713eba
312 changed files with 8682 additions and 2325 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/MatrixKit/Controllers/MXKRoomViewController.m
+9 -10
View File
@@ -1031,14 +1031,16 @@
roomDataSource = nil;
// Add reason label
_leftRoomReasonLabel = [[UILabel alloc] initWithFrame:CGRectMake(10, 5, self.view.frame.size.width - 20, 70)];
_leftRoomReasonLabel.numberOfLines = 0;
_leftRoomReasonLabel.text = reason;
_leftRoomReasonLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth;
UILabel *leftRoomReasonLabel = [[UILabel alloc] initWithFrame:CGRectMake(10, 5, self.view.frame.size.width - 20, 70)];
leftRoomReasonLabel.numberOfLines = 0;
leftRoomReasonLabel.text = reason;
leftRoomReasonLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth;
_bubblesTableView.tableHeaderView = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, 80)];
[_bubblesTableView.tableHeaderView addSubview:_leftRoomReasonLabel];
[_bubblesTableView.tableHeaderView addSubview:leftRoomReasonLabel];
[_bubblesTableView reloadData];
_leftRoomReasonLabel = leftRoomReasonLabel;
[self updateViewControllerAppearanceOnRoomDataSourceState];
}
@@ -2177,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
@@ -3666,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.