status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes to NativeMap/Array 

Reviewed By: mhorowitz

Differential Revision: D3376409

fbshipit-source-id: 4efd1a8567358baf2634008af77f7e743ace849e
This commit is contained in:
Chris Hopman 2016-06-02 13:37:57 -07:00 committed by Facebook Github Bot 1
parent 1b2d4266b9
commit 9a6e61426d
2 changed files with 35 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
ReactAndroid/src/main/jni/react/jni/NativeCommon.cpp
View File

@ -14,59 +14,42 @@ const char *gUnexpectedNativeTypeExceptionClass =
namespace {
local_ref<ReadableType> getTypeField(const char* fieldName) {
// Returns a leaked global_ref.
alias_ref<ReadableType> getTypeField(const char* fieldName) {
static auto cls = ReadableType::javaClassStatic();
auto field = cls->getStaticField<ReadableType::javaobject>(fieldName);
return cls->getStaticFieldValue(field);
}
alias_ref<ReadableType> getNullValue() {
static alias_ref<ReadableType> val = make_global(getTypeField("Null")).release();
return val;
}
alias_ref<ReadableType> getBooleanValue() {
static alias_ref<ReadableType> val = make_global(getTypeField("Boolean")).release();
return val;
}
alias_ref<ReadableType> getNumberValue() {
static alias_ref<ReadableType> val = make_global(getTypeField("Number")).release();
return val;
}
alias_ref<ReadableType> getStringValue() {
static alias_ref<ReadableType> val = make_global(getTypeField("String")).release();
return val;
}
alias_ref<ReadableType> getMapValue() {
static alias_ref<ReadableType> val = make_global(getTypeField("Map")).release();
return val;
}
alias_ref<ReadableType> getArrayValue() {
static alias_ref<ReadableType> val = make_global(getTypeField("Array")).release();
return val;
return make_global(cls->getStaticFieldValue(field)).release();
}
} // namespace
local_ref<ReadableType> ReadableType::getType(folly::dynamic::Type type) {
switch (type) {
case folly::dynamic::Type::NULLT:
return make_local(getNullValue());
case folly::dynamic::Type::BOOL:
return make_local(getBooleanValue());
case folly::dynamic::Type::NULLT: {
static alias_ref<ReadableType> val = getTypeField("Null");
return make_local(val);
}
case folly::dynamic::Type::BOOL: {
static alias_ref<ReadableType> val = getTypeField("Boolean");
return make_local(val);
}
case folly::dynamic::Type::DOUBLE:
case folly::dynamic::Type::INT64:
return make_local(getNumberValue());
case folly::dynamic::Type::STRING:
return make_local(getStringValue());
case folly::dynamic::Type::OBJECT:
return make_local(getMapValue());
case folly::dynamic::Type::ARRAY:
return make_local(getArrayValue());
case folly::dynamic::Type::INT64: {
static alias_ref<ReadableType> val = getTypeField("Number");
return make_local(val);
}
case folly::dynamic::Type::STRING: {
static alias_ref<ReadableType> val = getTypeField("String");
return make_local(val);
}
case folly::dynamic::Type::OBJECT: {
static alias_ref<ReadableType> val = getTypeField("Map");
return make_local(val);
}
case folly::dynamic::Type::ARRAY: {
static alias_ref<ReadableType> val = getTypeField("Array");
return make_local(val);
}
default:
throwNewJavaException(exceptions::gUnexpectedNativeTypeExceptionClass, "Unknown type");
}

10
ReactAndroid/src/main/jni/react/jni/ReadableNativeArray.cpp
View File

@ -83,6 +83,13 @@ local_ref<NativeMap::jhybridobject> ReadableNativeArray::getMap(jint index) {
return ReadableNativeMap::createWithContents(std::move(array.at(index)));
}
namespace {
// This is just to allow signature deduction below.
local_ref<ReadableNativeMap::jhybridobject> getMapFixed(alias_ref<ReadableNativeArray::jhybridobject> array, jint index) {
return static_ref_cast<ReadableNativeMap::jhybridobject>(array->cthis()->getMap(index));
}
}
void ReadableNativeArray::registerNatives() {
registerHybrid({
makeNativeMethod("size", ReadableNativeArray::getSize),
@ -92,8 +99,7 @@ void ReadableNativeArray::registerNatives() {
makeNativeMethod("getInt", ReadableNativeArray::getInt),
makeNativeMethod("getString", ReadableNativeArray::getString),
makeNativeMethod("getArray", ReadableNativeArray::getArray),
makeNativeMethod("getMap", jmethod_traits<ReadableNativeMap::jhybridobject(jint)>::descriptor(),
ReadableNativeArray::getMap),
makeNativeMethod("getMap", getMapFixed),
makeNativeMethod("getType", ReadableNativeArray::getType),
});
}