Modify JavaToStdString to allow ISO-8859-1 encoded strings.

webrtc/sdk/android/src/jni/jni_helpers.cc

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 #include "webrtc/sdk/android/src/jni/jni_helpers.h"
 
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 
 #include <asm/unistd.h>
 #include <sys/prctl.h>
 #include <sys/syscall.h>
 #include <unistd.h>
+#include <vector>
 
 namespace webrtc_jni {
 
 static JavaVM* g_jvm = nullptr;
 
 static pthread_once_t g_jni_ptr_once = PTHREAD_ONCE_INIT;
 
 // Key for per-thread JNIEnv* data.  Non-NULL in threads attached to |g_jvm| by
 // AttachCurrentThreadIfNeeded(), NULL in unattached threads and threads that
 // were attached by the JVM because of a Java->native call.
@@ skipping 184 matching lines @@
   return jni->IsSameObject(obj, nullptr);
 }
 
 // Given a UTF-8 encoded |native| string return a new (UTF-16) jstring.
 jstring JavaStringFromStdString(JNIEnv* jni, const std::string& native) {
   jstring jstr = jni->NewStringUTF(native.c_str());
   CHECK_EXCEPTION(jni) << "error during NewStringUTF";
   return jstr;
 }
 
-// Given a (UTF-16) jstring return a new UTF-8 native string.
+// Given a jstring, reinterprets it to a new native string.
 std::string JavaToStdString(JNIEnv* jni, const jstring& j_string) {
-  const char* chars = jni->GetStringUTFChars(j_string, nullptr);
-  CHECK_EXCEPTION(jni) << "Error during GetStringUTFChars";
-  std::string str(chars, jni->GetStringUTFLength(j_string));
-  CHECK_EXCEPTION(jni) << "Error during GetStringUTFLength";
-  jni->ReleaseStringUTFChars(j_string, chars);
-  CHECK_EXCEPTION(jni) << "Error during ReleaseStringUTFChars";
-  return str;
+  // Invoke String.getBytes(String charsetName) method to convert |j_string|
+  // to a byte array.
+  const jclass string_class = GetObjectClass(jni, j_string);
+  const jmethodID get_bytes =
+      GetMethodID(jni, string_class, "getBytes", "(Ljava/lang/String;)[B");
+  const jstring charset_name = jni->NewStringUTF("ISO-8859-1");
+  CHECK_EXCEPTION(jni) << "error during NewStringUTF";
+  const jbyteArray j_byte_array =
+      (jbyteArray)jni->CallObjectMethod(j_string, get_bytes, charset_name);
+  CHECK_EXCEPTION(jni) << "error during CallObjectMethod";
+
+  const size_t len = jni->GetArrayLength(j_byte_array);
+  CHECK_EXCEPTION(jni) << "error during GetArrayLength";
+  std::vector<char> buf(len);
+  jni->GetByteArrayRegion(j_byte_array, 0, len,
+                          reinterpret_cast<jbyte*>(&buf[0]));
+  CHECK_EXCEPTION(jni) << "error during GetByteArrayRegion";
+
+  return std::string(buf.begin(), buf.end());
 }
 
 // Return the (singleton) Java Enum object corresponding to |index|;
 jobject JavaEnumFromIndex(JNIEnv* jni, jclass state_class,
                           const std::string& state_class_name, int index) {
   jmethodID state_values_id = GetStaticMethodID(
       jni, state_class, "values", ("()[L" + state_class_name  + ";").c_str());
   jobjectArray state_values = static_cast<jobjectArray>(
       jni->CallStaticObjectMethod(state_class, state_values_id));
   CHECK_EXCEPTION(jni) << "error during CallStaticObjectMethod";
@@ skipping 100 matching lines @@
   RTC_CHECK(!AtEnd());
   return value_;
 }
 
 bool Iterable::Iterator::AtEnd() const {
   RTC_CHECK(thread_checker_.CalledOnValidThread());
   return jni_ == nullptr || IsNull(jni_, iterator_);
 }
 
 }  // namespace webrtc_jni