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

Merge branch 'develop' into ismail/4384_room_summary_store

Browse Source
This commit is contained in:
ismailgulek
2021-10-12 11:49:55 +03:00
parent 665fa5fa9d ad37f87210
commit 32bb4c668a
120 changed files with 3683 additions and 1012 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Common/Recents/RecentsViewController.m
+1 -1
View File
@@ -417,7 +417,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
// Update here the index of the current selected cell (if any) - Useful in landscape mode with split view controller.
NSIndexPath *currentSelectedCellIndexPath = nil;
MasterTabBarController *masterTabBarController = [AppDelegate theDelegate].masterTabBarController;
if (masterTabBarController.currentRoomViewController)
if (masterTabBarController.selectedRoomId)
{
// Look for the rank of this selected room in displayed recents
currentSelectedCellIndexPath = [self.dataSource cellIndexPathWithRoomId:masterTabBarController.selectedRoomId andMatrixSession:masterTabBarController.selectedRoomSession];
Riot/Modules/Common/Recents/Views/RecentTableViewCell.m
+1
View File
@@ -125,6 +125,7 @@
}
[self.roomAvatar vc_setRoomAvatarImageWith:roomCellData.avatarUrl
roomId:roomCellData.roomIdentifier
displayName:roomCellData.roomDisplayname
mediaManager:roomCellData.mxSession.mediaManager];
}