moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-13 11:12:22 -05:00
Code Issues Releases Wiki Activity

Caldav: Fix AllDay handling

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@414 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-03-03 15:59:06 +00:00
parent 6bf03bba3a
commit cc1aa6ce32
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -961,7 +961,7 @@ public class ExchangeSession {
byte[] decodedValue = Base64.decode(uid.getBytes()); byte[] decodedValue = Base64.decode(uid.getBytes());
long result = 0; long result = 0;
for (int i = 2; i < 9; i++) { for (int i = 3; i < 9; i++) {
result = result << 8; result = result << 8;
result |= decodedValue[i] & 0xff; result |= decodedValue[i] & 0xff;
} }
@ -1094,7 +1094,14 @@ public class ExchangeSession {
} }
public int compareTo(Object message) { public int compareTo(Object message) {
return (int) (getUidAsLong() - ((Message) message).getUidAsLong()); long compareValue = (getUidAsLong() - ((Message) message).getUidAsLong());
if (compareValue > 0) {
return 1;
} else if (compareValue < 0) {
return -1;
} else {
return 0;
}
} }
@Override @Override
@ -1309,15 +1316,15 @@ public class ExchangeSession {
String line; String line;
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
if (currentAllDayState.isAllDay && "X-MICROSOFT-CDO-ALLDAYEVENT:FALSE".equals(line)) { if (!fromServer && currentAllDayState.isAllDay && "X-MICROSOFT-CDO-ALLDAYEVENT:FALSE".equals(line)) {
line = "X-MICROSOFT-CDO-ALLDAYEVENT:TRUE"; line = "X-MICROSOFT-CDO-ALLDAYEVENT:TRUE";
} else if ("END:VEVENT".equals(line) && currentAllDayState.isAllDay && !currentAllDayState.hasCdoAllDay) { } else if (!fromServer && "END:VEVENT".equals(line) && currentAllDayState.isAllDay && !currentAllDayState.hasCdoAllDay) {
result.writeLine("X-MICROSOFT-CDO-ALLDAYEVENT:TRUE"); result.writeLine("X-MICROSOFT-CDO-ALLDAYEVENT:TRUE");
} else if (!currentAllDayState.isAllDay && "X-MICROSOFT-CDO-ALLDAYEVENT:TRUE".equals(line)) { } else if (!fromServer && !currentAllDayState.isAllDay && "X-MICROSOFT-CDO-ALLDAYEVENT:TRUE".equals(line)) {
line = "X-MICROSOFT-CDO-ALLDAYEVENT:FALSE"; line = "X-MICROSOFT-CDO-ALLDAYEVENT:FALSE";
} else if (fromServer && currentAllDayState.isCdoAllDay && line.startsWith("DTSTART;TZID")) { } else if (fromServer && currentAllDayState.isCdoAllDay && line.startsWith("DTSTART") && !line.startsWith("DTSTART;VALUE=DATE")) {
line = getAllDayLine(line); line = getAllDayLine(line);
} else if (fromServer && currentAllDayState.isCdoAllDay && line.startsWith("DTEND;TZID")) { } else if (fromServer && currentAllDayState.isCdoAllDay && line.startsWith("DTEND") && !line.startsWith("DTEND;VALUE=DATE")) {
line = getAllDayLine(line); line = getAllDayLine(line);
} else if ("BEGIN:VEVENT".equals(line)) { } else if ("BEGIN:VEVENT".equals(line)) {
currentAllDayState = allDayStates.get(count++); currentAllDayState = allDayStates.get(count++);
@ -1383,11 +1390,11 @@ public class ExchangeSession {
int keyIndex = line.indexOf(';'); int keyIndex = line.indexOf(';');
int valueIndex = line.lastIndexOf(':'); int valueIndex = line.lastIndexOf(':');
int valueEndIndex = line.lastIndexOf('T'); int valueEndIndex = line.lastIndexOf('T');
if (keyIndex < 0 || valueIndex < 0 || valueEndIndex < 0) { if (valueIndex < 0 || valueEndIndex < 0) {
throw new IOException("Invalid ICS line: " + line); throw new IOException("Invalid ICS line: " + line);
} }
String dateValue = line.substring(valueIndex + 1); String dateValue = line.substring(valueIndex + 1, valueEndIndex);
String key = line.substring(0, keyIndex); String key = line.substring(0, Math.max(keyIndex, valueIndex));
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
Date date; Date date;
@ -1399,7 +1406,7 @@ public class ExchangeSession {
if ("DTEND".equals(key)) { if ("DTEND".equals(key)) {
date.setTime(date.getTime() - 1); date.setTime(date.getTime() - 1);
} }
return line.substring(0, keyIndex) + ";VALUE=DATE:" + line.substring(valueIndex + 1, valueEndIndex); return key + ";VALUE=DATE:" + dateValue;
} }