From c53811d970206bcb77129c2f3d4a91168be80caa Mon Sep 17 00:00:00 2001 From: kean Date: Wed, 29 Jan 2025 21:09:33 -0500 Subject: [PATCH] Fix crash in a GIFAnimatedImage extension --- Modules/Sources/AsyncImageKit/Views/AsyncImageView.swift | 4 ++-- .../AsyncImageKit/Views/UIImageView+ImageDownloader.swift | 2 +- .../Media/SiteMedia/Views/SiteMediaCollectionCell.swift | 2 +- .../Media/SiteMedia/Views/SiteMediaImageView.swift | 2 +- .../RichTextView/AnimatedGifAttachmentViewProvider.swift | 3 +-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Modules/Sources/AsyncImageKit/Views/AsyncImageView.swift b/Modules/Sources/AsyncImageKit/Views/AsyncImageView.swift index df8c49bd1fcb..ab139f46980e 100644 --- a/Modules/Sources/AsyncImageKit/Views/AsyncImageView.swift +++ b/Modules/Sources/AsyncImageKit/Views/AsyncImageView.swift @@ -47,7 +47,7 @@ public final class AsyncImageView: UIView { if let image { imageView.configure(image: image) } else { - imageView.prepareForReuse() + imageView.reset() } } } @@ -185,7 +185,7 @@ extension GIFImageView { } } - public func prepareForReuse() { + public func reset() { if isAnimatingGIF { prepareForReuse() } else { diff --git a/Modules/Sources/AsyncImageKit/Views/UIImageView+ImageDownloader.swift b/Modules/Sources/AsyncImageKit/Views/UIImageView+ImageDownloader.swift index 422a61af70d5..3670efa9f16f 100644 --- a/Modules/Sources/AsyncImageKit/Views/UIImageView+ImageDownloader.swift +++ b/Modules/Sources/AsyncImageKit/Views/UIImageView+ImageDownloader.swift @@ -14,7 +14,7 @@ public struct ImageViewExtensions { controller.prepareForReuse() if let gifView = imageView as? GIFImageView, gifView.isAnimatingGIF { - gifView.prepareForReuse() + gifView.reset() } else { imageView.image = nil } diff --git a/WordPress/Classes/ViewRelated/Media/SiteMedia/Views/SiteMediaCollectionCell.swift b/WordPress/Classes/ViewRelated/Media/SiteMedia/Views/SiteMediaCollectionCell.swift index e4c9e8b7fe67..b5e13d94c18a 100644 --- a/WordPress/Classes/ViewRelated/Media/SiteMedia/Views/SiteMediaCollectionCell.swift +++ b/WordPress/Classes/ViewRelated/Media/SiteMedia/Views/SiteMediaCollectionCell.swift @@ -68,7 +68,7 @@ final class SiteMediaCollectionCell: UICollectionViewCell, Reusable { viewModel?.onDisappear() viewModel = nil - imageView.prepareForReuse() + imageView.reset() imageView.image = nil imageView.alpha = 0 diff --git a/WordPress/Classes/ViewRelated/Media/SiteMedia/Views/SiteMediaImageView.swift b/WordPress/Classes/ViewRelated/Media/SiteMedia/Views/SiteMediaImageView.swift index cf2e38dedefa..e765c0950f61 100644 --- a/WordPress/Classes/ViewRelated/Media/SiteMedia/Views/SiteMediaImageView.swift +++ b/WordPress/Classes/ViewRelated/Media/SiteMedia/Views/SiteMediaImageView.swift @@ -53,7 +53,7 @@ final class SiteMediaImageView: UIView { if let image { imageView.configure(image: image) } else { - imageView.prepareForReuse() + imageView.reset() } } } diff --git a/WordPress/Classes/ViewRelated/Views/RichTextView/AnimatedGifAttachmentViewProvider.swift b/WordPress/Classes/ViewRelated/Views/RichTextView/AnimatedGifAttachmentViewProvider.swift index c9a36d9885c2..bd211f290b62 100644 --- a/WordPress/Classes/ViewRelated/Views/RichTextView/AnimatedGifAttachmentViewProvider.swift +++ b/WordPress/Classes/ViewRelated/Views/RichTextView/AnimatedGifAttachmentViewProvider.swift @@ -11,8 +11,7 @@ class AnimatedGifAttachmentViewProvider: NSTextAttachmentViewProvider { guard let animatedImageView = view as? GIFImageView else { return } - - animatedImageView.prepareForReuse() + animatedImageView.reset() } override init(textAttachment: NSTextAttachment, parentView: UIView?, textLayoutManager: NSTextLayoutManager?, location: NSTextLocation) {