From 254abf1b9f29ec7f502ba24cf66123bbac9cfe80 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Tue, 18 Mar 2014 23:06:02 +0000
Subject: [PATCH] EWS: expect UTF-8 in options responses

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2267 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/exchange/ews/EwsExchangeSession.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/java/davmail/exchange/ews/EwsExchangeSession.java b/src/java/davmail/exchange/ews/EwsExchangeSession.java
index e6b12642..9c739461 100644
--- a/src/java/davmail/exchange/ews/EwsExchangeSession.java
+++ b/src/java/davmail/exchange/ews/EwsExchangeSession.java
@@ -354,7 +354,7 @@ public class EwsExchangeSession extends ExchangeSession {
                     )) {
                 BufferedReader autodiscoverReader = null;
                 try {
-                    autodiscoverReader = new BufferedReader(new InputStreamReader(getResponseBodyAsStream()));
+                    autodiscoverReader = new BufferedReader(new InputStreamReader(getResponseBodyAsStream(), "UTF-8"));
                     String line;
                     // find ews url
                     //noinspection StatementWithEmptyBody
@@ -647,7 +647,7 @@ public class EwsExchangeSession extends ExchangeSession {
 
                 mimeMessage.writeTo(baos);
                 if (LOGGER.isDebugEnabled()) {
-                    LOGGER.debug("Rebuilt message content: " + new String(baos.toByteArray()));
+                    LOGGER.debug("Rebuilt message content: " + new String(baos.toByteArray(), "UTF-8"));
                 }
                 mimeContent = baos.toByteArray();
 
@@ -2149,7 +2149,7 @@ public class EwsExchangeSession extends ExchangeSession {
         GetMethod optionsMethod = new GetMethod("/owa/?ae=Options&t=Regional");
         try {
             DavGatewayHttpClientFacade.executeGetMethod(httpClient, optionsMethod, false);
-            optionsPageReader = new BufferedReader(new InputStreamReader(optionsMethod.getResponseBodyAsStream()));
+            optionsPageReader = new BufferedReader(new InputStreamReader(optionsMethod.getResponseBodyAsStream(), "UTF-8"));
             String line;
             // find timezone
             //noinspection StatementWithEmptyBody