From ca40e8d0c76321f6e457f736f9c370c8f461e93c Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Mon, 21 Jun 2021 14:51:09 +0300 Subject: [PATCH 1/3] Hide invited rooms in recents if auto-accept option enabled --- .../Recents/DataSources/RecentsDataSource.m | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m index a63d14489..3857f61fc 100644 --- a/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m +++ b/Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m @@ -1273,7 +1273,10 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou } else if (room.summary.membership == MXMembershipInvite) { - [invitesCellDataArray addObject:recentCellDataStoring]; + if (!MXSDKOptions.sharedInstance.autoAcceptRoomInvites) + { + [invitesCellDataArray addObject:recentCellDataStoring]; + } } else if (room.isDirect) { @@ -1303,7 +1306,11 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou { if (room.summary.membership == MXMembershipInvite) { - [invitesCellDataArray addObject:recentCellDataStoring]; + if (!MXSDKOptions.sharedInstance.autoAcceptRoomInvites) + { + [invitesCellDataArray addObject:recentCellDataStoring]; + } + } else { @@ -1319,7 +1326,10 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou // 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]; + if (!MXSDKOptions.sharedInstance.autoAcceptRoomInvites) + { + [invitesCellDataArray addObject:recentCellDataStoring]; + } } else if ((!room.accountData.tags.count || room.accountData.tags[kMXRoomTagFavourite]) && room.summary.roomType != MXRoomTypeSpace) { From 6910876ce85404fa7721cf6a92b03e06b96961a2 Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Mon, 21 Jun 2021 15:10:43 +0300 Subject: [PATCH 2/3] Update CHANGES.rst --- CHANGES.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.rst b/CHANGES.rst index 6522acffc..0fa72bdbf 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -15,6 +15,7 @@ Changes to be released in next version * Wording: Replace Recovery Passphrase and Recovery Key by Security Phrase and Security Key (#4268). * Room directory: Join room by alias or id (#4429). * Room lists: Avoid app freezes by building them on a separated thread (#3777). + * Room lists: Hide invited rooms if auto-accept option enabled. 🐛 Bugfix * StartChatViewController: Add more helpful message when trying to start DM with a user that does not exist (#224). From eaf8d6d2d7f1093349a2487e5abeb37a10844f25 Mon Sep 17 00:00:00 2001 From: ismailgulek Date: Tue, 22 Jun 2021 10:43:44 +0300 Subject: [PATCH 3/3] Update CHANGES.rst --- CHANGES.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index b1fd74234..fb4d525a5 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,7 +5,7 @@ Changes to be released in next version * 🙌 Improvements - * + * Room lists: Hide invited rooms if auto-accept option enabled. 🐛 Bugfix * @@ -39,7 +39,6 @@ Changes in 1.4.2 (2021-06-21) * Wording: Replace Recovery Passphrase and Recovery Key by Security Phrase and Security Key (#4268). * Room directory: Join room by alias or id (#4429). * Room lists: Avoid app freezes by building them on a separated thread (#3777). - * Room lists: Hide invited rooms if auto-accept option enabled. 🐛 Bugfix * StartChatViewController: Add more helpful message when trying to start DM with a user that does not exist (#224).