fix Comments

iOSClient/CCGlobal.h

@@ -81,7 +81,7 @@
 
 // Database Realm
 #define k_databaseDefault                               @"nextcloud.realm"
-#define k_databaseSchemaVersion                         68
+#define k_databaseSchemaVersion                         71
 
 // Intro selector
 #define k_intro_login                                   0

iOSClient/Database/NCDatabase.swift

@@ -212,7 +212,6 @@ class tableComments: Object {
     @objc dynamic var actorId = ""
     @objc dynamic var actorType = ""
     @objc dynamic var creationDateTime = NSDate()
-    @objc dynamic var fileId = ""
     @objc dynamic var isUnread: Bool = false
     @objc dynamic var message = ""
     @objc dynamic var messageID = ""
@@ -330,6 +329,7 @@ class tableMedia: Object {
     @objc dynamic var e2eEncrypted: Bool = false
     @objc dynamic var etag = ""
     @objc dynamic var favorite: Bool = false
+    @objc dynamic var fileId = ""
     @objc dynamic var fileName = ""
     @objc dynamic var fileNameView = ""
     @objc dynamic var hasPreview: Bool = false
@@ -372,6 +372,7 @@ class tableMetadata: Object {
     @objc dynamic var e2eEncrypted: Bool = false
     @objc dynamic var etag = ""
     @objc dynamic var favorite: Bool = false
+    @objc dynamic var fileId = ""
     @objc dynamic var fileName = ""
     @objc dynamic var fileNameView = ""
     @objc dynamic var hasPreview: Bool = false

iOSClient/Database/NCManageDatabase.swift

@@ -63,7 +63,7 @@ class NCManageDatabase: NSObject {
                     migration.deleteData(forType: tableShare.className())
                 }
                 
-                if oldSchemaVersion < 70 {
+                if oldSchemaVersion < 71 {
                     
                     migration.enumerateObjects(ofType: tableLocalFile.className()) { oldObject, newObject in
                         newObject!["ocId"] = oldObject!["fileID"]
@@ -81,6 +81,7 @@ class NCManageDatabase: NSObject {
                         newObject!["ocId"] = oldObject!["fileID"]
                     }
                     
+                    migration.deleteData(forType: tableComments.className())
                     migration.deleteData(forType: tableMetadata.className())
                     migration.deleteData(forType: tableE2eEncryptionLock.className())
                     migration.deleteData(forType: tableTag.className())
@@ -1011,14 +1012,14 @@ class NCManageDatabase: NSObject {
     //MARK: -
     //MARK: Table Comments
     
-    @objc func addComments(_ listOfComments: [NCComments], account: String, fileId: String) {
+    @objc func addComments(_ listOfComments: [NCComments], account: String, objectId: String) {
         
         let realm = try! Realm()
         
         do {
             try realm.write {
                 
-                let results = realm.objects(tableComments.self).filter("account == %@ AND fileId == %@", account, fileId)
+                let results = realm.objects(tableComments.self).filter("account == %@ AND objectId == %@", account, objectId)
                 realm.delete(results)
                 
                 for comment in listOfComments {
@@ -1030,7 +1031,6 @@ class NCManageDatabase: NSObject {
                     addObject.actorId = comment.actorId
                     addObject.actorType = comment.actorType
                     addObject.creationDateTime = comment.creationDateTime as NSDate
-                    addObject.fileId = fileId
                     addObject.isUnread = comment.isUnread
                     addObject.message = comment.message
                     addObject.messageID = comment.messageID
@@ -1046,12 +1046,12 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    @objc func getComments(account: String, fileId: String) -> [tableComments] {
+    @objc func getComments(account: String, objectId: String) -> [tableComments] {
         
         let realm = try! Realm()
         realm.refresh()
         
-        let results = realm.objects(tableComments.self).filter("account == %@ AND fileId == %@", account, fileId).sorted(byKeyPath: "creationDateTime", ascending: false)
+        let results = realm.objects(tableComments.self).filter("account == %@ AND objectId == %@", account, objectId).sorted(byKeyPath: "creationDateTime", ascending: false)
         
         return Array(results.map { tableComments.init(value:$0) })
     }

iOSClient/Library/OCCommunicationLib/OCWebDavClient/OCWebDAVClient.m

@@ -65,7 +65,7 @@ NSString *const NCResource = @"<d:displayname/>"
                               "<d:quota-available-bytes/>"
                               "<permissions xmlns=\"http://owncloud.org/ns\"/>"
                               "<id xmlns=\"http://owncloud.org/ns\"/>"
-                              "<ocId xmlns=\"http://owncloud.org/ns\"/>"
+                              "<fileid xmlns=\"http://owncloud.org/ns\"/>"
                               "<size xmlns=\"http://owncloud.org/ns\"/>"
                               "<favorite xmlns=\"http://owncloud.org/ns\"/>"
                               "<is-encrypted xmlns=\"http://nextcloud.org/ns\"/>"

iOSClient/Share/NCShareComments.swift

@@ -86,10 +86,10 @@ class NCShareComments: UIViewController, NCShareCommentsCellDelegate {
         
         guard let metadata = self.metadata else { return }
 
-        OCNetworking.sharedManager()?.getCommentsWithAccount(appDelegate.activeAccount, fileId: metadata.ocId, completion: { (account, items, message, errorCode) in
+        OCNetworking.sharedManager()?.getCommentsWithAccount(appDelegate.activeAccount, fileId: metadata.fileId, completion: { (account, items, message, errorCode) in
             if errorCode == 0 {
                 let itemsNCComments = items as! [NCComments]
-                NCManageDatabase.sharedInstance.addComments(itemsNCComments, account: metadata.account, fileId: metadata.ocId)
+                NCManageDatabase.sharedInstance.addComments(itemsNCComments, account: metadata.account, objectId: metadata.fileId)
                 self.tableView.reloadData()
             } else {
                 self.appDelegate.messageNotification("_share_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
@@ -107,7 +107,7 @@ class NCShareComments: UIViewController, NCShareCommentsCellDelegate {
         guard let metadata = self.metadata else { return }
         if message.count == 0 { return }
 
-        OCNetworking.sharedManager()?.putComments(withAccount: appDelegate.activeAccount, fileId: metadata.ocId, message: message, completion: { (account, message, errorCode) in
+        OCNetworking.sharedManager()?.putComments(withAccount: appDelegate.activeAccount, fileId: metadata.fileId, message: message, completion: { (account, message, errorCode) in
             if errorCode == 0 {
                 self.newCommentField.text = ""
                 self.reloadData()
@@ -146,7 +146,7 @@ class NCShareComments: UIViewController, NCShareCommentsCellDelegate {
                 alert.addAction(UIAlertAction(title: NSLocalizedString("_ok_", comment: ""), style: .default, handler: { action in
                     if let message = alert.textFields?.first?.text {
                         if message != "" {
-                            OCNetworking.sharedManager()?.updateComments(withAccount: metadata.account, fileId: metadata.ocId, messageID: tableComments.messageID, message: message, completion: { (account, message, errorCode) in
+                            OCNetworking.sharedManager()?.updateComments(withAccount: metadata.account, fileId: metadata.fileId, messageID: tableComments.messageID, message: message, completion: { (account, message, errorCode) in
                                 if errorCode == 0 {
                                     self.reloadData()
                                 } else {
@@ -165,7 +165,7 @@ class NCShareComments: UIViewController, NCShareCommentsCellDelegate {
                 guard let metadata = self.metadata else { return }
                 guard let tableComments = tableComments else { return }
 
-                OCNetworking.sharedManager()?.deleteComments(withAccount: metadata.account, fileId: metadata.ocId, messageID: tableComments.messageID, completion: { (account, message, errorCode) in
+                OCNetworking.sharedManager()?.deleteComments(withAccount: metadata.account, fileId: metadata.fileId, messageID: tableComments.messageID, completion: { (account, message, errorCode) in
                     if errorCode == 0 {
                         self.reloadData()
                     } else {
@@ -200,13 +200,13 @@ extension NCShareComments: UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
-        let comments = NCManageDatabase.sharedInstance.getComments(account: metadata!.account, fileId: metadata!.ocId)
+        let comments = NCManageDatabase.sharedInstance.getComments(account: metadata!.account, objectId: metadata!.fileId)
         return comments.count
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
-        let comments = NCManageDatabase.sharedInstance.getComments(account: metadata!.account, fileId: metadata!.ocId)
+        let comments = NCManageDatabase.sharedInstance.getComments(account: metadata!.account, objectId: metadata!.fileId)
         let tableComments = comments[indexPath.row]
         
         if let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath) as? NCShareCommentsCell {

iOSClient/Utility/CCUtility.m

@@ -1417,6 +1417,7 @@
     metadata.directory = itemDto.isDirectory;
     metadata.e2eEncrypted = itemDto.isEncrypted;
     metadata.etag = itemDto.etag;
+    metadata.fileId = itemDto.fileId;
     metadata.favorite = itemDto.isFavorite;
     metadata.fileName = fileName;
     metadata.fileNameView = fileNameView;