amorfo77/sogo
1
0 Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-10-18 09:48:12 +00:00
Code Issues Projects Releases Wiki Activity

(fix) fallback to email if no cn is found (should avoid displaying bogus chips)

Browse Source
This commit is contained in:
Ludovic Marcotte committed 2016-06-21 15:57:35 -04:00
1 parent b72b52f052
commit 1efeca72c5
2 files changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

SoObjects/Appointments/iCalEntityObject+SOGo.m
+2 -2
View File
@@ -118,7 +118,7 @@ NSNumber *iCalDistantFutureNumber = nil;
{ {
organizerData = [NSMutableDictionary dictionaryWithObjectsAndKeys: organizerData = [NSMutableDictionary dictionaryWithObjectsAndKeys:
[organizer rfc822Email], @"email", [organizer rfc822Email], @"email",
[organizer cnWithoutQuotes], @"name", ([[organizer cnWithoutQuotes] length] ? [organizer cnWithoutQuotes] : [organizer rfc822Email]), @"name",
nil]; nil];
uid = [organizer uid]; uid = [organizer uid];
if ([uid length]) [organizerData setObject: uid forKey: @"uid"]; if ([uid length]) [organizerData setObject: uid forKey: @"uid"];
@@ -134,7 +134,7 @@ NSNumber *iCalDistantFutureNumber = nil;
{ {
attendeeData = [NSMutableDictionary dictionaryWithObjectsAndKeys: attendeeData = [NSMutableDictionary dictionaryWithObjectsAndKeys:
[currentAttendee rfc822Email], @"email", [currentAttendee rfc822Email], @"email",
[currentAttendee cnWithoutQuotes], @"name", ([[currentAttendee cnWithoutQuotes] length] ? [currentAttendee cnWithoutQuotes] : [currentAttendee rfc822Email]) , @"name",
nil]; nil];
if ((uid = [currentAttendee uid])) if ((uid = [currentAttendee uid]))
{ {
UI/MailPartViewers/UIxMailPartICalViewer.m
+1 -1
View File
@@ -546,7 +546,7 @@
person = [participants objectAtIndex: i]; person = [participants objectAtIndex: i];
if (![[person delegatedTo] length]) if (![[person delegatedTo] length])
[a addObject: [NSDictionary dictionaryWithObjectsAndKeys: ([person cnWithoutQuotes] ? [person cnWithoutQuotes] : [person rfc822Email]), @"name", [a addObject: [NSDictionary dictionaryWithObjectsAndKeys: ([[person cnWithoutQuotes] length] ? [person cnWithoutQuotes] : [person rfc822Email]), @"name",
[person rfc822Email], @"email", [person rfc822Email], @"email",
[[person partStatWithDefault] lowercaseString], @"partstat", nil]]; [[person partStatWithDefault] lowercaseString], @"partstat", nil]];
} }