From cc07c9f0a3b667abb431c0da1555ef2f059a962c Mon Sep 17 00:00:00 2001 From: "Choma, Matus" Date: Tue, 12 Jun 2018 08:42:14 -0700 Subject: [PATCH] Fixed comparison on possible null object (#19675) Summary: Motivation: getting NPE on BlobModule part screen shot 2018-06-12 at 3 03 48 pm Should still build and pass all tests since project settings changes should be safe changes. No documentation change is required [ANDROID][BUGFIX][BlobModule] safe equals checks Closes https://github.com/facebook/react-native/pull/19675 Differential Revision: D8380228 Pulled By: hramos fbshipit-source-id: 1d3caefdb7a7d638228490ef7b3771617745d26f --- .../java/com/facebook/react/modules/blob/BlobModule.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java index ee62d2cd2..379a5735e 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java +++ b/ReactAndroid/src/main/java/com/facebook/react/modules/blob/BlobModule.java @@ -81,7 +81,7 @@ public class BlobModule extends ReactContextBaseJavaModule { String scheme = uri.getScheme(); boolean isRemote = "http".equals(scheme) || "https".equals(scheme); - return (!isRemote && responseType.equals("blob")); + return (!isRemote && "blob".equals(responseType)); } @Override @@ -133,7 +133,7 @@ public class BlobModule extends ReactContextBaseJavaModule { new NetworkingModule.ResponseHandler() { @Override public boolean supports(String responseType) { - return responseType.equals("blob"); + return "blob".equals(responseType); } @Override @@ -236,7 +236,7 @@ public class BlobModule extends ReactContextBaseJavaModule { } private String getNameFromUri(Uri contentUri) { - if (contentUri.getScheme().equals("file")) { + if ("file".equals(contentUri.getScheme())) { return contentUri.getLastPathSegment(); } String[] projection = {MediaStore.MediaColumns.DISPLAY_NAME}; @@ -256,7 +256,7 @@ public class BlobModule extends ReactContextBaseJavaModule { } private long getLastModifiedFromUri(Uri contentUri) { - if (contentUri.getScheme().equals("file")) { + if ("file".equals(contentUri.getScheme())) { return new File(contentUri.toString()).lastModified(); } return 0;