From 6c38f8d14c2bed256ece2f83b118234008a5fdf7 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Fri, 11 Jan 2019 15:56:40 -0500
Subject: [PATCH] Only complete media loads once.

---
 .../PhotoLibrary/PhotoLibrary.swift             | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Signal/src/ViewControllers/PhotoLibrary/PhotoLibrary.swift b/Signal/src/ViewControllers/PhotoLibrary/PhotoLibrary.swift
index 86a45d86d..d30f57fa1 100644
--- a/Signal/src/ViewControllers/PhotoLibrary/PhotoLibrary.swift
+++ b/Signal/src/ViewControllers/PhotoLibrary/PhotoLibrary.swift
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation
@@ -48,12 +48,21 @@ class PhotoPickerAssetItem: PhotoGridItem {
 
     func asyncThumbnail(completion: @escaping (UIImage?) -> Void) -> UIImage? {
         var syncImageResult: UIImage?
+        var hasCompleted = false
 
         // Surprisingly, iOS will opportunistically run the completion block sync if the image is
         // already available
         photoCollectionContents.requestThumbnail(for: self.asset, thumbnailSize: photoMediaSize.thumbnailSize) { image, _ in
-            syncImageResult = image
-            completion(image)
+            DispatchMainThreadSafe({
+                syncImageResult = image
+
+                // Once we've _successfully_ completed (e.g. invoked the completion with
+                // a non-nil image), don't invoke the completion again.
+                if !hasCompleted {
+                    completion(image)
+                    hasCompleted = image != nil
+                }
+            })
         }
         return syncImageResult
     }
@@ -294,7 +303,7 @@ class PhotoLibrary: NSObject, PHPhotoLibraryChangeObserver {
         let processPHAssetCollections: (PHFetchResult<PHAssetCollection>) -> Void = { (fetchResult) in
             // undocumented constant
 
-            fetchResult.enumerateObjects { (assetCollection, index, stop) in
+            fetchResult.enumerateObjects { (assetCollection, _, _) in
                 // We're already sorting albums by last-updated. "Recently Added" is mostly redundant
                 guard assetCollection.assetCollectionSubtype != .smartAlbumRecentlyAdded else {
                     return