Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

The local contacts section does not contain anymore the "unknown" matrix users

Browse source
This commit is contained in:
ylecollen 2015-01-27 08:36:21 +01:00
parent cf32cd9cad
commit ab08870677
1 changed files with 3 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
matrixConsole/matrixConsole/API/ContactManager.m
View file

@ -218,10 +218,7 @@ static ContactManager* sharedContactManager = nil;
// update with the known dict 3PID -> matrix ID
[self updateMatrixIDDeviceContactsList];
// build a merged contacts list until the 3PIDs lookups are performed
NSMutableArray* mergedContactsList = [deviceContactsList mutableCopy];
[self mergeMXUsers:mergedContactsList];
tmpContacts = mergedContactsList;
tmpContacts = [deviceContactsList mutableCopy];
}
lastSyncDate = [NSDate date];
@ -232,10 +229,8 @@ static ContactManager* sharedContactManager = nil;
// refresh the 3PIDS -> matrix IDs
[self refreshMatrixIDs];
#else
// add the MX users
NSMutableArray* tmpContacts = [deviceContactsList mutableCopy];
[self mergeMXUsers:tmpContacts];
contacts = tmpContacts;
// nop
// wait that refreshContactMatrixIDs is called
#endif
// at least, display the known contacts
@ -277,30 +272,6 @@ static ContactManager* sharedContactManager = nil;
}
}
// merge the knowns MXUsers with the contacts list
// return the number of modified / added contacts
- (int) mergeMXUsers:(NSMutableArray*)contactsList {
// check if the some room users are not defined in the local contacts book
MatrixSDKHandler *mxHandler = [MatrixSDKHandler sharedHandler];
// check if the user is already known
NSArray* users = [mxHandler.mxSession users];
NSArray* knownUserIDs = [matrixIDBy3PID allValues];
int count = 0;
for(MXUser* user in users) {
if (!knownUserIDs || [knownUserIDs indexOfObject:user.userId] == NSNotFound) {
MXCContact* contact = [[MXCContact alloc] initWithDisplayName:(user.displayname ? user.displayname : user.userId) matrixID:user.userId];
[matrixContactByMatrixUserID setValue:contact forKey:user.userId];
[contactsList addObject:contact];
count++;
}
}
return count;
}
#ifdef CONTACTS_3PIDS_SYNC
// refresh the 3PIDs -> Matrix ID list
// update the contact is required