new view share (comments)

iOSClient/CCGlobal.h

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

iOSClient/Database/NCDatabase.swift

@@ -215,8 +215,8 @@ class tableComments: Object {
     @objc dynamic var fileID = ""
     @objc dynamic var isUnread: Bool = false
     @objc dynamic var message = ""
-    @objc dynamic var messageID: Double = 0
-    @objc dynamic var objectId: Double = 0
+    @objc dynamic var messageID = ""
+    @objc dynamic var objectId = ""
     @objc dynamic var objectType = ""
     @objc dynamic var verb = ""
     

iOSClient/Database/NCManageDatabase.swift

@@ -996,6 +996,9 @@ class NCManageDatabase: NSObject {
         do {
             try realm.write {
                 
+                let results = realm.objects(tableComments.self).filter("account == %@ AND fileID == %@", account, fileID)
+                realm.delete(results)
+                
                 for comment in listOfComments {
                     
                     let addObject = tableComments()

iOSClient/Library/OCCommunicationLib/NCComments.h

@@ -30,8 +30,8 @@
 @property (nonatomic, strong) NSDate *creationDateTime;
 @property BOOL isUnread;
 @property (nonatomic, strong) NSString *message;
-@property double messageID;
-@property double objectId;
+@property (nonatomic, strong) NSString *messageID;
+@property (nonatomic, strong) NSString *objectId;
 @property (nonatomic, strong) NSString *objectType;
 @property (nonatomic, strong) NSString *verb;
 

iOSClient/Library/OCCommunicationLib/NCComments.m

@@ -35,6 +35,8 @@
     self.objectType = @"";
     self.actorDisplayName = @"";
     self.message = @"";
+    self.messageID = @"";
+    self.objectId = @"";
     
     return self;
 }

iOSClient/Library/OCCommunicationLib/OCWebDavClient/Parsers/NCXMLCommentsParser.m

@@ -56,7 +56,7 @@
         
     } else if ([elementName isEqualToString:@"oc:id"]) {
         
-        self.currentComment.messageID = [self.xmlChars doubleValue];
+        self.currentComment.messageID = [NSString stringWithString:self.xmlChars];
     
     } else if ([elementName isEqualToString:@"oc:verb"]) {
         
@@ -82,7 +82,7 @@
     
     } else if ([elementName isEqualToString:@"oc:objectId"]) {
         
-        self.currentComment.objectId = [self.xmlChars doubleValue];
+        self.currentComment.objectId = [NSString stringWithString:self.xmlChars];
         
     } else if ([elementName isEqualToString:@"oc:isUnread"]) {
         

iOSClient/Networking/OCNetworking.h

@@ -117,7 +117,7 @@
 
 #pragma mark ===== Comments =====
 
-- (void)getCommentsWithAccount:(NSString *)account fileID:(NSString *)fileID completion:(void (^)(NSString *account, NSArray *list, NSString *message, NSInteger errorCode))completion;
+- (void)getCommentsWithAccount:(NSString *)account fileID:(NSString *)fileID completion:(void (^)(NSString *account, NSArray *items, NSString *message, NSInteger errorCode))completion;
 
 #pragma mark ===== Third Parts =====
 

iOSClient/Networking/OCNetworking.m

@@ -2709,7 +2709,7 @@
 #pragma mark ===== Comments =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)getCommentsWithAccount:(NSString *)account fileID:(NSString *)fileID completion:(void (^)(NSString *account, NSArray *list, NSString *message, NSInteger errorCode))completion
+- (void)getCommentsWithAccount:(NSString *)account fileID:(NSString *)fileID completion:(void (^)(NSString *account, NSArray *items, NSString *message, NSInteger errorCode))completion
 {
     tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountWithPredicate:[NSPredicate predicateWithFormat:@"account == %@", account]];
     if (tableAccount == nil) {

iOSClient/Share/NCShareComments.swift

@@ -31,8 +31,15 @@ class NCShareComments: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        OCNetworking.sharedManager()?.getCommentsWithAccount(appDelegate.activeAccount, fileID: metadata?.fileID, completion: { (account, list, message, errorCode) in
-            print("ciao")
+        guard let metadata = self.metadata else { return }
+
+        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.fileID)
+            } else {
+                self.appDelegate.messageNotification("_share_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)
+            }
         })
     }
 }