activity protocol

iOSClient/FileSystem/CCCoreData.h

@@ -211,7 +211,7 @@
 // ===== Activity =====
 
 + (void)addActivity:(OCActivity *)activity account:(NSString *)account;
-+ (void)addActivityFile:(NSString *)file subject:(NSString *)subject message:(NSString *)message session:(NSString *)session type:(NSString *)type verbose:(NSInteger)verbose account:(NSString *)account;
++ (void)addActivityFile:(NSString *)file action:(NSString *)action note:(NSString *)note session:(NSString *)session type:(NSString *)type verbose:(NSInteger)verbose account:(NSString *)account;
 + (NSArray *)getAllTableActivityWithPredicate:(NSPredicate *)predicate;
 
 // ===== File System =====

iOSClient/FileSystem/CCCoreData.m

@@ -1868,16 +1868,16 @@
     }];
 }
 
-+ (void)addActivityFile:(NSString *)file subject:(NSString *)subject message:(NSString *)message session:(NSString *)session type:(NSString *)type verbose:(NSInteger)verbose account:(NSString *)account
++ (void)addActivityFile:(NSString *)file action:(NSString *)action note:(NSString *)note session:(NSString *)session type:(NSString *)type verbose:(NSInteger)verbose account:(NSString *)account
 {
     [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
         
         TableActivity *record = [TableActivity MR_createEntityInContext:localContext];
         
         record.account = account;
-        record.idActivity = 0;
         record.date = [NSDate date];
         record.file = file;
+        record.note = note;
         record.session = session;
         record.type = type;
         record.verbose = [NSNumber numberWithInteger:verbose];

iOSClient/Networking/OCNetworking.m

@@ -168,9 +168,9 @@
 #pragma mark ===== Activity LOG =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)createActivityType:(NSString *)type Verbose:(NSInteger)verbose
+- (void)createActivityType:(NSString *)type Verbose:(NSInteger)verbose note:(NSString *)note
 {
-    [CCCoreData addActivityFile:_fileActivityLog subject:_metadataNet.selector message:_metadataNet.action session:[CCUtility createRandomString:16] type:type verbose:verbose account:_metadataNet.account];
+    [CCCoreData addActivityFile:_fileActivityLog action:_metadataNet.action note:note session:[CCUtility createRandomString:16] type:type verbose:verbose account:_metadataNet.account];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -431,7 +431,8 @@
         if ([error code] == NSURLErrorServerCertificateUntrusted)
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
-        [self createActivityType:k_activityTypeFailure Verbose:k_activityVerboseClientDebug];
+        [self createActivityType:k_activityTypeFailure Verbose:k_activityVerboseClientDebug note:[error.userInfo valueForKey:@"NSLocalizedDescription"]];
+        
         [self complete];
     }];
 }