From 552338ce9ffb32500fb30c227953d5e426fc3f7f Mon Sep 17 00:00:00 2001 From: Gijs Weterings Date: Wed, 9 Apr 2025 09:07:30 -0700 Subject: [PATCH] fix nullsafe FIXMEs for ThemedReactContext.java and mark nullsafe Summary: Gone trough all the FIXMEs added in the previous diff by the nullsafe tool, marked the class as nullsafe and ensured no remaining violations. Changelog: [Android][Fixed] Made ThemedReactContext.java nullsafe Reviewed By: alanleedev Differential Revision: D72384053 fbshipit-source-id: 39ce998cfce1de358f13b4f068f180dfd1d88378 --- .../react/uimanager/ThemedReactContext.java | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java index fff20491b09..1da9fb2cd6f 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java @@ -10,6 +10,7 @@ package com.facebook.react.uimanager; import android.app.Activity; import android.content.Context; import androidx.annotation.Nullable; +import com.facebook.infer.annotation.Nullsafe; import com.facebook.react.bridge.Callback; import com.facebook.react.bridge.CatalystInstance; import com.facebook.react.bridge.JavaScriptContextHolder; @@ -30,6 +31,7 @@ import java.util.Collection; * events for this wrapper instances. TODO: T7538544 Rename ThemedReactContext to be in alignment * with name of ReactApplicationContext */ +@Nullsafe(Nullsafe.Mode.LOCAL) public class ThemedReactContext extends ReactContext { private final ReactApplicationContext mReactApplicationContext; @@ -94,15 +96,13 @@ public class ThemedReactContext extends ReactContext { return mReactApplicationContext.getNativeModules(); } - @Nullable @Override - public T getNativeModule(Class nativeModuleInterface) { + public @Nullable T getNativeModule(Class nativeModuleInterface) { return mReactApplicationContext.getNativeModule(nativeModuleInterface); } - @Nullable @Override - public NativeModule getNativeModule(String moduleName) { + public @Nullable NativeModule getNativeModule(String moduleName) { return mReactApplicationContext.getNativeModule(moduleName); } @@ -176,27 +176,23 @@ public class ThemedReactContext extends ReactContext { return mReactApplicationContext.isBridgeless(); } - @Nullable @Override - public JavaScriptContextHolder getJavaScriptContextHolder() { + public @Nullable JavaScriptContextHolder getJavaScriptContextHolder() { return mReactApplicationContext.getJavaScriptContextHolder(); } - @Nullable @Override - public CallInvokerHolder getJSCallInvokerHolder() { + public @Nullable CallInvokerHolder getJSCallInvokerHolder() { return mReactApplicationContext.getJSCallInvokerHolder(); } @Override - public UIManager getFabricUIManager() { - // NULLSAFE_FIXME[Return Not Nullable] + public @Nullable UIManager getFabricUIManager() { return mReactApplicationContext.getFabricUIManager(); } - @Nullable @Override - public String getSourceURL() { + public @Nullable String getSourceURL() { return mReactApplicationContext.getSourceURL(); }