From 4ddb7c59d08ebcb0dfba11d46e7a1b6f6a8a457d Mon Sep 17 00:00:00 2001
From: Felix Oghina <foghina@fb.com>
Date: Thu, 14 Apr 2016 03:17:31 -0700
Subject: [PATCH] move more bugreporting logic to bugreporting module

Reviewed By: astreet

Differential Revision: D3168205

fb-gh-sync-id: 3cf5691acb258f9741c61005bbec0a8507bc8162
fbshipit-source-id: 3cf5691acb258f9741c61005bbec0a8507bc8162
---
 .../com/facebook/react/bridge/CatalystInstance.java   |  1 +
 .../facebook/react/bridge/CatalystInstanceImpl.java   |  5 +++++
 .../facebook/react/bridge/NativeModuleRegistry.java   |  4 ++++
 .../java/com/facebook/react/bridge/ReactContext.java  | 11 ++++++++++-
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
index 28aacb95d..f85b9cf69 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
@@ -52,6 +52,7 @@ public interface CatalystInstance extends MemoryPressureListener {
 
   <T extends JavaScriptModule> T getJSModule(Class<T> jsInterface);
   <T extends JavaScriptModule> T getJSModule(ExecutorToken executorToken, Class<T> jsInterface);
+  <T extends NativeModule> boolean hasNativeModule(Class<T> nativeModuleInterface);
   <T extends NativeModule> T getNativeModule(Class<T> nativeModuleInterface);
   Collection<NativeModule> getNativeModules();
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
index dfd79b9df..702b7759d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
@@ -290,6 +290,11 @@ public class CatalystInstanceImpl implements CatalystInstance {
     return Assertions.assertNotNull(mJSModuleRegistry).getJavaScriptModule(executorToken, jsInterface);
   }
 
+  @Override
+  public <T extends NativeModule> boolean hasNativeModule(Class<T> nativeModuleInterface) {
+    return mJavaRegistry.hasModule(nativeModuleInterface);
+  }
+
   @Override
   public <T extends NativeModule> T getNativeModule(Class<T> nativeModuleInterface) {
     return mJavaRegistry.getModule(nativeModuleInterface);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
index 2179a4b7a..e6e0f80a2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/NativeModuleRegistry.java
@@ -144,6 +144,10 @@ public class NativeModuleRegistry {
     }
   }
 
+  public <T extends NativeModule> boolean hasModule(Class<T> moduleInterface) {
+    return mModuleInstances.containsKey(moduleInterface);
+  }
+
   public <T extends NativeModule> T getModule(Class<T> moduleInterface) {
     return (T) Assertions.assertNotNull(mModuleInstances.get(moduleInterface));
   }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
index 05d312360..60f59f52d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
@@ -104,12 +104,21 @@ public class ReactContext extends ContextWrapper {
     return mCatalystInstance.getJSModule(executorToken, jsInterface);
   }
 
+  public <T extends NativeModule> boolean hasNativeModule(Class<T> nativeModuleInterface) {
+    if (mCatalystInstance == null) {
+      throw new RuntimeException(
+        "Trying to call native module before CatalystInstance has been set!");
+    }
+    return mCatalystInstance.hasNativeModule(nativeModuleInterface);
+  }
+
   /**
    * @return the instance of the specified module interface associated with this ReactContext.
    */
   public <T extends NativeModule> T getNativeModule(Class<T> nativeModuleInterface) {
     if (mCatalystInstance == null) {
-      throw new RuntimeException("Trying to invoke JS before CatalystInstance has been set!");
+      throw new RuntimeException(
+        "Trying to call native module before CatalystInstance has been set!");
     }
     return mCatalystInstance.getNativeModule(nativeModuleInterface);
   }