moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2025-01-05 18:58:02 -05:00
Code Issues Releases Wiki Activity

Caldav: fix regression on iCal FreeBusy handling

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1724 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2011-06-28 22:24:55 +00:00
parent 2739a51ea3
commit 913a4d76e8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/davmail/exchange/ExchangeSession.java
View File

@ -2773,7 +2773,7 @@ public abstract class ExchangeSession {
* @return fixed value * @return fixed value
*/ */
protected String replaceIcal4Principal(String value) { protected String replaceIcal4Principal(String value) {
if (value.contains("/principals/__uuids__/")) { if (value != null && value.contains("/principals/__uuids__/")) {
return value.replaceAll("/principals/__uuids__/([^/]*)__AT__([^/]*)/", "mailto:$1@$2"); return value.replaceAll("/principals/__uuids__/([^/]*)__AT__([^/]*)/", "mailto:$1@$2");
} else { } else {
return value; return value;
@ -3216,12 +3216,14 @@ public abstract class ExchangeSession {
* @throws IOException on error * @throws IOException on error
*/ */
public FreeBusy getFreebusy(String attendee, String startDateValue, String endDateValue) throws IOException { public FreeBusy getFreebusy(String attendee, String startDateValue, String endDateValue) throws IOException {
// first check that email address is valid to avoid InvalidSmtpAddress error // replace ical encoded attendee name
attendee = replaceIcal4Principal(attendee);
// then check that email address is valid to avoid InvalidSmtpAddress error
if (attendee == null || attendee.indexOf('@') < 0 || attendee.charAt(attendee.length() - 1) == '@') { if (attendee == null || attendee.indexOf('@') < 0 || attendee.charAt(attendee.length() - 1) == '@') {
return null; return null;
} }
attendee = replaceIcal4Principal(attendee);
if (attendee.startsWith("mailto:") || attendee.startsWith("MAILTO:")) { if (attendee.startsWith("mailto:") || attendee.startsWith("MAILTO:")) {
attendee = attendee.substring("mailto:".length()); attendee = attendee.substring("mailto:".length());
} }