DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2276 from jason-simmons/jni_utf_string

Browse Source 
Fix Dart/JNI string conversion to treat the data as UTF-16
This commit is contained in:
Jason Simmons 2016-01-19 12:37:30 -08:00
commit a41dd9a890
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sky/engine/bindings/jni/jni_object.cc
View File

@ -133,7 +133,7 @@ jstring JniString::java_string() {
return static_cast<jstring>(java_object());
}
std::string JniString::GetText() {
Dart_Handle JniString::GetText() {
Dart_Handle exception = nullptr;
{
ENTER_JNI();
@ -144,7 +144,7 @@ std::string JniString::GetText() {
const jchar* chars = env->GetStringChars(java_string(), NULL);
if (CheckJniException(env, &exception)) goto fail;
std::string result(reinterpret_cast<const char*>(chars), length);
Dart_Handle result = Dart_NewStringFromUTF16(chars, length);
env->ReleaseStringChars(java_string(), chars);
return result;
@ -152,7 +152,7 @@ std::string JniString::GetText() {
fail:
Dart_ThrowException(exception);
ASSERT_NOT_REACHED();
return std::string();
return Dart_Null();
}
} // namespace blink

2
sky/engine/bindings/jni/jni_object.h
View File

@ -48,7 +48,7 @@ class JniString : public JniObject {
public:
~JniString() override;
std::string GetText();
Dart_Handle GetText();
private:
JniString(JNIEnv* env, jstring string);