OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/android/jni_array.h" | 5 #include "base/android/jni_array.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/scoped_java_reference.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/android/scoped_java_ref.h" | |
9 #include "base/logging.h" | 10 #include "base/logging.h" |
10 | 11 |
11 namespace base { | 12 namespace base { |
12 namespace android { | 13 namespace android { |
13 | 14 |
14 jbyteArray ToJavaByteArray(JNIEnv* env, | 15 jbyteArray ToJavaByteArray(JNIEnv* env, |
15 const unsigned char* bytes, | 16 const unsigned char* bytes, |
16 size_t len) { | 17 size_t len) { |
17 jbyteArray byte_array = env->NewByteArray(len); | 18 jbyteArray byte_array = env->NewByteArray(len); |
18 if (!byte_array) { | 19 CheckException(env); |
19 return NULL; | 20 CHECK(byte_array); |
20 } | |
21 | 21 |
22 jbyte* elements = env->GetByteArrayElements(byte_array, NULL); | 22 jbyte* elements = env->GetByteArrayElements(byte_array, NULL); |
23 DCHECK(elements); | |
24 memcpy(elements, bytes, len); | 23 memcpy(elements, bytes, len); |
25 env->ReleaseByteArrayElements(byte_array, elements, 0); | 24 env->ReleaseByteArrayElements(byte_array, elements, 0); |
26 CheckException(env); | 25 CheckException(env); |
27 | 26 |
28 return byte_array; | 27 return byte_array; |
29 } | 28 } |
30 | 29 |
31 jobjectArray ToJavaArrayOfByteArray(JNIEnv* env, | 30 jobjectArray ToJavaArrayOfByteArray(JNIEnv* env, |
32 const std::vector<std::string>& v) { | 31 const std::vector<std::string>& v) { |
33 size_t count = v.size(); | 32 ScopedJavaLocalRef<jclass> byte_array_clazz(env, env->FindClass("[B")); |
34 DCHECK_GT(count, 0U); | 33 jobjectArray joa = env->NewObjectArray(v.size(), |
35 jclass byte_array_class = env->FindClass("[B"); | 34 byte_array_clazz.obj(), NULL); |
36 jobjectArray joa = env->NewObjectArray(count, byte_array_class, NULL); | 35 CheckException(env); |
37 if (joa == NULL) | |
38 return NULL; | |
39 | 36 |
40 for (size_t i = 0; i < count; ++i) { | 37 for (size_t i = 0; i < v.size(); ++i) { |
41 ScopedJavaReference<jobject> byte_array(env, ToJavaByteArray(env, | 38 ScopedJavaLocalRef<jobject> byte_array(env, ToJavaByteArray(env, |
42 reinterpret_cast<const uint8*>(v[i].data()), v[i].length())); | 39 reinterpret_cast<const uint8*>(v[i].data()), v[i].length())); |
brettw
2011/09/06 18:12:27
Can you fix the indenting here (should be 4 spaces
| |
43 if (!byte_array.obj()) { | |
44 env->DeleteLocalRef(joa); | |
45 return NULL; | |
46 } | |
47 env->SetObjectArrayElement(joa, i, byte_array.obj()); | 40 env->SetObjectArrayElement(joa, i, byte_array.obj()); |
48 } | 41 } |
49 return joa; | 42 return joa; |
50 } | 43 } |
51 | 44 |
45 jobjectArray ToJavaArrayOfStrings(JNIEnv* env, | |
46 const std::vector<std::string>& v) { | |
47 ScopedJavaLocalRef<jclass> string_clazz(env, | |
48 env->FindClass("java/lang/String")); | |
49 jobjectArray joa = env->NewObjectArray(v.size(), string_clazz.obj(), NULL); | |
50 CheckException(env); | |
51 | |
52 for (size_t i = 0; i < v.size(); ++i) { | |
53 ScopedJavaLocalRef<jstring> item(env, | |
54 ConvertUTF8ToJavaString(env, v[i])); | |
55 env->SetObjectArrayElement(joa, i, item.obj()); | |
56 } | |
57 return joa; | |
58 } | |
59 | |
52 } // namespace android | 60 } // namespace android |
53 } // namespace base | 61 } // namespace base |
OLD | NEW |