feat(android): support converting byte[] to ArrayBuffer

tidev · Aug 13, 2020 · 9e77600 · 9e77600
1 parent e42bbcb
commit 9e77600
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 0 deletions.
diff --git a/...kroll-apt/src/main/resources/org/appcelerator/kroll/annotations/generator/ProxyBinding.fm b/...kroll-apt/src/main/resources/org/appcelerator/kroll/annotations/generator/ProxyBinding.fm
@@ -305,6 +305,18 @@ namespace ${ns?lower_case} {
 		"javaDeleteLocalRef":true,
 		"defaultValue": "null"
 	},
+	"byte[]":{
+		"jsType":"ArrayBuffer",
+		"jsHandleCast":"ArrayBuffer",
+		"jsToJavaConverter":"jsArrayBufferToJavaByteArray",
+		"javaToJsConverter":"javaByteArrayToJsArrayBuffer",
+		"jvalue":"l", "signature":"[B",
+		"javaCallMethodType":"Object",
+		"javaReturnType":"jbyteArray",
+		"javaValidation":true,
+		"javaDeleteLocalRef":true,
+		"defaultValue": "null"
+	},
 	"int[]":{
 		"jsType":"Array",
 		"jsHandleCast":"Array",

diff --git a/android/runtime/v8/src/native/JNIUtil.cpp b/android/runtime/v8/src/native/JNIUtil.cpp
@@ -30,6 +30,7 @@ jclass JNIUtil::doubleClass = NULL;
 jclass JNIUtil::booleanClass = NULL;
 jclass JNIUtil::stringArrayClass = NULL;
 jclass JNIUtil::objectArrayClass = NULL;
+jclass JNIUtil::byteArrayClass = NULL;
 jclass JNIUtil::shortArrayClass = NULL;
 jclass JNIUtil::intArrayClass = NULL;
 jclass JNIUtil::longArrayClass = NULL;
@@ -312,6 +313,7 @@ void JNIUtil::initCache()
 	floatClass = findClass("java/lang/Float");
 	doubleClass = findClass("java/lang/Double");
 	booleanClass = findClass("java/lang/Boolean");
+	byteArrayClass = findClass("[B");
 	shortArrayClass = findClass("[S");
 	intArrayClass = findClass("[I");
 	longArrayClass = findClass("[J");

diff --git a/android/runtime/v8/src/native/JNIUtil.h b/android/runtime/v8/src/native/JNIUtil.h
@@ -78,6 +78,7 @@ class JNIUtil
 	static jclass booleanClass;
 	static jclass stringArrayClass;
 	static jclass objectArrayClass;
+	static jclass byteArrayClass;
 	static jclass shortArrayClass;
 	static jclass intArrayClass;
 	static jclass longArrayClass;

diff --git a/android/runtime/v8/src/native/TypeConverter.cpp b/android/runtime/v8/src/native/TypeConverter.cpp
@@ -540,6 +540,28 @@ Local<Array> TypeConverter::javaArrayToJsArray(Isolate* isolate, JNIEnv *env, ji
 	return jsArray;
 }
 
+Local<ArrayBuffer> TypeConverter::javaByteArrayToJsArrayBuffer(Isolate* isolate, jbyteArray javaByteArray)
+{
+	JNIEnv *env = JNIScope::getEnv();
+	if (env == NULL) {
+		return Local<ArrayBuffer>();
+	}
+	return TypeConverter::javaByteArrayToJsArrayBuffer(isolate, env, javaByteArray);
+}
+
+Local<ArrayBuffer> TypeConverter::javaByteArrayToJsArrayBuffer(Isolate* isolate, JNIEnv *env, jbyteArray javaByteArray)
+{
+	size_t byteCount = env->GetArrayLength(javaByteArray);
+	Local<ArrayBuffer> jsArray = ArrayBuffer::New(isolate, byteCount);
+	if (byteCount > 0) {
+		void* sourcePointer = (void*)(env->GetByteArrayElements(javaByteArray, 0));
+		void* destinationPointer = jsArray->GetContents().Data();
+		memcpy(destinationPointer, sourcePointer, byteCount);
+		env->ReleaseByteArrayElements(javaByteArray, reinterpret_cast<jbyte*>(sourcePointer), JNI_ABORT);
+	}
+	return jsArray;
+}
+
 jlongArray TypeConverter::jsArrayToJavaLongArray(Isolate* isolate, Local<Array> jsArray)
 {
 	JNIEnv *env = JNIScope::getEnv();
@@ -1033,6 +1055,9 @@ Local<Value> TypeConverter::javaObjectToJsValue(Isolate* isolate, JNIEnv *env, j
 	} else if (env->IsInstanceOf(javaObject, JNIUtil::objectArrayClass)) {
 		return javaArrayToJsArray(isolate, (jobjectArray) javaObject);
 
+	} else if (env->IsInstanceOf(javaObject, JNIUtil::byteArrayClass)) {
+		return javaByteArrayToJsArrayBuffer(isolate, (jbyteArray) javaObject);
+
 	} else if (env->IsInstanceOf(javaObject, JNIUtil::shortArrayClass)) {
 		return javaArrayToJsArray(isolate, (jshortArray) javaObject);
 

diff --git a/android/runtime/v8/src/native/TypeConverter.h b/android/runtime/v8/src/native/TypeConverter.h
@@ -141,6 +141,7 @@ class TypeConverter
 	static v8::Local<v8::Array> javaArrayToJsArray(v8::Isolate* isolate, jbooleanArray javaBooleanArray);
 	static jshortArray jsArrayToJavaShortArray(v8::Isolate* isolate, v8::Local<v8::Array> jsArray);
 	static v8::Local<v8::Array> javaArrayToJsArray(v8::Isolate* isolate, jshortArray javaShortArray);
+	static v8::Local<v8::ArrayBuffer> javaByteArrayToJsArrayBuffer(v8::Isolate* isolate, jbyteArray javaByteArray);
 	static jintArray jsArrayToJavaIntArray(v8::Isolate* isolate, v8::Local<v8::Array> jsArray);
 	static v8::Local<v8::Array> javaArrayToJsArray(v8::Isolate* isolate, jintArray javaIntArray);
 	static jlongArray jsArrayToJavaLongArray(v8::Isolate* isolate, v8::Local<v8::Array> jsArray);
@@ -154,6 +155,7 @@ class TypeConverter
 	static jarray jsArrayToJavaArray(v8::Isolate* isolate, JNIEnv *env, v8::Local<v8::Array> jsArray);
 	static jobjectArray jsArrayToJavaStringArray(v8::Isolate* isolate, JNIEnv *env, v8::Local<v8::Array> jsArray);
 	static v8::Local<v8::Array> javaArrayToJsArray(v8::Isolate* isolate, JNIEnv *env, jbooleanArray javaBooleanArray);
+	static v8::Local<v8::ArrayBuffer> javaByteArrayToJsArrayBuffer(v8::Isolate* isolate, JNIEnv *env, jbyteArray javaByteArray);
 	static jshortArray jsArrayToJavaShortArray(v8::Isolate* isolate, JNIEnv *env, v8::Local<v8::Array> jsArray);
 	static v8::Local<v8::Array> javaArrayToJsArray(v8::Isolate* isolate, JNIEnv *env, jshortArray javaShortArray);
 	static jintArray jsArrayToJavaIntArray(v8::Isolate* isolate, JNIEnv *env, v8::Local<v8::Array> jsArray);