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

Caldav: try to merge Exchange 2010 and 2007 filters 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1830 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2011-10-25 21:44:36 +00:00
parent 83385085bc
commit fc4a6f0b00
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/java/davmail/exchange/ews/EwsExchangeSession.java
View File

@ -1569,14 +1569,15 @@ public class EwsExchangeSession extends ExchangeSession {
@Override
protected Condition getCalendarItemCondition(boolean excludeTasks, Condition dateCondition) {
if ("Exchange2010".equals(serverVersion)) {
// tasks in calendar not supported over EWS
return or(isTrue("isrecurring"),
and(isFalse("isrecurring"), dateCondition));
} else {
return or(isEqualTo("instancetype", 1),
and(isEqualTo("instancetype", 0), dateCondition));
}
// tasks in calendar not supported over EWS => do not look for instancetype null
return or(
// Exchange 2010
or(isTrue("isrecurring"),
and(isFalse("isrecurring"), dateCondition)),
// Exchange 2007
or(isEqualTo("instancetype", 1),
and(isEqualTo("instancetype", 0), dateCondition))
);
}
@Override