final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
// Don't auto-launch if this fails.
- prefs.edit().remove(C.DICT_FILE).commit();
+ prefs.edit().remove(C.DICT_FILE).remove(C.INDEX_SHORT_NAME).commit();
setContentView(R.layout.dictionary_activity);
setSearchText(text, true);
Log.d(LOG, "Trying to restore searchText=" + text);
- setDictionaryPrefs(this, dictFile, index.shortName, searchView.getQuery().toString());
+ setDictionaryPrefs(this, dictFile, index.shortName);
updateLangButton();
searchView.requestFocus();
}
private static void setDictionaryPrefs(final Context context, final File dictFile,
- final String indexShortName, final String searchToken) {
+ final String indexShortName) {
final SharedPreferences.Editor prefs = PreferenceManager.getDefaultSharedPreferences(
context).edit();
if (dictFile != null) {
prefs.putString(C.DICT_FILE, dictFile.getPath());
prefs.putString(C.INDEX_SHORT_NAME, indexShortName);
}
- prefs.putString(C.SEARCH_TOKEN, ""); // Don't need to save search token.
+ prefs.remove(C.SEARCH_TOKEN); // Don't need to save search token.
prefs.commit();
}
final LinearLayout result = new LinearLayout(parent.getContext());
- for (int i = 0; i < dictionaryInfo.indexInfos.size(); ++i) {
+ for (int i = 0; dictionaryInfo.indexInfos != null && i < dictionaryInfo.indexInfos.size(); ++i) {
final IndexInfo indexInfo = dictionaryInfo.indexInfos.get(i);
final View button = IsoUtils.INSTANCE.createButton(parent.getContext(),
dictionaryInfo, indexInfo, application.languageButtonPixels);
indexAdapter = new IndexAdapter(index);
setListAdapter(indexAdapter);
Log.d(LOG, "changingIndex, newLang=" + index.longName);
- setDictionaryPrefs(this, dictFile, index.shortName, searchView.getQuery().toString());
+ setDictionaryPrefs(this, dictFile, index.shortName);
updateLangButton();
}
setSearchText(newSearchText, true, hideKeyboard);
// Set the columns in the table.
if (r > 0) {
final TextView bullet = new TextView(tableRow.getContext());
- bullet.setText(" • ");
+ bullet.setText(" •");
tableRow.addView(bullet);
}
tableRow.addView(col1, layoutParams);
- final TextView margin = new TextView(tableRow.getContext());
- margin.setText(" ");
- tableRow.addView(margin);
if (r > 0) {
final TextView bullet = new TextView(tableRow.getContext());
- bullet.setText(" • ");
+ bullet.setText(" •");
tableRow.addView(bullet);
}
tableRow.addView(col2, layoutParams);