Update image source after recycling bitmap in custom target (#12310)

Fixes #11519
dotnet · Dec 28, 2022 · de692d4 · de692d4
1 parent a639458
commit de692d4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/glide/MauiCustomViewTarget.java b/src/Core/AndroidNative/maui/src/main/java/com/microsoft/maui/glide/MauiCustomViewTarget.java
@@ -27,6 +27,7 @@ public MauiCustomViewTarget(@NonNull ImageView view, ImageLoaderCallback callbac
 
     @Override
     protected void onResourceCleared(@Nullable Drawable placeholder) {
+		this.view.setImageDrawable(placeholder);
     }
 
     @Override
@@ -57,10 +58,10 @@ private void post(Runnable runnable) {
     }
 
     private void clear() {
-        post(() -> {
+        //post(() -> {
             // TODO: Explicitly release image
             // https://github.com/dotnet/maui/issues/6464
             // https://github.com/dotnet/maui/pull/6543
-        });
+        //});
     }
 }
diff --git a/src/Core/src/maui.aar b/src/Core/src/maui.aar
diff --git a/src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.Android.cs b/src/Core/tests/DeviceTests/Handlers/Image/ImageHandlerTests.Android.cs
@@ -9,6 +9,28 @@ namespace Microsoft.Maui.DeviceTests
 {
 	public partial class ImageHandlerTests<TImageHandler, TStub>
 	{
+		[Fact]
+		public async Task UpdatingSourceWorks()
+		{
+			var image = new TStub
+			{
+				Background = new SolidPaintStub(Colors.Black),
+				Source = new FileImageSourceStub("red.png"),
+			};
+
+			await InvokeOnMainThreadAsync(async () =>
+			{
+				var handler = CreateHandler<CountedImageHandler>(image);
+				await image.Wait();
+				await handler.PlatformView.AssertContainsColor(Colors.Red);
+
+				image.Source = new FileImageSourceStub("blue.png");
+				handler.UpdateValue(nameof(IImage.Source));
+				await image.Wait();
+				await handler.PlatformView.AssertContainsColor(Colors.Blue);
+			});
+		}
+
 		[Fact]
 		public async Task LoadDrawableAsyncReturnsWithSameImageAndDoesNotHang()
 		{