package com.hughes.android.dictionary;
+import android.Manifest;
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;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
+import android.content.pm.PackageManager;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
import android.preference.PreferenceManager;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+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.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 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;
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.
return getListView().getAdapter();
}
+ // For DownloadManager bug workaround
+ private Set<Long> finishedDownloadIds = new HashSet<Long>();
+
DictionaryApplication application;
SearchView filterSearchView;
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);
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());
- ZipFile zipFile = null;
- InputStream zipIn = null;
+
+
+ final Uri zipUri = Uri.parse(dest);
+ File localZipFile = null;
+ InputStream zipFileStream = null;
+ ZipInputStream zipFile = null;
OutputStream zipOut = null;
try {
- 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());
- 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());
}
zipOut = new FileOutputStream(targetFile);
- copyStream(zipIn, zipOut);
+ 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();
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();
+ try { if (zipFileStream != null) zipFileStream.close(); } catch (IOException e) {}
+ if (localZipFile != null) localZipFile.delete();
}
}
}
return intent;
}
+ public void readableCheckAndError(boolean requestPermission) {
+ final File dictDir = application.getDictDir();
+ if (dictDir.canRead() && dictDir.canExecute()) return;
+ blockAutoLaunch = true;
+ if (requestPermission &&
+ ContextCompat.checkSelfPermission(getApplicationContext(), Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+ ActivityCompat.requestPermissions(this,
+ new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
+ Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0);
+ return;
+ }
+ blockAutoLaunch = true;
+
+ AlertDialog.Builder builder = new AlertDialog.Builder(getListView().getContext());
+ builder.setTitle(getString(R.string.error));
+ builder.setMessage(getString(
+ R.string.unableToReadDictionaryDir,
+ dictDir.getAbsolutePath(),
+ Environment.getExternalStorageDirectory()));
+ builder.setNeutralButton("Close", null);
+ builder.create().show();
+ }
+
+ @Override
+ public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
+ readableCheckAndError(false);
+
+ application.backgroundUpdateDictionaries(dictionaryUpdater);
+
+ setMyListAdapater();
+ }
+
@Override
public void onCreate(Bundle savedInstanceState) {
// This must be first, otherwise the actiona bar doesn't get
setMyListAdapater();
registerForContextMenu(getListView());
- final File dictDir = application.getDictDir();
- if (!dictDir.canRead() || !dictDir.canExecute()) {
- blockAutoLaunch = true;
-
- AlertDialog.Builder builder = new AlertDialog.Builder(getListView().getContext());
- builder.setTitle(getString(R.string.error));
- builder.setMessage(getString(
- R.string.unableToReadDictionaryDir,
- dictDir.getAbsolutePath(),
- Environment.getExternalStorageDirectory()));
- builder.setNeutralButton("Close", null);
- builder.create().show();
- }
+ readableCheckAndError(true);
onCreateSetupActionBar();
}
@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;
}
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;
}
}
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();
Log.d(LOG, "Downloading to: " + destFile);
request.setTitle(destFile);
+ File destFilePath = new File(application.getDictDir(), destFile);
+ destFilePath.delete();
try {
- request.setDestinationInExternalFilesDir(getApplicationContext(), null, destFile);
- } catch (IllegalStateException e) {
- request.setDestinationUri(Uri.fromFile(new File(Environment
- .getExternalStorageDirectory(), destFile)));
+ request.setDestinationUri(Uri.fromFile(destFilePath));
+ } catch (Exception e) {
}
- downloadManager.enqueue(request);
+ try {
+ downloadManager.enqueue(request);
+ } catch (SecurityException e) {
+ request = new Request(Uri.parse(downloadUrl));
+ request.setTitle(destFile);
+ downloadManager.enqueue(request);
+ }
+ Log.w(LOG, "Download started: " + destFile);
downloadButton.setText("X");
}
projects / Dictionary.git / blobdiff