mirror of
https://github.com/moparisthebest/davmail
synced 2024-12-14 03:32:22 -05:00
Caldav: fix multi calendar Exchange path for sub folders
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@715 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
parent
736437670a
commit
5eb3fd2569
@ -435,7 +435,7 @@ public class CaldavConnection extends AbstractConnection {
|
|||||||
"0");
|
"0");
|
||||||
}
|
}
|
||||||
if (request.hasProperty("getetag")) {
|
if (request.hasProperty("getetag")) {
|
||||||
response.appendProperty("D:getetag", session.getFolderResourceTag(request.getExchangeFolderPath(subFolder)));
|
response.appendProperty("D:getetag", "0");
|
||||||
}
|
}
|
||||||
if (request.hasProperty("displayname")) {
|
if (request.hasProperty("displayname")) {
|
||||||
response.appendProperty("D:displayname", "outbox");
|
response.appendProperty("D:displayname", "outbox");
|
||||||
@ -1283,7 +1283,12 @@ public class CaldavConnection extends AbstractConnection {
|
|||||||
*/
|
*/
|
||||||
public String getExchangeFolderPath() throws IOException {
|
public String getExchangeFolderPath() throws IOException {
|
||||||
if ("users".equals(getPathElement(1))) {
|
if ("users".equals(getPathElement(1))) {
|
||||||
return session.buildCalendarPath(getPathElement(2), getPathElement(3));
|
StringBuilder calendarPath = new StringBuilder();
|
||||||
|
calendarPath.append(getPathElement(3));
|
||||||
|
for (int i=4;i<getPathLength()-1;i++) {
|
||||||
|
calendarPath.append('/').append(getPathElement(i));
|
||||||
|
}
|
||||||
|
return session.buildCalendarPath(getPathElement(2), calendarPath.toString());
|
||||||
} else {
|
} else {
|
||||||
return path;
|
return path;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user