From 798acac18e9daab543d7b2e947bc2ed760703d99 Mon Sep 17 00:00:00 2001
From: Dave Miller <dmmiller@fb.com>
Date: Fri, 22 Jan 2016 10:37:44 -0800
Subject: [PATCH] Fix a crash in Image when passed an invalid uri

Summary:
public

Fix https://github.com/facebook/react-native/issues/5465

Instead of returning null when we fail to parse the Uri, just return an empty Uri which somewhat hides the problem but does prevent the crash

Reviewed By: mkonicek

Differential Revision: D2854902

fb-gh-sync-id: 71265d5e52302e174b898af5be25ac698abcf9ab
---
 .../java/com/facebook/react/views/image/ReactImageView.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
index 515c957d0..58ebb0c80 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.java
@@ -352,11 +352,11 @@ public class ReactImageView extends GenericDraweeView {
     return resId > 0 ? context.getResources().getDrawable(resId) : null;
   }
 
-  private static @Nullable Uri getResourceDrawableUri(Context context, @Nullable String name) {
+  private static Uri getResourceDrawableUri(Context context, @Nullable String name) {
     int resId = getResourceDrawableId(context, name);
     return resId > 0 ? new Uri.Builder()
         .scheme(UriUtil.LOCAL_RESOURCE_SCHEME)
         .path(String.valueOf(resId))
-        .build() : null;
+        .build() : Uri.EMPTY;
   }
 }