diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm index 3e776b612..9eeceb387 100644 --- a/React/CxxBridge/RCTCxxBridge.mm +++ b/React/CxxBridge/RCTCxxBridge.mm @@ -132,7 +132,6 @@ private: - (instancetype)initWithParentBridge:(RCTBridge *)bridge; - (void)partialBatchDidFlush; - (void)batchDidComplete; -- (void)handleError:(NSError *)error; @end @@ -146,9 +145,6 @@ struct RCTInstanceCallback : public InstanceCallback { } void incrementPendingJSCalls() override {} void decrementPendingJSCalls() override {} - void onNativeException(const std::string &what) override { - [bridge_ handleError:RCTErrorWithMessage(@(what.c_str()))]; - } ExecutorToken createExecutorToken() override { return ExecutorToken(std::make_shared()); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java index 38a9d5485..80be1fbe5 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java +++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/CatalystInstanceImpl.java @@ -168,14 +168,6 @@ public class CatalystInstanceImpl implements CatalystInstance { impl.decrementPendingJSCalls(); } } - - @Override - public void onNativeException(Exception e) { - CatalystInstanceImpl impl = mOuter.get(); - if (impl != null) { - impl.onNativeException(e); - } - } } private native void initializeBridge( diff --git a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ReactCallback.java b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ReactCallback.java index 6eb743dbe..d4299a439 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ReactCallback.java +++ b/ReactAndroid/src/main/java/com/facebook/react/cxxbridge/ReactCallback.java @@ -21,7 +21,4 @@ import com.facebook.proguard.annotations.DoNotStrip; @DoNotStrip void decrementPendingJSCalls(); - - @DoNotStrip - void onNativeException(Exception e); } diff --git a/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp b/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp index 23b1e4d2d..3c6a45166 100644 --- a/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp +++ b/ReactAndroid/src/main/jni/xreact/jni/CatalystInstanceImpl.cpp @@ -71,16 +71,6 @@ class JInstanceCallback : public InstanceCallback { method(jobj_); } - void onNativeException(const std::string& what) override { - static auto exCtor = - Exception::javaClassStatic()->getConstructor(); - static auto method = - ReactCallback::javaClassStatic()->getMethod("onNativeException"); - - method(jobj_, Exception::javaClassStatic()->newObject( - exCtor, jni::make_jstring(what).get()).get()); - } - ExecutorToken createExecutorToken() override { auto jobj = JExecutorToken::newObjectCxxArgs(); return jobj->cthis()->getExecutorToken(jobj); diff --git a/ReactCommon/cxxreact/CxxNativeModule.cpp b/ReactCommon/cxxreact/CxxNativeModule.cpp index b487588bb..40d37f1a0 100644 --- a/ReactCommon/cxxreact/CxxNativeModule.cpp +++ b/ReactCommon/cxxreact/CxxNativeModule.cpp @@ -133,7 +133,6 @@ void CxxNativeModule::invoke(ExecutorToken token, unsigned int reactMethodId, fo try { method.func(std::move(params), first, second); } catch (const facebook::xplat::JsArgumentException& ex) { - // This ends up passed to the onNativeException callback. throw; } catch (...) { // This means some C++ code is buggy. As above, we fail hard so the C++ diff --git a/ReactCommon/cxxreact/Instance.h b/ReactCommon/cxxreact/Instance.h index cf1cd2459..13a66cfb3 100644 --- a/ReactCommon/cxxreact/Instance.h +++ b/ReactCommon/cxxreact/Instance.h @@ -19,7 +19,6 @@ struct InstanceCallback { virtual void onBatchComplete() = 0; virtual void incrementPendingJSCalls() = 0; virtual void decrementPendingJSCalls() = 0; - virtual void onNativeException(const std::string& what) = 0; virtual ExecutorToken createExecutorToken() = 0; virtual void onExecutorStopped(ExecutorToken) = 0; };