marinofaggiana 4 жил өмнө
parent
commit
6d327ae997

+ 1 - 1
iOSClient/Database/NCManageDatabase.swift

@@ -2384,7 +2384,7 @@ class NCManageDatabase: NSObject {
         return tableMetadata.init(value: result)
     }
     
-    @objc func getMetadatasMedia(predicate: NSPredicate, completion: @escaping (_ metadatas: [tableMetadata])->()) {
+    @objc func getMetadatasMedia(predicate: NSPredicate, sort: String, ascending:Bool = false, completion: @escaping (_ metadatas: [tableMetadata])->()) {
                 
         DispatchQueue.global().async {
             autoreleasepool {

+ 1 - 1
iOSClient/Media/NCMedia.swift

@@ -597,7 +597,7 @@ extension NCMedia {
             predicate = NSPredicate(format: "account == %@ AND serverUrl BEGINSWITH %@ AND (typeFile == %@ OR typeFile == %@) AND NOT (session CONTAINS[c] 'upload')", appDelegate.activeAccount, startServerUrl, k_metadataTypeFile_image, k_metadataTypeFile_video)
         }
                 
-        NCManageDatabase.sharedInstance.getMetadatasMedia(predicate: predicate!) { (metadatas) in
+        NCManageDatabase.sharedInstance.getMetadatasMedia(predicate: predicate!, sort: "date") { (metadatas) in
             DispatchQueue.main.sync {
                 self.metadatas = metadatas
                 self.reloadDataThenPerform {

+ 0 - 4
iOSClient/Networking/NCOperationQueue.swift

@@ -270,10 +270,6 @@ class NCOperationReadFileForMediaQueue: ConcurrentOperation {
                             metadata.uploadDate = file.uploadDate!
                             modify = true
                         }
-                        if metadata.date != file.date {
-                            metadata.date = file.date
-                            modify = true
-                        }
                         if modify {
                             NCManageDatabase.sharedInstance.addMetadata(metadata)
                         }