From 3f0df9788b84ba862abe239da44cea2177248214 Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Sat, 6 Mar 2021 20:27:48 -0800 Subject: [PATCH] Migrate all NativeModules to invalidate() Summary: This diff migrates all NativeModules away from onCatalystInstanceDestroy() to the invalidate() method. Changelog: [Internal] Reviewed By: JoshuaGross Differential Revision: D26871595 fbshipit-source-id: 132f6b75e485361835769a2b53bc742eefa47b59 --- .../com/facebook/react/animated/NativeAnimatedModule.java | 2 +- .../java/com/facebook/react/devsupport/LogBoxModule.java | 2 +- .../accessibilityinfo/AccessibilityInfoModule.java | 4 ++-- .../facebook/react/modules/appstate/AppStateModule.java | 4 ++-- .../com/facebook/react/modules/core/TimingModule.java | 2 +- .../react/modules/debug/AnimationsDebugModule.java | 2 +- .../react/modules/deviceinfo/DeviceInfoModule.java | 7 ++----- .../com/facebook/react/modules/dialog/DialogModule.java | 4 ++-- .../com/facebook/react/modules/fresco/FrescoModule.java | 4 ++-- .../facebook/react/modules/network/NetworkingModule.java | 2 +- .../react/modules/storage/AsyncStorageModule.java | 2 +- .../react/modules/network/NetworkingModuleTest.java | 8 ++++---- 12 files changed, 20 insertions(+), 23 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java index ccc800b3507..58ca6599796 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java @@ -893,7 +893,7 @@ public class NativeAnimatedModule extends NativeAnimatedModuleSpec } @Override - public void onCatalystInstanceDestroy() { + public void invalidate() { ReactApplicationContext context = getReactApplicationContextIfActiveOrWarn(); if (context != null) { context.removeLifecycleEventListener(this); diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.java index 201ee96f950..e4f705ed123 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/LogBoxModule.java @@ -93,7 +93,7 @@ public class LogBoxModule extends NativeLogBoxSpec { } @Override - public void onCatalystInstanceDestroy() { + public void invalidate() { UiThreadUtil.runOnUiThread( new Runnable() { @Override diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java index 3974b0d0605..c746918f09d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/accessibilityinfo/AccessibilityInfoModule.java @@ -163,8 +163,8 @@ public class AccessibilityInfoModule extends NativeAccessibilityInfoSpec } @Override - public void onCatalystInstanceDestroy() { - super.onCatalystInstanceDestroy(); + public void invalidate() { + super.invalidate(); ReactApplicationContext applicationContext = getReactApplicationContextIfActiveOrWarn(); if (applicationContext != null) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java index b4122a4cf3d..d01ca87d500 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appstate/AppStateModule.java @@ -121,8 +121,8 @@ public class AppStateModule extends NativeAppStateSpec } @Override - public void onCatalystInstanceDestroy() { - super.onCatalystInstanceDestroy(); + public void invalidate() { + super.invalidate(); ReactApplicationContext applicationContext = getReactApplicationContextIfActiveOrWarn(); if (applicationContext != null) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java index 16a0571d138..deca22cf138 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.java @@ -129,7 +129,7 @@ public final class TimingModule extends NativeTimingSpec } @Override - public void onCatalystInstanceDestroy() { + public void invalidate() { ReactApplicationContext reactApplicationContext = getReactApplicationContext(); HeadlessJsTaskContext headlessJsTaskContext = diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java index da69cf93c05..b803f0d46b4 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/AnimationsDebugModule.java @@ -103,7 +103,7 @@ public class AnimationsDebugModule extends NativeAnimationsDebugModuleSpec { } @Override - public void onCatalystInstanceDestroy() { + public void invalidate() { if (mFrameCallback != null) { mFrameCallback.stop(); mFrameCallback = null; diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java index 470322b9aca..62082cbffa1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/deviceinfo/DeviceInfoModule.java @@ -104,11 +104,8 @@ public class DeviceInfoModule extends NativeDeviceInfoSpec implements LifecycleE } @Override - public void invalidate() {} - - @Override - public void onCatalystInstanceDestroy() { - super.onCatalystInstanceDestroy(); + public void invalidate() { + super.invalidate(); ReactApplicationContext applicationContext = getReactApplicationContextIfActiveOrWarn(); if (applicationContext != null) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java index fe1d2bf24f8..55f5b0461df 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java @@ -242,8 +242,8 @@ public class DialogModule extends NativeDialogManagerAndroidSpec implements Life } @Override - public void onCatalystInstanceDestroy() { - super.onCatalystInstanceDestroy(); + public void invalidate() { + super.invalidate(); ReactApplicationContext applicationContext = getReactApplicationContextIfActiveOrWarn(); if (applicationContext != null) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java index 145f1a28e8c..188fbfa6015 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java @@ -196,8 +196,8 @@ public class FrescoModule extends ReactContextBaseJavaModule } @Override - public void onCatalystInstanceDestroy() { - super.onCatalystInstanceDestroy(); + public void invalidate() { + super.invalidate(); ReactApplicationContext applicationContext = getReactApplicationContextIfActiveOrWarn(); if (applicationContext != null) { diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java index a584d4fbcb8..9c97c468db1 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java @@ -190,7 +190,7 @@ public final class NetworkingModule extends NativeNetworkingAndroidSpec { } @Override - public void onCatalystInstanceDestroy() { + public void invalidate() { mShuttingDown = true; cancelAllRequests(); diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java index 34890a98ba3..4ba1a4ac2c6 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/storage/AsyncStorageModule.java @@ -103,7 +103,7 @@ public final class AsyncStorageModule extends NativeAsyncSQLiteDBStorageSpec } @Override - public void onCatalystInstanceDestroy() { + public void invalidate() { mShuttingDown = true; } diff --git a/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java b/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java index a6e401ed9b0..b62d42b83d4 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java +++ b/ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java @@ -545,7 +545,7 @@ public class NetworkingModuleTest { } @Test - public void testCancelAllCallsOnCatalystInstanceDestroy() throws Exception { + public void testCancelAllCallsInvalidate() throws Exception { PowerMockito.mockStatic(OkHttpCallUtil.class); final int requests = 3; final Call[] calls = new Call[requests]; @@ -578,7 +578,7 @@ public class NetworkingModuleTest { } verify(mHttpClient, times(3)).newCall(any(Request.class)); - mNetworkingModule.onCatalystInstanceDestroy(); + mNetworkingModule.invalidate(); PowerMockito.verifyStatic(OkHttpCallUtil.class, times(3)); ArgumentCaptor clientArguments = ArgumentCaptor.forClass(OkHttpClient.class); ArgumentCaptor requestIdArguments = ArgumentCaptor.forClass(Integer.class); @@ -591,7 +591,7 @@ public class NetworkingModuleTest { } @Test - public void testCancelSomeCallsOnCatalystInstanceDestroy() throws Exception { + public void testCancelSomeCallsInvalidate() throws Exception { PowerMockito.mockStatic(OkHttpCallUtil.class); final int requests = 3; final Call[] calls = new Call[requests]; @@ -634,7 +634,7 @@ public class NetworkingModuleTest { // verifyStatic actually does not clear all calls so far, so we have to check for all of them. // If `cancelTag` would've been called again for the aborted call, we would have had // `requests + 1` calls. - mNetworkingModule.onCatalystInstanceDestroy(); + mNetworkingModule.invalidate(); PowerMockito.verifyStatic(OkHttpCallUtil.class, times(requests)); clientArguments = ArgumentCaptor.forClass(OkHttpClient.class); requestIdArguments = ArgumentCaptor.forClass(Integer.class);