fix(Image): Fetching local images as BitmapImage. Supported fetching images from FutureAccessList. (microsoft#1563)

phongcao · rozele · commit a3ce66470b3b · 2018-01-09T11:36:04.000-05:00
diff --git a/ReactWindows/ReactNative/Modules/Image/ImageLoaderModule.cs b/ReactWindows/ReactNative/Modules/Image/ImageLoaderModule.cs
@@ -126,7 +126,7 @@ public async void queryCache(string[] urls, IPromise promise)
             foreach (var url in urls)
             {
                 var uri = new Uri(url);
-                if (imagePipeline.IsInBitmapMemoryCache(uri))
+                if (imagePipeline.IsInEncodedMemoryCache(uri))
                 {
                     result.Add(url, "memory");
                 }
diff --git a/ReactWindows/ReactNative/Views/Image/ReactImageManager.cs b/ReactWindows/ReactNative/Views/Image/ReactImageManager.cs
@@ -271,19 +271,7 @@ private async void SetUriFromSingleSource(Border view, string source)
             try
             {
                 var imagePipeline = ImagePipelineFactory.Instance.GetImagePipeline();
-                var image = default(BitmapSource);
-                var uri = new Uri(source);
-
-                // Remote images
-                if (source.StartsWith("http:") || source.StartsWith("https:"))
-                {
-                    image = await imagePipeline.FetchEncodedBitmapImageAsync(uri);                   
-                }
-                else // Base64 or local images
-                {
-                    image = await imagePipeline.FetchDecodedBitmapImageAsync(ImageRequest.FromUri(uri));
-                }
-
+                var image = await imagePipeline.FetchEncodedBitmapImageAsync(new Uri(source));
                 var metadata = new ImageMetadata(source, image.PixelWidth, image.PixelHeight);
                 OnImageStatusUpdate(view, ImageLoadStatus.OnLoad, metadata);
                 imageBrush.ImageSource = image;
diff --git a/ReactWindows/ReactNative/project.json b/ReactWindows/ReactNative/project.json
@@ -1,7 +1,7 @@
 ﻿{
   "dependencies": {
     "Facebook.Yoga": "1.5.0-pre1",
-    "fresco.imagepipeline": "0.0.8",
+    "fresco.imagepipeline": "0.1.1",
     "Microsoft.NETCore.UniversalWindowsPlatform": "6.0.1",
     "Newtonsoft.Json": "9.0.1",
     "OpenCover": "4.6.519",

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public async void queryCache(string[] urls, IPromise promise)`
`126`	`126`	`foreach (var url in urls)`
`127`	`127`	`{`
`128`	`128`	`var uri = new Uri(url);`
`129`		`- if (imagePipeline.IsInBitmapMemoryCache(uri))`
	`129`	`+ if (imagePipeline.IsInEncodedMemoryCache(uri))`
`130`	`130`	`{`
`131`	`131`	`result.Add(url, "memory");`
`132`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
`3`	`3`	`"Facebook.Yoga": "1.5.0-pre1",`
`4`		`- "fresco.imagepipeline": "0.0.8",`
	`4`	`+ "fresco.imagepipeline": "0.1.1",`
`5`	`5`	`"Microsoft.NETCore.UniversalWindowsPlatform": "6.0.1",`
`6`	`6`	`"Newtonsoft.Json": "9.0.1",`
`7`	`7`	`"OpenCover": "4.6.519",`