Fix potential threading issues

ne0rrmatrix · ne0rrmatrix · commit 69936ec7f1a9 · 2025-02-10T17:45:22.000-08:00
diff --git a/src/CommunityToolkit.Maui.MediaElement/Primitives/Metadata.macios.cs b/src/CommunityToolkit.Maui.MediaElement/Primitives/Metadata.macios.cs
@@ -77,7 +77,7 @@ public async Task SetMetadata(AVPlayerItem? playerItem, IMediaElement? mediaElem
 			return;
 		}
 		ClearNowPlaying();
-		var artwork = await MetadataArtworkUrl(mediaElement.MetadataArtworkSource).ConfigureAwait(false);
+		var artwork = await MetadataArtworkUrl(mediaElement.MetadataArtworkSource);
 
 		if (artwork is UIImage image)
 		{
@@ -184,12 +184,12 @@ MPRemoteCommandHandlerStatus ToggleCommand(MPRemoteCommandEvent? commandEvent)
 		{
 			var uri = fileMediaSource.Path;
 
-			return await GetBitmapFromFile(uri, cancellationToken).ConfigureAwait(false);
+			return await GetBitmapFromFile(uri, cancellationToken);
 		}
 		else if (artworkUrl is ResourceMediaSource resourceMediaSource)
 		{
 			var path = resourceMediaSource.Path;
-			return await GetBitmapFromResource(path, cancellationToken).ConfigureAwait(false);
+			return await GetBitmapFromResource(path, cancellationToken);
 		}
 		return null;
 	}
@@ -202,7 +202,7 @@ MPRemoteCommandHandlerStatus ToggleCommand(MPRemoteCommandEvent? commandEvent)
 		}
 		using var fileStream = File.OpenRead(resource);
 		using var memoryStream = new MemoryStream();
-		await fileStream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);
+		await fileStream.CopyToAsync(memoryStream, cancellationToken);
 		memoryStream.Position = 0;
 		NSData temp = NSData.FromStream(memoryStream) ?? new NSData();
 		return UIImage.LoadFromData(temp);
@@ -221,14 +221,14 @@ MPRemoteCommandHandlerStatus ToggleCommand(MPRemoteCommandEvent? commandEvent)
 		{
 			return null;
 		}
-		using var inputStream = await FileSystem.OpenAppPackageFileAsync(resource).ConfigureAwait(false);
+		using var inputStream = await FileSystem.OpenAppPackageFileAsync(resource);
 		using var memoryStream = new MemoryStream();
 		if (inputStream is null)
 		{
 			System.Diagnostics.Trace.TraceInformation($"{inputStream} is null.");
 			return null;
 		}
-		await inputStream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);
+		await inputStream.CopyToAsync(memoryStream, cancellationToken);
 		memoryStream.Position = 0;
 		NSData? nsdata = NSData.FromStream(memoryStream);
 		if (nsdata is null)
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.android.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.android.cs
@@ -339,7 +339,7 @@ protected virtual async partial ValueTask PlatformUpdateSource()
 		Player.PlayWhenReady = MediaElement.ShouldAutoPlay;
 		cancellationTokenSource ??= new();
 		// ConfigureAwait(true) is required to prevent crash on startup
-		var result = await SetPlayerData(cancellationTokenSource.Token).ConfigureAwait(true);
+		var result = await SetPlayerData(cancellationTokenSource.Token);
 		var item = result?.Build();
 
 		if (item?.MediaMetadata is not null)
@@ -541,7 +541,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)
 					var uri = uriMediaSource.Uri;
 					if (!string.IsNullOrWhiteSpace(uri?.AbsoluteUri))
 					{
-						return await CreateMediaItem(uri.AbsoluteUri, cancellationToken).ConfigureAwait(false);
+						return await CreateMediaItem(uri.AbsoluteUri, cancellationToken);
 					}
 
 					break;
@@ -551,7 +551,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)
 					var filePath = fileMediaSource.Path;
 					if (!string.IsNullOrWhiteSpace(filePath))
 					{
-						return await CreateMediaItem(filePath, cancellationToken).ConfigureAwait(false);
+						return await CreateMediaItem(filePath, cancellationToken);
 					}
 
 					break;
@@ -563,7 +563,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)
 					if (!string.IsNullOrWhiteSpace(path))
 					{
 						var assetFilePath = $"asset://{package}{System.IO.Path.PathSeparator}{path}";
-						return await CreateMediaItem(assetFilePath, cancellationToken).ConfigureAwait(false);
+						return await CreateMediaItem(assetFilePath, cancellationToken);
 					}
 
 					break;
