moparisthebest
/
davmail
mirror of https://github.com/moparisthebest/davmail
1
0
Fork 0
Code Issues Releases Wiki Activity

Caldav: another iPhone fix, remove organizer line if user is organizer 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@658 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-08-08 09:13:25 +00:00
parent baaec39cac
commit 14084205bb
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/davmail/exchange/ExchangeSession.java
View File

@ -1536,7 +1536,6 @@ public class ExchangeSession {
// See https://trac.calendarserver.org/browser/CalendarServer/trunk/doc/Extensions/caldav-privateevents.txt // See https://trac.calendarserver.org/browser/CalendarServer/trunk/doc/Extensions/caldav-privateevents.txt
boolean isAppleiCal = false; boolean isAppleiCal = false;
boolean hasOrganizer = false; boolean hasOrganizer = false;
boolean hasAttendee = false;
boolean invalidTimezoneId = false; boolean invalidTimezoneId = false;
String eventClass = null; String eventClass = null;
@ -1565,8 +1564,6 @@ public class ExchangeSession {
eventClass = value; eventClass = value;
} else if (!isAppleiCal && "CLASS".equals(key)) { } else if (!isAppleiCal && "CLASS".equals(key)) {
eventClass = value; eventClass = value;
} else if (key.startsWith("ATTENDEE")) {
hasAttendee = true;
} else if (key.startsWith("ORGANIZER")) { } else if (key.startsWith("ORGANIZER")) {
hasOrganizer = true; hasOrganizer = true;
} else if (key.startsWith("DTSTART;TZID=\"")) { } else if (key.startsWith("DTSTART;TZID=\"")) {
@ -1643,8 +1640,8 @@ public class ExchangeSession {
result.writeLine("X-CALENDARSERVER-ACCESS:" + eventClass); result.writeLine("X-CALENDARSERVER-ACCESS:" + eventClass);
} }
} }
// remove organizer line if event has no attendees for iPhone // remove organizer line if user is organizer for iPhone
} else if (fromServer && line.startsWith("ORGANIZER") && !hasAttendee) { } else if (fromServer && line.startsWith("ORGANIZER") && line.toLowerCase().endsWith(email)) {
continue; continue;
// add organizer line to all events created in Exchange for active sync // add organizer line to all events created in Exchange for active sync
} else if (!fromServer && "END:VEVENT".equals(line) && !hasOrganizer) { } else if (!fromServer && "END:VEVENT".equals(line) && !hasOrganizer) {