Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Nullsafe FIXMEs for FileReaderModule.java and mark nullsafe (#50352)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/50352

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 FileReaderModule.java nullsafe

Reviewed By: cortinico

Differential Revision: D71979585

fbshipit-source-id: 3bef5ff48d1d27838d2668367785a85b2b863f05
This commit is contained in:
Gijs Weterings
2025-04-03 08:01:59 -07:00
committed by Facebook GitHub Bot
parent b9ad9966e6
commit 8f5aaf13b2
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactAndroid/src/main/java/com/facebook/react/modules/blob/FileReaderModule.java
+21 -11
View File
@@ -8,12 +8,15 @@
package com.facebook.react.modules.blob;
import android.util.Base64;
import androidx.annotation.Nullable;
import com.facebook.fbreact.specs.NativeFileReaderModuleSpec;
import com.facebook.infer.annotation.Nullsafe;
import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.module.annotations.ReactModule;
@Nullsafe(Nullsafe.Mode.LOCAL)
@ReactModule(name = NativeFileReaderModuleSpec.NAME)
public class FileReaderModule extends NativeFileReaderModuleSpec {
@@ -23,15 +26,13 @@ public class FileReaderModule extends NativeFileReaderModuleSpec {
super(reactContext);
}
private BlobModule getBlobModule(String reason) {
private @Nullable BlobModule getBlobModule(String reason) {
ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
if (reactApplicationContext != null) {
// NULLSAFE_FIXME[Return Not Nullable]
return reactApplicationContext.getNativeModule(BlobModule.class);
}
// NULLSAFE_FIXME[Return Not Nullable]
return null;
}
@@ -48,9 +49,13 @@ public class FileReaderModule extends NativeFileReaderModuleSpec {
return;
}
byte[] bytes =
// NULLSAFE_FIXME[Parameter Not Nullable]
blobModule.resolve(blob.getString("blobId"), blob.getInt("offset"), blob.getInt("size"));
String blobId = blob.getString("blobId");
if (blobId == null) {
promise.reject(ERROR_INVALID_BLOB, "The specified blob does not contain a blobId");
return;
}
byte[] bytes = blobModule.resolve(blobId, blob.getInt("offset"), blob.getInt("size"));
if (bytes == null) {
promise.reject(ERROR_INVALID_BLOB, "The specified blob is invalid");
@@ -77,9 +82,13 @@ public class FileReaderModule extends NativeFileReaderModuleSpec {
return;
}
byte[] bytes =
// NULLSAFE_FIXME[Parameter Not Nullable]
blobModule.resolve(blob.getString("blobId"), blob.getInt("offset"), blob.getInt("size"));
String blobId = blob.getString("blobId");
if (blobId == null) {
promise.reject(ERROR_INVALID_BLOB, "The specified blob does not contain a blobId");
return;
}
byte[] bytes = blobModule.resolve(blobId, blob.getInt("offset"), blob.getInt("size"));
if (bytes == null) {
promise.reject(ERROR_INVALID_BLOB, "The specified blob is invalid");
@@ -90,8 +99,9 @@ public class FileReaderModule extends NativeFileReaderModuleSpec {
StringBuilder sb = new StringBuilder();
sb.append("data:");
// NULLSAFE_FIXME[Nullable Dereference]
if (blob.hasKey("type") && !blob.getString("type").isEmpty()) {
if (blob.hasKey("type")
&& blob.getString("type") != null
&& !blob.getString("type").isEmpty()) {
sb.append(blob.getString("type"));
} else {
sb.append("application/octet-stream");