]> gitweb.fperrin.net Git - Dictionary.git/blobdiff - src/com/hughes/android/dictionary/DictionaryManagerActivity.java
Fix trailing whitespace and DOS linebreaks.
[Dictionary.git] / src / com / hughes / android / dictionary / DictionaryManagerActivity.java
index 127de4358792396ba289327b3673ae7d793d1611..a1bc375823f8954db8fb41e4d3ba0500fb4ff7eb 100644 (file)
@@ -18,6 +18,7 @@ import android.app.AlertDialog;
 import android.app.DownloadManager;
 import android.app.DownloadManager.Request;
 import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -33,6 +34,8 @@ 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.text.InputType;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.ContextMenu;
@@ -43,6 +46,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;
@@ -60,6 +64,7 @@ import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
 import com.hughes.android.util.IntentLauncher;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -67,9 +72,12 @@ import java.io.OutputStream;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
+import java.util.zip.ZipInputStream;
 
 // Right-click:
 //  Delete, move to top.
@@ -93,6 +101,9 @@ public class DictionaryManagerActivity extends ActionBarActivity {
         return getListView().getAdapter();
     }
 
+    // For DownloadManager bug workaround
+    private Set<Long> finishedDownloadIds = new HashSet<Long>();
+
     DictionaryApplication application;
 
     SearchView filterSearchView;
@@ -120,18 +131,19 @@ public class DictionaryManagerActivity extends ActionBarActivity {
 
     final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
         @Override
-        public void onReceive(Context context, Intent intent) {
+        public synchronized void onReceive(Context context, Intent intent) {
             final String action = intent.getAction();
 
             if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action)) {
                 final long downloadId = intent.getLongExtra(
                         DownloadManager.EXTRA_DOWNLOAD_ID, 0);
+                if (finishedDownloadIds.contains(downloadId)) return; // ignore double notifications
                 final DownloadManager.Query query = new DownloadManager.Query();
                 query.setFilterById(downloadId);
                 final DownloadManager downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE);
                 final Cursor cursor = downloadManager.query(query);
 
-                if (!cursor.moveToFirst()) {
+                if (cursor == null || !cursor.moveToFirst()) {
                     Log.e(LOG, "Couldn't find download.");
                     return;
                 }
@@ -142,45 +154,66 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                         .getInt(cursor
                                 .getColumnIndex(DownloadManager.COLUMN_STATUS));
                 if (DownloadManager.STATUS_SUCCESSFUL != status) {
+                    final int reason = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_REASON));
                     Log.w(LOG,
                             "Download failed: status=" + status +
-                                    ", reason=" + cursor.getString(cursor
-                                            .getColumnIndex(DownloadManager.COLUMN_REASON)));
-                    new AlertDialog.Builder(context).setTitle(getString(R.string.error)).setMessage(getString(R.string.downloadFailed, dest)).setNeutralButton("Close", null).show();
+                                    ", reason=" + reason);
+                    String msg = Integer.toString(reason);
+                    switch (reason) {
+                    case DownloadManager.ERROR_FILE_ALREADY_EXISTS: msg = "File exists"; break;
+                    case DownloadManager.ERROR_FILE_ERROR: msg = "File error"; break;
+                    case DownloadManager.ERROR_INSUFFICIENT_SPACE: msg = "Not enough space"; break;
+                    }
+                    new AlertDialog.Builder(context).setTitle(getString(R.string.error)).setMessage(getString(R.string.downloadFailed, msg)).setNeutralButton("Close", null).show();
                     return;
                 }
 
-                Log.w(LOG, "Download finished: " + dest);
+                Log.w(LOG, "Download finished: " + dest + " Id: " + downloadId);
                 Toast.makeText(context, getString(R.string.unzippingDictionary, dest),
                         Toast.LENGTH_LONG).show();
-                
-                
-                final File localZipFile = new File(Uri.parse(dest).getPath());
+
+
+                final Uri zipUri = Uri.parse(dest);
+                File localZipFile = null;
+                InputStream zipFileStream = null;
+                ZipInputStream zipFile = null;
+                OutputStream zipOut = null;
                 try {
-                    ZipFile zipFile = new ZipFile(localZipFile);
-                    final ZipEntry zipEntry = zipFile.entries().nextElement();
+                    if (zipUri.getScheme().equals("content")) {
+                        zipFileStream = context.getContentResolver().openInputStream(zipUri);
+                        localZipFile = null;
+                    } else {
+                        localZipFile = new File(zipUri.getPath());
+                        zipFileStream = new FileInputStream(localZipFile);
+                    }
+                    zipFile = new ZipInputStream(zipFileStream);
+                    final ZipEntry zipEntry = zipFile.getNextEntry();
                     Log.d(LOG, "Unzipping entry: " + zipEntry.getName());
-                    final InputStream 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);
-                    copyStream(zipIn, zipOut);
-                    zipFile.close();
+                    zipOut = new FileOutputStream(targetFile);
+                    copyStream(zipFile, zipOut);
                     application.backgroundUpdateDictionaries(dictionaryUpdater);
                     Toast.makeText(context, getString(R.string.installationFinished, dest),
                             Toast.LENGTH_LONG).show();
