1 files changed, 42 insertions, 24 deletions

diff --git a/java/src/com/android/inputmethod/latin/BinaryDictionary.java b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
index 813f7d32f..ff7e2b88a 100644
--- a/java/src/com/android/inputmethod/latin/BinaryDictionary.java
+++ b/java/src/com/android/inputmethod/latin/BinaryDictionary.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.util.Log;
 
+import java.io.File;
 import java.util.Arrays;
 
 /**
@@ -72,9 +73,40 @@ public class BinaryDictionary extends Dictionary {
     public static BinaryDictionary initDictionary(Context context, int resId, int dicTypeId) {
         synchronized (sInstance) {
             sInstance.closeInternal();
-            if (resId != 0) {
-                sInstance.loadDictionary(context, resId);
+            try {
+                final AssetFileDescriptor afd = context.getResources().openRawResourceFd(resId);
+                if (afd == null) {
+                    Log.e(TAG, "Found the resource but it is compressed. resId=" + resId);
+                    return null;
+                }
+                final String sourceDir = context.getApplicationInfo().sourceDir;
+                final File packagePath = new File(sourceDir);
+                // TODO: Come up with a way to handle a directory.
+                if (!packagePath.isFile()) {
+                    Log.e(TAG, "sourceDir is not a file: " + sourceDir);
+                    return null;
+                }
+                sInstance.loadDictionary(sourceDir, afd.getStartOffset(), afd.getLength());
                 sInstance.mDicTypeId = dicTypeId;
+            } catch (android.content.res.Resources.NotFoundException e) {
+                Log.e(TAG, "Could not find the resource. resId=" + resId);
+                return null;
+            }
+        }
+        return sInstance;
+    }
+
+    // For unit test
+    /* package */ static BinaryDictionary initDictionary(File dictionary, long startOffset,
+            long length, int dicTypeId) {
+        synchronized (sInstance) {
+            sInstance.closeInternal();
+            if (dictionary.isFile()) {
+                sInstance.loadDictionary(dictionary.getAbsolutePath(), startOffset, length);
+                sInstance.mDicTypeId = dicTypeId;
+            } else {
+                Log.e(TAG, "Could not find the file. path=" + dictionary.getAbsolutePath());
+                return null;
             }
         }
         return sInstance;
@@ -86,33 +118,21 @@ public class BinaryDictionary extends Dictionary {
     private native void closeNative(int dict);
     private native boolean isValidWordNative(int nativeData, char[] word, int wordLength);
     private native int getSuggestionsNative(int dict, int[] inputCodes, int codesSize,
-            char[] outputChars, int[] frequencies,
-            int[] nextLettersFrequencies, int nextLettersSize);
+            char[] outputChars, int[] frequencies);
     private native int getBigramsNative(int dict, char[] prevWord, int prevWordLength,
             int[] inputCodes, int inputCodesLength, char[] outputChars, int[] frequencies,
             int maxWordLength, int maxBigrams, int maxAlternatives);
 
-    private final void loadDictionary(Context context, int resId) {
-        try {
-            final AssetFileDescriptor afd = context.getResources().openRawResourceFd(resId);
-            if (afd == null) {
-                Log.e(TAG, "Found the resource but it is compressed. resId=" + resId);
-                return;
-            }
-            mNativeDict = openNative(context.getApplicationInfo().sourceDir,
-                    afd.getStartOffset(), afd.getLength(),
+    private final void loadDictionary(String path, long startOffset, long length) {
+        mNativeDict = openNative(path, startOffset, length,
                     TYPED_LETTER_MULTIPLIER, FULL_WORD_FREQ_MULTIPLIER,
                     MAX_WORD_LENGTH, MAX_WORDS, MAX_ALTERNATIVES);
-            mDictLength = afd.getLength();
-        } catch (android.content.res.Resources.NotFoundException e) {
-            Log.e(TAG, "Could not find the resource. resId=" + resId);
-            return;
-        }
+        mDictLength = length;
     }
 
     @Override
     public void getBigrams(final WordComposer codes, final CharSequence previousWord,
-            final WordCallback callback, int[] nextLettersFrequencies) {
+            final WordCallback callback) {
         if (mNativeDict == 0) return;
 
         char[] chars = previousWord.toString().toCharArray();
@@ -144,15 +164,14 @@ public class BinaryDictionary extends Dictionary {
     }
 
     @Override
-    public void getWords(final WordComposer codes, final WordCallback callback,
-            int[] nextLettersFrequencies) {
+    public void getWords(final WordComposer codes, final WordCallback callback) {
         if (mNativeDict == 0) return;
 
         final int codesSize = codes.size();
         // Won't deal with really long words.
         if (codesSize > MAX_WORD_LENGTH - 1) return;
 
-        Arrays.fill(mInputCodes, -1);
+        Arrays.fill(mInputCodes, WordComposer.NOT_A_CODE);
         for (int i = 0; i < codesSize; i++) {
             int[] alternatives = codes.getCodesAt(i);
             System.arraycopy(alternatives, 0, mInputCodes, i * MAX_ALTERNATIVES,
@@ -162,8 +181,7 @@ public class BinaryDictionary extends Dictionary {
         Arrays.fill(mFrequencies, 0);
 
         int count = getSuggestionsNative(mNativeDict, mInputCodes, codesSize, mOutputChars,
-                mFrequencies, nextLettersFrequencies,
-                nextLettersFrequencies != null ? nextLettersFrequencies.length : 0);
+                mFrequencies);
 
         for (int j = 0; j < count; ++j) {
             if (mFrequencies[j] < 1) break;