am 80d413ca: Merge "Straighten out database cursors behavior."
* commit '80d413caff342149aea958199cd343ebc75c8e91': Straighten out database cursors behavior.main
commit
83d21b8703
|
@ -350,7 +350,8 @@ public final class DictionaryProvider extends ContentProvider {
|
|||
clientId);
|
||||
if (null == results) {
|
||||
return Collections.<WordListInfo>emptyList();
|
||||
} else {
|
||||
}
|
||||
try {
|
||||
final HashMap<String, WordListInfo> dicts = new HashMap<String, WordListInfo>();
|
||||
final int idIndex = results.getColumnIndex(MetadataDbHelper.WORDLISTID_COLUMN);
|
||||
final int localeIndex = results.getColumnIndex(MetadataDbHelper.LOCALE_COLUMN);
|
||||
|
@ -416,8 +417,9 @@ public final class DictionaryProvider extends ContentProvider {
|
|||
}
|
||||
} while (results.moveToNext());
|
||||
}
|
||||
results.close();
|
||||
return Collections.unmodifiableCollection(dicts.values());
|
||||
} finally {
|
||||
results.close();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -283,63 +283,70 @@ public final class DictionarySettingsFragment extends PreferenceFragment
|
|||
final ArrayList<Preference> result = new ArrayList<Preference>();
|
||||
result.add(createErrorMessage(activity, R.string.cannot_connect_to_dict_service));
|
||||
return result;
|
||||
} else if (!cursor.moveToFirst()) {
|
||||
final ArrayList<Preference> result = new ArrayList<Preference>();
|
||||
result.add(createErrorMessage(activity, R.string.no_dictionaries_available));
|
||||
cursor.close();
|
||||
return result;
|
||||
} else {
|
||||
final String systemLocaleString = Locale.getDefault().toString();
|
||||
final TreeMap<String, WordListPreference> prefMap =
|
||||
new TreeMap<String, WordListPreference>();
|
||||
final int idIndex = cursor.getColumnIndex(MetadataDbHelper.WORDLISTID_COLUMN);
|
||||
final int versionIndex = cursor.getColumnIndex(MetadataDbHelper.VERSION_COLUMN);
|
||||
final int localeIndex = cursor.getColumnIndex(MetadataDbHelper.LOCALE_COLUMN);
|
||||
final int descriptionIndex = cursor.getColumnIndex(MetadataDbHelper.DESCRIPTION_COLUMN);
|
||||
final int statusIndex = cursor.getColumnIndex(MetadataDbHelper.STATUS_COLUMN);
|
||||
final int filesizeIndex = cursor.getColumnIndex(MetadataDbHelper.FILESIZE_COLUMN);
|
||||
do {
|
||||
final String wordlistId = cursor.getString(idIndex);
|
||||
final int version = cursor.getInt(versionIndex);
|
||||
final String localeString = cursor.getString(localeIndex);
|
||||
final Locale locale = new Locale(localeString);
|
||||
final String description = cursor.getString(descriptionIndex);
|
||||
final int status = cursor.getInt(statusIndex);
|
||||
final int matchLevel = LocaleUtils.getMatchLevel(systemLocaleString, localeString);
|
||||
final String matchLevelString = LocaleUtils.getMatchLevelSortedString(matchLevel);
|
||||
final int filesize = cursor.getInt(filesizeIndex);
|
||||
// The key is sorted in lexicographic order, according to the match level, then
|
||||
// the description.
|
||||
final String key = matchLevelString + "." + description + "." + wordlistId;
|
||||
final WordListPreference existingPref = prefMap.get(key);
|
||||
if (null == existingPref || existingPref.hasPriorityOver(status)) {
|
||||
final WordListPreference oldPreference = mCurrentPreferenceMap.get(key);
|
||||
final WordListPreference pref;
|
||||
if (null != oldPreference
|
||||
&& oldPreference.mVersion == version
|
||||
&& oldPreference.hasStatus(status)
|
||||
&& oldPreference.mLocale.equals(locale)) {
|
||||
// If the old preference has all the new attributes, reuse it. Ideally, we
|
||||
// should reuse the old pref even if its status is different and call
|
||||
// setStatus here, but setStatus calls Preference#setSummary() which needs
|
||||
// to be done on the UI thread and we're not on the UI thread here. We
|
||||
// could do all this work on the UI thread, but in this case it's probably
|
||||
// lighter to stay on a background thread and throw this old preference out.
|
||||
pref = oldPreference;
|
||||
} else {
|
||||
// Otherwise, discard it and create a new one instead.
|
||||
// TODO: when the status is different from the old one, we need to
|
||||
// animate the old one out before animating the new one in.
|
||||
pref = new WordListPreference(activity, mDictionaryListInterfaceState,
|
||||
mClientId, wordlistId, version, locale, description, status,
|
||||
filesize);
|
||||
}
|
||||
try {
|
||||
if (!cursor.moveToFirst()) {
|
||||
final ArrayList<Preference> result = new ArrayList<Preference>();
|
||||
result.add(createErrorMessage(activity, R.string.no_dictionaries_available));
|
||||
return result;
|
||||
} else {
|
||||
final String systemLocaleString = Locale.getDefault().toString();
|
||||
final TreeMap<String, WordListPreference> prefMap =
|
||||
new TreeMap<String, WordListPreference>();
|
||||
final int idIndex = cursor.getColumnIndex(MetadataDbHelper.WORDLISTID_COLUMN);
|
||||
final int versionIndex = cursor.getColumnIndex(MetadataDbHelper.VERSION_COLUMN);
|
||||
final int localeIndex = cursor.getColumnIndex(MetadataDbHelper.LOCALE_COLUMN);
|
||||
final int descriptionIndex =
|
||||
cursor.getColumnIndex(MetadataDbHelper.DESCRIPTION_COLUMN);
|
||||
final int statusIndex = cursor.getColumnIndex(MetadataDbHelper.STATUS_COLUMN);
|
||||
final int filesizeIndex = cursor.getColumnIndex(MetadataDbHelper.FILESIZE_COLUMN);
|
||||
do {
|
||||
final String wordlistId = cursor.getString(idIndex);
|
||||
final int version = cursor.getInt(versionIndex);
|
||||
final String localeString = cursor.getString(localeIndex);
|
||||
final Locale locale = new Locale(localeString);
|
||||
final String description = cursor.getString(descriptionIndex);
|
||||
final int status = cursor.getInt(statusIndex);
|
||||
final int matchLevel =
|
||||
LocaleUtils.getMatchLevel(systemLocaleString, localeString);
|
||||
final String matchLevelString =
|
||||
LocaleUtils.getMatchLevelSortedString(matchLevel);
|
||||
final int filesize = cursor.getInt(filesizeIndex);
|
||||
// The key is sorted in lexicographic order, according to the match level, then
|
||||
// the description.
|
||||
final String key = matchLevelString + "." + description + "." + wordlistId;
|
||||
final WordListPreference existingPref = prefMap.get(key);
|
||||
if (null == existingPref || existingPref.hasPriorityOver(status)) {
|
||||
final WordListPreference oldPreference = mCurrentPreferenceMap.get(key);
|
||||
final WordListPreference pref;
|
||||
if (null != oldPreference
|
||||
&& oldPreference.mVersion == version
|
||||
&& oldPreference.hasStatus(status)
|
||||
&& oldPreference.mLocale.equals(locale)) {
|
||||
// If the old preference has all the new attributes, reuse it. Ideally,
|
||||
// we should reuse the old pref even if its status is different and call
|
||||
// setStatus here, but setStatus calls Preference#setSummary() which
|
||||
// needs to be done on the UI thread and we're not on the UI thread
|
||||
// here. We could do all this work on the UI thread, but in this case
|
||||
// it's probably lighter to stay on a background thread and throw this
|
||||
// old preference out.
|
||||
pref = oldPreference;
|
||||
} else {
|
||||
// Otherwise, discard it and create a new one instead.
|
||||
// TODO: when the status is different from the old one, we need to
|
||||
// animate the old one out before animating the new one in.
|
||||
pref = new WordListPreference(activity, mDictionaryListInterfaceState,
|
||||
mClientId, wordlistId, version, locale, description, status,
|
||||
filesize);
|
||||
}
|
||||
prefMap.put(key, pref);
|
||||
}
|
||||
prefMap.put(key, pref);
|
||||
}
|
||||
} while (cursor.moveToNext());
|
||||
} while (cursor.moveToNext());
|
||||
mCurrentPreferenceMap = prefMap;
|
||||
return prefMap.values();
|
||||
}
|
||||
} finally {
|
||||
cursor.close();
|
||||
mCurrentPreferenceMap = prefMap;
|
||||
return prefMap.values();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -533,12 +533,17 @@ public class MetadataDbHelper extends SQLiteOpenHelper {
|
|||
PENDINGID_COLUMN + "= ?",
|
||||
new String[] { Long.toString(id) },
|
||||
null, null, null);
|
||||
// There should never be more than one result. If because of some bug there are, returning
|
||||
// only one result is the right thing to do, because we couldn't handle several anyway
|
||||
// and we should still handle one.
|
||||
final ContentValues result = getFirstLineAsContentValues(cursor);
|
||||
cursor.close();
|
||||
return result;
|
||||
if (null == cursor) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
// There should never be more than one result. If because of some bug there are,
|
||||
// returning only one result is the right thing to do, because we couldn't handle
|
||||
// several anyway and we should still handle one.
|
||||
return getFirstLineAsContentValues(cursor);
|
||||
} finally {
|
||||
cursor.close();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -559,11 +564,16 @@ public class MetadataDbHelper extends SQLiteOpenHelper {
|
|||
new String[] { id, Integer.toString(STATUS_INSTALLED),
|
||||
Integer.toString(STATUS_DELETING) },
|
||||
null, null, null);
|
||||
// There should only be one result, but if there are several, we can't tell which
|
||||
// is the best, so we just return the first one.
|
||||
final ContentValues result = getFirstLineAsContentValues(cursor);
|
||||
cursor.close();
|
||||
return result;
|
||||
if (null == cursor) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
// There should only be one result, but if there are several, we can't tell which
|
||||
// is the best, so we just return the first one.
|
||||
return getFirstLineAsContentValues(cursor);
|
||||
} finally {
|
||||
cursor.close();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -622,10 +632,15 @@ public class MetadataDbHelper extends SQLiteOpenHelper {
|
|||
METADATA_TABLE_COLUMNS,
|
||||
WORDLISTID_COLUMN + "= ? AND " + VERSION_COLUMN + "= ?",
|
||||
new String[] { id, Integer.toString(version) }, null, null, null);
|
||||
// This is a lookup by primary key, so there can't be more than one result.
|
||||
final ContentValues result = getFirstLineAsContentValues(cursor);
|
||||
cursor.close();
|
||||
return result;
|
||||
if (null == cursor) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
// This is a lookup by primary key, so there can't be more than one result.
|
||||
return getFirstLineAsContentValues(cursor);
|
||||
} finally {
|
||||
cursor.close();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -641,10 +656,15 @@ public class MetadataDbHelper extends SQLiteOpenHelper {
|
|||
METADATA_TABLE_COLUMNS,
|
||||
WORDLISTID_COLUMN + "= ?",
|
||||
new String[] { id }, null, null, VERSION_COLUMN + " DESC", "1");
|
||||
// This is a lookup by primary key, so there can't be more than one result.
|
||||
final ContentValues result = getFirstLineAsContentValues(cursor);
|
||||
cursor.close();
|
||||
return result;
|
||||
if (null == cursor) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
// This is a lookup by primary key, so there can't be more than one result.
|
||||
return getFirstLineAsContentValues(cursor);
|
||||
} finally {
|
||||
cursor.close();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -44,8 +44,7 @@ public class MetadataHandler {
|
|||
*/
|
||||
private static List<WordListMetadata> makeMetadataObject(final Cursor results) {
|
||||
final ArrayList<WordListMetadata> buildingMetadata = new ArrayList<WordListMetadata>();
|
||||
|
||||
if (results.moveToFirst()) {
|
||||
if (null != results && results.moveToFirst()) {
|
||||
final int localeColumn = results.getColumnIndex(MetadataDbHelper.LOCALE_COLUMN);
|
||||
final int typeColumn = results.getColumnIndex(MetadataDbHelper.TYPE_COLUMN);
|
||||
final int descriptionColumn =
|
||||
|
@ -61,7 +60,6 @@ public class MetadataHandler {
|
|||
final int versionIndex = results.getColumnIndex(MetadataDbHelper.VERSION_COLUMN);
|
||||
final int formatVersionIndex =
|
||||
results.getColumnIndex(MetadataDbHelper.FORMATVERSION_COLUMN);
|
||||
|
||||
do {
|
||||
buildingMetadata.add(new WordListMetadata(results.getString(idIndex),
|
||||
results.getInt(typeColumn),
|
||||
|
@ -75,8 +73,6 @@ public class MetadataHandler {
|
|||
results.getInt(formatVersionIndex),
|
||||
0, results.getString(localeColumn)));
|
||||
} while (results.moveToNext());
|
||||
|
||||
results.close();
|
||||
}
|
||||
return Collections.unmodifiableList(buildingMetadata);
|
||||
}
|
||||
|
@ -92,9 +88,14 @@ public class MetadataHandler {
|
|||
// If clientId is null, we get a cursor on the default database (see
|
||||
// MetadataDbHelper#getInstance() for more on this)
|
||||
final Cursor results = MetadataDbHelper.queryCurrentMetadata(context, clientId);
|
||||
final List<WordListMetadata> resultList = makeMetadataObject(results);
|
||||
results.close();
|
||||
return resultList;
|
||||
// If null, we should return makeMetadataObject(null), so we go through.
|
||||
try {
|
||||
return makeMetadataObject(results);
|
||||
} finally {
|
||||
if (null != results) {
|
||||
results.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -142,7 +142,7 @@ public final class BinaryDictionaryFileDumper {
|
|||
final ContentProviderClient client = context.getContentResolver().
|
||||
acquireContentProviderClient(getProviderUriBuilder("").build());
|
||||
if (null == client) return Collections.<WordListInfo>emptyList();
|
||||
|
||||
Cursor cursor = null;
|
||||
try {
|
||||
final Uri.Builder builder = getContentUriBuilderForType(clientId, client,
|
||||
QUERY_PATH_DICT_INFO, locale.toString());
|
||||
|
@ -154,24 +154,22 @@ public final class BinaryDictionaryFileDumper {
|
|||
final boolean isProtocolV2 = (QUERY_PARAMETER_PROTOCOL_VALUE.equals(
|
||||
queryUri.getQueryParameter(QUERY_PARAMETER_PROTOCOL)));
|
||||
|
||||
Cursor c = client.query(queryUri, DICTIONARY_PROJECTION, null, null, null);
|
||||
if (isProtocolV2 && null == c) {
|
||||
cursor = client.query(queryUri, DICTIONARY_PROJECTION, null, null, null);
|
||||
if (isProtocolV2 && null == cursor) {
|
||||
reinitializeClientRecordInDictionaryContentProvider(context, client, clientId);
|
||||
c = client.query(queryUri, DICTIONARY_PROJECTION, null, null, null);
|
||||
cursor = client.query(queryUri, DICTIONARY_PROJECTION, null, null, null);
|
||||
}
|
||||
if (null == c) return Collections.<WordListInfo>emptyList();
|
||||
if (c.getCount() <= 0 || !c.moveToFirst()) {
|
||||
c.close();
|
||||
if (null == cursor) return Collections.<WordListInfo>emptyList();
|
||||
if (cursor.getCount() <= 0 || !cursor.moveToFirst()) {
|
||||
return Collections.<WordListInfo>emptyList();
|
||||
}
|
||||
final ArrayList<WordListInfo> list = CollectionUtils.newArrayList();
|
||||
do {
|
||||
final String wordListId = c.getString(0);
|
||||
final String wordListLocale = c.getString(1);
|
||||
final String wordListId = cursor.getString(0);
|
||||
final String wordListLocale = cursor.getString(1);
|
||||
if (TextUtils.isEmpty(wordListId)) continue;
|
||||
list.add(new WordListInfo(wordListId, wordListLocale));
|
||||
} while (c.moveToNext());
|
||||
c.close();
|
||||
} while (cursor.moveToNext());
|
||||
return list;
|
||||
} catch (RemoteException e) {
|
||||
// The documentation is unclear as to in which cases this may happen, but it probably
|
||||
|
@ -186,6 +184,9 @@ public final class BinaryDictionaryFileDumper {
|
|||
Log.e(TAG, "Unexpected exception communicating with the dictionary pack", e);
|
||||
return Collections.<WordListInfo>emptyList();
|
||||
} finally {
|
||||
if (null != cursor) {
|
||||
cursor.close();
|
||||
}
|
||||
client.release();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -139,23 +139,24 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
|
|||
}
|
||||
|
||||
private void loadDictionaryAsyncForUri(final Uri uri) {
|
||||
Cursor cursor = null;
|
||||
try {
|
||||
Cursor cursor = mContext.getContentResolver()
|
||||
.query(uri, PROJECTION, null, null, null);
|
||||
if (cursor != null) {
|
||||
try {
|
||||
if (cursor.moveToFirst()) {
|
||||
sContactCountAtLastRebuild = getContactCount();
|
||||
addWords(cursor);
|
||||
}
|
||||
} finally {
|
||||
cursor.close();
|
||||
}
|
||||
cursor = mContext.getContentResolver().query(uri, PROJECTION, null, null, null);
|
||||
if (null == cursor) {
|
||||
return;
|
||||
}
|
||||
if (cursor.moveToFirst()) {
|
||||
sContactCountAtLastRebuild = getContactCount();
|
||||
addWords(cursor);
|
||||
}
|
||||
} catch (final SQLiteException e) {
|
||||
Log.e(TAG, "SQLiteException in the remote Contacts process.", e);
|
||||
} catch (final IllegalStateException e) {
|
||||
Log.e(TAG, "Contacts DB is having problems", e);
|
||||
} finally {
|
||||
if (null != cursor) {
|
||||
cursor.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -186,18 +187,20 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
|
|||
private int getContactCount() {
|
||||
// TODO: consider switching to a rawQuery("select count(*)...") on the database if
|
||||
// performance is a bottleneck.
|
||||
Cursor cursor = null;
|
||||
try {
|
||||
final Cursor cursor = mContext.getContentResolver().query(
|
||||
Contacts.CONTENT_URI, PROJECTION_ID_ONLY, null, null, null);
|
||||
if (cursor != null) {
|
||||
try {
|
||||
return cursor.getCount();
|
||||
} finally {
|
||||
cursor.close();
|
||||
}
|
||||
cursor = mContext.getContentResolver().query(Contacts.CONTENT_URI, PROJECTION_ID_ONLY,
|
||||
null, null, null);
|
||||
if (null == cursor) {
|
||||
return 0;
|
||||
}
|
||||
return cursor.getCount();
|
||||
} catch (final SQLiteException e) {
|
||||
Log.e(TAG, "SQLiteException in the remote Contacts process.", e);
|
||||
} finally {
|
||||
if (null != cursor) {
|
||||
cursor.close();
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
@ -281,26 +284,27 @@ public class ContactsBinaryDictionary extends ExpandableBinaryDictionary {
|
|||
// Check all contacts since it's not possible to find out which names have changed.
|
||||
// This is needed because it's possible to receive extraneous onChange events even when no
|
||||
// name has changed.
|
||||
Cursor cursor = mContext.getContentResolver().query(
|
||||
Contacts.CONTENT_URI, PROJECTION, null, null, null);
|
||||
if (cursor != null) {
|
||||
try {
|
||||
if (cursor.moveToFirst()) {
|
||||
while (!cursor.isAfterLast()) {
|
||||
String name = cursor.getString(INDEX_NAME);
|
||||
if (isValidName(name) && !isNameInDictionary(name)) {
|
||||
if (DEBUG) {
|
||||
Log.d(TAG, "Contact name missing: " + name + " (runtime = "
|
||||
+ (SystemClock.uptimeMillis() - startTime) + " ms)");
|
||||
}
|
||||
return true;
|
||||
final Cursor cursor = mContext.getContentResolver().query(Contacts.CONTENT_URI, PROJECTION,
|
||||
null, null, null);
|
||||
if (null == cursor) {
|
||||
return false;
|
||||
}
|
||||
try {
|
||||
if (cursor.moveToFirst()) {
|
||||
while (!cursor.isAfterLast()) {
|
||||
String name = cursor.getString(INDEX_NAME);
|
||||
if (isValidName(name) && !isNameInDictionary(name)) {
|
||||
if (DEBUG) {
|
||||
Log.d(TAG, "Contact name missing: " + name + " (runtime = "
|
||||
+ (SystemClock.uptimeMillis() - startTime) + " ms)");
|
||||
}
|
||||
cursor.moveToNext();
|
||||
return true;
|
||||
}
|
||||
cursor.moveToNext();
|
||||
}
|
||||
} finally {
|
||||
cursor.close();
|
||||
}
|
||||
} finally {
|
||||
cursor.close();
|
||||
}
|
||||
if (DEBUG) {
|
||||
Log.d(TAG, "No contacts changed. (runtime = " + (SystemClock.uptimeMillis() - startTime)
|
||||
|
|
|
@ -61,12 +61,17 @@ public class UserDictionaryList extends PreferenceFragment {
|
|||
if (null == cursor) {
|
||||
// The user dictionary service is not present or disabled. Return null.
|
||||
return null;
|
||||
} else if (cursor.moveToFirst()) {
|
||||
final int columnIndex = cursor.getColumnIndex(UserDictionary.Words.LOCALE);
|
||||
do {
|
||||
final String locale = cursor.getString(columnIndex);
|
||||
localeSet.add(null != locale ? locale : "");
|
||||
} while (cursor.moveToNext());
|
||||
}
|
||||
try {
|
||||
if (cursor.moveToFirst()) {
|
||||
final int columnIndex = cursor.getColumnIndex(UserDictionary.Words.LOCALE);
|
||||
do {
|
||||
final String locale = cursor.getString(columnIndex);
|
||||
localeSet.add(null != locale ? locale : "");
|
||||
} while (cursor.moveToNext());
|
||||
}
|
||||
} finally {
|
||||
cursor.close();
|
||||
}
|
||||
if (!UserDictionarySettings.IS_SHORTCUT_API_SUPPORTED) {
|
||||
// For ICS, we need to show "For all languages" in case that the keyboard locale
|
||||
|
|
|
@ -140,6 +140,8 @@ public class UserDictionarySettings extends ListFragment {
|
|||
}
|
||||
|
||||
mLocale = locale;
|
||||
// WARNING: The following cursor is never closed! TODO: don't put that in a member, and
|
||||
// make sure all cursors are correctly closed.
|
||||
mCursor = createCursor(locale);
|
||||
TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
|
||||
emptyView.setText(R.string.user_dict_settings_empty_text);
|
||||
|
|
Loading…
Reference in New Issue