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

Merge pull request #4452 from vector-im/auto_accept_invites

Browse Source 
Auto Accept Invites
This commit is contained in:
ismailgulek
2021-06-23 10:45:35 +03:00
committed by GitHub
parent 2bb35b0bcf eaf8d6d2d7
commit 01c6dc7bcd
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES.rst
+1 -1
View File
@@ -5,7 +5,7 @@ Changes to be released in next version
*
🙌 Improvements
*
* Room lists: Hide invited rooms if auto-accept option enabled.
🐛 Bugfix
*
Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
+13 -3
View File
@@ -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)
{