@@ -580,7 +580,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)
 		MediaMetadata.Builder mediaMetaData = new();
 		mediaMetaData.SetArtist(MediaElement.MetadataArtist);
 		mediaMetaData.SetTitle(MediaElement.MetadataTitle);
-		var data = await GetImageFromMediaSource(MediaElement.MetadataArtworkSource, cancellationToken).ConfigureAwait(true) ?? BlankByteArray();
+		var data = await GetImageFromMediaSource(MediaElement.MetadataArtworkSource, cancellationToken) ?? BlankByteArray();
 		mediaMetaData.SetArtworkData(data, (Java.Lang.Integer)MediaMetadata.PictureTypeFrontCover);
 
 		mediaItem = new MediaItem.Builder();
@@ -606,7 +606,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)
 				System.Diagnostics.Trace.TraceInformation("Arkwork Uri is null or empty");
 				return null;
 			}
-			return await client.GetByteArrayAsync(uri, cancellationToken).ConfigureAwait(false);
+			return await client.GetByteArrayAsync(uri, cancellationToken);
 		}
 		else if (artworkUrl is FileMediaSource fileMediaSource)
 		{
@@ -616,7 +616,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)
 				System.Diagnostics.Trace.TraceInformation("Arkwork File path is null or empty");
 				return null;
 			}
-			return await GetByteArrayFromFile(filePath, cancellationToken).ConfigureAwait(false);
+			return await GetByteArrayFromFile(filePath, cancellationToken);
 		}
 		else if (artworkUrl is ResourceMediaSource resourceMediaSource)
 		{
@@ -627,7 +627,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)
 				System.Diagnostics.Trace.TraceInformation("Arkwork Resource path is null or empty");
 				return null;
 			}
-			return await GetByteArrayFromResource(item).ConfigureAwait(false);
+			return await GetByteArrayFromResource(item);
 		}
 		return null;
 	}
@@ -641,7 +641,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)
 			return null;
 		}
 		using var memoryStream = new MemoryStream();
-		await stream.CopyToAsync(memoryStream, CancellationToken.None).ConfigureAwait(false);
+		await stream.CopyToAsync(memoryStream, CancellationToken.None);
 		var bytes = memoryStream.ToArray();
 		return bytes;
 	}
@@ -655,7 +655,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)
 		}
 		var stream = File.OpenRead(filePath);
 		var memoryStream = new MemoryStream();
-		await stream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);
+		await stream.CopyToAsync(memoryStream, cancellationToken);
 		var bytes = memoryStream.ToArray();
 		return bytes;
 	}
diff --git a/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs b/src/CommunityToolkit.Maui.MediaElement/Views/MediaManager.macios.cs
@@ -503,7 +503,7 @@ async ValueTask SetPoster(CancellationToken cancellationToken = default)
 		{
 			return;
 		}
