From d4efba35991363e1e96d83a36fb8841439c8919c Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Tue, 18 Mar 2014 23:47:40 +0000
Subject: [PATCH] From coverity: more encoding fixes

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2274 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/DavGateway.java               |  2 +-
 src/java/davmail/exchange/ExchangeSession.java | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/java/davmail/DavGateway.java b/src/java/davmail/DavGateway.java
index 22fe3693..ca39f27a 100644
--- a/src/java/davmail/DavGateway.java
+++ b/src/java/davmail/DavGateway.java
@@ -225,7 +225,7 @@ public final class DavGateway {
                 HttpClient httpClient = DavGatewayHttpClientFacade.getInstance(HTTP_DAVMAIL_SOURCEFORGE_NET_VERSION_TXT);
                 int status = httpClient.executeMethod(getMethod);
                 if (status == HttpStatus.SC_OK) {
-                    versionReader = new BufferedReader(new InputStreamReader(getMethod.getResponseBodyAsStream()));
+                    versionReader = new BufferedReader(new InputStreamReader(getMethod.getResponseBodyAsStream(), "UTF-8"));
                     version = versionReader.readLine();
                     LOGGER.debug("DavMail released version: " + version);
                 }
diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index 51d068b6..814a8bc5 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -2608,16 +2608,16 @@ public abstract class ExchangeSession {
                         .append((after ^ fromServer) ? "-server" : "-client")
                         .append(".ics");
                 if ((icsBody != null) && (icsBody.length() > 0)) {
-                    FileWriter fileWriter = null;
+                    OutputStreamWriter writer = null;
                     try {
-                        fileWriter = new FileWriter(filePath.toString());
-                        fileWriter.write(icsBody);
+                        writer = new OutputStreamWriter(new FileOutputStream(filePath.toString()), "UTF-8");
+                        writer.write(icsBody);
                     } catch (IOException e) {
                         LOGGER.error(e);
                     } finally {
-                        if (fileWriter != null) {
+                        if (writer != null) {
                             try {
-                                fileWriter.close();
+                                writer.close();
                             } catch (IOException e) {
                                 LOGGER.error(e);
                             }
@@ -3301,7 +3301,7 @@ public abstract class ExchangeSession {
             GetMethod optionsMethod = new GetMethod("/owa/?ae=Options&t=About");
             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 email and alias