1 files changed, 12 insertions, 9 deletions
diff --git a/Source/Android/jni/AndroidCommon/AndroidCommon.cpp b/Source/Android/jni/AndroidCommon/AndroidCommon.cpp
index cb7b9ff073..1f9973d451 100644
--- a/Source/Android/jni/AndroidCommon/AndroidCommon.cpp
+++ b/Source/Android/jni/AndroidCommon/AndroidCommon.cpp
@@ -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)