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

Pass expanded folly::dynamic as argument to sync nativeHook 

Reviewed By: mhorowitz

Differential Revision: D4409865

fbshipit-source-id: f99e02e36bf691fa5b4a5affce1fa4fd4cf321a6
This commit is contained in:
Pieter De Baets 2017-01-30 06:39:51 -08:00 committed by Facebook Github Bot
parent 2a638c2ee7
commit 919e49a8b8
3 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ReactAndroid/src/main/jni/xreact/jni/ModuleRegistryHolder.cpp
View File

@ -163,10 +163,6 @@ class NewJavaNativeModule : public NativeModule {
std::vector<MethodDescriptor> methodDescriptors_;
MethodCallResult invokeInner(ExecutorToken token, unsigned int reactMethodId, folly::dynamic&& params) {
if (!params.isArray()) {
throw std::invalid_argument(
folly::to<std::string>("method parameters should be array, but are ", params.typeName()));
}
return methods_[reactMethodId].invoke(instance_, module_.get(), token, params);
}
};

15
ReactCommon/cxxreact/CxxNativeModule.cpp
View File

@ -163,20 +163,7 @@ MethodCallResult CxxNativeModule::callSerializableNativeHook(
" is asynchronous but invoked synchronously"));
}
if (!args.isString()) {
throw std::invalid_argument(
folly::to<std::string>("method parameters should be string, but are ", args.typeName()));
}
folly::dynamic params = folly::parseJson(args.stringPiece());
if (!params.isArray()) {
throw std::invalid_argument(
folly::to<std::string>("parsed method parameters should be array, but are ",
args.typeName()));
}
return { method.syncFunc(std::move(params)), false };
return { method.syncFunc(std::move(args)), false };
}
}

10
ReactCommon/cxxreact/JSCExecutor.cpp
View File

@ -264,7 +264,6 @@ void JSCExecutor::initOnJSVMThread() throw(JSException) {
installNativeHook<&JSCExecutor::nativeStartWorker>("nativeStartWorker");
installNativeHook<&JSCExecutor::nativePostMessageToWorker>("nativePostMessageToWorker");
installNativeHook<&JSCExecutor::nativeTerminateWorker>("nativeTerminateWorker");
installNativeHook<&JSCExecutor::nativeCallSyncHook>("nativeCallSyncHook");
installGlobalFunction(m_context, "nativeLoggingHook", JSNativeHooks::loggingHook);
installGlobalFunction(m_context, "nativePerformanceNow", JSNativeHooks::nowHook);
@ -867,13 +866,18 @@ JSValueRef JSCExecutor::nativeCallSyncHook(
unsigned int moduleId = Value(m_context, arguments[0]).asUnsignedInteger();
unsigned int methodId = Value(m_context, arguments[1]).asUnsignedInteger();
std::string argsJson = Value(m_context, arguments[2]).toJSONString();
folly::dynamic args = folly::parseJson(Value(m_context, arguments[2]).toJSONString());
if (!args.isArray()) {
throw std::invalid_argument(
folly::to<std::string>("method parameters should be array, but are ", args.typeName()));
}
MethodCallResult result = m_delegate->callSerializableNativeHook(
*this,
moduleId,
methodId,
argsJson);
std::move(args));
if (result.isUndefined) {
return Value::makeUndefined(m_context);
}