moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-13 11:12:22 -05:00
Code Issues Releases Wiki Activity

Caldav: revert @ encoding, breaks iCal

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@635 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-07-28 06:52:18 +00:00
parent c86c957a54
commit 3e06e834b4
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -300,7 +300,7 @@ public class CaldavConnection extends AbstractConnection {
protected void appendEventResponse(CaldavResponse response, CaldavRequest request, ExchangeSession.Event event) throws IOException { protected void appendEventResponse(CaldavResponse response, CaldavRequest request, ExchangeSession.Event event) throws IOException {
StringBuilder eventPath = new StringBuilder(); StringBuilder eventPath = new StringBuilder();
eventPath.append(encodePath(request.getPath())); eventPath.append(URIUtil.encodePath(request.getPath()));
if (!(eventPath.charAt(eventPath.length() - 1) == '/')) { if (!(eventPath.charAt(eventPath.length() - 1) == '/')) {
eventPath.append('/'); eventPath.append('/');
} }
@ -328,7 +328,7 @@ public class CaldavConnection extends AbstractConnection {
} }
public void appendCalendar(CaldavResponse response, CaldavRequest request, String subFolder) throws IOException { public void appendCalendar(CaldavResponse response, CaldavRequest request, String subFolder) throws IOException {
response.startResponse(encodePath(request.getPath(subFolder))); response.startResponse(URIUtil.encodePath(request.getPath(subFolder)));
response.startPropstat(); response.startPropstat();
if (request.hasProperty("resourcetype")) { if (request.hasProperty("resourcetype")) {
@ -364,7 +364,7 @@ public class CaldavConnection extends AbstractConnection {
} }
public void appendInbox(CaldavResponse response, CaldavRequest request, String subFolder) throws IOException { public void appendInbox(CaldavResponse response, CaldavRequest request, String subFolder) throws IOException {
response.startResponse(encodePath(request.getPath(subFolder))); response.startResponse(URIUtil.encodePath(request.getPath(subFolder)));
response.startPropstat(); response.startPropstat();
if (request.hasProperty("resourcetype")) { if (request.hasProperty("resourcetype")) {
@ -389,7 +389,7 @@ public class CaldavConnection extends AbstractConnection {
} }
public void appendOutbox(CaldavResponse response, CaldavRequest request, String subFolder) throws IOException { public void appendOutbox(CaldavResponse response, CaldavRequest request, String subFolder) throws IOException {
response.startResponse(encodePath(request.getPath(subFolder))); response.startResponse(URIUtil.encodePath(request.getPath(subFolder)));
response.startPropstat(); response.startPropstat();
if (request.hasProperty("resourcetype")) { if (request.hasProperty("resourcetype")) {
@ -513,7 +513,7 @@ public class CaldavConnection extends AbstractConnection {
// send not found events errors // send not found events errors
for (String href : notFound) { for (String href : notFound) {
response.startResponse(encodePath(href)); response.startResponse(URIUtil.encodePath(href));
response.appendPropstatNotFound(); response.appendPropstatNotFound();
response.endResponse(); response.endResponse();
} }
@ -524,7 +524,7 @@ public class CaldavConnection extends AbstractConnection {
public void sendUserRoot(CaldavRequest request) throws IOException { public void sendUserRoot(CaldavRequest request) throws IOException {
CaldavResponse response = new CaldavResponse(HttpStatus.SC_MULTI_STATUS); CaldavResponse response = new CaldavResponse(HttpStatus.SC_MULTI_STATUS);
response.startMultistatus(); response.startMultistatus();
response.startResponse(encodePath(request.getPath())); response.startResponse(URIUtil.encodePath(request.getPath()));
response.startPropstat(); response.startPropstat();
if (request.hasProperty("resourcetype")) { if (request.hasProperty("resourcetype")) {
@ -597,7 +597,7 @@ public class CaldavConnection extends AbstractConnection {
CaldavResponse response = new CaldavResponse(HttpStatus.SC_MULTI_STATUS); CaldavResponse response = new CaldavResponse(HttpStatus.SC_MULTI_STATUS);
response.startMultistatus(); response.startMultistatus();
response.startResponse(encodePath("/principals/" + prefix + '/' + principal)); response.startResponse(URIUtil.encodePath("/principals/" + prefix + '/' + principal));
response.startPropstat(); response.startPropstat();
if (request.hasProperty("calendar-home-set")) { if (request.hasProperty("calendar-home-set")) {
@ -852,15 +852,6 @@ public class CaldavConnection extends AbstractConnection {
return result; return result;
} }
public static final BitSet caldav_allowed_abs_path = new BitSet(256);
static {
caldav_allowed_abs_path.or(URI.allowed_abs_path);
caldav_allowed_abs_path.clear('@');
}
protected String encodePath(String unencodedPath) throws URIException {
return URIUtil.encode(unencodedPath, caldav_allowed_abs_path,URI.getDefaultProtocolCharset());
}
protected class CaldavRequest { protected class CaldavRequest {
protected final String command; protected final String command;
protected final String path; protected final String path;
@ -1162,7 +1153,7 @@ public class CaldavConnection extends AbstractConnection {
} }
public void appendHrefProperty(String propertyName, String propertyValue) throws IOException { public void appendHrefProperty(String propertyName, String propertyValue) throws IOException {
appendProperty(propertyName, null, "<D:href>"+encodePath(propertyValue)+"</D:href>"); appendProperty(propertyName, null, "<D:href>"+URIUtil.encodePath(propertyValue)+"</D:href>");
} }
public void appendProperty(String propertyName) throws IOException { public void appendProperty(String propertyName) throws IOException {