amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-10 02:45:08 +00:00
Code Issues Projects Releases Wiki Activity

(fix) avoid duplicating attendees when accepting event using a different identity over CalDAV

Browse Source 
Conflicts:

	SoObjects/Appointments/iCalEntityObject+SOGo.h
This commit is contained in:
Ludovic Marcotte
2015-12-15 11:08:30 -05:00
parent 544cb85e4d
commit cfb741fc9f
4 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/SOGoAppointmentObject.m
+27 -3
View File
@@ -2173,13 +2173,37 @@ inRecurrenceExceptionsForEvent: (iCalEvent *) theEvent
{
iCalPerson *attendee, *delegate;
NSString *delegateEmail;
attendee = [newEvent userAsAttendee: [SOGoUser userWithLogin: owner]];
attendee = [oldEvent userAsAttendee: [SOGoUser userWithLogin: owner]];
if (!attendee)
[newEvent userAsAttendee: [SOGoUser userWithLogin: owner]];
else
{
// We must do an extra check here since Bob could have invited Alice
// using alice@example.com but she would have accepted with ATTENDEE set
// to sexy@example.com. That would duplicate the ATTENDEE and set the
// participation status to ACCEPTED for sexy@example.com but leave it
// to NEEDS-ACTION to alice@example. This can happen in Mozilla Thunderbird/Lightning
// when a user with multiple identities accepts an event invitation to one
// of its identity (which is different than the email address associated with
// the mail account) prior doing a calendar refresh.
NSMutableArray *attendees;
NSString *partStat;
attendees = [NSMutableArray arrayWithArray: [newEvent attendeesWithoutUser: [SOGoUser userWithLogin: owner]]];
partStat = [newEvent participationStatusForUser: [SOGoUser userWithLogin: owner]
attendee: attendee];
[attendee setPartStat: partStat];
[attendees addObject: attendee];
[newEvent setAttendees: attendees];
}
// We first check of the sequences are alright. We don't accept attendees
// accepting "old" invitations. If that's the case, we return a 403
if ([[newEvent sequence] intValue] < [[oldEvent sequence] intValue])
return [NSException exceptionWithHTTPStatus:403
return [NSException exceptionWithHTTPStatus: 403
reason: @"sequences don't match"];
// Remove the RSVP attribute, as an action from the attendee