kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-03-06 22:37:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve issue #23816, updated with recent merges (#23961)

Browse Source 
Summary:
This fixes #23816, which states that `getSize()` does not function correctly on Android. The original PR for this is now outdated as there have been merges into master that would create merge conflicts.

[Android] [Fixed] - Added correct handling for `getSize()` to avoid warnings being thrown.import
Pull Request resolved: https://github.com/facebook/react-native/pull/23961

Differential Revision: D14505183

Pulled By: cpojer

fbshipit-source-id: 3d8976fd518de0903d7736a8cbd8371987eb1b2d
This commit is contained in:
Ryan Elliott
2019-03-18 10:54:05 -07:00
committed by Facebook Github Bot
parent 68825f9ca5
commit eec2495a96
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ReactAndroid/src/main/java/com/facebook/react/modules/image/BUCK
View File

@@ -17,5 +17,6 @@ rn_android_library(
react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/modules/fresco:fresco"),
react_native_target("java/com/facebook/react/module/annotations:annotations"),
react_native_target("java/com/facebook/react/views/imagehelper:imagehelper"),
],
)

9
ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.java
View File

@@ -34,6 +34,7 @@ import com.facebook.react.bridge.ReadableArray;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.module.annotations.ReactModule;
import com.facebook.react.views.imagehelper.ImageSource;
@ReactModule(name = ImageLoaderModule.NAME)
public class ImageLoaderModule extends ReactContextBaseJavaModule implements
@@ -79,8 +80,8 @@ public class ImageLoaderModule extends ReactContextBaseJavaModule implements
return;
}
Uri uri = Uri.parse(uriString);
ImageRequest request = ImageRequestBuilder.newBuilderWithSource(uri).build();
ImageSource source = new ImageSource(getReactApplicationContext(), uriString);
ImageRequest request = ImageRequestBuilder.newBuilderWithSource(source.getUri()).build();
DataSource<CloseableReference<CloseableImage>> dataSource =
Fresco.getImagePipeline().fetchDecodedImage(request, mCallerContext);
@@ -139,8 +140,8 @@ public class ImageLoaderModule extends ReactContextBaseJavaModule implements
return;
}
Uri uri = Uri.parse(uriString);
ImageRequestBuilder imageRequestBuilder = ImageRequestBuilder.newBuilderWithSource(uri);
ImageSource source = new ImageSource(getReactApplicationContext(), uriString);
ImageRequestBuilder imageRequestBuilder = ImageRequestBuilder.newBuilderWithSource(source.getUri());
ImageRequest request = ReactNetworkImageRequest.fromBuilderWithHeaders(imageRequestBuilder, headers);
DataSource<CloseableReference<CloseableImage>> dataSource =