code improved

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -1044,8 +1044,7 @@ extension NCManageDatabase {
 
         do {
             let realm = try Realm()
-            let sortProperties = [SortDescriptor(keyPath: "serverUrl", ascending: false), SortDescriptor(keyPath: "fileName", ascending: false)]
-            let results = realm.objects(tableMetadata.self).filter(predicate).sorted(by: sortProperties)
+            let results = realm.objects(tableMetadata.self).filter(predicate).sorted(byKeyPath: "date", ascending: false)
             return Array(results.map { tableMetadata.init(value: $0) })
         } catch let error {
             NextcloudKit.shared.nkCommonInstance.writeLog("Could not write to database: \(error)")

iOSClient/NCImageCache.swift

@@ -152,20 +152,7 @@ import NextcloudKit
 
         let predicateDefault = NSPredicate(format: "account == %@ AND serverUrl BEGINSWITH %@ AND (classFile == %@ OR classFile == %@) AND NOT (session CONTAINS[c] 'upload') AND NOT(livePhotoFile != '' AND classFile == %@)", account.account, startServerUrl, NKCommon.TypeClassFile.image.rawValue, NKCommon.TypeClassFile.video.rawValue, NKCommon.TypeClassFile.video.rawValue)
 
-        var metadatas = NCManageDatabase.shared.getMetadatasMedia(predicate: predicate ?? predicateDefault)
-
-        switch NCKeychain().mediaSortDate {
-        case "date":
-            metadatas = metadatas.sorted(by: {($0.date as Date) > ($1.date as Date)})
-        case "creationDate":
-            metadatas = metadatas.sorted(by: {($0.creationDate as Date) > ($1.creationDate as Date)})
-        case "uploadDate":
-            metadatas = metadatas.sorted(by: {($0.uploadDate as Date) > ($1.uploadDate as Date)})
-        default:
-            break
-        }
-
-        return metadatas
+        return NCManageDatabase.shared.getMetadatasMedia(predicate: predicate ?? predicateDefault)
     }
 
     // MARK: -

iOSClient/Settings/NCKeychain.swift

@@ -291,19 +291,6 @@ import KeychainAccess
         }
     }
 
-    var mediaSortDate: String {
-        get {
-            migrate(key: "mediaSortDate")
-            if let value = try? keychain.get("mediaSortDate") {
-                return value
-            }
-            return "date"
-        }
-        set {
-            keychain["mediaSortDate"] = newValue
-        }
-    }
-
     var textRecognitionStatus: Bool {
         get {
             migrate(key: "textRecognitionStatus")