From ff6601bfb78600e3ded170d4ee214a43175d0fc5 Mon Sep 17 00:00:00 2001 From: Gijs Weterings Date: Thu, 3 Apr 2025 08:01:59 -0700 Subject: [PATCH] Fix nullsafe FIXMES for ReconnectingWebSocket.java and mark nullsafe (#50354) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/50354 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 ReconnectingWebSocket.java nullsafe Reviewed By: cortinico Differential Revision: D71979606 fbshipit-source-id: d71e26fe37bdf5abbe7b933d0fee25e05d0da87d --- .../react/packagerconnection/ReconnectingWebSocket.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java index 48800ea607d..02bcd557453 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/ReconnectingWebSocket.java @@ -11,6 +11,7 @@ import android.os.Handler; import android.os.Looper; import androidx.annotation.Nullable; import com.facebook.common.logging.FLog; +import com.facebook.infer.annotation.Nullsafe; import java.io.IOException; import java.nio.channels.ClosedChannelException; import java.util.concurrent.TimeUnit; @@ -22,6 +23,7 @@ import okhttp3.WebSocketListener; import okio.ByteString; /** A wrapper around WebSocketClient that reconnects automatically */ +@Nullsafe(Nullsafe.Mode.LOCAL) public final class ReconnectingWebSocket extends WebSocketListener { private static final String TAG = ReconnectingWebSocket.class.getSimpleName(); @@ -138,8 +140,8 @@ public final class ReconnectingWebSocket extends WebSocketListener { } @Override - // NULLSAFE_FIXME[Inconsistent Subclass Parameter Annotation] - public synchronized void onFailure(WebSocket webSocket, Throwable t, Response response) { + public synchronized void onFailure( + @Nullable WebSocket webSocket, Throwable t, @Nullable Response response) { if (mWebSocket != null) { abort("Websocket exception", t); }