Caldav: fix OSX Mountain Lion (iCal 6) support
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1983 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
parent
939115a471
commit
0f47689ecd
|
@ -96,7 +96,7 @@ public class CaldavConnection extends AbstractConnection {
|
|||
while ((line = readClient()) != null && line.length() > 0) {
|
||||
int index = line.indexOf(':');
|
||||
if (index <= 0) {
|
||||
wireLogger.warn("Invalid header: "+line);
|
||||
wireLogger.warn("Invalid header: " + line);
|
||||
throw new DavMailException("EXCEPTION_INVALID_HEADER");
|
||||
}
|
||||
headers.put(line.substring(0, index).toLowerCase(), line.substring(index + 1).trim());
|
||||
|
@ -1440,7 +1440,9 @@ public class CaldavConnection extends AbstractConnection {
|
|||
}
|
||||
|
||||
protected boolean isIcal5() {
|
||||
return isUserAgent("CoreDAV/") || isUserAgent("iOS/5");
|
||||
return isUserAgent("CoreDAV/") || isUserAgent("iOS/5")
|
||||
// iCal 6
|
||||
|| isUserAgent("Mac OS X/10.8");
|
||||
}
|
||||
|
||||
protected boolean isUserAgent(String key) {
|
||||
|
@ -1629,12 +1631,12 @@ public class CaldavConnection extends AbstractConnection {
|
|||
*/
|
||||
String result = calendarPath.toString();
|
||||
// replace unsupported spaces
|
||||
if (result.indexOf(' ') >=0 ) {
|
||||
result = result.replaceAll("___", " ");
|
||||
if (result.indexOf(' ') >= 0) {
|
||||
result = result.replaceAll("___", " ");
|
||||
}
|
||||
// replace /addressbook suffix on public folders
|
||||
if (result.startsWith("/public")) {
|
||||
result = result.replaceAll("/addressbook", "");
|
||||
result = result.replaceAll("/addressbook", "");
|
||||
}
|
||||
|
||||
return result;
|
||||
|
|
Loading…
Reference in New Issue