Merge pull request #19184 from wordpress-mobile/issue/19183-pages-list-freeze

[Pages List] Fix app freeze when loading page with GIF as its featured image

Author: hassaanelgarem

RELEASE-NOTES.txt

@@ -1,6 +1,7 @@
 20.6
 -----
 * [*] [Jetpack-only] Recommend App: you can now share the Jetpack app with your friends. [#19174]
+* [*] Pages List: Fixed an issue where the app would freeze when opening the pages list if one of the featured images is a GIF. [#19184]
 
 
 20.5

WordPress/Classes/Networking/MediaHost+Blog.swift

@@ -9,9 +9,14 @@ extension MediaHost {
     }
 
     init(with blog: Blog, failure: (BlogError) -> ()) {
+        let isAtomic = blog.isAtomic()
+        self.init(with: blog, isAtomic: isAtomic, failure: failure)
+    }
+
+    init(with blog: Blog, isAtomic: Bool, failure: (BlogError) -> ()) {
         self.init(isAccessibleThroughWPCom: blog.isAccessibleThroughWPCom(),
             isPrivate: blog.isPrivate(),
-            isAtomic: blog.isAtomic(),
+            isAtomic: isAtomic,
             siteID: blog.dotComID?.intValue,
             username: blog.usernameForSite,
             authToken: blog.authToken,

WordPress/Classes/Utility/Media/ImageLoader.swift

@@ -314,18 +314,24 @@ import AutomatticTracks
 // MARK: - Loading Media object
 
 extension ImageLoader {
-    @objc(loadImageFromMedia:preferredSize:placeholder:success:error:)
+    @objc(loadImageFromMedia:preferredSize:placeholder:isBlogAtomic:success:error:)
     /// Load an image from the given Media object. If it's a gif, it will animate it.
     /// For any other type of media, this will load the corresponding static image.
     ///
     /// - Parameters:
     ///   - media: The media object
     ///   - placeholder: A placeholder to show while the image is loading.
     ///   - size: The preferred size of the image to load.
+    ///   - isBlogAtomic: Whether the blog associated to the media item is Atomic or not
     ///   - success: A closure to be called if the image was loaded successfully.
     ///   - error: A closure to be called if there was an error loading the image.
     ///
-    func loadImage(media: Media, preferredSize size: CGSize = .zero, placeholder: UIImage?, success: ImageLoaderSuccessBlock?, error: ImageLoaderFailureBlock?) {
+    func loadImage(media: Media,
+                   preferredSize size: CGSize = .zero,
+                   placeholder: UIImage?,
+                   isBlogAtomic: Bool,
+                   success: ImageLoaderSuccessBlock?,
+                   error: ImageLoaderFailureBlock?) {
         guard let mediaId = media.mediaID?.stringValue else {
             let error = createError(description: "The Media id doesn't exist")
             callErrorHandler(with: error)
@@ -342,7 +348,7 @@ extension ImageLoader {
                     if let fetchedMedia = fetchedMedia,
                         let fetchedMediaId = fetchedMedia.mediaID?.stringValue, fetchedMediaId == mediaId {
                         DispatchQueue.main.async {
-                            self?.loadImage(media: fetchedMedia, preferredSize: size, placeholder: placeholder, success: success, error: error)
+                            self?.loadImage(media: fetchedMedia, preferredSize: size, placeholder: placeholder, isBlogAtomic: isBlogAtomic, success: success, error: error)
                         }
                     } else {
                         self?.callErrorHandler(with: fetchedMediaError)
@@ -357,7 +363,7 @@ extension ImageLoader {
         }
 
         if url.isGif {
-            let host = MediaHost(with: media.blog) { error in
+            let host = MediaHost(with: media.blog, isAtomic: isBlogAtomic) { error in
                 // We'll log the error, so we know it's there, but we won't halt execution.
                 WordPressAppDelegate.crashLogging?.logError(error)
             }

WordPress/Classes/ViewRelated/Cells/MediaItemTableViewCells.swift

@@ -216,7 +216,8 @@ struct MediaImageRow: ImmuTableRow {
     }
 
     private func loadImageFor(_ cell: MediaItemImageTableViewCell) {
-        cell.imageLoader.loadImage(media: media, placeholder: placeholderImage, success: nil) { (error) in
+        let isBlogAtomic = media.blog.isAtomic()
+        cell.imageLoader.loadImage(media: media, placeholder: placeholderImage, isBlogAtomic: isBlogAtomic, success: nil) { (error) in
             self.show(error)
         }
     }

WordPress/Classes/ViewRelated/Pages/PageListTableViewCell.m

@@ -193,11 +193,13 @@ - (void)configureFeaturedImage
     BOOL hideFeaturedImage = page.featuredImage == nil;
     self.featuredImageView.hidden = hideFeaturedImage;
     self.labelsContainerTrailing.active = !hideFeaturedImage;
+    BOOL isBlogAtomic = [page.featuredImage.blog isAtomic];
 
     if (!hideFeaturedImage) {
         [self.featuredImageLoader loadImageFromMedia:page.featuredImage
                                        preferredSize:CGSizeMake(FeaturedImageSize, FeaturedImageSize)
                                          placeholder:nil
+                                        isBlogAtomic:isBlogAtomic
                                              success:nil
                                                error:^(NSError *error) {
                                                    DDLogError(@"Failed to load the media: %@", error);

WordPress/Classes/ViewRelated/Reader/WPImageViewController.m

@@ -281,7 +281,8 @@ - (void)loadImageFromMedia
     self.imageView.image = self.image;
     self.isLoadingImage = YES;
     __weak __typeof__(self) weakSelf = self;
-    [self.imageLoader loadImageFromMedia:self.media preferredSize:CGSizeZero placeholder:self.image success:^{
+    BOOL isBlogAtomic = [self.media.blog isAtomic];
+    [self.imageLoader loadImageFromMedia:self.media preferredSize:CGSizeZero placeholder:self.image isBlogAtomic:isBlogAtomic success:^{
         weakSelf.isLoadingImage = NO;
         weakSelf.image = weakSelf.imageView.image;
         [weakSelf updateImageView];