From eb3f79174ececb65b616fe03fffad527bb7e7c08 Mon Sep 17 00:00:00 2001 From: Ethan Perez Date: Tue, 17 Sep 2019 14:23:50 -0400 Subject: [PATCH] Prevent against actions before attaching to bridge --- .../github/kevinejohn/keyevent/KeyEventModule.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/android/src/main/java/com/github/kevinejohn/keyevent/KeyEventModule.java b/android/src/main/java/com/github/kevinejohn/keyevent/KeyEventModule.java index 3615f25..6227266 100644 --- a/android/src/main/java/com/github/kevinejohn/keyevent/KeyEventModule.java +++ b/android/src/main/java/com/github/kevinejohn/keyevent/KeyEventModule.java @@ -28,6 +28,10 @@ public static KeyEventModule getInstance() { } public void onKeyDownEvent(int keyCode, KeyEvent keyEvent) { + if (!mReactContext.hasActiveCatalystInstance()) { + return; + } + if (mJSModule == null) { mJSModule = mReactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class); } @@ -35,6 +39,10 @@ public void onKeyDownEvent(int keyCode, KeyEvent keyEvent) { }; public void onKeyUpEvent(int keyCode, KeyEvent keyEvent) { + if (!mReactContext.hasActiveCatalystInstance()) { + return; + } + if (mJSModule == null) { mJSModule = mReactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class); } @@ -42,6 +50,10 @@ public void onKeyUpEvent(int keyCode, KeyEvent keyEvent) { }; public void onKeyMultipleEvent(int keyCode, int repeatCount, KeyEvent keyEvent) { + if (!mReactContext.hasActiveCatalystInstance()) { + return; + } + if (mJSModule == null) { mJSModule = mReactContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class); }