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

Caldav: use i18n calendar name as display name for iCal 

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1488 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-10-01 21:26:55 +00:00
parent cb5530fcea
commit 0649996caf
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -437,7 +437,12 @@ public class CaldavConnection extends AbstractConnection {
}
if (request.hasProperty("displayname")) {
if (subFolder == null || subFolder.length() == 0) {
response.appendProperty("D:displayname", request.getLastPath());
// use i18n calendar name as display name
String displayname = request.getLastPath();
if ("calendar".equals(displayname)) {
displayname = folder.displayName;
}
response.appendProperty("D:displayname", displayname);
} else {
response.appendProperty("D:displayname", subFolder);
}
@ -638,7 +643,7 @@ public class CaldavConnection extends AbstractConnection {
public void patchCalendar(CaldavRequest request) throws IOException {
String displayname = request.getProperty("displayname");
String folderPath = request.getFolderPath();
if (displayname != null && !folderPath.equalsIgnoreCase("/users/"+session.getEmail()+"/calendar")) {
if (displayname != null && !folderPath.equalsIgnoreCase("/users/" + session.getEmail() + "/calendar")) {
String targetPath = request.getParentFolderPath() + '/' + displayname;
if (!targetPath.equals(folderPath)) {
session.moveFolder(folderPath, targetPath);