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

Merge branch 'develop' into gil/4570_home_space_data_filtering

Browse Source
This commit is contained in:
Gil Eluard
2021-10-15 14:20:04 +02:00
parent cc576861c0 d86d3a139d
commit b5ded8d2a7
158 changed files with 5040 additions and 1109 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
+8 -2
View File
@@ -126,11 +126,17 @@
if (roomCellData.spaceChildInfo)
{
[self.roomAvatar vc_setRoomAvatarImageWith:roomCellData.spaceChildInfo.avatarUrl displayName:roomCellData.spaceChildInfo.displayName mediaManager:roomCellData.recentsDataSource.mxSession.mediaManager];
[self.roomAvatar vc_setRoomAvatarImageWith:roomCellData.spaceChildInfo.avatarUrl
roomId:roomCellData.spaceChildInfo.childRoomId
displayName:roomCellData.spaceChildInfo.displayName
mediaManager:roomCellData.recentsDataSource.mxSession.mediaManager];
}
else
{
[self.roomAvatar vc_setRoomAvatarImageWith:roomCellData.roomSummary.avatar displayName:roomCellData.roomSummary.displayname mediaManager:roomCellData.roomSummary.mxSession.mediaManager];
[self.roomAvatar vc_setRoomAvatarImageWith:roomCellData.roomSummary.avatar
roomId:roomCellData.roomSummary.roomId
displayName:roomCellData.roomSummary.displayname
mediaManager:roomCellData.roomSummary.mxSession.mediaManager];
}
}
else