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

Fix crash in [MXKContactManager localContactsSplitByContactMethod]

Browse Source 
https://github.com/matrix-org/riot-ios-rageshakes/issues/36

Do not call this method from another thread than main to avoid race conditions within MXKContactManager queues.
This does not affect performance on the UI. CPU eating processing seems to be in the for-loops in the block.
This commit is contained in:
manuroe
2017-06-12 09:17:53 +02:00
parent 36df0c14d2
commit 4d9ced4786
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Model/Contact/ContactsDataSource.m
+23 -23
View File
@@ -150,32 +150,32 @@
searchText = [searchText stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
searchProcessingCount++;
dispatch_async(searchProcessingQueue, ^{
if (!searchText.length)
if (!searchText.length)
{
searchProcessingLocalContacts = nil;
searchProcessingMatrixContacts = nil;
// Disclose by default the sections if a search was in progress.
if (searchProcessingText.length)
{
searchProcessingLocalContacts = nil;
searchProcessingMatrixContacts = nil;
// Disclose by default the sections if a search was in progress.
if (searchProcessingText.length)
{
shrinkedSectionsBitMask = 0;
}
}
else if (forceRefresh || !searchProcessingText.length || [searchText hasPrefix:searchProcessingText] == NO)
{
// Retrieve all the local contacts
searchProcessingLocalContacts = [self unfilteredLocalContactsArray];
// Retrieve all known matrix users
searchProcessingMatrixContacts = [self unfilteredMatrixContactsArray];
// Disclose the sections
shrinkedSectionsBitMask = 0;
}
}
else if (forceRefresh || !searchProcessingText.length || [searchText hasPrefix:searchProcessingText] == NO)
{
// Retrieve all the local contacts
searchProcessingLocalContacts = [self unfilteredLocalContactsArray];
// Retrieve all known matrix users
searchProcessingMatrixContacts = [self unfilteredMatrixContactsArray];
// Disclose the sections
shrinkedSectionsBitMask = 0;
}
dispatch_async(searchProcessingQueue, ^{
for (NSUInteger index = 0; index < searchProcessingLocalContacts.count;)
{
MXKContact* contact = searchProcessingLocalContacts[index];