diff --git a/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.cpp b/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.cpp index 5b565478d9c..7fde44be4bb 100644 --- a/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.cpp +++ b/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.cpp @@ -35,12 +35,7 @@ jni::local_ref WorkletsModule::initHybrid( return makeCxxInstance(jThis, (jsi::Runtime *)jsContext, valueUnpackerCode); } -void WorkletsModule::installJSIBindings() {} - void WorkletsModule::registerNatives() { - registerHybrid( - {makeNativeMethod("initHybrid", WorkletsModule::initHybrid), - makeNativeMethod( - "installJSIBindings", WorkletsModule::installJSIBindings)}); + registerHybrid({makeNativeMethod("initHybrid", WorkletsModule::initHybrid)}); } } // namespace worklets diff --git a/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.h b/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.h index 6c830293e08..0f0de771f54 100644 --- a/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.h +++ b/packages/react-native-reanimated/android/src/main/cpp/worklets/android/WorkletsModule.h @@ -19,7 +19,6 @@ #include #include -#include namespace worklets { @@ -48,30 +47,6 @@ class WorkletsModule : public jni::HybridClass { jsi::Runtime *rnRuntime_; std::shared_ptr nativeWorkletsModule_; - void installJSIBindings(); - - /*** - * Wraps a method of `WorkletsModule` in a function object capturing - * `this` - * @tparam TReturn return type of passed method - * @tparam TParams parameter types of passed method - * @param methodPtr pointer to method to be wrapped - * @return a function object with the same signature as the method, calling - * that method on `this` - */ - template - std::function bindThis( - TReturn (WorkletsModule::*methodPtr)(TParams...)) { - return [this, methodPtr](TParams &&...args) { - return (this->*methodPtr)(std::forward(args)...); - }; - } - - template - JMethod getJniMethod(std::string const &methodName) { - return javaPart_->getClass()->getMethod(methodName.c_str()); - } - explicit WorkletsModule( jni::alias_ref jThis, jsi::Runtime *rnRuntime, diff --git a/packages/react-native-reanimated/android/src/reactNativeVersionPatch/ReanimatedUIManager/latest/com/swmansion/worklets/WorkletsModule.java b/packages/react-native-reanimated/android/src/reactNativeVersionPatch/ReanimatedUIManager/latest/com/swmansion/worklets/WorkletsModule.java index c122573217a..b3ed1c890bc 100644 --- a/packages/react-native-reanimated/android/src/reactNativeVersionPatch/ReanimatedUIManager/latest/com/swmansion/worklets/WorkletsModule.java +++ b/packages/react-native-reanimated/android/src/reactNativeVersionPatch/ReanimatedUIManager/latest/com/swmansion/worklets/WorkletsModule.java @@ -24,7 +24,6 @@ public class WorkletsModule extends NativeWorkletsModuleSpec { /** * @noinspection unused */ - // TODO: Do I need this? protected HybridData getHybridData() { return mHybridData; } @@ -35,22 +34,10 @@ protected HybridData getHybridData() { @OptIn(markerClass = FrameworkAPI.class) private native HybridData initHybrid(long jsContext, String valueUnpackerCode); - // TODO: Remove this public WorkletsModule(ReactApplicationContext reactContext) { super(reactContext); } - /** - * @noinspection JavaJniMissingFunction - */ - // TODO: Remove this - protected native void installJSIBindings(); - - // TODO: Remove this - @Override - public void initialize() { - // Do nothing. - } @OptIn(markerClass = FrameworkAPI.class) @ReactMethod(isBlockingSynchronousMethod = true) @@ -64,9 +51,4 @@ public boolean installTurboModule(String valueUnpackerCode) { return true; } - // TODO: Remove this - @Override - public void invalidate() { - super.invalidate(); - } }