From b36186b618f1b37cb1a23560915f3e87ba92966d Mon Sep 17 00:00:00 2001 From: TSI-amrutwaghmare <96108296+TSI-amrutwaghmare@users.noreply.github.com> Date: Wed, 6 Dec 2023 14:57:19 +0530 Subject: [PATCH] NMC 2157 - Merging conflict resolve after nextcloud 4.9.3 release --- iOSClient/Select/NCSelect.swift | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/iOSClient/Select/NCSelect.swift b/iOSClient/Select/NCSelect.swift index f1e303876e..73bd069393 100644 --- 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 {