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 f293dd03a3..7bd186202a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java @@ -116,8 +116,7 @@ public class NativeAnimatedModule extends ReactContextBaseJavaModule @Override public void initialize() { - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(NAME, "initialize"); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { UIManagerModule uiManager = reactApplicationContext.getNativeModule(UIManagerModule.class); @@ -179,8 +178,7 @@ public class NativeAnimatedModule extends ReactContextBaseJavaModule private NativeAnimatedNodesManager getNodesManager() { if (mNodesManager == null) { - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(NAME, "getNodesManager"); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { UIManagerModule uiManager = reactApplicationContext.getNativeModule(UIManagerModule.class); @@ -229,8 +227,7 @@ public class NativeAnimatedModule extends ReactContextBaseJavaModule onAnimatedValueData.putDouble("value", value); ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn( - NAME, "startListeningToAnimatedNodeValue.onValueUpdate"); + getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { reactApplicationContext .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java index 33e9576568..386a18674a 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContextBaseJavaModule.java @@ -45,15 +45,15 @@ public abstract class ReactContextBaseJavaModule extends BaseJavaModule { * thread-safe. */ @ThreadConfined(ANY) - protected @Nullable final ReactApplicationContext getReactApplicationContextIfActiveOrWarn( - String tag, String reason) { + protected @Nullable final ReactApplicationContext getReactApplicationContextIfActiveOrWarn() { if (mReactApplicationContext.hasActiveCatalystInstance()) { return mReactApplicationContext; } // We want to collect data about how often this happens, but SoftExceptions will cause a crash // in debug mode, which isn't usually desirable. - String msg = "Catalyst Instance has already disappeared: " + reason; + String msg = "Catalyst Instance has already disappeared: requested by " + this.getName(); + String tag = "ReactContextBaseJavaModule"; if (ReactBuildConfig.DEBUG) { FLog.w(tag, msg); } else { diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java index 147fae4ce9..030d7833bc 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSCHeapCapture.java @@ -56,8 +56,7 @@ public class JSCHeapCapture extends ReactContextBaseJavaModule { File f = new File(path + "/capture.json"); f.delete(); - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(TAG, "captureHeap"); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { HeapCapture heapCapture = reactApplicationContext.getJSModule(HeapCapture.class); diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDevSupport.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDevSupport.java index f44e686751..1130c32e76 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDevSupport.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDevSupport.java @@ -54,8 +54,7 @@ public class JSDevSupport extends ReactContextBaseJavaModule { } public synchronized void getJSHierarchy(int reactTag, DevSupportCallback callback) { - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(MODULE_NAME, "getJSHierarchy"); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); JSDevSupportModule jsDevSupportModule = null; if (reactApplicationContext != null) { 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 9ff400bb32..bb7bec2c38 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 @@ -117,8 +117,7 @@ public class AccessibilityInfoModule extends ReactContextBaseJavaModule if (mReduceMotionEnabled != isReduceMotionEnabled) { mReduceMotionEnabled = isReduceMotionEnabled; - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(NAME, "updateAndSendReduceMotionChangeEvent"); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { reactApplicationContext .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) @@ -131,9 +130,7 @@ public class AccessibilityInfoModule extends ReactContextBaseJavaModule if (mTouchExplorationEnabled != enabled) { mTouchExplorationEnabled = enabled; - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn( - NAME, "updateAndSendTouchExplorationChangeEvent"); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { getReactApplicationContext() .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.java index 321f732779..d267f3a4bf 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.java @@ -86,8 +86,7 @@ public class AppearanceModule extends ReactContextBaseJavaModule { WritableMap appearancePreferences = Arguments.createMap(); appearancePreferences.putString("colorScheme", colorScheme); - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(NAME, "emitAppearanceChanged"); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { reactApplicationContext 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 e4c5f40dd5..7b88dda632 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 @@ -93,9 +93,7 @@ public class AppStateModule extends ReactContextBaseJavaModule } private void sendEvent(String eventName, @Nullable Object data) { - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn( - TAG, "sendAppStateChangeEvent: trying to update app state"); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { reactApplicationContext.getJSModule(RCTDeviceEventEmitter.class).emit(eventName, data); diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java index e9ac538778..bf432b9095 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java @@ -287,8 +287,7 @@ public class BlobModule extends ReactContextBaseJavaModule { } private WebSocketModule getWebSocketModule(String reason) { - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(NAME, reason); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { return reactApplicationContext.getNativeModule(WebSocketModule.class); @@ -299,8 +298,7 @@ public class BlobModule extends ReactContextBaseJavaModule { @ReactMethod public void addNetworkingHandler() { - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(NAME, "addNetworkingHandler"); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { NetworkingModule networkingModule = diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java index e86d37db5e..1345a576bd 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java @@ -31,8 +31,7 @@ public class FileReaderModule extends ReactContextBaseJavaModule { } private BlobModule getBlobModule(String reason) { - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(NAME, reason); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { return reactApplicationContext.getNativeModule(BlobModule.class); diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java index 45a016c575..ec8e8c3e2c 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/DeviceEventManagerModule.java @@ -47,8 +47,7 @@ public class DeviceEventManagerModule extends ReactContextBaseJavaModule { /** Sends an event to the JS instance that the hardware back has been pressed. */ public void emitHardwareBackPressed() { - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(NAME, "emitHardwareBackPressed"); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { reactApplicationContext @@ -59,8 +58,7 @@ public class DeviceEventManagerModule extends ReactContextBaseJavaModule { /** Sends an event to the JS instance that a new intent was received. */ public void emitNewIntentReceived(Uri uri) { - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(NAME, "emitHardwareBackPressed"); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { WritableMap map = Arguments.createMap(); 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 9220e3b9c9..b7e7d05248 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 @@ -25,8 +25,7 @@ public final class TimingModule extends ReactContextBaseJavaModule public class BridgeTimerManager implements JavaScriptTimerManager { @Override public void callTimers(WritableArray timerIDs) { - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(NAME, "callTimers"); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { reactApplicationContext.getJSModule(JSTimers.class).callTimers(timerIDs); @@ -35,8 +34,7 @@ public final class TimingModule extends ReactContextBaseJavaModule @Override public void callIdleCallbacks(double frameTime) { - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(NAME, "callIdleCallbacks"); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { reactApplicationContext.getJSModule(JSTimers.class).callIdleCallbacks(frameTime); @@ -45,8 +43,7 @@ public final class TimingModule extends ReactContextBaseJavaModule @Override public void emitTimeDriftWarning(String warningMessage) { - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(NAME, "emitTimeDriftWarning"); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { reactApplicationContext.getJSModule(JSTimers.class).emitTimeDriftWarning(warningMessage); diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java index ea6feb19b5..55ad479ebc 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/debug/DevSettingsModule.java @@ -94,7 +94,7 @@ public class DevSettingsModule extends ReactContextBaseJavaModule { data.putString("title", title); ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(NAME, "onOptionSelected"); + getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { reactApplicationContext 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 91e1a2588b..e9398ed6f7 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 @@ -754,8 +754,7 @@ public final class NetworkingModule extends ReactContextBaseJavaModule { } private RCTDeviceEventEmitter getEventEmitter(String reason) { - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn(TAG, reason); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { return getReactApplicationContext().getJSModule(RCTDeviceEventEmitter.class); diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java index f45bf22412..97750befeb 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.java @@ -59,9 +59,7 @@ public final class WebSocketModule extends NativeWebSocketModuleSpec { } private void sendEvent(String eventName, WritableMap params) { - ReactApplicationContext reactApplicationContext = - getReactApplicationContextIfActiveOrWarn( - TAG, "sendAppStateChangeEvent: trying to update app state"); + ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn(); if (reactApplicationContext != null) { reactApplicationContext