Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Fix AvatarView UriImageSource Stream closed exception #1052

Merged
merged 1 commit into from
Mar 11, 2021
Merged

Fix AvatarView UriImageSource Stream closed exception #1052

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 10 additions & 30 deletions src/CommunityToolkit/Xamarin.CommunityToolkit/Views/AvatarView/AvatarView.shared.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,23 +354,17 @@ async void OnSourcePropertyChanged(bool isBindingContextChanged)

try
{
var imageStreamLoadingTask = GetImageStreamLoadingTask(source, imageLoadingTokenSource.Token);
if (imageStreamLoadingTask != null)
if (source is UriImageSource uriImageSource)
{
using var stream = await imageStreamLoadingTask;
if (stream != null)
{
var newStream = new MemoryStream();
stream.CopyTo(newStream);
newStream.Position = 0;
Image.IsVisible = true;
source = ImageSource.FromStream(() => newStream);
}
else
{
Image.IsVisible = false;
source = null;
}
static async Task<Stream?> getStreamAsync(UriImageSource uriSource, CancellationToken token) => uriSource.Uri != null ? await uriSource.GetStreamAsync(token) : null;

var stream = await getStreamAsync(uriImageSource, imageLoadingTokenSource.Token);

source = stream != null
? ImageSource.FromStream(async (token) => stream?.CanRead ?? true ? stream : (stream = await getStreamAsync(uriImageSource, token)))
: null;

Image.IsVisible = source != null;
}
else
Image.IsVisible = await imageSourceValidator.IsImageSourceValidAsync(source);
Expand Down Expand Up @@ -402,19 +396,5 @@ double CalculateFontSize()

return size * .4;
}

Task<Stream?> GetImageStreamLoadingTask(ImageSource? source, CancellationToken token) => source switch
{
IStreamImageSource streamImageSource => streamImageSource.GetStreamAsync(token),
UriImageSource uriImageSource => uriImageSource.Uri != null
? new UriImageSource
{
Uri = uriImageSource.Uri,
CachingEnabled = uriImageSource.CachingEnabled,
CacheValidity = uriImageSource.CacheValidity
}.GetStreamAsync(token)
: Task.FromResult<Stream?>(null),
_ => Task.FromResult<Stream?>(null)
};
}
}