NMC 2157 - Merging conflict resolve after nextcloud 4.9.3 release

nextmcloud · Feb 19, 2024 · b36186b · b36186b
1 parent 069e486
commit b36186b
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/iOSClient/Select/NCSelect.swift b/iOSClient/Select/NCSelect.swift
@@ -504,7 +504,7 @@ extension NCSelect: UICollectionViewDataSource {
             cell.selectMode(false)
 
             // Live Photo
-            if metadata.livePhoto {
+            if metadata.isLivePhoto {
                 cell.imageStatus.image = NCImageCache.images.livePhoto
             }
 
@@ -584,7 +584,7 @@ extension NCSelect: UICollectionViewDataSource {
             cell.hideButtonMore(true)
 
             // Live Photo
-            if metadata.livePhoto {
+            if metadata.isLivePhoto {
                 cell.imageStatus.image = NCImageCache.images.livePhoto
             }
 
@@ -722,7 +722,6 @@ extension NCSelect {
                                        ascending: layoutForView?.ascending,
                                        directoryOnTop: layoutForView?.directoryOnTop,
                                        favoriteOnTop: true,
-                                       filterLivePhoto: true,
                                        groupByField: groupByField)
 
         if withLoadFolder {