-		var artwork = await Metadata.MetadataArtworkUrl(MediaElement.MetadataArtworkSource, cancellationToken).ConfigureAwait(false);
+		var artwork = await Metadata.MetadataArtworkUrl(MediaElement.MetadataArtworkSource, cancellationToken);
 		if (artwork is null)
 		{
 			System.Diagnostics.Trace.TraceInformation($"{artwork} is null.");

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public async Task SetMetadata(AVPlayerItem? playerItem, IMediaElement? mediaElem`
`77`	`77`	`return;`
`78`	`78`	`}`
`79`	`79`	`ClearNowPlaying();`
`80`		`- var artwork = await MetadataArtworkUrl(mediaElement.MetadataArtworkSource).ConfigureAwait(false);`
	`80`	`+ var artwork = await MetadataArtworkUrl(mediaElement.MetadataArtworkSource);`
`81`	`81`
`82`	`82`	`if (artwork is UIImage image)`
`83`	`83`	`{`
`@@ -184,12 +184,12 @@ MPRemoteCommandHandlerStatus ToggleCommand(MPRemoteCommandEvent? commandEvent)`
`184`	`184`	`{`
`185`	`185`	`var uri = fileMediaSource.Path;`
`186`	`186`
`187`		`- return await GetBitmapFromFile(uri, cancellationToken).ConfigureAwait(false);`
	`187`	`+ return await GetBitmapFromFile(uri, cancellationToken);`
`188`	`188`	`}`
`189`	`189`	`else if (artworkUrl is ResourceMediaSource resourceMediaSource)`
`190`	`190`	`{`
`191`	`191`	`var path = resourceMediaSource.Path;`
`192`		`- return await GetBitmapFromResource(path, cancellationToken).ConfigureAwait(false);`
	`192`	`+ return await GetBitmapFromResource(path, cancellationToken);`
`193`	`193`	`}`
`194`	`194`	`return null;`
`195`	`195`	`}`
`@@ -202,7 +202,7 @@ MPRemoteCommandHandlerStatus ToggleCommand(MPRemoteCommandEvent? commandEvent)`
`202`	`202`	`}`
`203`	`203`	`using var fileStream = File.OpenRead(resource);`
`204`	`204`	`using var memoryStream = new MemoryStream();`
`205`		`- await fileStream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);`
	`205`	`+ await fileStream.CopyToAsync(memoryStream, cancellationToken);`
`206`	`206`	`memoryStream.Position = 0;`
`207`	`207`	`NSData temp = NSData.FromStream(memoryStream) ?? new NSData();`
`208`	`208`	`return UIImage.LoadFromData(temp);`
`@@ -221,14 +221,14 @@ MPRemoteCommandHandlerStatus ToggleCommand(MPRemoteCommandEvent? commandEvent)`
`221`	`221`	`{`
`222`	`222`	`return null;`
`223`	`223`	`}`
`224`		`- using var inputStream = await FileSystem.OpenAppPackageFileAsync(resource).ConfigureAwait(false);`
	`224`	`+ using var inputStream = await FileSystem.OpenAppPackageFileAsync(resource);`
`225`	`225`	`using var memoryStream = new MemoryStream();`
`226`	`226`	`if (inputStream is null)`
`227`	`227`	`{`
`228`	`228`	`System.Diagnostics.Trace.TraceInformation($"{inputStream} is null.");`
`229`	`229`	`return null;`
`230`	`230`	`}`
`231`		`- await inputStream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);`
	`231`	`+ await inputStream.CopyToAsync(memoryStream, cancellationToken);`
`232`	`232`	`memoryStream.Position = 0;`
`233`	`233`	`NSData? nsdata = NSData.FromStream(memoryStream);`
`234`	`234`	`if (nsdata is null)`
Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ protected virtual async partial ValueTask PlatformUpdateSource()`
`339`	`339`	`Player.PlayWhenReady = MediaElement.ShouldAutoPlay;`
`340`	`340`	`cancellationTokenSource ??= new();`
`341`	`341`	`// ConfigureAwait(true) is required to prevent crash on startup`
`342`		`- var result = await SetPlayerData(cancellationTokenSource.Token).ConfigureAwait(true);`
	`342`	`+ var result = await SetPlayerData(cancellationTokenSource.Token);`
`343`	`343`	`var item = result?.Build();`
`344`	`344`
`345`	`345`	`if (item?.MediaMetadata is not null)`
`@@ -541,7 +541,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)`
`541`	`541`	`var uri = uriMediaSource.Uri;`
`542`	`542`	`if (!string.IsNullOrWhiteSpace(uri?.AbsoluteUri))`
`543`	`543`	`{`
`544`		`- return await CreateMediaItem(uri.AbsoluteUri, cancellationToken).ConfigureAwait(false);`
	`544`	`+ return await CreateMediaItem(uri.AbsoluteUri, cancellationToken);`
`545`	`545`	`}`
`546`	`546`
`547`	`547`	`break;`
`@@ -551,7 +551,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)`
`551`	`551`	`var filePath = fileMediaSource.Path;`
`552`	`552`	`if (!string.IsNullOrWhiteSpace(filePath))`
`553`	`553`	`{`
`554`		`- return await CreateMediaItem(filePath, cancellationToken).ConfigureAwait(false);`
	`554`	`+ return await CreateMediaItem(filePath, cancellationToken);`
`555`	`555`	`}`
`556`	`556`
`557`	`557`	`break;`
`@@ -563,7 +563,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)`
`563`	`563`	`if (!string.IsNullOrWhiteSpace(path))`
`564`	`564`	`{`
`565`	`565`	`var assetFilePath = $"asset://{package}{System.IO.Path.PathSeparator}{path}";`
`566`		`- return await CreateMediaItem(assetFilePath, cancellationToken).ConfigureAwait(false);`
	`566`	`+ return await CreateMediaItem(assetFilePath, cancellationToken);`
