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

Caldav: fix #98 Support of Contacts in CardDav REPORT 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2323 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2014-10-30 22:32:03 +00:00
parent 411caf611e
commit addbd73ff7
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/java/davmail/caldav/CaldavConnection.java
View File

@ -771,15 +771,20 @@ public class CaldavConnection extends AbstractConnection {
events = session.getEventMessages(request.getFolderPath()); events = session.getEventMessages(request.getFolderPath());
appendEventsResponses(response, request, events); appendEventsResponses(response, request, events);
} else { } else {
// TODO: handle contacts ? ExchangeSession.Folder folder = session.getFolder(folderPath);
if (request.vTodoOnly) { if (folder.isContact()) {
events = session.searchTasksOnly(request.getFolderPath()); List<ExchangeSession.Contact> contacts = session.getAllContacts(folderPath);
} else if (request.vEventOnly) { appendContactsResponses(response, request, contacts);
events = session.searchEventsOnly(request.getFolderPath(), request.timeRangeStart, request.timeRangeEnd);
} else { } else {
events = session.searchEvents(request.getFolderPath(), request.timeRangeStart, request.timeRangeEnd); if (request.vTodoOnly) {
events = session.searchTasksOnly(request.getFolderPath());
} else if (request.vEventOnly) {
events = session.searchEventsOnly(request.getFolderPath(), request.timeRangeStart, request.timeRangeEnd);
} else {
events = session.searchEvents(request.getFolderPath(), request.timeRangeStart, request.timeRangeEnd);
}
appendEventsResponses(response, request, events);
} }
appendEventsResponses(response, request, events);
} }
// send not found events errors // send not found events errors