X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryManagerActivity.java;h=0139c474b18aa142ac6e0c6eab96ee5154bab59a;hb=51adf3a1cb11c9be99558e27162f2eb51c6c62ea;hp=4b1723fe0b46fff71d5d73b83c1b42772143627a;hpb=d19797d0b1f95fe19fa8d4d03ee4c437ab3fd168;p=Dictionary.git diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java index 4b1723f..0139c47 100644 --- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java +++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java @@ -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; @@ -29,20 +30,25 @@ import android.os.Bundle; import android.os.Environment; import android.os.Handler; import android.preference.PreferenceManager; +import android.support.v4.view.MenuItemCompat; 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; import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; import android.view.Menu; +import android.view.MenuItem; 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 +66,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 +74,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 +103,9 @@ public class DictionaryManagerActivity extends ActionBarActivity { return getListView().getAdapter(); } + // For DownloadManager bug workaround + private Set finishedDownloadIds = new HashSet(); + DictionaryApplication application; SearchView filterSearchView; @@ -120,18 +133,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; } @@ -152,32 +166,43 @@ public class DictionaryManagerActivity extends ActionBarActivity { 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, reason)).setNeutralButton("Close", null).show(); + 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); File dir = application.getDictDir(); @@ -187,7 +212,10 @@ 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 { - 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(); } } } @@ -268,6 +296,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 +306,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 @@ -306,6 +334,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 @@ -379,6 +411,16 @@ public class DictionaryManagerActivity extends ActionBarActivity { @Override public boolean onCreateOptionsMenu(final Menu menu) { + final MenuItem sort = menu.add(getString(R.string.sortDicts)); + MenuItemCompat.setShowAsAction(sort, MenuItem.SHOW_AS_ACTION_NEVER); + sort.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() { + public boolean onMenuItemClick(final MenuItem menuItem) { + application.sortDictionaries(); + setMyListAdapater(); + return true; + } + }); + application.onCreateGlobalOptionsMenu(this, menu); return true; } @@ -442,8 +484,8 @@ public class DictionaryManagerActivity extends ActionBarActivity { DictionaryInfo dictionaryInfo; boolean onDevice; - private Row(DictionaryInfo dictinoaryInfo, boolean onDevice) { - this.dictionaryInfo = dictinoaryInfo; + private Row(DictionaryInfo dictionaryInfo, boolean onDevice) { + this.dictionaryInfo = dictionaryInfo; this.onDevice = onDevice; } } @@ -585,10 +627,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"); @@ -611,15 +651,23 @@ public class DictionaryManagerActivity extends ActionBarActivity { return row; } - private void downloadDictionary(final String downloadUrl, long bytes, Button downloadButton) { + 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, "Couldn't query Download Manager")) + .setMessage(getString(R.string.downloadFailed, R.string.downloadManagerQueryFailed)) .setNeutralButton("Close", null).show(); return; } @@ -627,6 +675,8 @@ public class DictionaryManagerActivity extends ActionBarActivity { 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))); @@ -640,21 +690,25 @@ public class DictionaryManagerActivity extends ActionBarActivity { 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); - - try { - request.setDestinationInExternalFilesDir(getApplicationContext(), null, destFile); - } catch (IllegalStateException e) { - request.setDestinationUri(Uri.fromFile(new File(Environment - .getExternalStorageDirectory(), destFile))); - } - } catch (MalformedURLException e) { - throw new RuntimeException(e); + request.setDestinationUri(Uri.fromFile(destFilePath)); + } catch (Exception 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"); }