marinofaggiana 5 years ago
parent
commit
e2e5abced9
2 changed files with 11 additions and 0 deletions
  1. 10 0
      iOSClient/Main/NCDetailViewController.swift
  2. 1 0
      iOSClient/Offline/NCOffline.swift

+ 10 - 0
iOSClient/Main/NCDetailViewController.swift

@@ -451,9 +451,19 @@ extension NCDetailViewController: MediaBrowserViewControllerDelegate, MediaBrows
             return NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account == %@ AND favorite == 1 AND typeFile == %@", metadata.account, k_metadataTypeFile_image), sorted: CCUtility.getOrderSettings(), ascending: CCUtility.getAscendingSettings())
         } else if mediaFilterImage {
             return NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account == %@ AND typeFile == %@", metadata.account, k_metadataTypeFile_image), sorted: "date", ascending: false)
+        } else if offlineFilterImage {
+            if let files = NCManageDatabase.sharedInstance.getTableLocalFiles(predicate: NSPredicate(format: "account == %@ AND offline == true", appDelegate.activeAccount), sorted: "fileName", ascending: true) {
+                var ocIds = [String]()
+                for file: tableLocalFile in files {
+                    ocIds.append(file.ocId)
+                }
+                return NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account == %@ AND ocId IN %@", appDelegate.activeAccount, ocIds), sorted: "fileName", ascending: true)
+            }
         } else {
             return NCManageDatabase.sharedInstance.getMetadatas(predicate: NSPredicate(format: "account == %@ AND serverUrl == %@ AND typeFile == %@", metadata.account, metadata.serverUrl, k_metadataTypeFile_image), sorted: CCUtility.getOrderSettings(), ascending: CCUtility.getAscendingSettings())
         }
+        
+        return nil
     }
     
     func getImageOffOutline() -> UIImage {

+ 1 - 0
iOSClient/Offline/NCOffline.swift

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