activity protocol

iOSClient/FileSystem/CCCoreData.m

@@ -1860,11 +1860,15 @@
         TableActivity *record = [TableActivity MR_createEntityInContext:localContext];
 
         record.account = account;
-        record.idActivity = [NSNumber numberWithInteger:activity.idActivity];
+        record.action = @"Server";
         record.date = activity.date;
         record.file = activity.file;
+        record.idActivity = [NSNumber numberWithInteger:activity.idActivity];
         record.link = activity.link;
         record.note = activity.subject;
+        record.session = @"";
+        record.type = k_activityTypeInfo;
+        record.verbose = [NSNumber numberWithInteger:k_activityVerboseServer];
     }];
 }
 
@@ -1875,8 +1879,11 @@
         TableActivity *record = [TableActivity MR_createEntityInContext:localContext];
         
         record.account = account;
+        record.action = action;
         record.date = [NSDate date];
         record.file = file;
+        record.idActivity = 0;
+        record.link = @"";
         record.note = note;
         record.session = session;
         record.type = type;

iOSClient/MenuAccount+ControlCenter/CCControlCenterActivity.m

@@ -154,7 +154,8 @@
     UIImageView *typeImage = (UIImageView *) [headerView viewWithTag:102];
         
     dataLabel.textColor = [UIColor colorWithRed:130.0/255.0 green:130.0/255.0 blue:130.0/255.0 alpha:1.0];
-    dataLabel.text =  [CCUtility getTitleSectionDate:date];
+    NSString *strigDate = [CCUtility getTitleSectionDate:date];
+    dataLabel.text = [NSString stringWithFormat:@"%@ %@", strigDate, activity.action];
     [dataLabel setFont:fontSizeData];
     
     if ([activity.type length] == 0 || [activity.type isEqualToString:k_activityTypeInfo])
@@ -198,7 +199,6 @@
 #pragma mark - ==== Utility ====
 #pragma --------------------------------------------------------------------------------------------
 
-
 - (CGFloat)getLabelHeight:(UILabel*)label
 {
     CGSize constraint = CGSizeMake(self.collectionView.frame.size.width, CGFLOAT_MAX);

iOSClient/Networking/OCNetworking.m

@@ -41,10 +41,6 @@
     
     BOOL _isCryptoCloudMode;
     BOOL _hasServerForbiddenCharactersSupport;
-    
-    NSString *_fileActivityLog;
-    NSString *_messageActivityLog;
-    NSString *_subjectActivityLog;
 }
 @end
 
@@ -132,23 +128,6 @@
         
     if([self respondsToSelector:NSSelectorFromString(_metadataNet.action)])
         [self performSelector:NSSelectorFromString(_metadataNet.action)];
-    
-    // Activity LOG
-    if ([_metadataNet.selector length] > 0) {
-        
-        if ([_metadataNet.fileName length] > 0) {
-            
-            _fileActivityLog = [NSString stringWithFormat:@"%@/%@", _metadataNet.serverUrl, _metadataNet.fileName];
-            _messageActivityLog = [CCUtility returnFileNamePathFromFileName:_metadataNet.fileName serverUrl:_metadataNet.serverUrl activeUrl:_activeUrl];
-            _subjectActivityLog = _metadataNet.action;
-
-        } else {
-            
-            _fileActivityLog = _metadataNet.serverUrl;
-            _messageActivityLog = [CCUtility returnFileNamePathFromFileName:@"" serverUrl:_metadataNet.serverUrl activeUrl:_activeUrl];
-            _subjectActivityLog = _metadataNet.action;
-        }
-    }
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -164,15 +143,6 @@
 #endif
 }
 
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Activity LOG =====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)createActivityType:(NSString *)type Verbose:(NSInteger)verbose note:(NSString *)note
-{
-    [CCCoreData addActivityFile:_fileActivityLog action:_metadataNet.action note:note session:[CCUtility createRandomString:16] type:type verbose:verbose account:_metadataNet.account];
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== downloadFile =====
 #pragma --------------------------------------------------------------------------------------------
@@ -431,7 +401,8 @@
         if ([error code] == NSURLErrorServerCertificateUntrusted)
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
-        [self createActivityType:k_activityTypeFailure Verbose:k_activityVerboseClientDebug note:[error.userInfo valueForKey:@"NSLocalizedDescription"]];
+        // Activity
+        [CCCoreData addActivityFile:_metadataNet.serverUrl action:_metadataNet.action note:[error.userInfo valueForKey:@"NSLocalizedDescription"] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseClientDebug account:_metadataNet.account];
         
         [self complete];
     }];