Prevent against actions before attaching to bridge

enna-systems · Sep 17, 2019 · eb3f791 · eb3f791
1 parent b6b48fc
commit eb3f791
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/android/src/main/java/com/github/kevinejohn/keyevent/KeyEventModule.java b/android/src/main/java/com/github/kevinejohn/keyevent/KeyEventModule.java
@@ -28,20 +28,32 @@ public static KeyEventModule getInstance() {
     }
 
     public void onKeyDownEvent(int keyCode, KeyEvent keyEvent) {
+        if (!mReactContext.hasActiveCatalystInstance()) {
+            return;
+        }
+
         if (mJSModule == null) {
             mJSModule = mReactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class);
         }
         mJSModule.emit("onKeyDown", getJsEventParams(keyCode, keyEvent, null));
     };
 
     public void onKeyUpEvent(int keyCode, KeyEvent keyEvent) {
+        if (!mReactContext.hasActiveCatalystInstance()) {
+            return;
+        }
+
         if (mJSModule == null) {
             mJSModule = mReactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class);
         }
         mJSModule.emit("onKeyUp", getJsEventParams(keyCode, keyEvent, null));
     };
 
     public void onKeyMultipleEvent(int keyCode, int repeatCount, KeyEvent keyEvent) {
+        if (!mReactContext.hasActiveCatalystInstance()) {
+            return;
+        }
+
         if (mJSModule == null) {
             mJSModule = mReactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class);
         }