fix

iOSClient/Favorites/CCFavorites.m

@@ -621,7 +621,6 @@
     
     detailViewController.metadata = self.metadataForPushDetail;
     detailViewController.selector = self.selectorForPushDetail;
-    detailViewController.favoriteFilterImage = true;
     
     [detailViewController setTitle:self.metadata.fileNameView];
 }

iOSClient/Main/NCDetailViewController.swift

@@ -34,9 +34,7 @@ class NCDetailViewController: UIViewController {
     @objc var isNavigationBarHidden = false
     @objc var metadata: tableMetadata?
     @objc var selector: String?
-    @objc var favoriteFilterImage: Bool = false
     @objc var mediaFilterImage: Bool = false
-    @objc var offlineFilterImage: Bool = false
     
     @objc var viewerImageViewController: NCViewerImageViewController?
     @objc var metadatas: [tableMetadata] = []
@@ -571,7 +569,7 @@ extension NCDetailViewController: NCViewerImageViewControllerDelegate, NCViewerI
         
         closeAllSubView()
         
-        NCViewerImageCommon.shared.getMetadatasDatasource(metadata: self.metadata, favoriteDatasorce: favoriteFilterImage, mediaDatasorce: mediaFilterImage, offLineDatasource: offlineFilterImage) { (metadatas) in
+        NCViewerImageCommon.shared.getMetadatasDatasource(metadata: self.metadata, mediaDatasorce: mediaFilterImage) { (metadatas) in
             
             guard let metadatas = metadatas else {
                 self.viewUnload()

iOSClient/Offline/NCOffline.swift

@@ -461,7 +461,6 @@ class NCOffline: UIViewController, UIGestureRecognizerDelegate, NCListCellDelega
             if let segueViewController = segueNavigationController.topViewController as? NCDetailViewController {
             
                 segueViewController.metadata = metadataPush
-                segueViewController.offlineFilterImage = true
             }
         }
     }

iOSClient/Viewer/NCViewerImage/NCViewerImageCommon.swift

@@ -42,29 +42,18 @@ class NCViewerImageCommon: NSObject {
         NCViewerImageCommon.offOutlineImage = CCGraphics.changeThemingColorImage(UIImage.init(named: "offOutlineImage"), width: UIScreen.main.bounds.size.width, height: UIScreen.main.bounds.size.width, color: NCBrandColor.sharedInstance.brandElement)
     }
     
-    func getMetadatasDatasource(metadata: tableMetadata?, favoriteDatasorce: Bool, mediaDatasorce: Bool, offLineDatasource: Bool, completion: @escaping (_ metadatas: [tableMetadata]?) -> Void) {
+    func getMetadatasDatasource(metadata: tableMetadata?, mediaDatasorce: Bool, completion: @escaping (_ metadatas: [tableMetadata]?) -> Void) {
         guard let metadata = metadata else {
             completion(nil)
             return
         }
-        if favoriteDatasorce {
+        if metadata.favorite {
             let metadatas = NCManageDatabase.sharedInstance.getMetadatasViewer(predicate: NSPredicate(format: "account == %@ AND favorite == 1 AND (typeFile == %@ || typeFile == %@ || typeFile == %@)", metadata.account, k_metadataTypeFile_image, k_metadataTypeFile_video, k_metadataTypeFile_audio), sorted: CCUtility.getOrderSettings(), ascending: CCUtility.getAscendingSettings())
             completion(metadatas)
         } else if mediaDatasorce {
             appDelegate.activeMedia.reloadDataSourceWithCompletion { (metadatas) in
                 completion(metadatas)
             }
-        } else if offLineDatasource {
-            var datasourceSorted = ""
-            var datasourceAscending = true
-            (_, datasourceSorted, datasourceAscending, _, _) = NCUtility.shared.getLayoutForView(key: k_layout_view_offline)
-            let files = NCManageDatabase.sharedInstance.getTableLocalFiles(predicate: NSPredicate(format: "account == %@ AND offline == true", metadata.account), sorted: datasourceSorted, ascending: datasourceAscending)
-            var ocIds: [String] = []
-            for file: tableLocalFile in files {
-                ocIds.append(file.ocId)
-            }
-            let metadatas = NCManageDatabase.sharedInstance.getMetadatasViewer(predicate: NSPredicate(format: "account == %@ AND ocId IN %@ AND (typeFile == %@ || typeFile == %@ || typeFile == %@)", metadata.account, ocIds, k_metadataTypeFile_image, k_metadataTypeFile_video, k_metadataTypeFile_audio), sorted: datasourceSorted, ascending: datasourceAscending)
-            completion(metadatas)
         } else {
             let metadatas = NCManageDatabase.sharedInstance.getMetadatasViewer(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND (typeFile == %@ || typeFile == %@ || typeFile == %@)", metadata.account, metadata.serverUrl, k_metadataTypeFile_image, k_metadataTypeFile_video, k_metadataTypeFile_audio), sorted: CCUtility.getOrderSettings(), ascending: CCUtility.getAscendingSettings())
             completion(metadatas)