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

am 55d80e4f: am e8ed5d88: Delete obsolete dictionaries 

* commit '55d80e4f0ce89aa9dab2ba5ce2320e32de91f40e':
  Delete obsolete dictionaries
main
Jean Chalard 2013-05-15 11:05:07 -07:00 committed by Android Git Automerger
parent 926abffaaa 55d80e4f0c
commit e7c5c8f6fd
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
java/src/com/android/inputmethod/dictionarypack/ActionBatch.java
View File

@ -483,13 +483,14 @@ public final class ActionBatch {
if (MetadataDbHelper.STATUS_INSTALLED == status if (MetadataDbHelper.STATUS_INSTALLED == status
|| MetadataDbHelper.STATUS_DISABLED == status || MetadataDbHelper.STATUS_DISABLED == status
|| MetadataDbHelper.STATUS_DELETING == status) { || MetadataDbHelper.STATUS_DELETING == status) {
// If it is installed or disabled, then we cannot remove the entry lest the user // If it is installed or disabled, we need to mark it as deleted so that LatinIME
// lose the ability to delete the file or otherwise administrate it. We will thus // will remove it next time it enquires for dictionaries.
// leave it as is, but remove the URI from the database since it is not supposed to
// be accessible any more.
// If it is deleting and we don't have a new version, then we have to wait until // 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.REMOTE_FILENAME_COLUMN, "");
values.put(MetadataDbHelper.STATUS_COLUMN, MetadataDbHelper.STATUS_DELETING);
db.update(MetadataDbHelper.METADATA_TABLE_NAME, values, db.update(MetadataDbHelper.METADATA_TABLE_NAME, values,
MetadataDbHelper.WORDLISTID_COLUMN + " = ? AND " MetadataDbHelper.WORDLISTID_COLUMN + " = ? AND "
+ MetadataDbHelper.VERSION_COLUMN + " = ?", + MetadataDbHelper.VERSION_COLUMN + " = ?",