| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/base/net_string_util_icu_alternatives_android.h" | 5 #include "net/base/net_string_util_icu_alternatives_android.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
| 9 #include "base/strings/string16.h" | 9 #include "base/strings/string16.h" |
| 10 #include "base/strings/string_piece.h" | 10 #include "base/strings/string_piece.h" |
| 11 #include "jni/NetStringUtil_jni.h" | 11 #include "jni/NetStringUtil_jni.h" |
| 12 #include "net/base/net_string_util.h" | 12 #include "net/base/net_string_util.h" |
| 13 | 13 |
| 14 namespace net { | 14 namespace net { |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 // Attempts to convert |text| encoded in |charset| to a jstring (Java unicode | 18 // Attempts to convert |text| encoded in |charset| to a jstring (Java unicode |
| 19 // string). Returns the result jstring, or NULL on failure. | 19 // string). Returns the result jstring, or NULL on failure. |
| 20 ScopedJavaLocalRef<jstring> ConvertToJstring(const std::string& text, | 20 ScopedJavaLocalRef<jstring> ConvertToJstring(const std::string& text, |
| 21 const char* charset) { | 21 const char* charset) { |
| 22 JNIEnv* env = base::android::AttachCurrentThread(); | 22 JNIEnv* env = base::android::AttachCurrentThread(); |
| 23 ScopedJavaLocalRef<jobject> java_byte_buffer( | 23 ScopedJavaLocalRef<jobject> java_byte_buffer( |
| 24 env, | 24 env, |
| 25 env->NewDirectByteBuffer(const_cast<char*>(text.data()), text.length())); | 25 env->NewDirectByteBuffer(const_cast<char*>(text.data()), text.length())); |
| 26 base::android::ScopedJavaLocalRef<jstring> java_charset = | 26 base::android::ScopedJavaLocalRef<jstring> java_charset = |
| 27 base::android::ConvertUTF8ToJavaString(env, base::StringPiece(charset)); | 27 base::android::ConvertUTF8ToJavaString(env, base::StringPiece(charset)); |
| 28 ScopedJavaLocalRef<jstring> java_result = | 28 ScopedJavaLocalRef<jstring> java_result = |
| 29 android::Java_NetStringUtil_convertToUnicode(env, java_byte_buffer.obj(), | 29 android::Java_NetStringUtil_convertToUnicode( |
| 30 java_charset.obj()); | 30 env, java_byte_buffer.obj(), java_charset.obj()); |
| 31 return java_result; | 31 return java_result; |
| 32 } | 32 } |
| 33 | 33 |
| 34 // Attempts to convert |text| encoded in |charset| to a jstring (Java unicode | 34 // Attempts to convert |text| encoded in |charset| to a jstring (Java unicode |
| 35 // string) and then normalizes the string. Returns the result jstring, or NULL | 35 // string) and then normalizes the string. Returns the result jstring, or NULL |
| 36 // on failure. | 36 // on failure. |
| 37 ScopedJavaLocalRef<jstring> ConvertToNormalizedJstring( | 37 ScopedJavaLocalRef<jstring> ConvertToNormalizedJstring(const std::string& text, |
| 38 const std::string& text, const char* charset) { | 38 const char* charset) { |
| 39 JNIEnv* env = base::android::AttachCurrentThread(); | 39 JNIEnv* env = base::android::AttachCurrentThread(); |
| 40 ScopedJavaLocalRef<jobject> java_byte_buffer( | 40 ScopedJavaLocalRef<jobject> java_byte_buffer( |
| 41 env, | 41 env, |
| 42 env->NewDirectByteBuffer(const_cast<char*>(text.data()), text.length())); | 42 env->NewDirectByteBuffer(const_cast<char*>(text.data()), text.length())); |
| 43 base::android::ScopedJavaLocalRef<jstring> java_charset = | 43 base::android::ScopedJavaLocalRef<jstring> java_charset = |
| 44 base::android::ConvertUTF8ToJavaString(env, base::StringPiece(charset)); | 44 base::android::ConvertUTF8ToJavaString(env, base::StringPiece(charset)); |
| 45 ScopedJavaLocalRef<jstring> java_result = | 45 ScopedJavaLocalRef<jstring> java_result = |
| 46 android::Java_NetStringUtil_convertToUnicodeAndNormalize( | 46 android::Java_NetStringUtil_convertToUnicodeAndNormalize( |
| 47 env, java_byte_buffer.obj(), java_charset.obj()); | 47 env, java_byte_buffer.obj(), java_charset.obj()); |
| 48 return java_result; | 48 return java_result; |
| 49 } | 49 } |
| 50 | 50 |
| 51 // Converts |text| encoded in |charset| to a jstring (Java unicode string). | 51 // Converts |text| encoded in |charset| to a jstring (Java unicode string). |
| 52 // Any characters that can not be converted are replaced with U+FFFD. | 52 // Any characters that can not be converted are replaced with U+FFFD. |
| 53 ScopedJavaLocalRef<jstring> ConvertToJstringWithSubstitutions( | 53 ScopedJavaLocalRef<jstring> ConvertToJstringWithSubstitutions( |
| 54 const std::string& text, const char* charset) { | 54 const std::string& text, |
| 55 const char* charset) { |
| 55 JNIEnv* env = base::android::AttachCurrentThread(); | 56 JNIEnv* env = base::android::AttachCurrentThread(); |
| 56 ScopedJavaLocalRef<jobject> java_byte_buffer( | 57 ScopedJavaLocalRef<jobject> java_byte_buffer( |
| 57 env, | 58 env, |
| 58 env->NewDirectByteBuffer(const_cast<char*>(text.data()), text.length())); | 59 env->NewDirectByteBuffer(const_cast<char*>(text.data()), text.length())); |
| 59 base::android::ScopedJavaLocalRef<jstring> java_charset = | 60 base::android::ScopedJavaLocalRef<jstring> java_charset = |
| 60 base::android::ConvertUTF8ToJavaString(env, base::StringPiece(charset)); | 61 base::android::ConvertUTF8ToJavaString(env, base::StringPiece(charset)); |
| 61 ScopedJavaLocalRef<jstring> java_result = | 62 ScopedJavaLocalRef<jstring> java_result = |
| 62 android::Java_NetStringUtil_convertToUnicodeWithSubstitutions( | 63 android::Java_NetStringUtil_convertToUnicodeWithSubstitutions( |
| 63 env, java_byte_buffer.obj(), java_charset.obj()); | 64 env, java_byte_buffer.obj(), java_charset.obj()); |
| 64 return java_result; | 65 return java_result; |
| 65 } | 66 } |
| 66 | 67 |
| 67 } // namespace | 68 } // namespace |
| 68 | 69 |
| 69 const char* const kCharsetLatin1 = "ISO-8859-1"; | 70 const char* const kCharsetLatin1 = "ISO-8859-1"; |
| 70 | 71 |
| 71 bool ConvertToUtf8(const std::string& text, const char* charset, | 72 bool ConvertToUtf8(const std::string& text, |
| 73 const char* charset, |
| 72 std::string* output) { | 74 std::string* output) { |
| 73 output->clear(); | 75 output->clear(); |
| 74 ScopedJavaLocalRef<jstring> java_result = ConvertToJstring(text, charset); | 76 ScopedJavaLocalRef<jstring> java_result = ConvertToJstring(text, charset); |
| 75 if (java_result.is_null()) | 77 if (java_result.is_null()) |
| 76 return false; | 78 return false; |
| 77 *output = base::android::ConvertJavaStringToUTF8(java_result); | 79 *output = base::android::ConvertJavaStringToUTF8(java_result); |
| 78 return true; | 80 return true; |
| 79 } | 81 } |
| 80 | 82 |
| 81 bool ConvertToUtf8AndNormalize(const std::string& text, const char* charset, | 83 bool ConvertToUtf8AndNormalize(const std::string& text, |
| 84 const char* charset, |
| 82 std::string* output) { | 85 std::string* output) { |
| 83 output->clear(); | 86 output->clear(); |
| 84 ScopedJavaLocalRef<jstring> java_result = ConvertToNormalizedJstring( | 87 ScopedJavaLocalRef<jstring> java_result = |
| 85 text, charset); | 88 ConvertToNormalizedJstring(text, charset); |
| 86 if (java_result.is_null()) | 89 if (java_result.is_null()) |
| 87 return false; | 90 return false; |
| 88 *output = base::android::ConvertJavaStringToUTF8(java_result); | 91 *output = base::android::ConvertJavaStringToUTF8(java_result); |
| 89 return true; | 92 return true; |
| 90 } | 93 } |
| 91 | 94 |
| 92 bool ConvertToUTF16(const std::string& text, const char* charset, | 95 bool ConvertToUTF16(const std::string& text, |
| 96 const char* charset, |
| 93 base::string16* output) { | 97 base::string16* output) { |
| 94 output->clear(); | 98 output->clear(); |
| 95 ScopedJavaLocalRef<jstring> java_result = ConvertToJstring(text, charset); | 99 ScopedJavaLocalRef<jstring> java_result = ConvertToJstring(text, charset); |
| 96 if (java_result.is_null()) | 100 if (java_result.is_null()) |
| 97 return false; | 101 return false; |
| 98 *output = base::android::ConvertJavaStringToUTF16(java_result); | 102 *output = base::android::ConvertJavaStringToUTF16(java_result); |
| 99 return true; | 103 return true; |
| 100 } | 104 } |
| 101 | 105 |
| 102 bool ConvertToUTF16WithSubstitutions(const std::string& text, | 106 bool ConvertToUTF16WithSubstitutions(const std::string& text, |
| 103 const char* charset, | 107 const char* charset, |
| 104 base::string16* output) { | 108 base::string16* output) { |
| 105 output->clear(); | 109 output->clear(); |
| 106 ScopedJavaLocalRef<jstring> java_result = | 110 ScopedJavaLocalRef<jstring> java_result = |
| 107 ConvertToJstringWithSubstitutions(text, charset); | 111 ConvertToJstringWithSubstitutions(text, charset); |
| 108 if (java_result.is_null()) | 112 if (java_result.is_null()) |
| 109 return false; | 113 return false; |
| 110 *output = base::android::ConvertJavaStringToUTF16(java_result); | 114 *output = base::android::ConvertJavaStringToUTF16(java_result); |
| 111 return true; | 115 return true; |
| 112 } | 116 } |
| 113 | 117 |
| 114 bool RegisterNetStringUtils(JNIEnv* env) { | 118 bool RegisterNetStringUtils(JNIEnv* env) { |
| 115 return android::RegisterNativesImpl(env); | 119 return android::RegisterNativesImpl(env); |
| 116 } | 120 } |
| 117 | 121 |
| 118 } // namespace net | 122 } // namespace net |
| OLD | NEW |