nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Metadata URI does not need additionalId. 

Bug 20701628.

Change-Id: Ifba1e7dd7f9934c8c13279dfb95bf02c0e30e650
main
Dan Zivkovic 2015-05-06 09:30:47 -07:00
parent 58bc0e057e
commit bdc55e77f7
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
java-overridable/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java
View File

@ -19,16 +19,11 @@ package com.android.inputmethod.dictionarypack;
import android.content.Context; import android.content.Context;
/** /**
* Helper to get the metadata URI from its base URI and the additional ID, if any. * Helper to get the metadata URI from its base URI.
*/ */
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class MetadataUriGetter { public class MetadataUriGetter {
private MetadataUriGetter() { public static String getUri(final Context context, final String baseUri) {
// This helper class is not instantiable.
}
public static String getUri(final Context context, final String baseUri,
final String additionalId) {
return baseUri; return baseUri;
} }
} }

7
java/src/com/android/inputmethod/dictionarypack/MetadataDbHelper.java
View File

@ -345,6 +345,8 @@ public class MetadataDbHelper extends SQLiteOpenHelper {
return null != getMetadataUriAsString(context, clientId); return null != getMetadataUriAsString(context, clientId);
} }
private static final MetadataUriGetter sMetadataUriGetter = new MetadataUriGetter();
/** /**
* Returns the metadata URI as a string. * Returns the metadata URI as a string.
* *
@ -358,13 +360,12 @@ public class MetadataDbHelper extends SQLiteOpenHelper {
public static String getMetadataUriAsString(final Context context, final String clientId) { public static String getMetadataUriAsString(final Context context, final String clientId) {
SQLiteDatabase defaultDb = MetadataDbHelper.getDb(context, null); SQLiteDatabase defaultDb = MetadataDbHelper.getDb(context, null);
final Cursor cursor = defaultDb.query(MetadataDbHelper.CLIENT_TABLE_NAME, final Cursor cursor = defaultDb.query(MetadataDbHelper.CLIENT_TABLE_NAME,
new String[] { MetadataDbHelper.CLIENT_METADATA_URI_COLUMN, new String[] { MetadataDbHelper.CLIENT_METADATA_URI_COLUMN },
MetadataDbHelper.CLIENT_METADATA_ADDITIONAL_ID_COLUMN },
MetadataDbHelper.CLIENT_CLIENT_ID_COLUMN + " = ?", new String[] { clientId }, MetadataDbHelper.CLIENT_CLIENT_ID_COLUMN + " = ?", new String[] { clientId },
null, null, null, null); null, null, null, null);
try { try {
if (!cursor.moveToFirst()) return null; if (!cursor.moveToFirst()) return null;
return MetadataUriGetter.getUri(context, cursor.getString(0), cursor.getString(1)); return sMetadataUriGetter.getUri(context, cursor.getString(0));
} finally { } finally {
cursor.close(); cursor.close();
} }