1 files changed, 6 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/dictionarypack/MetadataDbHelper.java b/java/src/com/android/inputmethod/dictionarypack/MetadataDbHelper.java
index 7d01351b4..fbc899192 100644
--- a/java/src/com/android/inputmethod/dictionarypack/MetadataDbHelper.java
+++ b/java/src/com/android/inputmethod/dictionarypack/MetadataDbHelper.java
@@ -50,7 +50,7 @@ public class MetadataDbHelper extends SQLiteOpenHelper {
     private static final int METADATA_DATABASE_VERSION_WITH_CLIENTID = 6;
     // The current database version.
     // This MUST be increased every time the dictionary pack metadata URL changes.
-    private static final int CURRENT_METADATA_DATABASE_VERSION = 16;
+    private static final int CURRENT_METADATA_DATABASE_VERSION = 14;
 
     private final static long NOT_A_DOWNLOAD_ID = -1;
 
@@ -266,6 +266,8 @@ public class MetadataDbHelper extends SQLiteOpenHelper {
      */
     @Override
     public void onUpgrade(final SQLiteDatabase db, final int oldVersion, final int newVersion) {
+        // Allow automatic download of dictionaries on upgrading the database.
+        CommonPreferences.setForceDownloadDict(mContext, true);
         if (METADATA_DATABASE_INITIAL_VERSION == oldVersion
                 && METADATA_DATABASE_VERSION_WITH_CLIENTID <= newVersion
                 && CURRENT_METADATA_DATABASE_VERSION >= newVersion) {
@@ -343,8 +345,6 @@ public class MetadataDbHelper extends SQLiteOpenHelper {
         return null != getMetadataUriAsString(context, clientId);
     }
 
-    private static final MetadataUriGetter sMetadataUriGetter = new MetadataUriGetter();
-
     /**
      * Returns the metadata URI as a string.
      *
@@ -358,12 +358,13 @@ public class MetadataDbHelper extends SQLiteOpenHelper {
     public static String getMetadataUriAsString(final Context context, final String clientId) {
         SQLiteDatabase defaultDb = MetadataDbHelper.getDb(context, null);
         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 },
                 null, null, null, null);
         try {
             if (!cursor.moveToFirst()) return null;
-            return sMetadataUriGetter.getUri(context, cursor.getString(0));
+            return MetadataUriGetter.getUri(context, cursor.getString(0), cursor.getString(1));
         } finally {
             cursor.close();
         }