From 1762426e9c4c937b124205200f06b0667cd5872b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mart=C3=ADn=20Bigio?= <martin@instagram.com>
Date: Tue, 28 Jun 2016 15:46:30 -0700
Subject: [PATCH] Revert change on ResourceDrawableIdHelper

Reviewed By: donyu

Differential Revision: D3494715

fbshipit-source-id: 807f3ea3db42a17e6f2eed63a72e0bccfc371a58
---
 .../imagehelper/ResourceDrawableIdHelper.java | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
index 009c4ca4764..2c7b86be905 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 
+import android.content.ContentResolver;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
@@ -18,7 +19,6 @@ public class ResourceDrawableIdHelper {
 
   private Map<String, Integer> mResourceDrawableIdMap;
 
-  private static final String LOCAL_RESOURCE_SCHEME = "res";
   private static ResourceDrawableIdHelper sResourceDrawableIdHelper;
 
   private ResourceDrawableIdHelper() {
@@ -45,9 +45,9 @@ public class ResourceDrawableIdHelper {
       return mResourceDrawableIdMap.get(name);
     }
     int id = context.getResources().getIdentifier(
-        name,
-        "drawable",
-        context.getPackageName());
+      name,
+      "drawable",
+      context.getPackageName());
     mResourceDrawableIdMap.put(name, id);
     return id;
   }
@@ -58,10 +58,16 @@ public class ResourceDrawableIdHelper {
   }
 
   public Uri getResourceDrawableUri(Context context, @Nullable String name) {
-    int resId = getResourceDrawableId(context, name);
-    return resId > 0 ? new Uri.Builder()
-        .scheme(LOCAL_RESOURCE_SCHEME)
-        .path(String.valueOf(resId))
-        .build() : Uri.EMPTY;
+    if (name == null || name.isEmpty()) {
+      return null;
+    }
+
+    int resId = ResourceDrawableIdHelper.getInstance().getResourceDrawableId(context, name);
+
+    return new Uri.Builder()
+      .scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
+      .authority(context.getPackageName())
+      .path(String.valueOf(resId))
+      .build();
   }
 }