mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-11-08 10:13:40 +00:00
Improve handling of mail delegates
This commit is contained in:
1 parent
0e8637ec9f
commit
bfd3508949
3 files changed
+14
-85
No files matched your search
@@ -346,18 +346,22 @@ static Class NSNullK;
|
||||
NSDictionary *contactInfos;
|
||||
NSString *cn, *email, *fullEmail;
|
||||
|
||||
fullEmail = nil;
|
||||
contactInfos = [self contactInfosForUserWithUIDorEmail: uid];
|
||||
email = [contactInfos objectForKey: @"c_email"];
|
||||
cn = [contactInfos objectForKey: @"cn"];
|
||||
if ([cn length] > 0)
|
||||
if (contactInfos)
|
||||
{
|
||||
if ([email length] > 0)
|
||||
fullEmail = [NSString stringWithFormat: @"%@ <%@>", cn, email];
|
||||
email = [contactInfos objectForKey: @"c_email"];
|
||||
cn = [contactInfos objectForKey: @"cn"];
|
||||
if ([cn length] > 0)
|
||||
{
|
||||
if ([email length] > 0)
|
||||
fullEmail = [NSString stringWithFormat: @"%@ <%@>", cn, email];
|
||||
else
|
||||
fullEmail = cn;
|
||||
}
|
||||
else
|
||||
fullEmail = cn;
|
||||
fullEmail = email;
|
||||
}
|
||||
else
|
||||
fullEmail = email;
|
||||
|
||||
return fullEmail;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user