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

Caldav: apply date filter to tasks 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1856 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2011-11-09 23:25:19 +00:00
parent cd8872b156
commit a998621d42
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2519,7 +2519,7 @@ public abstract class ExchangeSession {
*/
public List<Event> getAllEvents(String folderPath) throws IOException {
boolean caldavDisableTasks = Settings.getBooleanProperty("davmail.caldavDisableTasks");
List<Event> results = searchEvents(folderPath, getCalendarItemCondition(caldavDisableTasks, getPastDelayCondition()));
List<Event> results = searchEvents(folderPath, getCalendarItemCondition(caldavDisableTasks, getPastDelayCondition("dtstart")));
if (isMainCalendar(folderPath)) {
// retrieve tasks from main tasks folder
@ -2531,13 +2531,13 @@ public abstract class ExchangeSession {
protected abstract Condition getCalendarItemCondition(boolean excludeTasks, Condition dateCondition);
protected Condition getPastDelayCondition() {
protected Condition getPastDelayCondition(String attribute) {
int caldavPastDelay = Settings.getIntProperty("davmail.caldavPastDelay");
Condition dateCondition = null;
if (caldavPastDelay != 0) {
Calendar cal = Calendar.getInstance();
cal.add(Calendar.DAY_OF_MONTH, -caldavPastDelay);
dateCondition = gt("dtstart", formatSearchDate(cal.getTime()));
dateCondition = gt(attribute, formatSearchDate(cal.getTime()));
}
return dateCondition;
}
@ -2597,7 +2597,8 @@ public abstract class ExchangeSession {
* @throws IOException on error
*/
public List<Event> searchTasksOnly(String folderPath) throws IOException {
return searchEvents(folderPath, not(isEqualTo("outlookmessageclass", "IPM.Appointment")));
return searchEvents(folderPath, and(isEqualTo("outlookmessageclass", "IPM.Task"),
or(isNull("datecompleted"), getPastDelayCondition("datecompleted"))));
}
/**