diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java index 729a4b5f288..4206819813d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTImageView.java @@ -13,6 +13,7 @@ import javax.annotation.Nullable; import com.facebook.csslayout.Spacing; import com.facebook.drawee.drawable.ScalingUtils.ScaleType; +import com.facebook.react.bridge.ReadableArray; import com.facebook.react.uimanager.PixelUtil; import com.facebook.react.uimanager.annotations.ReactProp; import com.facebook.react.uimanager.ViewProps; @@ -86,7 +87,9 @@ import com.facebook.react.views.image.ImageResizeMode; } @ReactProp(name = "src") - public void setSource(@Nullable String source) { + public void setSource(@Nullable ReadableArray sources) { + final String source = + (sources == null || sources.size() == 0) ? null : sources.getMap(0).getString("uri"); getMutableDrawImage().setImageRequest( ImageRequestHelper.createImageRequest(getThemedContext(), source)); } diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java index fba7bd9171d..5682b04b221 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInlineImage.java @@ -14,6 +14,7 @@ import javax.annotation.Nullable; import android.text.SpannableStringBuilder; import android.text.Spanned; +import com.facebook.react.bridge.ReadableArray; import com.facebook.react.uimanager.annotations.ReactProp; /** @@ -65,7 +66,9 @@ import com.facebook.react.uimanager.annotations.ReactProp; } @ReactProp(name = "src") - public void setSource(@Nullable String source) { + public void setSource(@Nullable ReadableArray sources) { + final String source = + (sources == null || sources.size() == 0) ? null : sources.getMap(0).getString("uri"); getMutableSpan().setImageRequest( ImageRequestHelper.createImageRequest(getThemedContext(), source)); }