aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
diff options
context:
space:
mode:
authorKeisuke Kuroyanagi <ksk@google.com>2014-04-22 12:01:22 -0700
committerKeisuke Kuroyanagi <ksk@google.com>2014-04-22 12:01:22 -0700
commit903be5bbd33b664c7e691d8bee0dd4d6376947bc (patch)
tree8beceec3236b59a822b8179c14191c942fd07017 /native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
parent361881b82b387345ca8ddfad401feb71c21bee55 (diff)
downloadlatinime-903be5bbd33b664c7e691d8bee0dd4d6376947bc.tar.gz
latinime-903be5bbd33b664c7e691d8bee0dd4d6376947bc.tar.xz
latinime-903be5bbd33b664c7e691d8bee0dd4d6376947bc.zip
Implement latinime_BinaryDictionary_createOnMemory().
Bug: 14166482 Change-Id: If7ec3345ab34edcd6bc5cef9e72580ced894a0e3
Diffstat (limited to 'native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp')
-rw-r--r--native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp27
1 files changed, 24 insertions, 3 deletions
diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
index b2946da9c..9016cae69 100644
--- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
+++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp
@@ -51,7 +51,7 @@ static jlong latinime_BinaryDictionary_open(JNIEnv *env, jclass clazz, jstring s
env->GetStringUTFRegion(sourceDir, 0, env->GetStringLength(sourceDir), sourceDirChars);
sourceDirChars[sourceDirUtf8Length] = '\0';
DictionaryStructureWithBufferPolicy::StructurePolicyPtr dictionaryStructureWithBufferPolicy(
- DictionaryStructureWithBufferPolicyFactory::newDictionaryStructureWithBufferPolicy(
+ DictionaryStructureWithBufferPolicyFactory::newPolicyForExistingDictFile(
sourceDirChars, static_cast<int>(dictOffset), static_cast<int>(dictSize),
isUpdatable == JNI_TRUE));
if (!dictionaryStructureWithBufferPolicy) {
@@ -68,8 +68,29 @@ static jlong latinime_BinaryDictionary_open(JNIEnv *env, jclass clazz, jstring s
static jlong latinime_BinaryDictionary_createOnMemory(JNIEnv *env, jclass clazz,
jlong formatVersion, jstring locale, jobjectArray attributeKeyStringArray,
jobjectArray attributeValueStringArray) {
- // TODO: Implement.
- return 0;
+ const jsize localeUtf8Length = env->GetStringUTFLength(locale);
+ char localeChars[localeUtf8Length + 1];
+ env->GetStringUTFRegion(locale, 0, env->GetStringLength(locale), localeChars);
+ localeChars[localeUtf8Length] = '\0';
+ std::vector<int> localeCodePoints;
+ HeaderReadWriteUtils::insertCharactersIntoVector(localeChars, &localeCodePoints);
+ const int keyCount = env->GetArrayLength(attributeKeyStringArray);
+ const int valueCount = env->GetArrayLength(attributeValueStringArray);
+ if (keyCount != valueCount) {
+ return false;
+ }
+ DictionaryHeaderStructurePolicy::AttributeMap attributeMap =
+ JniDataUtils::constructAttributeMap(env, attributeKeyStringArray,
+ attributeValueStringArray);
+ DictionaryStructureWithBufferPolicy::StructurePolicyPtr dictionaryStructureWithBufferPolicy =
+ DictionaryStructureWithBufferPolicyFactory::newPolicyForOnMemoryDict(
+ formatVersion, localeCodePoints, &attributeMap);
+ if (!dictionaryStructureWithBufferPolicy) {
+ return 0;
+ }
+ Dictionary *const dictionary =
+ new Dictionary(env, std::move(dictionaryStructureWithBufferPolicy));
+ return reinterpret_cast<jlong>(dictionary);
}
static void latinime_BinaryDictionary_flush(JNIEnv *env, jclass clazz, jlong dict,