Order trash

iOSClient/Trash/NCTrash.swift

@@ -16,6 +16,8 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
     var path = ""
     var titleCurrentFolder = NSLocalizedString("_trash_view_", comment: "")
     var datasource = [tableTrash]()
+    var datasourceSorted = CCUtility.getOrderSettings()
+    var datasourceAscending = CCUtility.getAscendingSettings()
     
     var listLayout: ListLayout!
     var gridLayout: GridLayout!
@@ -68,7 +70,7 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
             path = k_dav + "/trashbin/" + userID! + "/trash/"
         }
         
-        guard let datasource = NCManageDatabase.sharedInstance.getTrash(filePath: path, sorted: "fileName", ascending: true) else {
+        guard let datasource = NCManageDatabase.sharedInstance.getTrash(filePath: path, sorted: datasourceSorted!, ascending: datasourceAscending) else {
             return
         }
         
@@ -212,7 +214,7 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
             NCManageDatabase.sharedInstance.deleteTrash(filePath: self.path)
             NCManageDatabase.sharedInstance.addTrashs(item as! [tableTrash])
             
-            let results = NCManageDatabase.sharedInstance.getTrash(filePath: self.path, sorted: "fileName", ascending: true)
+            let results = NCManageDatabase.sharedInstance.getTrash(filePath: self.path, sorted: self.datasourceSorted!, ascending: self.datasourceAscending)
             if (results != nil) {
                 self.datasource = results!
                 DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
@@ -241,7 +243,7 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
         ocNetworking?.moveFileOrFolder(fileName, fileNameTo: fileNameTo, success: {
             
             NCManageDatabase.sharedInstance.deleteTrash(fileID: fileID)
-            guard let datasource = NCManageDatabase.sharedInstance.getTrash(filePath: self.path, sorted: "fileName", ascending: true) else {
+            guard let datasource = NCManageDatabase.sharedInstance.getTrash(filePath: self.path, sorted: self.datasourceSorted!, ascending: self.datasourceAscending) else {
                 return
             }
             self.datasource = datasource
@@ -268,7 +270,7 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
             if errorCode == 0 {
                 
                 NCManageDatabase.sharedInstance.deleteTrash(fileID: fileID)
-                guard let datasource = NCManageDatabase.sharedInstance.getTrash(filePath: self.path, sorted: "fileName", ascending: true) else {
+                guard let datasource = NCManageDatabase.sharedInstance.getTrash(filePath: self.path, sorted: self.datasourceSorted!, ascending: self.datasourceAscending) else {
                     return
                 }
                 self.datasource = datasource