From ec1a06108dbf5c56b4aed8c6a06ecf91c3769aad Mon Sep 17 00:00:00 2001 From: Garulf <535299+Garulf@users.noreply.github.com> Date: Wed, 21 Sep 2022 12:02:39 -0400 Subject: [PATCH] Switch from WebClient to HTTP --- .../Image/ImageLoader.cs | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/Flow.Launcher.Infrastructure/Image/ImageLoader.cs b/Flow.Launcher.Infrastructure/Image/ImageLoader.cs index a3e9de4b8..7a6083706 100644 --- a/Flow.Launcher.Infrastructure/Image/ImageLoader.cs +++ b/Flow.Launcher.Infrastructure/Image/ImageLoader.cs @@ -120,21 +120,18 @@ namespace Flow.Launcher.Infrastructure.Image if (IsUriScheme) { // Download image from url - using (WebClient client = new WebClient()) + var resp = Http.Http.GetStreamAsync(path).Result; + if (resp == null) { - using (MemoryStream stream = new MemoryStream(client.DownloadData(path))) - { - var image = new BitmapImage(); - image.BeginInit(); - image.CacheOption = BitmapCacheOption.OnLoad; - image.StreamSource = stream; - image.EndInit(); - image.Freeze(); - ImageCache[path] = image; - return new ImageResult(image, ImageType.Data); - } - + return new ImageResult(ImageCache[Constant.MissingImgIcon], ImageType.Error); } + var image = new BitmapImage(); + image.BeginInit(); + image.StreamSource = resp; + image.EndInit(); + image.Freeze(); + ImageCache[path] = image; + return new ImageResult(image, ImageType.ImageFile); } if (path.StartsWith("data:", StringComparison.OrdinalIgnoreCase)) {