felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-19 16:13:42 +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
Riot/Modules/StartChat/StartChatViewController.m
+3 -3
View File
@@ -258,7 +258,7 @@
if (identifiers.count)
{
// Here the contact can only have one identifier
[contactsDataSource.ignoredContactsByMatrixId setObject:contact forKey:identifiers.firstObject];
contactsDataSource.ignoredContactsByMatrixId[identifiers.firstObject] = contact;
}
else
{
@@ -267,7 +267,7 @@
{
// Here the contact can only have one email
MXKEmail *email = emails.firstObject;
[contactsDataSource.ignoredContactsByEmail setObject:contact forKey:email.emailAddress];
contactsDataSource.ignoredContactsByEmail[email.emailAddress] = contact;
}
}
isMultiUseNameByDisplayName[contact.displayName] = (isMultiUseNameByDisplayName[contact.displayName] ? @(YES) : @(NO));
@@ -275,7 +275,7 @@
if (userContact)
{
[contactsDataSource.ignoredContactsByMatrixId setObject:userContact forKey:self.mainSession.myUser.userId];
contactsDataSource.ignoredContactsByMatrixId[self.mainSession.myUser.userId] = userContact;
}
}