mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Fix Nullsafe FIXMEs for DevServerHelper.java and mark nullsafe (#50060)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/50060 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 DevServerHelper.java nullsafe Reviewed By: rshest Differential Revision: D71126391 fbshipit-source-id: 0d39b23d0d96f32f25ac1003d849428000777852
This commit is contained in:
committed by
Facebook GitHub Bot
parent
e9af9a1793
commit
311cef3c0d
+9
-6
@@ -15,6 +15,7 @@ import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import com.facebook.common.logging.FLog;
|
||||
import com.facebook.infer.annotation.Assertions;
|
||||
import com.facebook.infer.annotation.Nullsafe;
|
||||
import com.facebook.react.bridge.ReactContext;
|
||||
import com.facebook.react.common.ReactConstants;
|
||||
import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener;
|
||||
@@ -59,6 +60,7 @@ import okio.Sink;
|
||||
* <li>Genymotion emulator with default settings: 10.0.3.2
|
||||
* </ul>
|
||||
*/
|
||||
@Nullsafe(Nullsafe.Mode.LOCAL)
|
||||
public class DevServerHelper {
|
||||
private static final int HTTP_CONNECT_TIMEOUT_MS = 5000;
|
||||
|
||||
@@ -205,11 +207,13 @@ public class DevServerHelper {
|
||||
protected Void doInBackground(Void... params) {
|
||||
Map<String, String> metadata =
|
||||
AndroidInfoHelpers.getInspectorHostMetadata(mApplicationContext);
|
||||
|
||||
String deviceName = metadata.get("deviceName");
|
||||
if (deviceName == null) {
|
||||
FLog.w(ReactConstants.TAG, "Could not get device name from Inspector Host Metadata.");
|
||||
return null;
|
||||
}
|
||||
mInspectorPackagerConnection =
|
||||
new CxxInspectorPackagerConnection(
|
||||
// NULLSAFE_FIXME[Parameter Not Nullable]
|
||||
getInspectorDeviceUrl(), metadata.get("deviceName"), mPackageName);
|
||||
new CxxInspectorPackagerConnection(getInspectorDeviceUrl(), deviceName, mPackageName);
|
||||
mInspectorPackagerConnection.connect();
|
||||
return null;
|
||||
}
|
||||
@@ -453,12 +457,11 @@ public class DevServerHelper {
|
||||
final Request request = new Request.Builder().url(resourceURL).build();
|
||||
|
||||
try (Response response = mClient.newCall(request).execute()) {
|
||||
if (!response.isSuccessful()) {
|
||||
if (!response.isSuccessful() || response.body() == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
try (Sink output = Okio.sink(outputFile)) {
|
||||
// NULLSAFE_FIXME[Nullable Dereference]
|
||||
Okio.buffer(response.body().source()).readAll(output);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user