Fixes crash occurrinng sometimes whenn refreshing header of image sec…

…tion
Piwigo · Jul 11, 2024 · ec9b1a7 · ec9b1a7
1 parent 7df2d5a
commit ec9b1a7
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/piwigo/Album/Extensions/AlbumViewController+DataSource.swift b/piwigo/Album/Extensions/AlbumViewController+DataSource.swift
@@ -117,13 +117,11 @@ extension AlbumViewController: UICollectionViewDataSource
                 header.backgroundColor = UIColor.piwigoColorBackground().withAlphaComponent(0.75)
                 return header
             case UICollectionView.elementKindSectionFooter:
-                if categoryId == Int32.zero {
-                    guard let footer = collectionView.dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: "ImageFooterReusableView", for: indexPath) as? ImageFooterReusableView
-                    else { preconditionFailure("Could not load ImageFooterReusableView")}
-                    footer.nberImagesLabel?.textColor = UIColor.piwigoColorHeader()
-                    footer.nberImagesLabel?.text = getImageCount()
-                    return footer
-                }
+                guard let footer = collectionView.dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: "ImageFooterReusableView", for: indexPath) as? ImageFooterReusableView
+                else { preconditionFailure("Could not load ImageFooterReusableView")}
+                footer.nberImagesLabel?.textColor = UIColor.piwigoColorHeader()
+                footer.nberImagesLabel?.text = getImageCount()
+                return footer
             default:
                 break
             }
@@ -177,13 +175,11 @@ extension AlbumViewController: UICollectionViewDataSource
                     }
                 }
             case UICollectionView.elementKindSectionFooter:
-                if indexPath.section == images.sections?.count ?? 0 {
-                    guard let footer = collectionView.dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: "ImageFooterReusableView", for: indexPath) as? ImageFooterReusableView
-                    else { preconditionFailure("Could not load ImageFooterReusableView")}
-                    footer.nberImagesLabel?.textColor = UIColor.piwigoColorHeader()
-                    footer.nberImagesLabel?.text = getImageCount()
-                    return footer
-                }
+                guard let footer = collectionView.dequeueReusableSupplementaryView(ofKind: UICollectionView.elementKindSectionFooter, withReuseIdentifier: "ImageFooterReusableView", for: indexPath) as? ImageFooterReusableView
+                else { preconditionFailure("Could not load ImageFooterReusableView")}
+                footer.nberImagesLabel?.textColor = UIColor.piwigoColorHeader()
+                footer.nberImagesLabel?.text = getImageCount()
+                return footer
             default:
                 break
             }

diff --git a/piwigo/Album/Extensions/AlbumViewController+FetchResults.swift b/piwigo/Album/Extensions/AlbumViewController+FetchResults.swift
@@ -42,8 +42,12 @@ extension AlbumViewController: NSFetchedResultsControllerDelegate
                     print("••> Delete image section at ", collectionSectionIndex)
                     self?.collectionView?.deleteSections(IndexSet(integer: collectionSectionIndex))
                 })
-            case .move, .update:
-                fallthrough
+            case .move:
+                let collectionSectionIndex = sectionIndex + 1
+                print("••> Move image section at ", collectionSectionIndex)
+            case .update:
+                let collectionSectionIndex = sectionIndex + 1
+                print("••> Update image section at ", collectionSectionIndex)
             @unknown default:
                 fatalError("Unknown NSFetchedResultsChangeType of section in AlbumViewController")
             }

diff --git a/piwigo/Album/Extensions/AlbumViewController+FlowLayout.swift b/piwigo/Album/Extensions/AlbumViewController+FlowLayout.swift
@@ -89,11 +89,8 @@ extension AlbumViewController: UICollectionViewDelegateFlowLayout
 
         default /* Images */:
             // Number of images shown at the bottom of the collection
-            guard AlbumVars.shared.isFetchingAlbumData.contains(categoryId) == false,
-                  section == images.sections?.count ?? 0
-            else {
-                return CGSize.zero
-            }
+            guard section == images.sections?.count ?? 0
+            else { return CGSize.zero }
         }
 
         // Get number of images and status