Apply requested changes

software-mansion · Jan 10, 2025 · db174c8 · db174c8
1 parent bd995b5
commit db174c8
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 14 deletions.
diff --git a/...react-native-reanimated/android/src/fabric/java/com/swmansion/reanimated/NativeProxy.java b/...react-native-reanimated/android/src/fabric/java/com/swmansion/reanimated/NativeProxy.java
@@ -65,8 +65,6 @@ private native HybridData initHybrid(
 
   public native void performOperations();
 
-  public native void invalidateCpp();
-
   @Override
   protected HybridData getHybridData() {
     return mHybridData;

diff --git a/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.cpp b/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.cpp
@@ -74,11 +74,6 @@ void NativeProxy::commonInit(
 }
 #endif // RCT_NEW_ARCH_ENABLED
 
-void NativeProxy::invalidateCpp() {
-  javaPart_ = nullptr;
-  layoutAnimations_->cthis()->invalidate();
-}
-
 NativeProxy::~NativeProxy() {
   // removed temporary, new event listener mechanism need fix on the RN side
   // reactScheduler_->removeEventListener(eventListener_);

diff --git a/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.h b/packages/react-native-reanimated/android/src/main/cpp/reanimated/android/NativeProxy.h
@@ -172,8 +172,6 @@ class NativeProxy : public jni::HybridClass<NativeProxy> {
   std::shared_ptr<ReanimatedModuleProxy> reanimatedModuleProxy_;
   jni::global_ref<LayoutAnimations::javaobject> layoutAnimations_;
 
-  void invalidateCpp();
-
 #ifndef NDEBUG
   void checkJavaVersion(jsi::Runtime &);
   void injectCppVersion();

diff --git a/...ages/react-native-reanimated/android/src/main/cpp/worklets/android/AndroidUIScheduler.cpp b/...ages/react-native-reanimated/android/src/main/cpp/worklets/android/AndroidUIScheduler.cpp
@@ -50,7 +50,7 @@ void AndroidUIScheduler::scheduleTriggerOnUI() {
   method(javaPart_.get());
 }
 
-void AndroidUIScheduler::invalidateCpp() {
+void AndroidUIScheduler::invalidate() {
   javaPart_ = nullptr;
   uiScheduler_.reset();
 }
@@ -59,7 +59,7 @@ void AndroidUIScheduler::registerNatives() {
   registerHybrid({
       makeNativeMethod("initHybrid", AndroidUIScheduler::initHybrid),
       makeNativeMethod("triggerUI", AndroidUIScheduler::triggerUI),
-      makeNativeMethod("invalidateCpp", AndroidUIScheduler::invalidateCpp),
+      makeNativeMethod("invalidate", AndroidUIScheduler::invalidate),
   });
 }
 

diff --git a/packages/react-native-reanimated/android/src/main/cpp/worklets/android/AndroidUIScheduler.h b/packages/react-native-reanimated/android/src/main/cpp/worklets/android/AndroidUIScheduler.h
@@ -34,7 +34,7 @@ class AndroidUIScheduler : public jni::HybridClass<AndroidUIScheduler> {
 
   void triggerUI();
 
-  void invalidateCpp();
+  void invalidate();
 
   jni::global_ref<AndroidUIScheduler::javaobject> javaPart_;
   std::shared_ptr<UIScheduler> uiScheduler_;

diff --git a/...ct-native-reanimated/android/src/main/java/com/swmansion/worklets/AndroidUIScheduler.java b/...ct-native-reanimated/android/src/main/java/com/swmansion/worklets/AndroidUIScheduler.java
@@ -32,7 +32,7 @@ public AndroidUIScheduler(ReactApplicationContext context) {
 
   public native void triggerUI();
 
-  public native void invalidateCpp();
+  public native void invalidate();
 
   @DoNotStrip
   private void scheduleTriggerOnUI() {
@@ -46,6 +46,6 @@ public void runGuarded() {
 
   public void deactivate() {
     mActive.set(false);
-    invalidateCpp();
+    invalidate();
   }
 }