+                    finishedDownloadIds.add(downloadId);
+                    Log.w(LOG, "Unzipping finished: " + dest + " Id: " + downloadId);
                 } catch (Exception e) {
                     String msg = getString(R.string.unzippingFailed, dest);
-                    if (!application.getDictDir().canWrite()) {
-                        msg = getString(R.string.notWritable, application.getDictDir().getAbsolutePath());
+                    File dir = application.getDictDir();
+                    if (!dir.canWrite() || !application.checkFileCreate(dir)) {
+                        msg = getString(R.string.notWritable, dir.getAbsolutePath());
                     }
                     new AlertDialog.Builder(context).setTitle(getString(R.string.error)).setMessage(msg).setNeutralButton("Close", null).show();
                     Log.e(LOG, "Failed to unzip.", e);
                 } finally {
-                    localZipFile.delete();
+                    try { if (zipOut != null) zipOut.close(); } catch (IOException e) {}
+                    try { if (zipFile != null) zipFile.close(); } catch (IOException e) {}
+                    try { if (zipFileStream != null) zipFileStream.close(); } catch (IOException e) {}
+                    if (localZipFile != null) localZipFile.delete();
                 }
             }
         }
@@ -261,6 +294,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);
@@ -269,24 +304,22 @@ 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.setInputType(InputType.TYPE_CLASS_TEXT);
         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
@@ -299,6 +332,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
@@ -518,7 +555,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
     }
 
     private View createDictionaryRow(final DictionaryInfo dictionaryInfo,
-            final ViewGroup parent, final boolean canLaunch) {
+            final ViewGroup parent, boolean canLaunch) {
 
         View row = LayoutInflater.from(parent.getContext()).inflate(
                 R.layout.dictionary_manager_row, parent, false);
@@ -528,8 +565,13 @@ public class DictionaryManagerActivity extends ActionBarActivity {
 
         final boolean updateAvailable = application.updateAvailable(dictionaryInfo);
         final Button downloadButton = (Button) row.findViewById(R.id.downloadButton);
-        if (!canLaunch || updateAvailable) {
-            final DictionaryInfo downloadable = application.getDownloadable(dictionaryInfo.uncompressedFilename);
+        final DictionaryInfo downloadable = application.getDownloadable(dictionaryInfo.uncompressedFilename);
+        boolean broken = false;
+        if (!dictionaryInfo.isValid()) {
+            broken = true;
+            canLaunch = false;
+        }
+        if (downloadable != null && (!canLaunch || updateAvailable)) {
             downloadButton
                     .setText(getString(
                             R.string.downloadButton,
@@ -538,7 +580,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
             downloadButton.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View arg0) {
-                    downloadDictionary(downloadable.downloadUrl);
+                    downloadDictionary(downloadable.downloadUrl, downloadable.zipBytes, downloadButton);
                 }
             });
         } else {
@@ -573,6 +615,14 @@ public class DictionaryManagerActivity extends ActionBarActivity {
             builder.append(getString(R.string.indexInfo, indexInfo.shortName,
                     indexInfo.mainTokenCount));
         }
+        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");
+            // Allow deleting, but cannot open
+            row.setLongClickable(true);
+        }
         details.setText(builder.toString());
 
         if (canLaunch) {
@@ -589,21 +639,65 @@ public class DictionaryManagerActivity extends ActionBarActivity {
         return row;
     }
 
-    private void downloadDictionary(final String downloadUrl) {
+    private synchronized void downloadDictionary(final String downloadUrl, long bytes, Button downloadButton) {
+        String destFile;
+        try {
+            destFile = new File(new URL(downloadUrl).getPath()).getName();
+        } catch (MalformedURLException e) {
+            throw new RuntimeException("Invalid download URL!", e);
+        }
         DownloadManager downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE);
+        final DownloadManager.Query query = new DownloadManager.Query();
+        query.setFilterByStatus(DownloadManager.STATUS_PAUSED | DownloadManager.STATUS_PENDING | DownloadManager.STATUS_RUNNING);
+        final Cursor cursor = downloadManager.query(query);
+
+        // Due to a bug, cursor is null instead of empty when
+        // the download manager is disabled.
+        if (cursor == null) {
+            new AlertDialog.Builder(DictionaryManagerActivity.this).setTitle(getString(R.string.error))
+                    .setMessage(getString(R.string.downloadFailed, R.string.downloadManagerQueryFailed))
+                    .setNeutralButton("Close", null).show();
+            return;
+        }
+
+        while (cursor.moveToNext()) {
+            if (downloadUrl.equals(cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_URI))))
+                break;
+            if (destFile.equals(cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_TITLE))))
+                break;
+        }
+        if (!cursor.isAfterLast()) {
+            downloadManager.remove(cursor.getLong(cursor.getColumnIndex(DownloadManager.COLUMN_ID)));
+            downloadButton
+                    .setText(getString(
+                            R.string.downloadButton,
+                            bytes / 1024.0 / 1024.0));
+            cursor.close();
+            return;
+        }
+        cursor.close();
         Request request = new Request(
                 Uri.parse(downloadUrl));
+
+        Log.d(LOG, "Downloading to: " + destFile);
+        request.setTitle(destFile);
+
+        File destFilePath = new File(application.getDictDir(), destFile);
+        destFilePath.delete();
         try {
-            final String destFile = new File(new URL(downloadUrl).getFile())
-                    .getName();
-            Log.d(LOG, "Downloading to: " + destFile);
+            request.setDestinationUri(Uri.fromFile(destFilePath));
+        } catch (Exception e) {
+        }
 
-            request.setDestinationUri(Uri.fromFile(new File(Environment
-                    .getExternalStorageDirectory(), destFile)));
-        } catch (MalformedURLException e) {
-            throw new RuntimeException(e);
+        try {
+            downloadManager.enqueue(request);
+        } catch (SecurityException e) {
+            request = new Request(Uri.parse(downloadUrl));
+            request.setTitle(destFile);
+            downloadManager.enqueue(request);
         }
-        downloadManager.enqueue(request);
+        Log.w(LOG, "Download started: " + destFile);
+        downloadButton.setText("X");
     }
 
 }