commit 3c7b603c46180ac8c6ec84c39719f72f0db08ffb
author Keisuke Kuroyanagi <ksk@google.com> Wed Nov 27 10:02:21 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 27 10:02:21 2013 +0000
tree be46d43e67136b803e6f0d5d01b308d26e589d2c
parent 169d76cc5c4cfffd6b9aad05a1e59f974db4717d
parent 02fd1a78a3e4ad8aaaddd4e324aeca28cf97a014

Merge "Start using Ver4 dictionary format."

java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java

diff --git a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
index 25aa5e5..7041df5 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -60,7 +60,7 @@
      */
     protected static final int MAX_WORD_LENGTH = Constants.DICTIONARY_MAX_WORD_LENGTH;
 
-    private static final int DICTIONARY_FORMAT_VERSION = 3;
+    private static final int DICTIONARY_FORMAT_VERSION = 4;
 
     private static final String SUPPORTS_DYNAMIC_UPDATE =
             FormatSpec.FileHeader.ATTRIBUTE_VALUE_TRUE;
@@ -238,7 +238,8 @@
             public void run() {
                 if (mDictionaryWriter == null) {
                     mBinaryDictionary.close();
-                    final File file = new File(mContext.getFilesDir(), mFilename);
+                    final File file = new File(mContext.getFilesDir(), mFilename + "/"
+                            + FormatSpec.TRIE_FILE_EXTENSION);
                     BinaryDictionary.createEmptyDictFile(file.getAbsolutePath(),
                             DICTIONARY_FORMAT_VERSION, getHeaderAttributeMap());
                     mBinaryDictionary = new BinaryDictionary(
@@ -481,7 +482,8 @@
                     + mFilenameDictionaryUpdateController.mLastUpdateTime);
         }
 
-        final File file = new File(mContext.getFilesDir(), mFilename);
+        final File file = new File(mContext.getFilesDir(), mFilename + "/"
+                + FormatSpec.TRIE_FILE_EXTENSION);
         final String filename = file.getAbsolutePath();
         final long length = file.length();