make use of Obj-C's modern syntax for literals and subscripting

This commit is contained in:
fridtjof
2019-01-08 00:24:11 +01:00
parent 125e801218
commit 0e8c73344d
27 changed files with 195 additions and 197 deletions

View File

@@ -375,7 +375,7 @@
NSArray *identifiers = contact.matrixIdentifiers;
if (identifiers.count)
{
if ([_ignoredContactsByMatrixId objectForKey:identifiers.firstObject])
if (_ignoredContactsByMatrixId[identifiers.firstObject])
{
[unfilteredLocalContacts removeObjectAtIndex:index];
continue;
@@ -396,7 +396,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;
@@ -434,7 +434,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];
@@ -444,7 +444,7 @@
else if (identifiers.count)
{
NSString *userId = identifiers.firstObject;
if ([_ignoredContactsByMatrixId objectForKey:userId] == nil)
if (_ignoredContactsByMatrixId[userId] == nil)
{
[unfilteredMatrixContacts addObject:contact];
}