Change OCNotifications

Libraries external/OCCommunicationLib/OCCommunicationLib/OCCommunication.m

@@ -1304,6 +1304,8 @@
         NSDictionary *jsongParsed = [NSJSONSerialization JSONObjectWithData:responseData options:NSJSONReadingMutableContainers error:&error];
         NSLog(@"[LOG] Notifications : %@",jsongParsed);
         
+        NSMutableArray *listOfNotifications = [NSMutableArray new];
+
         if (jsongParsed.allKeys > 0) {
         
             NSDictionary *ocs = [jsongParsed valueForKey:@"ocs"];
@@ -1324,44 +1326,19 @@
                     notification.date = [data valueForKey:@"datetime"];
                     notification.typeObject = [data valueForKey:@"object_type"];
                     notification.idObject = [data valueForKey:@"object_id"];
-                    
                     notification.subject = [data valueForKey:@"subject"];
                     notification.subjectRich = [data valueForKey:@"subjectRich"];
-                    
-                    NSDictionary *subjectsRichParameters = [data valueForKey:@"subjectRichParameters"];
-                    
-                    NSMutableArray *listSubjectRichParameters = [NSMutableArray new];
-                    for (NSDictionary *subjectRichParameters in subjectsRichParameters) {
-                     
-                        
-                        OCRichObjectStrings *richObjectStrings = [OCRichObjectStrings new];
-                        
-                        //richObjectStrings.idObject = [subjectRichParameters valueForKey:@"id"];
-                        richObjectStrings.type = [subjectRichParameters valueForKey:@"type"];
-                        richObjectStrings.name = [subjectRichParameters valueForKey:@"name"];
-                        richObjectStrings.path = [subjectRichParameters valueForKey:@"path"];
-                        richObjectStrings.link = [subjectRichParameters valueForKey:@"link"];
-                        richObjectStrings.server = [subjectRichParameters valueForKey:@"server"];
-                        
-                        [listSubjectRichParameters addObject:richObjectStrings];
-                    }
-                    notification.subjectRichParameters = [[NSArray alloc] initWithArray:listSubjectRichParameters copyItems:YES];
-                    
+                    notification.subjectRichParameters = [data valueForKey:@"subjectRichParameters"];
                     notification.message = [data valueForKey:@"message"];
                     notification.messageRich = [data valueForKey:@"messageRich"];
-                    NSDictionary *messagesRichParameters = [data valueForKey:@"messageRichParameters"];
-
+                    notification.messageRichParameters = [data valueForKey:@"messageRichParameters"];
                     notification.link = [data valueForKey:@"link"];
                     notification.icon = [data valueForKey:@"icon"];
+                    notification.action = [data valueForKey:@"actions"];
                     
-                    NSDictionary *actions = [data valueForKey:@"actions"];
-                    
-                    NSLog(@"end");
-
+                    [listOfNotifications addObject:notification];
                 }
                 
-                NSLog(@"end");
-                
             } else {
                 
                 NSString *message = (NSString*)[meta objectForKey:@"message"];
@@ -1377,7 +1354,7 @@
         }
     
         //Return success
-        successRequest(response, nil, request.redirectedServer);
+        successRequest(response, listOfNotifications, request.redirectedServer);
         
     } failure:^(NSHTTPURLResponse *response, NSData *responseData, NSError *error) {
         failureRequest(response, error, request.redirectedServer);

Libraries external/OCCommunicationLib/OCCommunicationLib/OCNotifications.h

@@ -18,13 +18,13 @@
 @property (nonatomic, strong) NSString *idObject;
 @property (nonatomic, strong) NSString *subject;
 @property (nonatomic, strong) NSString *subjectRich;
-@property (nonatomic, strong) NSArray *subjectRichParameters;
+@property (nonatomic, strong) NSDictionary *subjectRichParameters;
 @property (nonatomic, strong) NSString *message;
 @property (nonatomic, strong) NSString *messageRich;
-@property (nonatomic, strong) NSArray *messageRichParameters;
+@property (nonatomic, strong) NSDictionary *messageRichParameters;
 @property (nonatomic, strong) NSString *link;
 @property (nonatomic, strong) NSString *icon;
-@property (nonatomic, strong) NSArray *action;
+@property (nonatomic, strong) NSDictionary *action;
 
 @end