Skip to content

Commit fa39e07

Browse files
NMC 2157 - Merging conflict resolve after nextcloud 4.9.3 release
1 parent fb0f2ef commit fa39e07

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

iOSClient/Select/NCSelect.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ extension NCSelect: UICollectionViewDataSource {
500500
cell.selectMode(false)
501501

502502
// Live Photo
503-
if metadata.livePhoto {
503+
if metadata.isLivePhoto {
504504
cell.imageStatus.image = NCImageCache.images.livePhoto
505505
}
506506

@@ -580,7 +580,7 @@ extension NCSelect: UICollectionViewDataSource {
580580
cell.hideButtonMore(true)
581581

582582
// Live Photo
583-
if metadata.livePhoto {
583+
if metadata.isLivePhoto {
584584
cell.imageStatus.image = NCImageCache.images.livePhoto
585585
}
586586

@@ -718,7 +718,6 @@ extension NCSelect {
718718
ascending: layoutForView?.ascending,
719719
directoryOnTop: layoutForView?.directoryOnTop,
720720
favoriteOnTop: true,
721-
filterLivePhoto: true,
722721
groupByField: groupByField)
723722

724723
if withLoadFolder {

0 commit comments

Comments
 (0)