From 5774908bb30db63f912ae588caebf257251884c8 Mon Sep 17 00:00:00 2001 From: Jean Chalard Date: Wed, 10 Aug 2011 18:57:01 +0900 Subject: [PATCH] Give the orders to delete the source files to the dict pack Bug: 5095140 Change-Id: I64552861768ca30073ffe0d631b2e0c44dad4aa9 --- .../inputmethod/latin/BinaryDictionaryFileDumper.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java b/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java index 2d50a6f46..f4ba0bcdc 100644 --- a/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java +++ b/java/src/com/android/inputmethod/latin/BinaryDictionaryFileDumper.java @@ -168,13 +168,17 @@ public class BinaryDictionaryFileDumper { final List idList = getDictIdList(locale, context); final List fileAddressList = new ArrayList(); for (String id : idList) { - final Uri dictionaryPackUri = getProviderUri(id); + final Uri wordListUri = getProviderUri(id); final AssetFileDescriptor afd = - resolver.openAssetFileDescriptor(dictionaryPackUri, "r"); + resolver.openAssetFileDescriptor(wordListUri, "r"); if (null == afd) continue; final String fileName = copyFileTo(afd.createInputStream(), getCacheFileName(id, locale, context)); afd.close(); + if (0 >= resolver.delete(wordListUri, null, null)) { + // I'd rather not print the word list ID to the log here out of security concerns + Log.e(TAG, "Could not have the dictionary pack delete a word list"); + } fileAddressList.add(AssetFileAddress.makeFromFileName(fileName)); } return fileAddressList;