clear code

iOSClient/CCGlobal.h

@@ -79,7 +79,7 @@
 
 // Database Realm
 #define k_databaseDefault                               @"nextcloud.realm"
-#define k_databaseSchemaVersion                         144
+#define k_databaseSchemaVersion                         145
 
 // Database JSON
 #define k_databaseDefaultJSON                           @"nextcloud.json"

iOSClient/Database/NCDatabase.swift

@@ -359,17 +359,6 @@ class tablePhotoLibrary: Object {
     }
 }
 
-class tableRecent: Object {
-    
-    @objc dynamic var account = ""
-    @objc dynamic var date = NSDate()
-    @objc dynamic var ocId = ""
-    
-    override static func primaryKey() -> String {
-        return "ocId"
-    }
-}
-
 class tableShare: Object {
     
     @objc dynamic var account = ""

iOSClient/Database/NCManageDatabase.swift

@@ -210,7 +210,6 @@ class NCManageDatabase: NSObject {
         self.clearTable(tableLocalFile.self, account: account)
         self.clearTable(tableMetadata.self, account: account)
         self.clearTable(tablePhotoLibrary.self, account: account)
-        self.clearTable(tableRecent.self, account: account)
         self.clearTable(tableShare.self, account: account)
         self.clearTable(tableTag.self, account: account)
         self.clearTable(tableTrash.self, account: account)
@@ -2361,46 +2360,6 @@ class NCManageDatabase: NSObject {
         return Array(results.map { tablePhotoLibrary.init(value:$0) })
     }
     
-    //MARK: -
-    //MARK: Table Recent
-    
-    @objc func addRecent(_ account: String, ocId: String, date: NSDate) {
-
-        let realm = try! Realm()
-
-        do {
-            try realm.safeWrite {
-                let addObject = tableRecent()
-            
-                addObject.account = account
-                addObject.ocId = ocId
-                addObject.date = date
-                
-                realm.add(addObject, update: .all)
-            }
-        } catch let error {
-            NCCommunicationCommon.shared.writeLog("Could not write to database: \(error)")
-        }
-    }
-    
-    func getRecent(_ account: String) -> [tableMetadata] {
-        
-        let realm = try! Realm()
-        var metadatas: [tableMetadata] = []
-        
-        let results = realm.objects(tableRecent.self).filter("account == %@", account).sorted(byKeyPath: "date", ascending: false)
-        for result in results {
-            if let metadata = realm.objects(tableMetadata.self).filter("account == %@ AND ocId == %@", account, result.ocId).first {
-                metadatas.append(tableMetadata.init(value: metadata))
-                if metadatas.count == 100 {
-                    break
-                }
-            }
-        }
-
-        return metadatas
-    }
-    
     //MARK: -
     //MARK: Table Share
     

iOSClient/Networking/NCNetworking.swift

@@ -268,7 +268,6 @@ import Queuer
                
                 NCManageDatabase.sharedInstance.setMetadataSession(ocId: metadata.ocId, session: "", sessionError: "", sessionSelector: selector, sessionTaskIdentifier: 0, status: Int(k_metadataStatusNormal), etag: etag, setFavorite: setFavorite)
                 NCManageDatabase.sharedInstance.addLocalFile(metadata: metadata)
-                NCManageDatabase.sharedInstance.addRecent(metadata.account, ocId: metadata.ocId, date: NSDate())
                 
                 #if !EXTENSION
                 if let result = NCManageDatabase.sharedInstance.getE2eEncryption(predicate: NSPredicate(format: "fileNameIdentifier == %@ AND serverUrl == %@", metadata.fileName, metadata.serverUrl)) {
@@ -494,7 +493,6 @@ import Queuer
                 }
                 NCManageDatabase.sharedInstance.addMetadata(metadata)
                 NCManageDatabase.sharedInstance.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", ocIdTemp))
-                NCManageDatabase.sharedInstance.addRecent(tableAccount.account, ocId: ocId!, date: date ?? NSDate())
                 
                 #if !EXTENSION
                 self.getOcIdInBackgroundSession { (listOcId) in
@@ -838,7 +836,6 @@ import Queuer
                         
                             NCManageDatabase.sharedInstance.addMetadata(metadata)
                             NCManageDatabase.sharedInstance.addDirectory(encrypted: metadata.e2eEncrypted, favorite: metadata.favorite, ocId: metadata.ocId, fileId: metadata.fileId, etag: nil, permissions: metadata.permissions, serverUrl: fileNameFolderUrl, richWorkspace: metadata.richWorkspace, account: account)
-                            NCManageDatabase.sharedInstance.addRecent(account, ocId: metadata.ocId, date: metadata.date)
                         }
                         
                         if let metadata = NCManageDatabase.sharedInstance.getMetadataFromOcId(metadataFolder?.ocId) {
@@ -1003,7 +1000,6 @@ import Queuer
             if errorCode == 0 && metadata.account == account {
                 
                 NCManageDatabase.sharedInstance.setMetadataFavorite(ocId: metadata.ocId, favorite: favorite)
-                NCManageDatabase.sharedInstance.addRecent(metadata.account, ocId: metadata.ocId, date: NSDate())
                 
                 #if !EXTENSION
                 if favorite {
@@ -1103,7 +1099,6 @@ import Queuer
             if errorCode == 0 {
                         
                 NCManageDatabase.sharedInstance.renameMetadata(fileNameTo: fileNameNew, ocId: metadata.ocId)
-                NCManageDatabase.sharedInstance.addRecent(metadata.account, ocId: metadata.ocId, date: NSDate())
                         
                 if metadata.directory {
                             
@@ -1171,7 +1166,6 @@ import Queuer
                 
                 NCManageDatabase.sharedInstance.moveMetadata(ocId: metadata.ocId, serverUrlTo: serverUrlTo)
                 guard let metadataNew = NCManageDatabase.sharedInstance.getMetadataFromOcId(metadata.ocId) else { return }
-                NCManageDatabase.sharedInstance.addRecent(metadata.account, ocId: metadata.ocId, date: NSDate())
 
                 NotificationCenter.default.postOnMainThread(name: k_notificationCenter_moveFile, userInfo: ["metadata": metadata, "metadataNew": metadataNew])
                 
@@ -1213,7 +1207,6 @@ import Queuer
                    
             if errorCode == 0 {
                 
-                NCManageDatabase.sharedInstance.addRecent(metadata.account, ocId: metadata.ocId, date: NSDate())
                 NotificationCenter.default.postOnMainThread(name: k_notificationCenter_copyFile, userInfo: ["metadata": metadata, "serverUrlTo": serverUrlTo])
             }