NMC 2157 - Merging conflict resolve after nextcloud 4.9.3 release

nextmcloud · Mar 18, 2024 · 8651d53 · 8651d53
1 parent cec1c81
commit 8651d53
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/iOSClient/Select/NCSelect.swift b/iOSClient/Select/NCSelect.swift
@@ -500,7 +500,7 @@ extension NCSelect: UICollectionViewDataSource {
             cell.selectMode(false)
 
             // Live Photo
-            if metadata.livePhoto {
+            if metadata.isLivePhoto {
                 cell.imageStatus.image = NCImageCache.images.livePhoto
             }
 
@@ -580,7 +580,7 @@ extension NCSelect: UICollectionViewDataSource {
             cell.hideButtonMore(true)
 
             // Live Photo
-            if metadata.livePhoto {
+            if metadata.isLivePhoto {
                 cell.imageStatus.image = NCImageCache.images.livePhoto
             }
 
@@ -718,7 +718,6 @@ extension NCSelect {
                                        ascending: layoutForView?.ascending,
                                        directoryOnTop: layoutForView?.directoryOnTop,
                                        favoriteOnTop: true,
-                                       filterLivePhoto: true,
                                        groupByField: groupByField)
 
         if withLoadFolder {