diff options
| author |   Jean Chalard <jchalard@google.com> | 2014-05-22 02:44:42 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-05-22 02:44:42 +0000 |
| commit | cb9bb1903b0475e994eeb0fbec7eff39a85c064d (patch) | |
| tree | 645be6a4aa1e307d6c3bb7a9bacf3560675c5822 /java/src/com/android/inputmethod/dictionarypack/ActionBatch.java | |
| parent | 50f7bb2a976d8415f3f62a5413a420f97e02132a (diff) | |
| parent | ea09e6bddba6b968fbf1ee0264aa18bd7bbe7e80 (diff) | |
| download | latinime-cb9bb1903b0475e994eeb0fbec7eff39a85c064d.tar.gz latinime-cb9bb1903b0475e994eeb0fbec7eff39a85c064d.tar.xz latinime-cb9bb1903b0475e994eeb0fbec7eff39a85c064d.zip | |
am ea09e6bd: Merge "Add the rawChecksum column to the database."
* commit 'ea09e6bddba6b968fbf1ee0264aa18bd7bbe7e80':
Add the rawChecksum column to the database.
Diffstat (limited to 'java/src/com/android/inputmethod/dictionarypack/ActionBatch.java')
| -rw-r--r-- | java/src/com/android/inputmethod/dictionarypack/ActionBatch.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/dictionarypack/ActionBatch.java b/java/src/com/android/inputmethod/dictionarypack/ActionBatch.java index 706bdea8e..3f69cedee 100644 --- a/java/src/com/android/inputmethod/dictionarypack/ActionBatch.java +++ b/java/src/com/android/inputmethod/dictionarypack/ActionBatch.java @@ -325,8 +325,9 @@ public final class ActionBatch { MetadataDbHelper.TYPE_BULK, MetadataDbHelper.STATUS_AVAILABLE, mWordList.mId, mWordList.mLocale, mWordList.mDescription, null == mWordList.mLocalFilename ? "" : mWordList.mLocalFilename, - mWordList.mRemoteFilename, mWordList.mLastUpdate, mWordList.mChecksum, - mWordList.mFileSize, mWordList.mVersion, mWordList.mFormatVersion); + mWordList.mRemoteFilename, mWordList.mLastUpdate, mWordList.mRawChecksum, + mWordList.mChecksum, mWordList.mFileSize, mWordList.mVersion, + mWordList.mFormatVersion); PrivateLog.log("Insert 'available' record for " + mWordList.mDescription + " and locale " + mWordList.mLocale); db.insert(MetadataDbHelper.METADATA_TABLE_NAME, null, values); @@ -374,7 +375,7 @@ public final class ActionBatch { final ContentValues values = MetadataDbHelper.makeContentValues(0, MetadataDbHelper.TYPE_BULK, MetadataDbHelper.STATUS_INSTALLED, mWordList.mId, mWordList.mLocale, mWordList.mDescription, - "", mWordList.mRemoteFilename, mWordList.mLastUpdate, + "", mWordList.mRemoteFilename, mWordList.mLastUpdate, mWordList.mRawChecksum, mWordList.mChecksum, mWordList.mFileSize, mWordList.mVersion, mWordList.mFormatVersion); PrivateLog.log("Insert 'preinstalled' record for " + mWordList.mDescription @@ -416,8 +417,9 @@ public final class ActionBatch { oldValues.getAsInteger(MetadataDbHelper.STATUS_COLUMN), mWordList.mId, mWordList.mLocale, mWordList.mDescription, oldValues.getAsString(MetadataDbHelper.LOCAL_FILENAME_COLUMN), - mWordList.mRemoteFilename, mWordList.mLastUpdate, mWordList.mChecksum, - mWordList.mFileSize, mWordList.mVersion, mWordList.mFormatVersion); + mWordList.mRemoteFilename, mWordList.mLastUpdate, mWordList.mRawChecksum, + mWordList.mChecksum, mWordList.mFileSize, mWordList.mVersion, + mWordList.mFormatVersion); PrivateLog.log("Updating record for " + mWordList.mDescription + " and locale " + mWordList.mLocale); db.update(MetadataDbHelper.METADATA_TABLE_NAME, values, |