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;
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;
uiHandler.post(new Runnable() {
@Override
public void run() {
- setListAdapater();
+ setMyListAdapater();
}
});
}
}
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 {
@Override
public void onCreate(Bundle savedInstanceState) {
+ // This must be first, otherwise the actiona bar doesn't get
+ // styled properly.
setTheme(((DictionaryApplication) getApplication()).getSelectedTheme().themeId);
super.onCreate(savedInstanceState);
showDownloadable.setOnCheckedChangeListener(new OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- onShowLocalChanged();
+ onShowDownloadableChanged();
}
});
registerReceiver(broadcastReceiver, new IntentFilter(
DownloadManager.ACTION_DOWNLOAD_COMPLETE));
- setListAdapater();
+ setMyListAdapater();
registerForContextMenu(getListView());
final File dictDir = application.getDictDir();
@Override
public boolean onQueryTextChange(String filterText) {
- setListAdapater();
+ setMyListAdapater();
return true;
}
});
}
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
- showDownloadable.setChecked(prefs.getBoolean(C.SHOW_DOWNLOADABLE, false));
+ showDownloadable.setChecked(prefs.getBoolean(C.SHOW_DOWNLOADABLE, true));
if (!blockAutoLaunch &&
getIntent().getBooleanExtra(C.CAN_AUTO_LAUNCH_DICT, true) &&
application.backgroundUpdateDictionaries(dictionaryUpdater);
- setListAdapater();
+ setMyListAdapater();
}
@Override
@Override
public boolean onMenuItemClick(android.view.MenuItem item) {
application.moveDictionaryToTop(row.dictionaryInfo);
- setListAdapater();
+ setMyListAdapater();
return true;
}
});
@Override
public boolean onMenuItemClick(android.view.MenuItem item) {
application.deleteDictionary(row.dictionaryInfo);
- setListAdapater();
+ setMyListAdapater();
return true;
}
});
}
}
- private void onShowLocalChanged() {
- setListAdapater();
+ private void onShowDownloadableChanged() {
+ setMyListAdapater();
Editor prefs = PreferenceManager.getDefaultSharedPreferences(this).edit();
prefs.putBoolean(C.SHOW_DOWNLOADABLE, showDownloadable.isChecked());
prefs.commit();
}
- private void setListAdapater() {
+ private void setMyListAdapater() {
final String filter = filterSearchView == null ? "" : filterSearchView.getQuery()
.toString();
final String[] filters = filter.trim().toLowerCase().split("(\\s|-)+");
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);
downloadButton
.setText(getString(
R.string.downloadButton,
- application.getDownloadable(dictionaryInfo.uncompressedFilename).zipBytes / 1024.0 / 1024.0));
+ downloadable.zipBytes / 1024.0 / 1024.0));
downloadButton.setMinWidth(application.languageButtonPixels * 3 / 2);
downloadButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View arg0) {
- downloadDictionary(dictionaryInfo);
+ downloadDictionary(downloadable.downloadUrl);
}
});
} else {
.sortedIndexInfos(dictionaryInfo.indexInfos);
final StringBuilder builder = new StringBuilder();
if (updateAvailable) {
- builder.append(getString(R.string.updateButton));
+ builder.append(getString(R.string.updateAvailable));
}
for (IndexInfo indexInfo : sortedIndexInfos) {
final View button = application.createButton(buttons.getContext(), dictionaryInfo,
return row;
}
- private void downloadDictionary(final DictionaryInfo dictionaryInfo) {
+ private void downloadDictionary(final String downloadUrl) {
DownloadManager downloadManager = (DownloadManager) getSystemService(DOWNLOAD_SERVICE);
Request request = new Request(
- Uri.parse(dictionaryInfo.downloadUrl));
+ Uri.parse(downloadUrl));
try {
- final String destFile = new File(new URL(dictionaryInfo.downloadUrl).getFile())
+ final String destFile = new File(new URL(downloadUrl).getFile())
.getName();
Log.d(LOG, "Downloading to: " + destFile);