n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use jstring2string for more strings

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-05-16 12:07:16 -05:00
parent 1eea6cb36d
commit 09a6a30d8b
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
native/jni/org_futo_inputmethod_latin_xlm_LanguageModel.cpp
View File

@ -977,15 +977,14 @@ namespace latinime {
size_t inputSize = env->GetArrayLength(inComposeX);
const char* cstr = env->GetStringUTFChars(context, nullptr);
std::string contextString(cstr);
env->ReleaseStringUTFChars(context, cstr);
std::string contextString = "";
if(context != nullptr) {
contextString = jstring2string(env, context);
}
std::string partialWordString;
std::string partialWordString = "";
if(partialWord != nullptr){
const char* pwstr = env->GetStringUTFChars(partialWord, nullptr);
partialWordString = std::string(pwstr);
env->ReleaseStringUTFChars(partialWord, pwstr);
partialWordString = jstring2string(env, partialWord);
}
if(partialWordString.size() < inputSize) inputSize = partialWordString.size();

6
native/jni/src/jni_utils.cpp
View File

@ -7,9 +7,13 @@
#include "defines.h"
std::string jstring2string(JNIEnv *env, jstring jStr) {
if(jStr == nullptr) {
AKLOGE("jstring is null!");
return "";
}
const jsize stringUtf8Length = env->GetStringUTFLength(jStr);
if (stringUtf8Length <= 0) {
AKLOGE("Can't get jStr");
return "";
}
char stringChars[stringUtf8Length + 1];