`567`	`567`	`}`
`568`	`568`
`569`	`569`	`break;`
`@@ -580,7 +580,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)`
`580`	`580`	`MediaMetadata.Builder mediaMetaData = new();`
`581`	`581`	`mediaMetaData.SetArtist(MediaElement.MetadataArtist);`
`582`	`582`	`mediaMetaData.SetTitle(MediaElement.MetadataTitle);`
`583`		`- var data = await GetImageFromMediaSource(MediaElement.MetadataArtworkSource, cancellationToken).ConfigureAwait(true) ?? BlankByteArray();`
	`583`	`+ var data = await GetImageFromMediaSource(MediaElement.MetadataArtworkSource, cancellationToken) ?? BlankByteArray();`
`584`	`584`	`mediaMetaData.SetArtworkData(data, (Java.Lang.Integer)MediaMetadata.PictureTypeFrontCover);`
`585`	`585`
`586`	`586`	`mediaItem = new MediaItem.Builder();`
`@@ -606,7 +606,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)`
`606`	`606`	`System.Diagnostics.Trace.TraceInformation("Arkwork Uri is null or empty");`
`607`	`607`	`return null;`
`608`	`608`	`}`
`609`		`- return await client.GetByteArrayAsync(uri, cancellationToken).ConfigureAwait(false);`
	`609`	`+ return await client.GetByteArrayAsync(uri, cancellationToken);`
`610`	`610`	`}`
`611`	`611`	`else if (artworkUrl is FileMediaSource fileMediaSource)`
`612`	`612`	`{`
`@@ -616,7 +616,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)`
`616`	`616`	`System.Diagnostics.Trace.TraceInformation("Arkwork File path is null or empty");`
`617`	`617`	`return null;`
`618`	`618`	`}`
`619`		`- return await GetByteArrayFromFile(filePath, cancellationToken).ConfigureAwait(false);`
	`619`	`+ return await GetByteArrayFromFile(filePath, cancellationToken);`
`620`	`620`	`}`
`621`	`621`	`else if (artworkUrl is ResourceMediaSource resourceMediaSource)`
`622`	`622`	`{`
`@@ -627,7 +627,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)`
`627`	`627`	`System.Diagnostics.Trace.TraceInformation("Arkwork Resource path is null or empty");`
`628`	`628`	`return null;`
`629`	`629`	`}`
`630`		`- return await GetByteArrayFromResource(item).ConfigureAwait(false);`
	`630`	`+ return await GetByteArrayFromResource(item);`
`631`	`631`	`}`
`632`	`632`	`return null;`
`633`	`633`	`}`
`@@ -641,7 +641,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)`
`641`	`641`	`return null;`
`642`	`642`	`}`
`643`	`643`	`using var memoryStream = new MemoryStream();`
`644`		`- await stream.CopyToAsync(memoryStream, CancellationToken.None).ConfigureAwait(false);`
	`644`	`+ await stream.CopyToAsync(memoryStream, CancellationToken.None);`
`645`	`645`	`var bytes = memoryStream.ToArray();`
`646`	`646`	`return bytes;`
`647`	`647`	`}`
`@@ -655,7 +655,7 @@ void StopService(in BoundServiceConnection boundServiceConnection)`
`655`	`655`	`}`
`656`	`656`	`var stream = File.OpenRead(filePath);`
`657`	`657`	`var memoryStream = new MemoryStream();`
`658`		`- await stream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);`
	`658`	`+ await stream.CopyToAsync(memoryStream, cancellationToken);`
`659`	`659`	`var bytes = memoryStream.ToArray();`
`660`	`660`	`return bytes;`
`661`	`661`	`}`
Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,7 @@ async ValueTask SetPoster(CancellationToken cancellationToken = default)`
`503`	`503`	`{`
`504`	`504`	`return;`
`505`	`505`	`}`
`506`		`- var artwork = await Metadata.MetadataArtworkUrl(MediaElement.MetadataArtworkSource, cancellationToken).ConfigureAwait(false);`
	`506`	`+ var artwork = await Metadata.MetadataArtworkUrl(MediaElement.MetadataArtworkSource, cancellationToken);`
`507`	`507`	`if (artwork is null)`
`508`	`508`	`{`
`509`	`509`	`System.Diagnostics.Trace.TraceInformation($"{artwork} is null.");`