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 2c7b86be905..009c4ca4764 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,7 +7,6 @@ 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; @@ -19,6 +18,7 @@ public class ResourceDrawableIdHelper { private Map 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,16 +58,10 @@ public class ResourceDrawableIdHelper { } public Uri getResourceDrawableUri(Context context, @Nullable String name) { - 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(); + int resId = getResourceDrawableId(context, name); + return resId > 0 ? new Uri.Builder() + .scheme(LOCAL_RESOURCE_SCHEME) + .path(String.valueOf(resId)) + .build() : Uri.EMPTY; } }