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

Merge pull request #4590 from vector-im/steve/improve_recentsdatasource

Browse Source 
RecentsDataSource: Factorize section reset in one place
This commit is contained in:
SBiOSoftWhare
2021-07-29 12:05:26 +02:00
committed by GitHub
parent 44dffafa51 b3838b32a0
commit a924a35a23
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES.rst
+1
View File
@@ -10,6 +10,7 @@ Changes to be released in next version
* Notifications: Show decrypted content is enabled by default (#4519).
* People Tab: Remove the local contacts section (#4523).
* Contacts: Delay access to local contacts until they're needed for display (#4616).
* RecentsDataSource: Factorize section reset in one place (target #4591).
🐛 Bugfix
* Room: Fixed mentioning users from room info member details (#4583)
Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
+17 -14
View File
@@ -71,17 +71,9 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
processingQueue = dispatch_queue_create("RecentsDataSource", DISPATCH_QUEUE_SERIAL);
_crossSigningBannerDisplay = CrossSigningBannerDisplayNone;
crossSigningBannerSection = -1;
_secureBackupBannerDisplay = SecureBackupBannerDisplayNone;
secureBackupBannerSection = -1;
directorySection = -1;
invitesSection = -1;
favoritesSection = -1;
peopleSection = -1;
conversationSection = -1;
lowPrioritySection = -1;
serverNoticeSection = -1;
[self resetSectionIndexes];
_areSectionsShrinkable = NO;
shrinkedSectionsBitMask = 0;
@@ -96,6 +88,19 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
return self;
}
- (void)resetSectionIndexes
{
crossSigningBannerSection = -1;
secureBackupBannerSection = -1;
directorySection = -1;
invitesSection = -1;
favoritesSection = -1;
peopleSection = -1;
conversationSection = -1;
lowPrioritySection = -1;
serverNoticeSection = -1;
}
#pragma mark - Properties
@@ -445,7 +450,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
// Check whether all data sources are ready before rendering recents
if (self.state == MXKDataSourceStateReady)
{
crossSigningBannerSection = secureBackupBannerSection = directorySection = favoritesSection = peopleSection = conversationSection = lowPrioritySection = invitesSection = serverNoticeSection = -1;
[self resetSectionIndexes];
if (self.crossSigningBannerDisplay != CrossSigningBannerDisplayNone)
{
@@ -1119,10 +1124,8 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
#pragma mark - MXKDataSourceDelegate
- (void)refreshRoomsSection:(void (^)(void))onComplete;
- (void)refreshRoomsSection:(void (^)(void))onComplete
{
secureBackupBannerSection = directorySection = favoritesSection = peopleSection = conversationSection = lowPrioritySection = serverNoticeSection = invitesSection = -1;
if (displayedRecentsDataSourceArray.count > 0)
{
// FIXME manage multi accounts