fix nullsafe FIXMEs for NetworkingModule.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 NetworkingModule.java nullsafe

Reviewed By: cortinico

Differential Revision: D71979590

fbshipit-source-id: 0ddf764f4707d2ee76ab99bc1a09a4e2a7e6b794

Author: GijsWeterings

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java

@@ -107,7 +107,7 @@ public boolean supports(ReadableMap data) {
         }
 
         @Override
-        public RequestBody toRequestBody(ReadableMap data, String contentType) {
+        public RequestBody toRequestBody(ReadableMap data, @Nullable String contentType) {
           String type = contentType;
           if (data.hasKey("type")
               && data.getString("type") != null

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java

@@ -13,6 +13,8 @@
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.fbreact.specs.NativeNetworkingAndroidSpec;
+import com.facebook.infer.annotation.Assertions;
+import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactMethod;
@@ -48,6 +50,7 @@
 import okio.Okio;
 
 /** Implements the XMLHttpRequest JavaScript interface. */
+@Nullsafe(Nullsafe.Mode.LOCAL)
 @ReactModule(name = NativeNetworkingAndroidSpec.NAME)
 public final class NetworkingModule extends NativeNetworkingAndroidSpec {
 
@@ -69,7 +72,7 @@ public interface RequestBodyHandler {
     boolean supports(ReadableMap map);
 
     /** Returns the {@link RequestBody} for the JS body payload. */
-    RequestBody toRequestBody(ReadableMap map, String contentType);
+    RequestBody toRequestBody(ReadableMap map, @Nullable String contentType);
   }
 
   /** Allows adding custom handling to build the JS body payload from the {@link ResponseBody}. */
@@ -238,7 +241,7 @@ public void sendRequest(
       String url,
       double requestIdAsDouble,
       ReadableArray headers,
-      ReadableMap data,
+      @Nullable ReadableMap data,
       String responseType,
       boolean useIncrementalUpdates,
       double timeoutAsDouble,
@@ -272,7 +275,7 @@ public void sendRequestInternal(
       String url,
       final int requestId,
       ReadableArray headers,
-      ReadableMap data,
+      @Nullable ReadableMap data,
       final String responseType,
       final boolean useIncrementalUpdates,
       int timeout,
@@ -322,10 +325,11 @@ public void sendRequestInternal(
       clientBuilder.addNetworkInterceptor(
           chain -> {
             Response originalResponse = chain.proceed(chain.request());
+            ResponseBody originalResponseBody = originalResponse.body();
+            Assertions.assertNotNull(originalResponseBody);
             ProgressResponseBody responseBody =
                 new ProgressResponseBody(
-                    // NULLSAFE_FIXME[Parameter Not Nullable]
-                    originalResponse.body(),
+                    originalResponseBody,
                     new ProgressListener() {
                       long last = System.nanoTime();
 
@@ -386,7 +390,6 @@ public void onProgress(long bytesWritten, long contentLength, boolean done) {
         || method.toLowerCase(Locale.ROOT).equals("head")) {
       requestBody = RequestBodyUtil.getEmptyBody(method);
     } else if (handler != null) {
-      // NULLSAFE_FIXME[Parameter Not Nullable]
       requestBody = handler.toRequestBody(data, contentType);
     } else if (data.hasKey(REQUEST_BODY_KEY_STRING)) {
       if (contentType == null) {
@@ -400,8 +403,10 @@ public void onProgress(long bytesWritten, long contentLength, boolean done) {
       String body = data.getString(REQUEST_BODY_KEY_STRING);
       MediaType contentMediaType = MediaType.parse(contentType);
       if (RequestBodyUtil.isGzipEncoding(contentEncoding)) {
-        // NULLSAFE_FIXME[Parameter Not Nullable]
-        requestBody = RequestBodyUtil.createGzip(contentMediaType, body);
+        requestBody = null;
+        if (contentMediaType != null && body != null) {
+          requestBody = RequestBodyUtil.createGzip(contentMediaType, body);
+        }
         if (requestBody == null) {
           ResponseUtil.onRequestError(
               reactApplicationContext, requestId, "Failed to gzip request body", null);
@@ -415,7 +420,12 @@ public void onProgress(long bytesWritten, long contentLength, boolean done) {
             contentMediaType == null
                 ? StandardCharsets.UTF_8
                 : contentMediaType.charset(StandardCharsets.UTF_8);
-        // NULLSAFE_FIXME[Parameter Not Nullable, Nullable Dereference]
+        Assertions.assertNotNull(charset);
+        if (body == null) {
+          ResponseUtil.onRequestError(
+              reactApplicationContext, requestId, "Received request but body was empty", null);
+          return;
+        }
         requestBody = RequestBody.create(contentMediaType, body.getBytes(charset));
       }
     } else if (data.hasKey(REQUEST_BODY_KEY_BASE64)) {
@@ -428,9 +438,24 @@ public void onProgress(long bytesWritten, long contentLength, boolean done) {
         return;
       }
       String base64String = data.getString(REQUEST_BODY_KEY_BASE64);
+      Assertions.assertNotNull(base64String);
+
       MediaType contentMediaType = MediaType.parse(contentType);
-      // NULLSAFE_FIXME[Parameter Not Nullable]
-      requestBody = RequestBody.create(contentMediaType, ByteString.decodeBase64(base64String));
+      if (contentMediaType == null) {
+        ResponseUtil.onRequestError(
+            reactApplicationContext,
+            requestId,
+            "Invalid content type specified: " + contentType,
+            null);
+        return;
+      }
+      ByteString base64DecodedString = ByteString.decodeBase64(base64String);
+      if (base64DecodedString == null) {
+        ResponseUtil.onRequestError(
+            reactApplicationContext, requestId, "Request body base64 string was invalid", null);
+        return;
+      }
+      requestBody = RequestBody.create(contentMediaType, base64DecodedString);
     } else if (data.hasKey(REQUEST_BODY_KEY_URI)) {
       if (contentType == null) {
         ResponseUtil.onRequestError(
@@ -441,8 +466,12 @@ public void onProgress(long bytesWritten, long contentLength, boolean done) {
         return;
       }
       String uri = data.getString(REQUEST_BODY_KEY_URI);
+      if (uri == null) {
+        ResponseUtil.onRequestError(
+            reactApplicationContext, requestId, "Request body URI field was set but null", null);
+        return;
+      }
       InputStream fileInputStream =
-          // NULLSAFE_FIXME[Parameter Not Nullable]
           RequestBodyUtil.getFileInputStream(getReactApplicationContext(), uri);
       if (fileInputStream == null) {
         ResponseUtil.onRequestError(
@@ -455,8 +484,12 @@ public void onProgress(long bytesWritten, long contentLength, boolean done) {
         contentType = "multipart/form-data";
       }
       ReadableArray parts = data.getArray(REQUEST_BODY_KEY_FORMDATA);
+      if (parts == null) {
+        ResponseUtil.onRequestError(
+            reactApplicationContext, requestId, "Received request but form data was empty", null);
+        return;
+      }
       MultipartBody.Builder multipartBuilder =
-          // NULLSAFE_FIXME[Parameter Not Nullable]
           constructMultipartBody(parts, contentType, requestId);
       if (multipartBuilder == null) {
         return;
@@ -467,7 +500,6 @@ public void onProgress(long bytesWritten, long contentLength, boolean done) {
       requestBody = RequestBodyUtil.getEmptyBody(method);
     }
 
-    // NULLSAFE_FIXME[Parameter Not Nullable]
     requestBuilder.method(method, wrapRequestBodyWithProgressEmitter(requestBody, requestId));
 
     addRequest(requestId);
@@ -518,8 +550,12 @@ public void onResponse(Call call, Response response) throws IOException {
                   // See
                   // https://github.com/square/okhttp/blob/5b37cda9e00626f43acf354df145fd452c3031f1/okhttp/src/main/java/okhttp3/internal/http/BridgeInterceptor.java#L76-L111
                   ResponseBody responseBody = response.body();
-                  if ("gzip".equalsIgnoreCase(response.header("Content-Encoding"))
-                      && responseBody != null) {
+                  if (responseBody == null) {
+                    ResponseUtil.onRequestError(
+                        reactApplicationContext, requestId, "Response body is null", null);
+                    return;
+                  }
+                  if ("gzip".equalsIgnoreCase(response.header("Content-Encoding"))) {
                     GzipSource gzipSource = new GzipSource(responseBody.source());
                     String contentType = response.header("Content-Type");
                     responseBody =
@@ -532,7 +568,6 @@ public void onResponse(Call call, Response response) throws IOException {
                   // Check if a handler is registered
                   for (ResponseHandler handler : mResponseHandlers) {
                     if (handler.supports(responseType)) {
-                      // NULLSAFE_FIXME[Parameter Not Nullable]
                       WritableMap res = handler.toResponseData(responseBody);
                       ResponseUtil.onDataReceived(reactApplicationContext, requestId, res);
                       ResponseUtil.onRequestSuccess(reactApplicationContext, requestId);
@@ -544,7 +579,6 @@ public void onResponse(Call call, Response response) throws IOException {
                   // response,
                   // periodically send response data updates to JS.
                   if (useIncrementalUpdates && responseType.equals("text")) {
-                    // NULLSAFE_FIXME[Parameter Not Nullable]
                     readWithProgress(requestId, responseBody);
                     ResponseUtil.onRequestSuccess(reactApplicationContext, requestId);
                     return;
@@ -554,7 +588,6 @@ public void onResponse(Call call, Response response) throws IOException {
                   String responseString = "";
                   if (responseType.equals("text")) {
                     try {
-                      // NULLSAFE_FIXME[Nullable Dereference]
                       responseString = responseBody.string();
                     } catch (IOException e) {
                       if (response.request().method().equalsIgnoreCase("HEAD")) {
@@ -569,7 +602,6 @@ public void onResponse(Call call, Response response) throws IOException {
                       }
                     }
                   } else if (responseType.equals("base64")) {
-                    // NULLSAFE_FIXME[Nullable Dereference]
                     responseString = Base64.encodeToString(responseBody.bytes(), Base64.NO_WRAP);
                   }
                   ResponseUtil.onDataReceived(reactApplicationContext, requestId, responseString);
@@ -582,10 +614,9 @@ public void onResponse(Call call, Response response) throws IOException {
             });
   }
 
-  private RequestBody wrapRequestBodyWithProgressEmitter(
-      final RequestBody requestBody, final int requestId) {
+  private @Nullable RequestBody wrapRequestBodyWithProgressEmitter(
+      @Nullable final RequestBody requestBody, final int requestId) {
     if (requestBody == null) {
-      // NULLSAFE_FIXME[Return Not Nullable]
       return null;
     }
     final ReactApplicationContext reactApplicationContext =
@@ -622,8 +653,9 @@ private void readWithProgress(int requestId, ResponseBody responseBody) throws I
         responseBody.contentType() == null
             ? StandardCharsets.UTF_8
             : responseBody.contentType().charset(StandardCharsets.UTF_8);
+    Assertions.assertNotNull(
+        charset, "Null character set for Content-Type: " + responseBody.contentType());
 
-    // NULLSAFE_FIXME[Parameter Not Nullable]
     ProgressiveStringDecoder streamDecoder = new ProgressiveStringDecoder(charset);
     InputStream inputStream = responseBody.byteStream();
     try {
@@ -702,18 +734,25 @@ public void removeListeners(double count) {}
 
   private @Nullable MultipartBody.Builder constructMultipartBody(
       ReadableArray body, String contentType, int requestId) {
-    MultipartBody.Builder multipartBuilder = new MultipartBody.Builder();
-    // NULLSAFE_FIXME[Parameter Not Nullable]
-    multipartBuilder.setType(MediaType.parse(contentType));
-
     final ReactApplicationContext reactApplicationContext =
         getReactApplicationContextIfActiveOrWarn();
+    MultipartBody.Builder multipartBuilder = new MultipartBody.Builder();
+    MediaType mediaType = MediaType.parse(contentType);
+    if (mediaType == null) {
+      ResponseUtil.onRequestError(reactApplicationContext, requestId, "Invalid media type.", null);
+      return null;
+    }
+    multipartBuilder.setType(mediaType);
 
     for (int i = 0, size = body.size(); i < size; i++) {
       ReadableMap bodyPart = body.getMap(i);
+      if (bodyPart == null) {
+        ResponseUtil.onRequestError(
+            reactApplicationContext, requestId, "Unrecognized FormData part.", null);
+        return null;
+      }
 
       // Determine part's content type.
-      // NULLSAFE_FIXME[Nullable Dereference]
       ReadableArray headersArray = bodyPart.getArray("headers");
       Headers headers = extractHeaders(headersArray, null);
       if (headers == null) {
@@ -733,14 +772,12 @@ public void removeListeners(double count) {}
         headers = headers.newBuilder().removeAll(CONTENT_TYPE_HEADER_NAME).build();
       }
 
-      // NULLSAFE_FIXME[Nullable Dereference]
-      if (bodyPart.hasKey(REQUEST_BODY_KEY_STRING)) {
-        // NULLSAFE_FIXME[Nullable Dereference]
+      if (bodyPart.hasKey(REQUEST_BODY_KEY_STRING)
+          && bodyPart.getString(REQUEST_BODY_KEY_STRING) != null) {
         String bodyValue = bodyPart.getString(REQUEST_BODY_KEY_STRING);
-        // NULLSAFE_FIXME[Parameter Not Nullable]
         multipartBuilder.addPart(headers, RequestBody.create(partContentType, bodyValue));
-        // NULLSAFE_FIXME[Nullable Dereference]
-      } else if (bodyPart.hasKey(REQUEST_BODY_KEY_URI)) {
+      } else if (bodyPart.hasKey(REQUEST_BODY_KEY_URI)
+          && bodyPart.getString(REQUEST_BODY_KEY_URI) != null) {
         if (partContentType == null) {
           ResponseUtil.onRequestError(
               reactApplicationContext,
@@ -749,10 +786,8 @@ public void removeListeners(double count) {}
               null);
           return null;
         }
-        // NULLSAFE_FIXME[Nullable Dereference]
         String fileContentUriStr = bodyPart.getString(REQUEST_BODY_KEY_URI);
         InputStream fileInputStream =
-            // NULLSAFE_FIXME[Parameter Not Nullable]
             RequestBodyUtil.getFileInputStream(getReactApplicationContext(), fileContentUriStr);
         if (fileInputStream == null) {
           ResponseUtil.onRequestError(
@@ -785,8 +820,10 @@ public void removeListeners(double count) {}
       if (header == null || header.size() != 2) {
         return null;
       }
-      // NULLSAFE_FIXME[Parameter Not Nullable]
-      String headerName = HeaderUtil.stripHeaderName(header.getString(0));
+      String headerName = null;
+      if (header.getString(0) != null) {
+        headerName = HeaderUtil.stripHeaderName(header.getString(0));
+      }
       String headerValue = header.getString(1);
       if (headerName == null || headerValue == null) {
         return null;