From b9e9e852a61192d66561568b629e3aa9dfa79378 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Mon, 3 Oct 2022 04:13:53 -0700 Subject: [PATCH] Check for active catalyst instance when using RNLog Summary: Works around a crash identified by Sapienz in D39852058 (https://github.com/facebook/react-native/commit/30411ae1a42e46d0e5a2da494a39ed2767ba8808) These logs will still be logged to the console, as they were before Changelog: [Internal] Reviewed By: NickGerleman Differential Revision: D39968830 fbshipit-source-id: 5d7a5d935e85a7d67e7780d95b2253e50888ad90 --- .../src/main/java/com/facebook/react/util/RNLog.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/util/RNLog.java b/ReactAndroid/src/main/java/com/facebook/react/util/RNLog.java index 280ff714ac5..438750cf415 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/util/RNLog.java +++ b/ReactAndroid/src/main/java/com/facebook/react/util/RNLog.java @@ -61,7 +61,7 @@ public class RNLog { * @param message The message to log. */ public static void w(ReactContext context, String message) { - RNLog.logInternal(context, message, WARN); + logInternal(context, message, WARN); FLog.w(ReactConstants.TAG, message); } @@ -72,7 +72,7 @@ public class RNLog { * @param message The message to log. */ public static void e(ReactContext context, String message) { - RNLog.logInternal(context, message, ERROR); + logInternal(context, message, ERROR); FLog.e(ReactConstants.TAG, message); } @@ -88,7 +88,7 @@ public class RNLog { private static void logInternal(ReactContext context, String message, int level) { if (level >= MINIMUM_LEVEL_FOR_UI) { - if (context != null && message != null) { + if (context != null && context.hasActiveReactInstance() && message != null) { context.getJSModule(RCTLog.class).logIfNoNativeHook(levelToString(level), message); } }