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

Merge remote-tracking branch 'origin/develop' into reskin

Browse Source 
# Conflicts:
#	Riot/Constants/RiotDesignValues.m
#	Riot/Modules/Authentication/AuthenticationViewController.m
This commit is contained in:
manuroe
2019-01-10 11:50:57 +01:00
parent 43f870209a f4f5bdd906
commit 63ee0e14be
31 changed files with 240 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Riot/Modules/Contacts/DataSources/ContactsDataSource.m
View File

@@ -376,7 +376,7 @@
NSArray *identifiers = contact.matrixIdentifiers;
if (identifiers.count)
{
if ([_ignoredContactsByMatrixId objectForKey:identifiers.firstObject])
if (_ignoredContactsByMatrixId[identifiers.firstObject])
{
[unfilteredLocalContacts removeObjectAtIndex:index];
continue;
@@ -397,7 +397,7 @@
MXKEmail *email = emails.firstObject;
// Trick: ignore @facebook.com email addresses from the results - facebook have discontinued that service...
if ([_ignoredContactsByEmail objectForKey:email.emailAddress] || [email.emailAddress hasSuffix:@"@facebook.com"])
if (_ignoredContactsByEmail[email.emailAddress] || [email.emailAddress hasSuffix:@"@facebook.com"])
{
[unfilteredLocalContacts removeObjectAtIndex:index];
continue;
@@ -435,7 +435,7 @@
{
for (NSString *userId in identifiers)
{
if ([_ignoredContactsByMatrixId objectForKey:userId] == nil)
if (_ignoredContactsByMatrixId[userId] == nil)
{
MXKContact *splitContact = [[MXKContact alloc] initMatrixContactWithDisplayName:contact.displayName andMatrixID:userId];
[unfilteredMatrixContacts addObject:splitContact];
@@ -445,7 +445,7 @@
else if (identifiers.count)
{
NSString *userId = identifiers.firstObject;
if ([_ignoredContactsByMatrixId objectForKey:userId] == nil)
if (_ignoredContactsByMatrixId[userId] == nil)
{
[unfilteredMatrixContacts addObject:contact];
}