From 2a64453e804031967b4f689195d5013ca4937fd0 Mon Sep 17 00:00:00 2001 From: Stefan Ceriu Date: Wed, 10 May 2023 17:01:22 +0300 Subject: [PATCH] Fix the LoadableImage not using the already loaded image from the in-memory cache --- .../Other/SwiftUI/Views/LoadableImage.swift | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/ElementX/Sources/Other/SwiftUI/Views/LoadableImage.swift b/ElementX/Sources/Other/SwiftUI/Views/LoadableImage.swift index 569f92b49..3fdf8713b 100644 --- a/ElementX/Sources/Other/SwiftUI/Views/LoadableImage.swift +++ b/ElementX/Sources/Other/SwiftUI/Views/LoadableImage.swift @@ -130,16 +130,13 @@ private class ContentLoader: ObservableObject { return cachedContent } - if let image = imageProvider?.imageFromSource(mediaSource) { - let isGIF = mediaSource.mimeType == "image/gif" - - if isGIF { - if let data = image.kf.data(format: .GIF) { - return .gifData(data) - } - } else { - return .image(image) + if isGIF { + if let image = imageProvider?.imageFromSource(mediaSource), + let data = image.kf.data(format: .GIF) { + return .gifData(data) } + } else if let image = imageProvider?.imageFromSource(mediaSource, size: size) { + return .image(image) } return cachedContent