import android.widget.CompoundButton;
import android.widget.CompoundButton.OnCheckedChangeListener;
import android.widget.FrameLayout;
+import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.ListAdapter;
import android.widget.ListView;
}
Log.w(LOG, "Download finished: " + dest + " Id: " + downloadId);
- Toast.makeText(context, getString(R.string.unzippingDictionary, dest),
- Toast.LENGTH_LONG).show();
+ if (!isFinishing())
+ Toast.makeText(context, getString(R.string.unzippingDictionary, dest),
+ Toast.LENGTH_LONG).show();
- if (unzipInstall(context, Uri.parse(dest), dest)) {
+ if (unzipInstall(context, Uri.parse(dest), dest, true)) {
finishedDownloadIds.add(downloadId);
Log.w(LOG, "Unzipping finished: " + dest + " Id: " + downloadId);
}
}
};
- private boolean unzipInstall(Context context, Uri zipUri, String dest) {
+ private boolean unzipInstall(Context context, Uri zipUri, String dest, boolean delete) {
File localZipFile = null;
InputStream zipFileStream = null;
ZipInputStream zipFile = null;
localZipFile = null;
} else {
localZipFile = new File(zipUri.getPath());
- zipFileStream = new FileInputStream(localZipFile);
+ try {
+ zipFileStream = new FileInputStream(localZipFile);
+ } catch (Exception e) {
+ if (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 false;
+ }
+ throw e;
+ }
}
zipFile = new ZipInputStream(new BufferedInputStream(zipFileStream));
final ZipEntry zipEntry = zipFile.getNextEntry();
zipOut = new FileOutputStream(targetFile);
copyStream(zipFile, zipOut);
application.backgroundUpdateDictionaries(dictionaryUpdater);
- Toast.makeText(context, getString(R.string.installationFinished, dest),
- Toast.LENGTH_LONG).show();
+ if (!isFinishing())
+ Toast.makeText(context, getString(R.string.installationFinished, dest),
+ Toast.LENGTH_LONG).show();
result = true;
} catch (Exception e) {
String msg = getString(R.string.unzippingFailed, dest + ": " + e.getMessage());
File dir = application.getDictDir();
- if (!dir.canWrite() || !application.checkFileCreate(dir)) {
+ if (!dir.canWrite() || !DictionaryApplication.checkFileCreate(dir)) {
msg = getString(R.string.notWritable, dir.getAbsolutePath());
}
new AlertDialog.Builder(context).setTitle(getString(R.string.error)).setMessage(msg).setNeutralButton("Close", null).show();
try {
if (zipFileStream != null) zipFileStream.close();
} catch (IOException e) {}
- if (localZipFile != null) localZipFile.delete();
+ if (localZipFile != null && delete) localZipFile.delete();
}
return result;
}
getListView().getContext()).inflate(
R.layout.dictionary_manager_header_row_downloadable, getListView(), false);
- showDownloadable = (ToggleButton) downloadableDictionariesHeaderRow
+ showDownloadable = downloadableDictionariesHeaderRow
.findViewById(R.id.hideDownloadable);
showDownloadable.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
intent.getAction().equals(Intent.ACTION_VIEW)) {
blockAutoLaunch = true;
Uri uri = intent.getData();
- unzipInstall(this, uri, uri.getLastPathSegment());
+ unzipInstall(this, uri, uri.getLastPathSegment(), false);
}
}
startActivity(DictionaryActivity.getLaunchIntent(getApplicationContext(),
new File(prefs.getString(C.DICT_FILE, "")),
prefs.getString(C.INDEX_SHORT_NAME, ""),
- prefs.getString(C.SEARCH_TOKEN, "")));
+ ""));
finish();
return;
}
// Remove the active dictionary from the prefs so we won't autolaunch
// next time.
- final Editor editor = prefs.edit();
- editor.remove(C.DICT_FILE);
- editor.remove(C.INDEX_SHORT_NAME);
- editor.remove(C.SEARCH_TOKEN);
- editor.commit();
+ prefs.edit().remove(C.DICT_FILE).remove(C.INDEX_SHORT_NAME).commit();
application.backgroundUpdateDictionaries(dictionaryUpdater);
}
});
- application.onCreateGlobalOptionsMenu(this, menu);
+ final MenuItem browserDownload = menu.add(getString(R.string.browserDownload));
+ MenuItemCompat.setShowAsAction(browserDownload, MenuItem.SHOW_AS_ACTION_NEVER);
+ browserDownload.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+ public boolean onMenuItemClick(final MenuItem menuItem) {
+ final Intent intent = new Intent(Intent.ACTION_VIEW);
+ intent.setData(Uri
+ .parse("https://github.com/rdoeffinger/Dictionary/releases/v0.2-dictionaries"));
+ startActivity(intent);
+ return false;
+ }
+ });
+
+ DictionaryApplication.onCreateGlobalOptionsMenu(this, menu);
return true;
}
}
@Override
- public View getView(int position, View convertView, ViewGroup parent) {
- if (convertView instanceof LinearLayout &&
- convertView != dictionariesOnDeviceHeaderRow &&
- convertView != downloadableDictionariesHeaderRow) {
- /*
- * This is done to try to avoid leaking memory that used to
- * happen on Android 4.0.3
- */
- ((LinearLayout) convertView).removeAllViews();
- }
+ public int getViewTypeCount() {
+ return 3;
+ }
+ @Override
+ public int getItemViewType(int position) {
final Row row = getItem(position);
+ if (row.dictionaryInfo == null) {
+ return row.onDevice ? 0 : 1;
+ }
+ assert row.dictionaryInfo.indexInfos.size() <= 2;
+ return 2;
+ }
- if (row.onDevice) {
- if (row.dictionaryInfo == null) {
- return dictionariesOnDeviceHeaderRow;
- }
- return createDictionaryRow(row.dictionaryInfo, parent, true);
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ if (convertView == dictionariesOnDeviceHeaderRow ||
+ convertView == downloadableDictionariesHeaderRow) {
+ return convertView;
}
+ final Row row = getItem(position);
+
if (row.dictionaryInfo == null) {
- return downloadableDictionariesHeaderRow;
+ assert convertView == null;
+ return row.onDevice ? dictionariesOnDeviceHeaderRow : downloadableDictionariesHeaderRow;
}
- return createDictionaryRow(row.dictionaryInfo, parent, false);
+ return createDictionaryRow(row.dictionaryInfo, parent, convertView, row.onDevice);
}
}
}
private View createDictionaryRow(final DictionaryInfo dictionaryInfo,
- final ViewGroup parent, boolean canLaunch) {
+ final ViewGroup parent, View row, boolean canLaunch) {
- View row = LayoutInflater.from(parent.getContext()).inflate(
+ if (row == null) {
+ row = LayoutInflater.from(parent.getContext()).inflate(
R.layout.dictionary_manager_row, parent, false);
- final TextView name = (TextView) row.findViewById(R.id.dictionaryName);
- final TextView details = (TextView) row.findViewById(R.id.dictionaryDetails);
+ }
+ final TextView name = row.findViewById(R.id.dictionaryName);
+ final TextView details = row.findViewById(R.id.dictionaryDetails);
name.setText(application.getDictionaryName(dictionaryInfo.uncompressedFilename));
final boolean updateAvailable = application.updateAvailable(dictionaryInfo);
- final Button downloadButton = (Button) row.findViewById(R.id.downloadButton);
+ final Button downloadButton = row.findViewById(R.id.downloadButton);
final DictionaryInfo downloadable = application.getDownloadable(dictionaryInfo.uncompressedFilename);
boolean broken = false;
if (!dictionaryInfo.isValid()) {
downloadDictionary(downloadable.downloadUrl, downloadable.zipBytes, downloadButton);
}
});
+ downloadButton.setVisibility(View.VISIBLE);
} else {
- downloadButton.setVisibility(View.INVISIBLE);
+ downloadButton.setVisibility(View.GONE);
}
- LinearLayout buttons = (LinearLayout) row.findViewById(R.id.dictionaryLauncherButtons);
+ LinearLayout buttons = row.findViewById(R.id.dictionaryLauncherButtons);
+
final List<IndexInfo> sortedIndexInfos = application
.sortedIndexInfos(dictionaryInfo.indexInfos);
final StringBuilder builder = new StringBuilder();
if (updateAvailable) {
builder.append(getString(R.string.updateAvailable));
}
- for (IndexInfo indexInfo : sortedIndexInfos) {
- final View button = IsoUtils.INSTANCE.createButton(buttons.getContext(), dictionaryInfo,
+ assert buttons.getChildCount() == 4;
+ for (int i = 0; i < 2; i++) {
+ final Button textButton = (Button)buttons.getChildAt(2*i);
+ final ImageButton imageButton = (ImageButton)buttons.getChildAt(2*i + 1);
+ if (i >= sortedIndexInfos.size()) {
+ textButton.setVisibility(View.GONE);
+ imageButton.setVisibility(View.GONE);
+ continue;
+ }
+ final IndexInfo indexInfo = sortedIndexInfos.get(i);
+ final View button = IsoUtils.INSTANCE.setupButton(textButton, imageButton, dictionaryInfo,
indexInfo, application.languageButtonPixels);
- buttons.addView(button);
if (canLaunch) {
button.setOnClickListener(
application.getPath(dictionaryInfo.uncompressedFilename),
indexInfo.shortName, "")));
- } else {
- button.setEnabled(false);
- button.setFocusable(false);
}
+ button.setEnabled(canLaunch);
+ button.setFocusable(canLaunch);
if (builder.length() != 0) {
builder.append("; ");
}
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(getApplicationContext(),
application.getPath(dictionaryInfo.uncompressedFilename),
dictionaryInfo.indexInfos.get(0).shortName, "")));
// do not setFocusable, for keyboard navigation
// offering only the index buttons is better.
- row.setLongClickable(true);
}
+ row.setClickable(canLaunch);
+ // Allow deleting, even if we cannot open
+ row.setLongClickable(broken || canLaunch);
row.setBackgroundResource(android.R.drawable.menuitem_background);
return row;
projects / Dictionary.git / blobdiff