From e04b5b3ecf2d692d9a0f95db298ecb2a67a61eef 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 ReactTextAnchorViewManager.java and mark nullsafe Summary: https://developer.android.com/reference/android/widget/TextView#setEllipsize(android.text.TextUtils.TruncateAt) explicitly allows setting setEllipsize's argument in TextView to null to turn off ellipsizing, which is what we want for `clip` 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 ReactTextAnchorViewManager.java nullsafe Reviewed By: alanleedev Differential Revision: D72460123 fbshipit-source-id: 26d91d273ead5906060772f65a32fbf4389d0db3 --- .../facebook/react/views/text/ReactTextAnchorViewManager.java | 3 ++- .../java/com/facebook/react/views/text/ReactTextView.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java index 7f5ec070ce0..a2d7caa82bb 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java @@ -15,6 +15,7 @@ import android.view.Gravity; import android.view.View; import androidx.annotation.Nullable; import com.facebook.common.logging.FLog; +import com.facebook.infer.annotation.Nullsafe; import com.facebook.react.common.ReactConstants; import com.facebook.react.uimanager.BackgroundStyleApplicator; import com.facebook.react.uimanager.BaseViewManager; @@ -38,6 +39,7 @@ import com.facebook.react.uimanager.style.LogicalEdge; * Instead we use @{link ReactBaseTextShadowNode} hierarchy to calculate a {@link Spannable} text * represented the whole text subtree. */ +@Nullsafe(Nullsafe.Mode.LOCAL) public abstract class ReactTextAnchorViewManager extends BaseViewManager { @@ -72,7 +74,6 @@ public abstract class ReactTextAnchorViewManager