From ed95d79cc4c7f4646a388005f99a195b4794623b Mon Sep 17 00:00:00 2001 From: Keisuke Kuroyanagi Date: Fri, 17 Jan 2014 10:30:16 -0800 Subject: Make contacts dict and user dict version 4. Bug: 12515251 Change-Id: I0b332e03b9102957bffaea56d4de17b9ee3cef23 --- .../inputmethod/latin/AbstractDictionaryWriter.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/AbstractDictionaryWriter.java') diff --git a/java/src/com/android/inputmethod/latin/AbstractDictionaryWriter.java b/java/src/com/android/inputmethod/latin/AbstractDictionaryWriter.java index 1aee22baf..1c6a14efe 100644 --- a/java/src/com/android/inputmethod/latin/AbstractDictionaryWriter.java +++ b/java/src/com/android/inputmethod/latin/AbstractDictionaryWriter.java @@ -16,12 +16,12 @@ package com.android.inputmethod.latin; -import android.content.Context; import android.util.Log; import com.android.inputmethod.latin.makedict.DictEncoder; import com.android.inputmethod.latin.makedict.UnsupportedFormatException; -import com.android.inputmethod.latin.makedict.Ver2DictEncoder; +import com.android.inputmethod.latin.makedict.Ver4DictEncoder; +import com.android.inputmethod.latin.utils.FileUtils; import java.io.File; import java.io.IOException; @@ -31,10 +31,7 @@ abstract public class AbstractDictionaryWriter { /** Used for Log actions from this class */ private static final String TAG = AbstractDictionaryWriter.class.getSimpleName(); - private final Context mContext; - - public AbstractDictionaryWriter(final Context context) { - mContext = context; + public AbstractDictionaryWriter() { } abstract public void clear(); @@ -61,12 +58,11 @@ abstract public class AbstractDictionaryWriter { final Map attributeMap) throws IOException, UnsupportedFormatException; public void write(final File file, final Map attributeMap) { - final String tempFilePath = file.getAbsolutePath() + ".temp"; - final File tempFile = new File(tempFilePath); try { - final DictEncoder dictEncoder = new Ver2DictEncoder(tempFile); + FileUtils.deleteRecursively(file); + file.mkdir(); + final DictEncoder dictEncoder = new Ver4DictEncoder(file); writeDictionary(dictEncoder, attributeMap); - tempFile.renameTo(file); } catch (IOException e) { Log.e(TAG, "IO exception while writing file", e); } catch (UnsupportedFormatException e) { -- cgit v1.2.3-83-g751a