diff options
author | 2013-04-26 01:42:46 -0700 | |
---|---|---|
committer | 2013-04-26 01:42:46 -0700 | |
commit | 55d80e4f0ce89aa9dab2ba5ce2320e32de91f40e (patch) | |
tree | 3752924ae70e4b6e55977f93ce1067b565ec870a /java/src/com/android/inputmethod/dictionarypack/ActionBatch.java | |
parent | 42abed7ff30b4ad4c04407a81db8de86244b1d80 (diff) | |
parent | e8ed5d88763ce495ba36e7f7b8b334d75f211a2a (diff) | |
download | latinime-55d80e4f0ce89aa9dab2ba5ce2320e32de91f40e.tar.gz latinime-55d80e4f0ce89aa9dab2ba5ce2320e32de91f40e.tar.xz latinime-55d80e4f0ce89aa9dab2ba5ce2320e32de91f40e.zip |
am e8ed5d88: Delete obsolete dictionaries
* commit 'e8ed5d88763ce495ba36e7f7b8b334d75f211a2a':
Delete obsolete dictionaries
Diffstat (limited to 'java/src/com/android/inputmethod/dictionarypack/ActionBatch.java')
-rw-r--r-- | java/src/com/android/inputmethod/dictionarypack/ActionBatch.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/dictionarypack/ActionBatch.java b/java/src/com/android/inputmethod/dictionarypack/ActionBatch.java index a9d799218..bf2230553 100644 --- a/java/src/com/android/inputmethod/dictionarypack/ActionBatch.java +++ b/java/src/com/android/inputmethod/dictionarypack/ActionBatch.java @@ -483,13 +483,14 @@ public final class ActionBatch { if (MetadataDbHelper.STATUS_INSTALLED == status || MetadataDbHelper.STATUS_DISABLED == status || MetadataDbHelper.STATUS_DELETING == status) { - // If it is installed or disabled, then we cannot remove the entry lest the user - // lose the ability to delete the file or otherwise administrate it. We will thus - // leave it as is, but remove the URI from the database since it is not supposed to - // be accessible any more. + // If it is installed or disabled, we need to mark it as deleted so that LatinIME + // will remove it next time it enquires for dictionaries. // If it is deleting and we don't have a new version, then we have to wait until - // Android Keyboard actually has deleted it before we can remove its metadata. + // LatinIME actually has deleted it before we can remove its metadata. + // In both cases, remove the URI from the database since it is not supposed to + // be accessible any more. values.put(MetadataDbHelper.REMOTE_FILENAME_COLUMN, ""); + values.put(MetadataDbHelper.STATUS_COLUMN, MetadataDbHelper.STATUS_DELETING); db.update(MetadataDbHelper.METADATA_TABLE_NAME, values, MetadataDbHelper.WORDLISTID_COLUMN + " = ? AND " + MetadataDbHelper.VERSION_COLUMN + " = ?", |