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

[Spaces] Show suggested in room lists #4501

Browse Source 
- Preview suggested rooms
This commit is contained in:
Gil Eluard
2021-08-03 13:45:22 +02:00
parent b50ff1b290
commit 3985f079ef
5 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
View File

@@ -57,7 +57,6 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
@property (nonatomic, assign, readwrite) CrossSigningBannerDisplay crossSigningBannerDisplay;
@property (nonatomic, strong) CrossSigningService *crossSigningService;
@property (nonatomic, strong) NSArray<MXSpaceChildInfo *> *lastSuggestedRooms;
@end
@@ -1301,7 +1300,12 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
}
else if (recentCellDataStoring.spaceChildInfo != nil)
{
[suggestedRoomCellDataArray addObject:recentCellDataStoring];
MXRoomSummary *roomSummary = [mxSession roomSummaryWithRoomId:recentCellDataStoring.spaceChildInfo.childRoomId];
BOOL isJoined = roomSummary.membership == MXMembershipJoin || roomSummary.membershipTransitionState == MXMembershipTransitionStateJoined;
if (!isJoined)
{
[suggestedRoomCellDataArray addObject:recentCellDataStoring];
}
}
else
{
@@ -1343,7 +1347,12 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
{
if (recentCellDataStoring.spaceChildInfo)
{
[suggestedRoomCellDataArray addObject:recentCellDataStoring];
MXRoomSummary *roomSummary = [mxSession roomSummaryWithRoomId:recentCellDataStoring.spaceChildInfo.childRoomId];
BOOL isJoined = roomSummary.membership == MXMembershipJoin || roomSummary.membershipTransitionState == MXMembershipTransitionStateJoined;
if (!isJoined)
{
[suggestedRoomCellDataArray addObject:recentCellDataStoring];
}
}
// Consider only non direct rooms.
else if (!room.isDirect)