From 4664db138f50076213172ec0011c73dc190d475b Mon Sep 17 00:00:00 2001 From: Gijs Weterings Date: Mon, 7 Apr 2025 06:33:09 -0700 Subject: [PATCH] Apply Nullsafe FIXMEs for xplat/js/react-native-github/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManager.java (#50358) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/50358 Added nullsafe FIXMEs for easier reviewing of next diff, where we fix them Changelog: [Internal] Reviewed By: cortinico Differential Revision: D71979595 fbshipit-source-id: 19bfcea537b7b62536eafa8e1d0b3f8b50666e22 --- .../internal/turbomodule/core/TurboModuleManager.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManager.java index e8e594a3726..2a75b742b73 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/internal/turbomodule/core/TurboModuleManager.java @@ -67,12 +67,14 @@ public class TurboModuleManager implements TurboModuleRegistry { @Nullable final TurboModuleManagerDelegate delegate, CallInvokerHolder jsCallInvokerHolder, NativeMethodCallInvokerHolder nativeMethodCallInvokerHolder) { + // NULLSAFE_FIXME[Field Not Nullable] mDelegate = delegate; mHybridData = initHybrid( runtimeExecutor, (CallInvokerHolderImpl) jsCallInvokerHolder, (NativeMethodCallInvokerHolderImpl) nativeMethodCallInvokerHolder, + // NULLSAFE_FIXME[Parameter Not Nullable] delegate); installJSIBindings(shouldEnableLegacyModuleInterop()); @@ -240,12 +242,16 @@ public class TurboModuleManager implements TurboModuleRegistry { moduleHolder = mModuleHolders.get(moduleName); } + // NULLSAFE_FIXME[Nullable Dereference] TurboModulePerfLogger.moduleCreateStart(moduleName, moduleHolder.getModuleId()); + // NULLSAFE_FIXME[Parameter Not Nullable] NativeModule module = getOrCreateModule(moduleName, moduleHolder, true); if (module != null) { + // NULLSAFE_FIXME[Nullable Dereference] TurboModulePerfLogger.moduleCreateEnd(moduleName, moduleHolder.getModuleId()); } else { + // NULLSAFE_FIXME[Nullable Dereference] TurboModulePerfLogger.moduleCreateFail(moduleName, moduleHolder.getModuleId()); } @@ -426,6 +432,7 @@ public class TurboModuleManager implements TurboModuleRegistry { } private static class ModuleHolder { + // NULLSAFE_FIXME[Field Not Nullable] private volatile NativeModule mModule = null; private volatile boolean mIsTryingToCreate = false; private volatile boolean mIsDoneCreatingModule = false;