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

Caldav: send current-user-principal on principals folder for iCal 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1074 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-06-04 16:23:40 +00:00
parent 3e5ee6f24d
commit 5bcbf5b184
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,6 +226,9 @@ public class CaldavConnection extends AbstractConnection {
// send back principal on search // send back principal on search
} else if (request.isReport() && request.isPathLength(3)) { } else if (request.isReport() && request.isPathLength(3)) {
sendPrincipal(request, "users", session.getEmail()); sendPrincipal(request, "users", session.getEmail());
// iCal current-user-principal request
} else if (request.isPropFind() && request.isPathLength(3)) {
sendPrincipalsFolder(request);
} else { } else {
sendUnsupported(request); sendUnsupported(request);
} }
@ -692,6 +695,27 @@ public class CaldavConnection extends AbstractConnection {
response.close(); response.close();
} }
/**
* Send principals folder.
*
* @param request Caldav request
* @throws IOException on error
*/
public void sendPrincipalsFolder(CaldavRequest request) throws IOException {
CaldavResponse response = new CaldavResponse(HttpStatus.SC_MULTI_STATUS);
response.startMultistatus();
response.startResponse(URIUtil.encodePath(request.getPath()));
response.startPropstat();
if (request.hasProperty("current-user-principal")) {
response.appendHrefProperty("D:current-user-principal", "/principals/users/" + session.getEmail());
}
response.endPropStatOK();
response.endResponse();
response.endMultistatus();
response.close();
}
/** /**
* Send user response for request. * Send user response for request.
* *
@ -739,7 +763,7 @@ public class CaldavConnection extends AbstractConnection {
response.startPropstat(); response.startPropstat();
if (request.hasProperty("principal-collection-set")) { if (request.hasProperty("principal-collection-set")) {
response.appendHrefProperty("D:principal-collection-set", "/principals/users/" + session.getEmail()); response.appendHrefProperty("D:principal-collection-set", "/principals/users/");
} }
if (request.hasProperty("displayname")) { if (request.hasProperty("displayname")) {
response.appendProperty("D:displayname", "ROOT"); response.appendProperty("D:displayname", "ROOT");
@ -848,16 +872,16 @@ public class CaldavConnection extends AbstractConnection {
} }
if (request.hasProperty("addressbook-home-set") && "users".equals(prefix)) { if (request.hasProperty("addressbook-home-set") && "users".equals(prefix)) {
response.appendHrefProperty("E:addressbook-home-set", "/users/" + actualPrincipal + "/"); response.appendHrefProperty("E:addressbook-home-set", "/users/" + actualPrincipal + '/');
} }
if ("users".equals(prefix)) { if ("users".equals(prefix)) {
if (request.hasProperty("schedule-inbox-URL")) { if (request.hasProperty("schedule-inbox-URL")) {
response.appendHrefProperty("C:schedule-inbox-URL", "/users/" + actualPrincipal + "/inbox"); response.appendHrefProperty("C:schedule-inbox-URL", "/users/" + actualPrincipal + "/inbox/");
} }
if (request.hasProperty("schedule-outbox-URL")) { if (request.hasProperty("schedule-outbox-URL")) {
response.appendHrefProperty("C:schedule-outbox-URL", "/users/" + actualPrincipal + "/outbox"); response.appendHrefProperty("C:schedule-outbox-URL", "/users/" + actualPrincipal + "/outbox/");
} }
} else { } else {
// public calendar, send root href as inbox url (always empty) for Lightning // public calendar, send root href as inbox url (always empty) for Lightning
@ -866,7 +890,7 @@ public class CaldavConnection extends AbstractConnection {
} }
// send user outbox // send user outbox
if (request.hasProperty("schedule-outbox-URL")) { if (request.hasProperty("schedule-outbox-URL")) {
response.appendHrefProperty("C:schedule-outbox-URL", "/users/" + session.getEmail() + "/outbox"); response.appendHrefProperty("C:schedule-outbox-URL", "/users/" + session.getEmail() + "/outbox/");
} }
} }