moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2025-01-13 22:48:07 -05:00
Code Issues Releases Wiki Activity

Caldav: Fix regression on public calendar folders linked to multiple calendar support for iCal

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@824 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-11-05 21:55:43 +00:00
parent 8aec8d557a
commit 942e80f2c0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -548,10 +548,12 @@ public class CaldavConnection extends AbstractConnection {
List<ExchangeSession.Event> events = session.getAllEvents(folderPath);
DavGatewayTray.debug(new BundleMessage("LOG_FOUND_CALENDAR_EVENTS", events.size()));
appendEventsResponses(response, request, events);
// Send sub folders for multi-calendar support under iCal
List<ExchangeSession.Folder> folderList = session.getSubCalendarFolders(folderPath, false);
for (ExchangeSession.Folder folder : folderList) {
appendCalendar(response, request, folder.folderPath.substring(folder.folderPath.indexOf('/') + 1));
// Send sub folders for multi-calendar support under iCal, except for public folders
if (!folderPath.startsWith("/public")) {
List<ExchangeSession.Folder> folderList = session.getSubCalendarFolders(folderPath, false);
for (ExchangeSession.Folder folder : folderList) {
appendCalendar(response, request, folder.folderPath.substring(folder.folderPath.indexOf('/') + 1));
}
}
}
response.endMultistatus();