Fix some resource leaks.

[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryManagerActivity.java

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index dacc6d75cd2c806fc72317d2c96b78cec0a9731c..673c256a051cc6c2335a6b04f64450f4d259d800 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -33,6 +33,7 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.widget.SearchView;
 import android.support.v7.widget.SearchView.OnQueryTextListener;
+import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.ContextMenu;
@@ -43,6 +44,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.BaseAdapter;
 import android.widget.Button;
@@ -162,19 +164,21 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                 
                 
                 final File localZipFile = new File(Uri.parse(dest).getPath());
+                ZipFile zipFile = null;
+                InputStream zipIn = null;
+                OutputStream zipOut = null;
                 try {
-                    ZipFile zipFile = new ZipFile(localZipFile);
+                    zipFile = new ZipFile(localZipFile);
                     final ZipEntry zipEntry = zipFile.entries().nextElement();
                     Log.d(LOG, "Unzipping entry: " + zipEntry.getName());
-                    final InputStream zipIn = zipFile.getInputStream(zipEntry);
+                    zipIn = zipFile.getInputStream(zipEntry);
                     File targetFile = new File(application.getDictDir(), zipEntry.getName());
                     if (targetFile.exists()) {
                         targetFile.renameTo(new File(targetFile.getAbsolutePath().replace(".quickdic", ".bak.quickdic")));
                         targetFile = new File(application.getDictDir(), zipEntry.getName());
                     }
-                    final OutputStream zipOut = new FileOutputStream(targetFile);
+                    zipOut = new FileOutputStream(targetFile);
                     copyStream(zipIn, zipOut);
-                    zipFile.close();
                     application.backgroundUpdateDictionaries(dictionaryUpdater);
                     Toast.makeText(context, getString(R.string.installationFinished, dest),
                             Toast.LENGTH_LONG).show();
@@ -187,6 +191,9 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                     new AlertDialog.Builder(context).setTitle(getString(R.string.error)).setMessage(msg).setNeutralButton("Close", null).show();
                     Log.e(LOG, "Failed to unzip.", e);
                 } finally {
+                    try { if (zipOut != null) zipOut.close(); } catch (IOException e) {}
+                    try { if (zipIn != null) zipIn.close(); } catch (IOException e) {}
+                    try { if (zipFile != null) zipFile.close(); } catch (IOException e) {}
                     localZipFile.delete();
                 }
             }
@@ -268,6 +275,8 @@ public class DictionaryManagerActivity extends ActionBarActivity {
     private void onCreateSetupActionBar() {
         ActionBar actionBar = getSupportActionBar();
         actionBar.setDisplayShowTitleEnabled(false);
+        actionBar.setDisplayShowHomeEnabled(false);
+        actionBar.setDisplayHomeAsUpEnabled(false);
 
         filterSearchView = new SearchView(getSupportActionBar().getThemedContext());
         filterSearchView.setIconifiedByDefault(false);
@@ -276,24 +285,21 @@ public class DictionaryManagerActivity extends ActionBarActivity {
         // wrong place.
         filterSearchView.setQueryHint(getString(R.string.searchText));
         filterSearchView.setSubmitButtonEnabled(false);
-        final int width = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 300,
-                getResources().getDisplayMetrics());
-        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(width,
+        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT,
                 FrameLayout.LayoutParams.WRAP_CONTENT);
         filterSearchView.setLayoutParams(lp);
         filterSearchView.setImeOptions(
-                EditorInfo.IME_ACTION_SEARCH |
+                EditorInfo.IME_ACTION_DONE |
                         EditorInfo.IME_FLAG_NO_EXTRACT_UI |
-                        EditorInfo.IME_FLAG_NO_ENTER_ACTION |
                         // EditorInfo.IME_FLAG_NO_FULLSCREEN | // Requires API
                         // 11
-                        EditorInfo.IME_MASK_ACTION |
                         EditorInfo.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
 
         filterSearchView.setOnQueryTextListener(new OnQueryTextListener() {
             @Override
             public boolean onQueryTextSubmit(String query) {
-                return true;
+                filterSearchView.clearFocus();
+                return false;
             }
 
             @Override
@@ -306,6 +312,10 @@ public class DictionaryManagerActivity extends ActionBarActivity {
 
         actionBar.setCustomView(filterSearchView);
         actionBar.setDisplayShowCustomEnabled(true);
+
+        // Avoid wasting space on large left inset
+        Toolbar tb = (Toolbar)filterSearchView.getParent();
+        tb.setContentInsetsRelative(0, 0);
     }
 
     @Override
@@ -585,10 +595,8 @@ public class DictionaryManagerActivity extends ActionBarActivity {
             builder.append(getString(R.string.indexInfo, indexInfo.shortName,
                     indexInfo.mainTokenCount));
         }
-        if (downloadable != null || dictionaryInfo != null) {
-            builder.append("; ");
-            builder.append(getString(R.string.downloadButton, (dictionaryInfo != null ? dictionaryInfo.uncompressedBytes : downloadable.uncompressedBytes) / 1024.0 / 1024.0));
-        }
+        builder.append("; ");
+        builder.append(getString(R.string.downloadButton, dictionaryInfo.uncompressedBytes / 1024.0 / 1024.0));
         if (broken) {
             name.setText("Broken: " + application.getDictionaryName(dictionaryInfo.uncompressedFilename));
             builder.append("; Cannot be used, redownload, check hardware/file system");