EmbeddedResource test + missing null check

jonathanpeppers · Mar 1, 2018 · b22d83a · b22d83a
1 parent 1ab2b92
commit b22d83a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/glidex.forms.sample/Forms/Images.cs b/glidex.forms.sample/Forms/Images.cs
@@ -10,7 +10,7 @@ public static class Images
 		static readonly Random random = new Random ();
 		static readonly string tempDir = Path.Combine (Path.GetTempPath (), "glide.forms.sample");
 		static readonly string tempPath = Path.Combine (tempDir, "temp.jpg");
-		const int MaxImages = 9;
+		const int MaxImages = 10;
 
 		public static IEnumerable<ImageSource> RandomSources ()
 		{
@@ -50,6 +50,9 @@ public static ImageSource RandomSource ()
 				//Stream
 				case 8:
 					return ImageSource.FromStream (() => Android.App.Application.Context.Assets.Open ("assetpatch2.jpg"));
+				//Embedded Resource
+				case 9:
+					return ImageSource.FromResource ("Android.Glide.Sample.embeddedpatch1.jpg", typeof (App));
 				default:
 					throw new NotImplementedException ($"Whoops {x} not implemented!");
 			}

diff --git a/glidex.forms.sample/embeddedpatch1.jpg b/glidex.forms.sample/embeddedpatch1.jpg
diff --git a/glidex.forms.sample/glidex.forms.sample.csproj b/glidex.forms.sample/glidex.forms.sample.csproj
@@ -124,5 +124,8 @@
   <ItemGroup>
     <AndroidAsset Include="Assets\assetpatch2.jpg" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="embeddedpatch1.jpg" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
 </Project>
diff --git a/glidex.forms/ImageRenderer.cs b/glidex.forms/ImageRenderer.cs
@@ -168,7 +168,7 @@ async void UpdateSource ()
 				var token = new CancellationToken ();
 				using (var memoryStream = new MemoryStream ())
 				using (var stream = await streamSource.Stream (token)) {
-					if (token.IsCancellationRequested || source != _element.Source)
+					if (token.IsCancellationRequested || stream == null || source != _element.Source)
 						return;
 					stream.CopyTo (memoryStream);
 					builder = request.Load (memoryStream.ToArray ());