From: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Date: Fri, 12 Feb 2016 21:41:16 +0000 (+0100)
Subject: Fix resource leaks due to missing close().
X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=commitdiff_plain;h=2e8e801d4538ab26392361e23a7a0f1131b73c2c

Fix resource leaks due to missing close().
---

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 146eb69..e05da14 100644
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -177,6 +177,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                     final OutputStream zipOut = new FileOutputStream(targetFile);
                     copyStream(zipIn, zipOut);
                     zipFile.close();
+                    zipOut.close();
                     application.backgroundUpdateDictionaries(dictionaryUpdater);
                     Toast.makeText(context, getString(R.string.installationFinished, dest),
                             Toast.LENGTH_LONG).show();
diff --git a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
index dd07c4e..b174da6 100644
--- a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
+++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
@@ -28,6 +28,8 @@ import android.widget.Button;
 
 import com.hughes.util.StringUtil;
 
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 
 public final class HtmlDisplayActivity extends ActionBarActivity {
@@ -74,7 +76,12 @@ public final class HtmlDisplayActivity extends ActionBarActivity {
         final int htmlRes = getIntent().getIntExtra(HTML_RES, -1);
         String html;
         if (htmlRes != -1) {
-            html = StringUtil.readToString(getResources().openRawResource(htmlRes));
+            InputStream res = getResources().openRawResource(htmlRes);
+            html = StringUtil.readToString(res);
+            try {
+                res.close();
+            } catch (IOException e) {
+            }
         } else {
             html = getIntent().getStringExtra(HTML);
         }