import android.os.Environment;
import android.os.Handler;
import android.preference.PreferenceManager;
+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;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.LayoutInflater;
+import android.view.Menu;
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;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
+import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ToggleButton;
-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.view.Menu;
-import android.widget.ListAdapter;
import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
import com.hughes.android.util.IntentLauncher;
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;
}
.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)));
- Toast.makeText(context, getString(R.string.downloadFailed, dest),
- Toast.LENGTH_LONG).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, reason)).setNeutralButton("Close", null).show();
return;
}
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();
} catch (Exception e) {
- Toast.makeText(context, getString(R.string.unzippingFailed, dest),
- Toast.LENGTH_LONG).show();
+ String msg = getString(R.string.unzippingFailed, dest);
+ 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 {
+ 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();
}
}
}
};
- public static Intent getLaunchIntent() {
- final Intent intent = new Intent();
- intent.setClassName(DictionaryManagerActivity.class.getPackage().getName(),
- DictionaryManagerActivity.class.getName());
+ public static Intent getLaunchIntent(Context c) {
+ final Intent intent = new Intent(c, DictionaryManagerActivity.class);
intent.putExtra(C.CAN_AUTO_LAUNCH_DICT, false);
return intent;
}
if (!prefs.getString(C.THANKS_FOR_UPDATING_VERSION, "").equals(
thanksForUpdatingLatestVersion)) {
blockAutoLaunch = true;
- startActivity(HtmlDisplayActivity.getWhatsNewLaunchIntent());
+ startActivity(HtmlDisplayActivity.getWhatsNewLaunchIntent(getApplicationContext()));
prefs.edit().putString(C.THANKS_FOR_UPDATING_VERSION, thanksForUpdatingLatestVersion)
.commit();
}
R.string.unableToReadDictionaryDir,
dictDir.getAbsolutePath(),
Environment.getExternalStorageDirectory()));
+ builder.setNeutralButton("Close", null);
builder.create().show();
}
private void onCreateSetupActionBar() {
ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayShowTitleEnabled(false);
+ actionBar.setDisplayShowHomeEnabled(false);
+ actionBar.setDisplayHomeAsUpEnabled(false);
filterSearchView = new SearchView(getSupportActionBar().getThemedContext());
filterSearchView.setIconifiedByDefault(false);
// 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
actionBar.setCustomView(filterSearchView);
actionBar.setDisplayShowCustomEnabled(true);
+
+ // Avoid wasting space on large left inset
+ Toolbar tb = (Toolbar)filterSearchView.getParent();
+ tb.setContentInsetsRelative(0, 0);
}
@Override
prefs.contains(C.DICT_FILE) &&
prefs.contains(C.INDEX_SHORT_NAME)) {
Log.d(LOG, "Skipping DictionaryManager, going straight to dictionary.");
- startActivity(DictionaryActivity.getLaunchIntent(
+ startActivity(DictionaryActivity.getLaunchIntent(getApplicationContext(),
new File(prefs.getString(C.DICT_FILE, "")),
prefs.getString(C.INDEX_SHORT_NAME, ""),
prefs.getString(C.SEARCH_TOKEN, "")));
}
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);
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,
downloadButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
- downloadDictionary(downloadable.downloadUrl);
+ downloadDictionary(downloadable.downloadUrl, downloadable.zipBytes, downloadButton);
}
});
} else {
if (canLaunch) {
button.setOnClickListener(
new IntentLauncher(buttons.getContext(),
- DictionaryActivity.getLaunchIntent(
+ DictionaryActivity.getLaunchIntent(getApplicationContext(),
application.getPath(dictionaryInfo.uncompressedFilename),
indexInfo.shortName, "")));
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) {
row.setClickable(true);
row.setOnClickListener(new IntentLauncher(parent.getContext(),
- DictionaryActivity.getLaunchIntent(
+ DictionaryActivity.getLaunchIntent(getApplicationContext(),
application.getPath(dictionaryInfo.uncompressedFilename),
dictionaryInfo.indexInfos.get(0).shortName, "")));
row.setFocusable(true);
return row;
}
- private void downloadDictionary(final String downloadUrl) {
+ private void downloadDictionary(final String downloadUrl, long bytes, Button downloadButton) {
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 (!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));
try {
.getName();
Log.d(LOG, "Downloading to: " + destFile);
- request.setDestinationUri(Uri.fromFile(new File(Environment
- .getExternalStorageDirectory(), 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);
}
downloadManager.enqueue(request);
+ downloadButton.setText("X");
}
}
projects / Dictionary.git / blobdiff