From 8488358ff11c3a9557e0d9dff07d08c28b334beb Mon Sep 17 00:00:00 2001 From: war-in Date: Wed, 16 Jul 2025 10:21:45 +0200 Subject: [PATCH] wrap `RCTDeviceEventEmitter.emit` in `hasActiveReactInstance` check --- .../com/oblador/performance/PerformanceModule.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/react-native-performance/android/src/main/java/com/oblador/performance/PerformanceModule.java b/packages/react-native-performance/android/src/main/java/com/oblador/performance/PerformanceModule.java index 4a187bb..e8318a4 100644 --- a/packages/react-native-performance/android/src/main/java/com/oblador/performance/PerformanceModule.java +++ b/packages/react-native-performance/android/src/main/java/com/oblador/performance/PerformanceModule.java @@ -187,7 +187,7 @@ private void emit(PerformanceMetric metric) { WritableMap map = Arguments.fromBundle(metric.getDetail()); params.putMap("detail", map); } - if (getReactApplicationContext().hasActiveCatalystInstance()) { + if (getReactApplicationContext().hasActiveReactInstance()) { getReactApplicationContext() .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) .emit("metric", params); @@ -202,9 +202,11 @@ private void emit(PerformanceMark mark) { WritableMap map = Arguments.fromBundle(mark.getDetail()); params.putMap("detail", map); } - getReactApplicationContext() - .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) - .emit("mark", params); + if (getReactApplicationContext().hasActiveReactInstance()) { + getReactApplicationContext() + .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class) + .emit("mark", params); + } } @Override @@ -222,6 +224,6 @@ public void onCatalystInstanceDestroy() { // Fix new arch runtime error public void addListener(String eventName) { - + } }