mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-27 14:58:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Android: Use correct encoding when converting strings

Browse source 
The functions with "UTF" in the name use "modified UTF-8" rather
than the standard UTF-8 which Dolphin uses, at least according
to Oracle's documentation, so it is incorrect for us to use them.
This change fixes the problem by converting between UTF-8 and
UTF-16 manually instead of letting JNI do it for us.
This commit is contained in:
JosJuice 2020-06-28 19:16:23 +02:00
parent 38791eec18
commit f5da6e07d7
3 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Source/Android/jni/AndroidCommon/AndroidCommon.cpp
View file

@ -5,25 +5,28 @@
#include "jni/AndroidCommon/AndroidCommon.h"
#include <string>
#include <string_view>
#include <vector>
#include <jni.h>
#include "Common/StringUtil.h"
std::string GetJString(JNIEnv* env, jstring jstr)
{
std::string result = "";
if (!jstr)
return result;
const char* s = env->GetStringUTFChars(jstr, nullptr);
result = s;
env->ReleaseStringUTFChars(jstr, s);
return result;
const jchar* jchars = env->GetStringChars(jstr, nullptr);
const jsize length = env->GetStringLength(jstr);
const std::u16string_view string_view(reinterpret_cast<const char16_t*>(jchars), length);
const std::string converted_string = UTF16ToUTF8(string_view);
env->ReleaseStringChars(jstr, jchars);
return converted_string;
}
jstring ToJString(JNIEnv* env, const std::string& str)
{
return env->NewStringUTF(str.c_str());
const std::u16string converted_string = UTF8ToUTF16(str);
return env->NewString(reinterpret_cast<const jchar*>(converted_string.data()),
converted_string.size());
}
std::vector<std::string> JStringArrayToVector(JNIEnv* env, jobjectArray array)