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 146eb696a5599e279d0a3548bcc965615fbb1625..e05da14f443c6c5d38907cb6d4f9cd77c253891e 100644 (file)
--- 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 dd07c4e7dd975a88b4d11459f433afa2c929b67a..b174da636ecd25a280cade683711217ab9570e53 100644 (file)
--- a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
+++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
@@ -28,6 +28,8 @@ import android.widget.Button;
 \r
 import com.hughes.util.StringUtil;\r
 \r
+import java.io.IOException;\r
+import java.io.InputStream;\r
 import java.io.UnsupportedEncodingException;\r
 \r
 public final class HtmlDisplayActivity extends ActionBarActivity {\r
@@ -74,7 +76,12 @@ public final class HtmlDisplayActivity extends ActionBarActivity {
         final int htmlRes = getIntent().getIntExtra(HTML_RES, -1);\r
         String html;\r
         if (htmlRes != -1) {\r
-            html = StringUtil.readToString(getResources().openRawResource(htmlRes));\r
+            InputStream res = getResources().openRawResource(htmlRes);\r
+            html = StringUtil.readToString(res);\r
+            try {\r
+                res.close();\r
+            } catch (IOException e) {\r
+            }\r
         } else {\r
             html = getIntent().getStringExtra(HTML);\r
         }\r