mirror of
https://github.com/moparisthebest/davmail
synced 2024-12-13 03:02:22 -05:00
Fix calendar caldavPastDelay default value handling
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@212 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
parent
30e4bb903b
commit
6618f22c34
@ -796,9 +796,9 @@ public class ExchangeSession {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public List<Event> getAllEvents() throws IOException {
|
public List<Event> getAllEvents() throws IOException {
|
||||||
int caldavPastDelay = Settings.getIntProperty("davmail.caldavPastDelay", 90);
|
int caldavPastDelay = Settings.getIntProperty("davmail.caldavPastDelay", Integer.MAX_VALUE);
|
||||||
String dateCondition = "";
|
String dateCondition = "";
|
||||||
if (caldavPastDelay != 0) {
|
if (caldavPastDelay != Integer.MAX_VALUE) {
|
||||||
Calendar cal = Calendar.getInstance();
|
Calendar cal = Calendar.getInstance();
|
||||||
cal.add(Calendar.DAY_OF_MONTH, -caldavPastDelay);
|
cal.add(Calendar.DAY_OF_MONTH, -caldavPastDelay);
|
||||||
dateCondition = " AND \"urn:schemas:calendar:dtstart\" > '" + dateFormatter.format(cal.getTime()) + "'\n";
|
dateCondition = " AND \"urn:schemas:calendar:dtstart\" > '" + dateFormatter.format(cal.getTime()) + "'\n";
|
||||||
@ -812,7 +812,7 @@ public class ExchangeSession {
|
|||||||
" WHERE NOT \"urn:schemas:calendar:instancetype\" = 1\n" +
|
" WHERE NOT \"urn:schemas:calendar:instancetype\" = 1\n" +
|
||||||
" AND \"DAV:contentclass\" = 'urn:content-classes:appointment'\n" +
|
" AND \"DAV:contentclass\" = 'urn:content-classes:appointment'\n" +
|
||||||
dateCondition +
|
dateCondition +
|
||||||
" ORDER BY \"urn:schemas:calendar:dtstart\" ASC\n" +
|
" ORDER BY \"urn:schemas:calendar:dtstart\" DESC\n" +
|
||||||
" </d:sql>\n" +
|
" </d:sql>\n" +
|
||||||
"</d:searchrequest>";
|
"</d:searchrequest>";
|
||||||
SearchMethod searchMethod = new SearchMethod(calendarUrl, searchRequest);
|
SearchMethod searchMethod = new SearchMethod(calendarUrl, searchRequest);
|
||||||
|
Loading…
Reference in New Issue
Block a user