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

Merge develop into 4734_room_stack

Browse Source
This commit is contained in:
SBiOSoftWhare
2021-10-20 11:14:52 +02:00
parent 3959b40d12 52f96e37be
commit c49fe6cd7c
109 changed files with 3881 additions and 2763 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Common/Recents/RecentsViewController.m
+11 -6
View File
@@ -917,7 +917,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
{
id<MXKRecentCellDataStoring> cellDataStoring = (id<MXKRecentCellDataStoring> )cellData;
if (cellDataStoring.roomSummary.room.summary.membership != MXMembershipInvite)
if (cellDataStoring.roomSummary.membership != MXMembershipInvite)
{
return RecentTableViewCell.class;
}
@@ -1467,18 +1467,17 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
id<MXKRecentCellDataStoring> cellData = [self.dataSource cellDataAtIndexPath:indexPath];
// Retrieve the invited room
MXRoom* invitedRoom = cellData.roomSummary.room;
if (invitedRoom.summary.roomType == MXRoomTypeSpace)
if (cellData.roomSummary.roomType == MXRoomTypeSpace)
{
// Indicates that spaces are not supported
[self showSpaceInviteNotAvailable];
}
// Check if can show preview for the invited room
else if ([self canShowRoomPreviewFor:invitedRoom])
else if ([self canShowRoomPreviewFor:cellData.roomSummary])
{
// Display the room preview
[self showRoomWithRoomId:invitedRoom.roomId inMatrixSession:invitedRoom.mxSession];
[self showRoomWithRoomId:cellData.roomIdentifier inMatrixSession:cellData.mxSession];
}
else
{
@@ -2235,7 +2234,13 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
- (BOOL)shouldShowEmptyView
{
return NO;
// Do not present empty screen while searching
if (self.recentsDataSource.searchPatternsList.count)
{
return NO;
}
return self.recentsDataSource.totalVisibleItemCount == 0;
}
#pragma mark - RoomsDirectoryCoordinatorBridgePresenterDelegate