signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Only complete media loads once.

Browse Source
This commit is contained in:
Matthew Chen 2019-01-11 15:56:40 -05:00
parent 6b100e80e2
commit 6c38f8d14c
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Signal/src/ViewControllers/PhotoLibrary/PhotoLibrary.swift
View File

@ -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