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

Fix regression in getAliasFromMailboxDisplayName

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1338 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2010-08-14 16:44:11 +00:00
parent 9d00702c19
commit ce61242612
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java/davmail/exchange/dav/DavExchangeSession.java
View File

@ -277,7 +277,9 @@ public class DavExchangeSession extends ExchangeSession {
protected boolean needGalLookup(Set<String> returningAttributes) {
// iCal search, do not call gallookup
if (returningAttributes.contains("apple-serviceslocator")) {
if (returningAttributes == null) {
return false;
} else if (returningAttributes.contains("apple-serviceslocator")) {
return false;
// return all attributes => call gallookup
} else if (returningAttributes.isEmpty()) {
@ -1178,17 +1180,17 @@ public class DavExchangeSession extends ExchangeSession {
folder.uidNext = getIntPropertyIfExists(properties, "uidNext");
// replace well known folder names
if (href.startsWith(inboxUrl)) {
if (inboxUrl != null && href.startsWith(inboxUrl)) {
folder.folderPath = href.replaceFirst(inboxUrl, INBOX);
} else if (href.startsWith(sentitemsUrl)) {
} else if (sentitemsUrl != null && href.startsWith(sentitemsUrl)) {
folder.folderPath = href.replaceFirst(sentitemsUrl, SENT);
} else if (href.startsWith(draftsUrl)) {
} else if (draftsUrl != null && href.startsWith(draftsUrl)) {
folder.folderPath = href.replaceFirst(draftsUrl, DRAFTS);
} else if (href.startsWith(deleteditemsUrl)) {
} else if (deleteditemsUrl != null && href.startsWith(deleteditemsUrl)) {
folder.folderPath = href.replaceFirst(deleteditemsUrl, TRASH);
} else if (href.startsWith(calendarUrl)) {
} else if (calendarUrl != null && href.startsWith(calendarUrl)) {
folder.folderPath = href.replaceFirst(calendarUrl, CALENDAR);
} else if (href.startsWith(contactsUrl)) {
} else if (contactsUrl != null && href.startsWith(contactsUrl)) {
folder.folderPath = href.replaceFirst(contactsUrl, CONTACTS);
} else {
int index = href.indexOf(mailPath.substring(0, mailPath.length() - 1));