diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImageWithDrawee.java b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImageWithDrawee.java index a317c779f..61695751d 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImageWithDrawee.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/DrawImageWithDrawee.java @@ -174,8 +174,8 @@ import com.facebook.react.views.image.ReactImageView; @Nullable Object imageInfo, @Nullable Animatable animatable) { if (mCallback != null && mReactTag != 0) { - mCallback.dispatchImageLoadEvent(mReactTag, ImageLoadEvent.ON_LOAD_END); mCallback.dispatchImageLoadEvent(mReactTag, ImageLoadEvent.ON_LOAD); + mCallback.dispatchImageLoadEvent(mReactTag, ImageLoadEvent.ON_LOAD_END); } } @@ -190,6 +190,7 @@ import com.facebook.react.views.image.ReactImageView; @Override public void onFailure(String id, Throwable throwable) { if (mCallback != null && mReactTag != 0) { + mCallback.dispatchImageLoadEvent(mReactTag, ImageLoadEvent.ON_ERROR); mCallback.dispatchImageLoadEvent(mReactTag, ImageLoadEvent.ON_LOAD_END); } } diff --git a/ReactAndroid/src/main/java/com/facebook/react/flat/PipelineRequestHelper.java b/ReactAndroid/src/main/java/com/facebook/react/flat/PipelineRequestHelper.java index 92beb10c5..8d2881b69 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/flat/PipelineRequestHelper.java +++ b/ReactAndroid/src/main/java/com/facebook/react/flat/PipelineRequestHelper.java @@ -155,8 +155,8 @@ import com.facebook.react.views.image.ImageLoadEvent; BitmapUpdateListener listener = Assertions.assumeNotNull(mBitmapUpdateListener); listener.onBitmapReady(bitmap); - listener.onImageLoadEvent(ImageLoadEvent.ON_LOAD_END); listener.onImageLoadEvent(ImageLoadEvent.ON_LOAD); + listener.onImageLoadEvent(ImageLoadEvent.ON_LOAD_END); } finally { dataSource.close(); } @@ -165,6 +165,7 @@ import com.facebook.react.views.image.ImageLoadEvent; @Override public void onFailure(DataSource> dataSource) { if (mDataSource == dataSource) { + Assertions.assumeNotNull(mBitmapUpdateListener).onImageLoadEvent(ImageLoadEvent.ON_ERROR); Assertions.assumeNotNull(mBitmapUpdateListener).onImageLoadEvent(ImageLoadEvent.ON_LOAD_END); mDataSource = null; }