Fixed photoLibraryDidChange crash.

UICollectionView doesn't like when we initialize a new data source. So instead just update the fetch result on the data source.
mikaoj · Apr 23, 2020 · 0d72b2d · 0d72b2d
1 parent 7bcf1b6
commit 0d72b2d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/Sources/Scene/Assets/AssetsCollectionViewDataSource.swift b/Sources/Scene/Assets/AssetsCollectionViewDataSource.swift
@@ -28,8 +28,8 @@ class AssetsCollectionViewDataSource : NSObject, UICollectionViewDataSource {
     private static let videoCellIdentifier = "VideoCell"
 
     var settings: Settings!
+    var fetchResult: PHFetchResult<PHAsset>
 
-    private let fetchResult: PHFetchResult<PHAsset>
     private let imageManager = PHCachingImageManager.default()
     private let durationFormatter = DateComponentsFormatter()
     private let store: AssetStore

diff --git a/Sources/Scene/Assets/AssetsViewController.swift b/Sources/Scene/Assets/AssetsViewController.swift
@@ -32,27 +32,23 @@ protocol AssetsViewControllerDelegate: class {
 class AssetsViewController: UIViewController {
     weak var delegate: AssetsViewControllerDelegate?
     var settings: Settings! {
-        didSet { dataSource?.settings = settings }
+        didSet { dataSource.settings = settings }
     }
 
     private let store: AssetStore
     private let collectionView: UICollectionView = UICollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout())
     private var fetchResult: PHFetchResult<PHAsset> = PHFetchResult<PHAsset>() {
         didSet {
-            dataSource = AssetsCollectionViewDataSource(fetchResult: fetchResult, store: store)
-        }
-    }
-    private var dataSource: AssetsCollectionViewDataSource? {
-        didSet {
-            dataSource?.settings = settings
-            collectionView.dataSource = dataSource
+            dataSource.fetchResult = fetchResult
         }
     }
+    private let dataSource: AssetsCollectionViewDataSource
 
     private let selectionFeedback = UISelectionFeedbackGenerator()
 
     init(store: AssetStore) {
         self.store = store
+        dataSource = AssetsCollectionViewDataSource(fetchResult: fetchResult, store: store)
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -79,6 +75,7 @@ class AssetsViewController: UIViewController {
         collectionView.alwaysBounceVertical = true
         collectionView.backgroundColor = settings.theme.backgroundColor
         collectionView.delegate = self
+        collectionView.dataSource = dataSource
         AssetsCollectionViewDataSource.registerCellIdentifiersForCollectionView(collectionView)
 
         let longPressRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(AssetsViewController.collectionViewLongPressed(_:)))