commit d1501ea78922289beb4d108fb9624f120e8b4cdb
author Keisuke Kuroyanagi <ksk@google.com> Mon Dec 02 20:38:21 2013 +0900
committer Keisuke Kuroyanagi <ksk@google.com> Mon Dec 02 21:59:56 2013 +0900
tree 3e4880e682e6c0baa1c224de1920bb35568837ce
parent e717f64659c3d8cc9bfa2b507cee11df66ad6fbb

Make contacts/user dictionary ver2.

Change-Id: I10c29bd45fd37d765f115333087e1700dd90570b

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

diff --git a/java/src/com/android/inputmethod/latin/DictionaryWriter.java b/java/src/com/android/inputmethod/latin/DictionaryWriter.java
index 3df2a2b..f1a0541 100644
--- a/java/src/com/android/inputmethod/latin/DictionaryWriter.java
+++ b/java/src/com/android/inputmethod/latin/DictionaryWriter.java
@@ -37,9 +37,9 @@
  * An in memory dictionary for memorizing entries and writing a binary dictionary.
  */
 public class DictionaryWriter extends AbstractDictionaryWriter {
-    private static final int BINARY_DICT_VERSION = 3;
+    private static final int BINARY_DICT_VERSION = 2;
     private static final FormatSpec.FormatOptions FORMAT_OPTIONS =
-            new FormatSpec.FormatOptions(BINARY_DICT_VERSION, true /* supportsDynamicUpdate */);
+            new FormatSpec.FormatOptions(BINARY_DICT_VERSION, false /* supportsDynamicUpdate */);
 
     private FusionDictionary mFusionDictionary;
 

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 0560542..17cb715 100644
--- a/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/ExpandableBinaryDictionary.java
@@ -131,7 +131,8 @@
     protected abstract boolean hasContentChanged();
 
     protected boolean isValidBinaryDictFormatVersion(final int formatVersion) {
-        return true;
+        // TODO: Use ver4 format.
+        return formatVersion == 2;
     }
 
     protected String getFileNameExtentionToOpenDict() {