Activity refresh

Libraries external/OCCommunicationLib/OCCommunicationLib/OCActivity.h

@@ -31,6 +31,7 @@
 @property (nonatomic, strong) NSString *link;
 @property (nonatomic, strong) NSString *message;
 @property (nonatomic, strong) NSString *subject;
+@property (nonatomic, strong) NSString *type;
 
 @end
 

Libraries external/OCCommunicationLib/OCCommunicationLib/OCActivity.m

@@ -36,6 +36,7 @@
         self.link = @"";
         self.message = @"";
         self.subject = @"";
+        self.type = @"";
     }
     
     return self;

Libraries external/OCCommunicationLib/OCCommunicationLib/OCCommunication.h

@@ -842,7 +842,7 @@ typedef enum {
  *
  */
 
-- (void) getActivityServer:(NSString*)serverPath start:(NSString *)start onCommunication:(OCCommunication *)sharedOCComunication successRequest:(void(^)(NSHTTPURLResponse *response, NSArray *listOfActivity, NSString *redirectedServer)) successRequest failureRequest:(void(^)(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer)) failureRequest;
+- (void) getActivityServer:(NSString*)serverPath onCommunication:(OCCommunication *)sharedOCComunication successRequest:(void(^)(NSHTTPURLResponse *response, NSArray *listOfActivity, NSString *redirectedServer)) successRequest failureRequest:(void(^)(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer)) failureRequest;
 
 #pragma mark -  User Profile
 

Libraries external/OCCommunicationLib/OCCommunicationLib/OCCommunication.m

@@ -1510,7 +1510,7 @@
 
 #pragma mark - Activity
 
-- (void) getActivityServer:(NSString*)serverPath start:(NSString *)start onCommunication:(OCCommunication *)sharedOCComunication successRequest:(void(^)(NSHTTPURLResponse *response, NSArray *listOfActivity, NSString *redirectedServer)) successRequest failureRequest:(void(^)(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer)) failureRequest {
+- (void) getActivityServer:(NSString*)serverPath onCommunication:(OCCommunication *)sharedOCComunication successRequest:(void(^)(NSHTTPURLResponse *response, NSArray *listOfActivity, NSString *redirectedServer)) successRequest failureRequest:(void(^)(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer)) failureRequest {
 
     serverPath = [serverPath encodeString:NSUTF8StringEncoding];
     serverPath = [serverPath stringByAppendingString:k_url_acces_remote_activity_api];
@@ -1518,7 +1518,7 @@
     OCWebDAVClient *request = [OCWebDAVClient new];
     request = [self getRequestWithCredentials:request];
     
-    [request getActivityServer:serverPath start:start onCommunication:sharedOCComunication success:^(NSHTTPURLResponse *response, id responseObject) {
+    [request getActivityServer:serverPath onCommunication:sharedOCComunication success:^(NSHTTPURLResponse *response, id responseObject) {
         
         NSData *responseData = (NSData*) responseObject;
         
@@ -1553,6 +1553,7 @@
                     if ([data valueForKey:@"link"]    && ![[data valueForKey:@"link"]    isEqual:[NSNull null]]) activity.link    = [data valueForKey:@"link"];
                     if ([data valueForKey:@"message"] && ![[data valueForKey:@"message"] isEqual:[NSNull null]]) activity.message = [data valueForKey:@"message"];
                     if ([data valueForKey:@"subject"] && ![[data valueForKey:@"subject"] isEqual:[NSNull null]]) activity.subject = [data valueForKey:@"subject"];
+                    if ([data valueForKey:@"type"] && ![[data valueForKey:@"type"] isEqual:[NSNull null]]) activity.subject = [data valueForKey:@"type"];
                     
                     [listOfActivity addObject:activity];
                 }

Libraries external/OCCommunicationLib/OCCommunicationLib/OCWebDavClient/OCWebDAVClient.h

@@ -541,7 +541,7 @@ extern NSString * _Nullable OCWebDAVModificationDateKey;
  *
  */
 
-- (void) getActivityServer:(NSString * _Nonnull)serverPath start:(NSString * _Nonnull)start onCommunication:(OCCommunication * _Nonnull)sharedOCComunication success:(void(^ _Nonnull)(NSHTTPURLResponse * _Nonnull operation, id _Nonnull response))success failure:(void(^ _Nonnull)(NSHTTPURLResponse * _Nonnull operation, id  _Nullable responseObject, NSError * _Nonnull error))failure;
+- (void) getActivityServer:(NSString * _Nonnull)serverPath onCommunication:(OCCommunication * _Nonnull)sharedOCComunication success:(void(^ _Nonnull)(NSHTTPURLResponse * _Nonnull operation, id _Nonnull response))success failure:(void(^ _Nonnull)(NSHTTPURLResponse * _Nonnull operation, id  _Nullable responseObject, NSError * _Nonnull error))failure;
 
 ///-----------------------------------
 /// @name Get User Profile

Libraries external/OCCommunicationLib/OCCommunicationLib/OCWebDavClient/OCWebDAVClient.m

@@ -738,16 +738,16 @@ NSString const *OCWebDAVModificationDateKey	= @"modificationdate";
 
 #pragma mark - Get Activity
 
-- (void) getActivityServer:(NSString*)serverPath start:(NSString *)start onCommunication:(OCCommunication *)sharedOCCommunication success:(void(^)(NSHTTPURLResponse *operation, id response))success
+- (void) getActivityServer:(NSString*)serverPath onCommunication:(OCCommunication *)sharedOCCommunication success:(void(^)(NSHTTPURLResponse *operation, id response))success
                        failure:(void(^)(NSHTTPURLResponse *operation, id  _Nullable responseObject, NSError *error))failure{
     
     _requestMethod = @"GET";
     
     NSString *jsonQuery = [NSString stringWithFormat:@"?format=json"];
-    NSString *startParamater = [NSString stringWithFormat:@"&start=%@", start];
+    //NSString *startParamater = [NSString stringWithFormat:@"&start=%@", start];
 
     serverPath = [serverPath stringByAppendingString:jsonQuery];
-    serverPath = [serverPath stringByAppendingString:startParamater];
+    //serverPath = [serverPath stringByAppendingString:startParamater];
     
     NSMutableURLRequest *request = [self sharedRequestWithMethod:_requestMethod path:serverPath parameters:nil];
     

iOSClient/Main/CCMain.m

@@ -1047,6 +1047,9 @@
     for (OCActivity *activity in listOfActivity) {
         [CCCoreData addActivity:activity account:app.activeAccount];
     }
+    
+    // Reload Activity Data Source
+    [app.controlCenterActivity reloadDatasource];
 }
 
 - (void)getActivityServerFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
@@ -1183,11 +1186,8 @@
 
     metadataNet.action = actionGetUserProfile;
     [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-    
-    NSInteger lastID = [CCCoreData getLastIDActivityActiveAccount:app.activeAccount];
-    
+        
     metadataNet.action = actionGetActivityServer;
-    metadataNet.options = [@(lastID) stringValue];;
     [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
 }
 

iOSClient/Networking/OCNetworking.m

@@ -1124,7 +1124,7 @@
     [communication setCredentialsWithUser:_activeUser andPassword:_activePassword];
     [communication setUserAgent:[CCUtility getUserAgent]];
     
-    [communication getActivityServer:[_activeUrl stringByAppendingString:@"/"] start:_metadataNet.options onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSArray *listOfActivity, NSString *redirectedServer) {
+    [communication getActivityServer:[_activeUrl stringByAppendingString:@"/"] onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSArray *listOfActivity, NSString *redirectedServer) {
         
         if ([self.delegate respondsToSelector:@selector(getActivityServerSuccess:)])
             [self.delegate getActivityServerSuccess:listOfActivity];