From 1344e4c9bd8cc2f4d1261b80656444533fcda2f9 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Thu, 29 Jul 2010 15:42:07 +0000
Subject: [PATCH] EWS: fix subfolder search on Exchange 2010

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1315 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/exchange/ews/EwsExchangeSession.java | 6 +++---
 src/test/davmail/imap/TestImap.java                   | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/java/davmail/exchange/ews/EwsExchangeSession.java b/src/java/davmail/exchange/ews/EwsExchangeSession.java
index 8fee20d7..529bedd9 100644
--- a/src/java/davmail/exchange/ews/EwsExchangeSession.java
+++ b/src/java/davmail/exchange/ews/EwsExchangeSession.java
@@ -540,11 +540,11 @@ public class EwsExchangeSession extends ExchangeSession {
         for (EWSMethod.Item item : findFolderMethod.getResponseItems()) {
             Folder folder = buildFolder(parentFolderId.mailbox, item);
             if (parentFolderPath.length() > 0) {
-                folder.folderPath = parentFolderPath + '/' + item.get(Field.get("urlcompname").getResponseName());
+                folder.folderPath = parentFolderPath + '/' + item.get(Field.get("folderDisplayName").getResponseName());
             } else if (folderIdMap.get(folder.folderId.value) != null) {
                 folder.folderPath = folderIdMap.get(folder.folderId.value);
             } else {
-                folder.folderPath = item.get(Field.get("urlcompname").getResponseName());
+                folder.folderPath = item.get(Field.get("folderDisplayName").getResponseName());
             }
             folders.add(folder);
             if (recursive && folder.hasChildren) {
@@ -777,7 +777,7 @@ public class EwsExchangeSession extends ExchangeSession {
             ItemId newItemId = new ItemId(createOrUpdateItemMethod.getResponseItem());
 
             // disable contact picture handling on Exchange 2007
-            if (!"Exchange2010".equals(serverVersion)) {
+            if ("Exchange2010".equals(serverVersion)) {
                 // first delete current picture
                 if (currentFileAttachment != null) {
                     DeleteAttachmentMethod deleteAttachmentMethod = new DeleteAttachmentMethod(currentFileAttachment.attachmentId);
diff --git a/src/test/davmail/imap/TestImap.java b/src/test/davmail/imap/TestImap.java
index f552f082..06c18caa 100644
--- a/src/test/davmail/imap/TestImap.java
+++ b/src/test/davmail/imap/TestImap.java
@@ -83,6 +83,11 @@ public class TestImap extends AbstractDavMailTestCase {
         assertEquals(". OK Authenticated", socketReader.readLine());
     }
 
+    public void testListFolders() throws IOException {
+        writeLine(". LSUB \"\" \"*\"");
+        assertEquals(". OK LSUB completed", readFullAnswer("."));
+    }
+
     public void testSelectInbox() throws IOException {
         writeLine(". SELECT INBOX");
         assertEquals(". OK [READ-WRITE] SELECT completed", readFullAnswer("."));