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

Caldav: more vcalendar patches 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1319 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-07-29 22:30:38 +00:00
parent 3edbd2c44c
commit cae681adc0
2 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/java/davmail/exchange/VCalendar.java
View File

@ -34,7 +34,7 @@ public class VCalendar extends VObject {
* Create VCalendar object from reader;
*
* @param reader stream reader
* @param email current user email
* @param email current user email
* @throws IOException on error
*/
public VCalendar(BufferedReader reader, String email) throws IOException {
@ -49,7 +49,7 @@ public class VCalendar extends VObject {
* Create VCalendar object from reader;
*
* @param vCalendarBody item body
* @param email current user email
* @param email current user email
* @throws IOException on error
*/
public VCalendar(String vCalendarBody, String email) throws IOException {
@ -69,7 +69,7 @@ public class VCalendar extends VObject {
protected boolean isAllDay(VObject vObject) {
VProperty dtstart = vObject.getProperty("DTSTART");
return dtstart != null && dtstart.hasParam("DATE");
return dtstart != null && dtstart.hasParam("VALUE", "DATE");
}
protected boolean hasCdoAllDay(VObject vObject) {
@ -118,29 +118,68 @@ public class VCalendar extends VObject {
for (VObject vObject : vObjects) {
if ("VEVENT".equals(vObject.type)) {
if (calendarServerAccess != null) {
setPropertyValue("CLASS", getEventClass(calendarServerAccess));
} else if (vObject.getPropertyValue("X-CALENDARSERVER-ACCESS") != null){
setPropertyValue("CLASS", getEventClass(vObject.getPropertyValue("X-CALENDARSERVER-ACCESS")));
vObject.setPropertyValue("CLASS", getEventClass(calendarServerAccess));
} else if (vObject.getPropertyValue("X-CALENDARSERVER-ACCESS") != null) {
vObject.setPropertyValue("CLASS", getEventClass(vObject.getPropertyValue("X-CALENDARSERVER-ACCESS")));
}
// add organizer line to all events created in Exchange for active sync
if (vObject.getPropertyValue("ORGANIZER") == null) {
vObject.setPropertyValue("ORGANIZER", "MAILTO:"+email);
if (!fromServer) {
// add organizer line to all events created in Exchange for active sync
if (vObject.getPropertyValue("ORGANIZER") == null) {
vObject.setPropertyValue("ORGANIZER", "MAILTO:" + email);
}
// set OWA allday flag
vObject.setPropertyValue("X-MICROSOFT-CDO-ALLDAYEVENT", isAllDay(vObject) ? "TRUE" : "FALSE");
fixAttendees(vObject);
} else {
// remove organizer line for event without attendees for iPhone
if (getProperty("ATTENDEE") == null) {
vObject.setPropertyValue("ORGANIZER", null);
}
}
}
}
}
/**
* Replace iCal4 (Snow Leopard) principal paths with mailto expression
*
* @param value attendee value or ics line
* @return fixed value
*/
protected String replaceIcal4Principal(String value) {
if (value.contains("/principals/__uuids__/")) {
return value.replaceAll("/principals/__uuids__/([^/]*)__AT__([^/]*)/", "mailto:$1@$2");
} else {
return value;
}
}
private void fixAttendees(VObject vObject) {
if (properties != null) {
for (VProperty property : properties) {
if ("ATTENDEE".equalsIgnoreCase(property.getKey())) {
property.setValue(replaceIcal4Principal(property.getValue()));
// ignore attendee as organizer
if (property.getValue().contains(email)) {
property.setValue(null);
}
}
}
}
}
/**
* Convert X-CALENDARSERVER-ACCESS to CLASS.
*
* @return CLASS value
*/
protected String getEventClass(String calendarServerAccess) {
if ("PRIVATE".equals(calendarServerAccess)) {
if ("PRIVATE".equalsIgnoreCase(calendarServerAccess)) {
return "CONFIDENTIAL";
} else if ("CONFIDENTIAL".equals(calendarServerAccess) || "RESTRICTED".equals(calendarServerAccess)) {
} else if ("CONFIDENTIAL".equalsIgnoreCase(calendarServerAccess) || "RESTRICTED".equalsIgnoreCase(calendarServerAccess)) {
return "PRIVATE";
} else {
return calendarServerAccess;
@ -154,9 +193,9 @@ public class VCalendar extends VObject {
*/
protected String getCalendarServerAccess() {
String eventClass = firstVevent.getPropertyValue("CLASS");
if ("PRIVATE".equals(eventClass)) {
if ("PRIVATE".equalsIgnoreCase(eventClass)) {
return "CONFIDENTIAL";
} else if ("CONFIDENTIAL".equals(eventClass)) {
} else if ("CONFIDENTIAL".equalsIgnoreCase(eventClass)) {
return "PRIVATE";
} else {
return eventClass;

2
src/java/davmail/exchange/dav/DavExchangeSession.java
View File

@ -856,7 +856,7 @@ public class DavExchangeSession extends ExchangeSession {
if (status == HttpStatus.SC_OK) {
LOGGER.debug("Updated event " + encodedHref);
} else if (status == HttpStatus.SC_CREATED) {
LOGGER.warn("Overwritten event " + encodedHref);
LOGGER.debug("Created event " + encodedHref);
} else if (status == HttpStatus.SC_NOT_FOUND) {
LOGGER.debug("Event not found at " + encodedHref + ", searching permanenturl by urlcompname");
// failover, search item by urlcompname