From 095ccc66afb856849cc36d85d64f87547308d6fb Mon Sep 17 00:00:00 2001 From: Thad Hughes Date: Thu, 26 Dec 2013 12:08:18 -0800 Subject: [PATCH] More messaging about downloads. --- res/values-de/strings.xml | 6 ++-- res/values/strings.xml | 15 +++------- .../dictionary/DictionaryManagerActivity.java | 28 ++++++++++--------- todo.txt | 2 +- 4 files changed, 23 insertions(+), 28 deletions(-) diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index dddd191..b3ca64e 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -3,7 +3,7 @@ QuickDic - QuickDic 4.0.1 + QuickDic 5.0.0 Über QuickDic… @@ -22,8 +22,8 @@ Wörterbuch entfernen %1$s: %2$,d Wörter Filter - Nur SD-Karte - + Nur SD-Karte + 4.0.1_de_b diff --git a/res/values/strings.xml b/res/values/strings.xml index b14259d..7eb70e6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3,14 +3,13 @@ QuickDic - QuickDic 4.0.1 + QuickDic 5.0.0 About QuickDic… Settings… Help Report issue… - Detected font problem (common on Sony Ericsson devices), switching back to default font. Please specify a default directory in the settings. @@ -18,14 +17,12 @@ Dictionary manager Dictionaries on device - No dictionaries on device Downloadable dictionaries %.1fMB UPDATE! Move to top Delete dictionary %1$s: %2$,d words - List filter Show Hide @@ -33,8 +30,10 @@ Unable to read dictionary directory: \n%1$s\n\nAndroid external storage directory: \n%2$s - Download finished: \n%s. Download failed: \n%s. + Unzipping dictionary: \n%s + Unzipping failed: \n%s + Installation finished: \n%s. @@ -43,16 +42,12 @@ Search Text Select dictionary… - Switch to %s Add to word list: %s Search: %s Failure adding to word list: %s - Unzipping dictionary… - Failed to unzip dictionary… Invalid dictionary: file=%1$s, error=%2$s No search results. About dictionary… - Random word Font failure: %s See also: %1$s (%2$s) Speak @@ -71,7 +66,6 @@ - Thad Hughes If you\'re using QuickDic, I\'d love to hear from you. Unfortunately, I cannot take responsibility for dictionary content (other than formatting), as it is generated from other sources. Please send comments, suggestions, bug reports, or just a quick hello to: @@ -90,7 +84,6 @@ Default Dic The directory to fired up when nothing else mentioned. - quickdicDirectory QuickDic directory The directory where QuickDic stores dictionaries (empty for default quickDic folder on external storage). diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java index fa0bf8a..30a4e3b 100644 --- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java +++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java @@ -15,7 +15,6 @@ package com.hughes.android.dictionary; import android.app.AlertDialog; -import android.app.Dialog; import android.app.DownloadManager; import android.app.DownloadManager.Request; import android.content.BroadcastReceiver; @@ -37,26 +36,22 @@ import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; -import android.view.View.OnLongClickListener; -import android.view.inputmethod.EditorInfo; import android.view.ViewGroup; +import android.view.inputmethod.EditorInfo; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.BaseAdapter; import android.widget.Button; import android.widget.CompoundButton; -import android.widget.FrameLayout; -import android.widget.ImageView; -import android.widget.ListView; -import android.widget.Toast; import android.widget.CompoundButton.OnCheckedChangeListener; +import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; +import android.widget.Toast; import android.widget.ToggleButton; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.SherlockListActivity; import com.actionbarsherlock.view.Menu; -import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.widget.SearchView; import com.actionbarsherlock.widget.SearchView.OnQueryTextListener; import com.hughes.android.dictionary.DictionaryInfo.IndexInfo; @@ -141,22 +136,29 @@ public class DictionaryManagerActivity extends SherlockListActivity { } Log.w(LOG, "Download finished: " + dest); + Toast.makeText(context, getString(R.string.unzippingDictionary, dest), + Toast.LENGTH_LONG).show(); + + final File localZipFile = new File(Uri.parse(dest).getPath()); - try { ZipFile zipFile = new ZipFile(localZipFile); final ZipEntry zipEntry = zipFile.entries().nextElement(); Log.d(LOG, "Unzipping entry: " + zipEntry.getName()); final InputStream zipIn = zipFile.getInputStream(zipEntry); - final OutputStream zipOut = new FileOutputStream( - new File(application.getDictDir(), zipEntry.getName())); + 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(); application.backgroundUpdateDictionaries(dictionaryUpdater); - Toast.makeText(context, getString(R.string.downloadFinished, dest), + Toast.makeText(context, getString(R.string.installationFinished, dest), Toast.LENGTH_LONG).show(); } catch (Exception e) { - Toast.makeText(context, getString(R.string.downloadFailed, dest), + Toast.makeText(context, getString(R.string.unzippingFailed, dest), Toast.LENGTH_LONG).show(); Log.e(LOG, "Failed to unzip.", e); } finally { diff --git a/todo.txt b/todo.txt index cd2fc80..335af62 100644 --- a/todo.txt +++ b/todo.txt @@ -1,3 +1,3 @@ * Internationalize strings. -* Back button in top left +* Back button and actionbar button. * HtmlEntries inline, expandable. \ No newline at end of file -- 2.43.0