Simplify API of `getReactApplicationContextIfActiveOrWarn`

Summary:
Simplify the API of `getReactApplicationContextIfActiveOrWarn`. We don't need to pass so much information into this method to collect good SoftExceptions.

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D18134400

fbshipit-source-id: 0a250ab0252a44121f3339a31506a0a6c4c7cd35

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 =
+    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-        getReactApplicationContextIfActiveOrWarn(NAME, "initialize");
 
     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 =
+      ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-          getReactApplicationContextIfActiveOrWarn(NAME, "getNodesManager");
 
       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(
+                getReactApplicationContextIfActiveOrWarn();
-                    NAME, "startListeningToAnimatedNodeValue.onValueUpdate");
             if (reactApplicationContext != null) {
               reactApplicationContext
                   .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)

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(
+  protected @Nullable final ReactApplicationContext getReactApplicationContextIfActiveOrWarn() {
-      String tag, String reason) {
     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 {

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 =
+    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-        getReactApplicationContextIfActiveOrWarn(TAG, "captureHeap");
 
     if (reactApplicationContext != null) {
       HeapCapture heapCapture = reactApplicationContext.getJSModule(HeapCapture.class);

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 =
+    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-        getReactApplicationContextIfActiveOrWarn(MODULE_NAME, "getJSHierarchy");
 
     JSDevSupportModule jsDevSupportModule = null;
     if (reactApplicationContext != null) {

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 =
+      ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-          getReactApplicationContextIfActiveOrWarn(NAME, "updateAndSendReduceMotionChangeEvent");
       if (reactApplicationContext != null) {
         reactApplicationContext
             .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
@@ -131,9 +130,7 @@ public class AccessibilityInfoModule extends ReactContextBaseJavaModule
     if (mTouchExplorationEnabled != enabled) {
       mTouchExplorationEnabled = enabled;
 
-      ReactApplicationContext reactApplicationContext =
+      ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-          getReactApplicationContextIfActiveOrWarn(
-              NAME, "updateAndSendTouchExplorationChangeEvent");
       if (reactApplicationContext != null) {
         getReactApplicationContext()
             .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)

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 =
+    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-        getReactApplicationContextIfActiveOrWarn(NAME, "emitAppearanceChanged");
 
     if (reactApplicationContext != null) {
       reactApplicationContext

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 =
+    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-        getReactApplicationContextIfActiveOrWarn(
-            TAG, "sendAppStateChangeEvent: trying to update app state");
 
     if (reactApplicationContext != null) {
       reactApplicationContext.getJSModule(RCTDeviceEventEmitter.class).emit(eventName, data);

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 =
+    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-        getReactApplicationContextIfActiveOrWarn(NAME, reason);
 
     if (reactApplicationContext != null) {
       return reactApplicationContext.getNativeModule(WebSocketModule.class);
@@ -299,8 +298,7 @@ public class BlobModule extends ReactContextBaseJavaModule {
 
   @ReactMethod
   public void addNetworkingHandler() {
-    ReactApplicationContext reactApplicationContext =
+    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-        getReactApplicationContextIfActiveOrWarn(NAME, "addNetworkingHandler");
 
     if (reactApplicationContext != null) {
       NetworkingModule networkingModule =

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 =
+    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-        getReactApplicationContextIfActiveOrWarn(NAME, reason);
 
     if (reactApplicationContext != null) {
       return reactApplicationContext.getNativeModule(BlobModule.class);

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 =
+    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-        getReactApplicationContextIfActiveOrWarn(NAME, "emitHardwareBackPressed");
 
     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 =
+    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-        getReactApplicationContextIfActiveOrWarn(NAME, "emitHardwareBackPressed");
 
     if (reactApplicationContext != null) {
       WritableMap map = Arguments.createMap();

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 =
+      ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-          getReactApplicationContextIfActiveOrWarn(NAME, "callTimers");
 
       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 =
+      ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-          getReactApplicationContextIfActiveOrWarn(NAME, "callIdleCallbacks");
 
       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 =
+      ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-          getReactApplicationContextIfActiveOrWarn(NAME, "emitTimeDriftWarning");
 
       if (reactApplicationContext != null) {
         reactApplicationContext.getJSModule(JSTimers.class).emitTimeDriftWarning(warningMessage);

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

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 =
+    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-        getReactApplicationContextIfActiveOrWarn(TAG, reason);
 
     if (reactApplicationContext != null) {
       return getReactApplicationContext().getJSModule(RCTDeviceEventEmitter.class);

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 =
+    ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
-        getReactApplicationContextIfActiveOrWarn(
-            TAG, "sendAppStateChangeEvent: trying to update app state");
 
     if (reactApplicationContext != null) {
       reactApplicationContext