From c25eb903aacd842f293d3e6831cccbe2e2563eca Mon Sep 17 00:00:00 2001
From: Kangho Hur <kangho.hur@samsung.com>
Date: Thu, 23 Sep 2021 21:07:36 +0900
Subject: [PATCH] Bump to latest (rc1)

- ImageButtonHandler and Handler Re-usability (#2352)
- Remove IBoxView (#2619)
- Add SupportedOSPlatformVersion (#2565)
- Merge all the .NET 6 projects/solutions (#2505)
- Shadow Support (#570)
- Add IndicatorView handler(#2038)
---
 .../Handlers/Button/ButtonHandler.Tizen.cs    | 15 +++++--
 .../Tizen/ImageSourceServiceResult.cs         | 39 -------------------
 2 files changed, 12 insertions(+), 42 deletions(-)
 delete mode 100644 src/Core/src/ImageSources/Tizen/ImageSourceServiceResult.cs

diff --git a/src/Core/src/Handlers/Button/ButtonHandler.Tizen.cs b/src/Core/src/Handlers/Button/ButtonHandler.Tizen.cs
index c5fedd297668..96255da0254a 100644
--- a/src/Core/src/Handlers/Button/ButtonHandler.Tizen.cs
+++ b/src/Core/src/Handlers/Button/ButtonHandler.Tizen.cs
@@ -58,9 +58,18 @@ public static Task MapImageSourceAsync(IButtonHandler handler, IImageButton imag
 			return handler.ImageSourceLoader.UpdateImageSourceAsync();
 		}
 
-		//TODO : Need to impl
-		[MissingMapper]
-		public static void MapImageSource(ButtonHandler handler, IButton image) { }
+		public static void MapImageSource(IButtonHandler handler, IButton image) =>
+			MapImageSourceAsync(handler, image).FireAndForget(handler);
+
+		public static Task MapImageSourceAsync(IButtonHandler handler, IButton image)
+		{
+			if (image.ImageSource == null)
+			{
+				return Task.CompletedTask;
+			}
+
+			return handler.ImageSourceLoader.UpdateImageSourceAsync();
+		}
 
 		[MissingMapper]
 		public static void MapCharacterSpacing(IButtonHandler handler, ITextStyle button) { }
diff --git a/src/Core/src/ImageSources/Tizen/ImageSourceServiceResult.cs b/src/Core/src/ImageSources/Tizen/ImageSourceServiceResult.cs
deleted file mode 100644
index 6e48ceaec7c1..000000000000
--- a/src/Core/src/ImageSources/Tizen/ImageSourceServiceResult.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-#nullable enable
-using System;
-
-namespace Microsoft.Maui
-{
-	public class ImageSourceServiceResult : IImageSourceServiceResult<bool>
-	{
-		Action? _dispose;
-
-		public ImageSourceServiceResult(bool result, Action? dispose = null)
-			: this(result, false, dispose)
-		{
-		}
-
-		public ImageSourceServiceResult(bool result, bool resolutionDependent, Action? dispose = null)
-		{
-			Value = result;
-			IsResolutionDependent = resolutionDependent;
-			_dispose = dispose;
-		}
-
-		public bool Value { get; }
-
-		public bool IsResolutionDependent { get; }
-
-		public bool IsDisposed { get; private set; }
-
-		public void Dispose()
-		{
-			if (IsDisposed)
-				return;
-
-			IsDisposed = true;
-
-			_dispose?.Invoke();
-			_dispose = null;
-		}
-	}
-}
\ No newline at end of file