From e9287782cfe2d1dc3c7fd0cc0defb712ae951047 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Thu, 29 Apr 2021 16:38:45 +0200 Subject: [PATCH 1/2] RecentsDataSource: Hide spaces from home and room list but keep space invites. --- .../Common/Recents/DataSources/RecentsDataSource.m | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m index 497f80fce..57474d9c8 100644 --- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m +++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m @@ -1188,7 +1188,11 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou } else { - [conversationCellDataArray addObject:recentCellDataStoring]; + // Hide spaces from home (keep space invites) + if (room.summary.roomType != MXRoomTypeSpace) + { + [conversationCellDataArray addObject:recentCellDataStoring]; + } } } else if (_recentsDataSourceMode == RecentsDataSourceModeFavourites) @@ -1219,12 +1223,12 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou // Consider only non direct rooms. if (!room.isDirect) { - // Keep only the invites, the favourites and the rooms without tag + // Keep only the invites, the favourites and the rooms without tag and room type different from space if (room.summary.membership == MXMembershipInvite) { [invitesCellDataArray addObject:recentCellDataStoring]; } - else if (!room.accountData.tags.count || room.accountData.tags[kMXRoomTagFavourite]) + else if ((!room.accountData.tags.count || room.accountData.tags[kMXRoomTagFavourite]) && room.summary.roomType != MXRoomTypeSpace) { [conversationCellDataArray addObject:recentCellDataStoring]; } From 4011a1f90f963828429e0098e98ce2bf0b8fa103 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Thu, 29 Apr 2021 16:39:30 +0200 Subject: [PATCH 2/2] Update changes --- CHANGES.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 2de09a9b6..2f855fa83 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ Changes to be released in next version * 🙌 Improvements - * + * Spaces: Hide spaces from room list and home but keep space invites (#4252). 🐛 Bugfix * RoomVC: Avoid navigation to integration management using integration popup with settings set to integration disabled (#4261).