Activity LOG

Picker/DocumentPickerViewController.swift

@@ -346,9 +346,6 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
     func downloadThumbnailFailure(_ metadataNet: CCMetadataNet!, message: String!, errorCode: Int) {
         
         NSLog("[LOG] Thumbnail Error \(metadataNet.fileName) \(message) (error \(errorCode))");
-        
-        // Activity
-        CCCoreData.addActivityFile(metadataNet.fileID, action: k_activityDebugActionDownloadThumbnail, note: "Selector : \(metadataNet.selector!) Error : \(message)", type: k_activityTypeFailure, verbose: Int(k_activityVerboseHigh), account: self.activeAccount)
     }
     
     func downloadThumbnailSuccess(_ metadataNet: CCMetadataNet!) {
@@ -402,9 +399,6 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         
         hud.hideHud()
         
-        // Activity
-        CCCoreData.addActivityFile(fileID, action: k_activityDebugActionDownloadPicker, note: "Selector : \(selector!) Error : \(message)", type: k_activityTypeFailure, verbose: Int(k_activityVerboseDefault), account: self.activeAccount)
-
         if selector == selectorLoadFileView && errorCode != -999 {
             
             let alert = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: message, preferredStyle: .alert)
@@ -422,9 +416,6 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         
         let metadata = CCCoreData.getMetadataWithPreficate(NSPredicate(format: "(account == '\(activeAccount!)') AND (fileID == '\(fileID!)')"), context: nil)
         
-        // Activity
-        CCCoreData.addActivityFile(metadata!.fileName, action: k_activityDebugActionDownloadPicker, note: "Selector : \(selector!)", type: k_activityTypeSuccess, verbose: Int(k_activityVerboseDefault), account: metadata!.account)
-        
         switch selector {
             
         case selectorLoadFileView :
@@ -468,9 +459,6 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         
         hud.hideHud()
         
-        // Activity
-        CCCoreData.addActivityFile(metadataNet.fileName, action: k_activityDebugActionUploadPicker, note: "Selector : \(selector) Error : \(message)", type: k_activityTypeFailure, verbose: Int(k_activityVerboseDefault), account: metadataNet.account)
-        
         // remove file
         CCCoreData.deleteMetadata(with: NSPredicate(format: "(account == '\(activeAccount!)') AND (fileID == '\(fileID)')"))
         
@@ -489,10 +477,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
     func uploadFileSuccess(_ metadataNet: CCMetadataNet, fileID: String, serverUrl: String, selector: String, selectorPost: String) {
         
         hud.hideHud()
-        
-        // Activity
-        CCCoreData.addActivityFile(metadataNet.fileName, action: k_activityDebugActionUploadPicker, note: "Selector : \(selector)", type: k_activityTypeSuccess, verbose: Int(k_activityVerboseHigh), account: metadataNet.account)
-        
+                
         dismissGrantingAccess(to: self.destinationURL)
     }
 }

Share Ext/ShareViewController.m

@@ -308,9 +308,6 @@
 {
     [self.hud hideHud];
     
-    // Activity
-    [CCCoreData addActivityFile:metadataNet.fileName action:k_activityDebugActionUploadShare note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] type:k_activityTypeFailure verbose:k_activityVerboseHigh account:metadataNet.account];
-    
     // remove file 
     [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount]];
     
@@ -338,10 +335,7 @@
     [self.hud hideHud];
     
     CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount] context:nil];
-    
-    // Activity
-    [CCCoreData addActivityFile:metadataNet.fileName action:k_activityDebugActionUploadShare note:[NSString stringWithFormat:@"Selector : %@", selector] type:k_activityTypeSuccess verbose:k_activityVerboseHigh account:metadataNet.account];
-    
+        
     [self.filesName removeObject:metadata.fileNamePrint];
     [self.shareTable performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:NO];
     

iOSClient/FileSystem/CCCoreData.m

@@ -1876,7 +1876,9 @@
         
         TableActivity *record = [TableActivity MR_createEntityInContext:localContext];
         
-        record.account = account;
+        if (!account) record.account = @"";
+        else record.account = account;
+        
         record.action = action;
         record.date = [NSDate date];
         record.file = file;

iOSClient/Main/CCMain.m

@@ -1251,9 +1251,6 @@
 {
     CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
     
-    // Activity
-    [CCCoreData addActivityFile:metadata.fileNamePrint action:k_activityDebugActionDownload note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] type:k_activityTypeFailure verbose:k_activityVerboseDefault account:metadata.account];
-
     // File do not exists on server, remove in local
     if (errorCode == kOCErrorServerPathNotFound || errorCode == kCFURLErrorBadServerResponse) {
         [CCCoreData deleteFile:metadata serverUrl:serverUrl directoryUser:app.directoryUser activeAccount:app.activeAccount];
@@ -1287,9 +1284,6 @@
     
     if (metadata == nil) return;
     
-    // Activity
-    [CCCoreData addActivityFile:metadata.fileNamePrint action:k_activityDebugActionDownload note:[NSString stringWithFormat:@"Selector : %@", selector] type:k_activityTypeSuccess verbose:k_activityVerboseDefault account:metadata.account];
-
     // Download
     if ([selector isEqualToString:selectorDownloadFile]) {
         [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
@@ -1527,9 +1521,6 @@
 
 - (void)uploadFileFailure:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector message:(NSString *)message errorCode:(NSInteger)errorCode
 {
-    // Activity
-    [CCCoreData addActivityFile:metadataNet.fileName action:k_activityDebugActionUpload note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] type:k_activityTypeFailure verbose:k_activityVerboseDefault account:metadataNet.account];
-
     // Automatic upload
     if([selector isEqualToString:selectorUploadAutomatic] || [selector isEqualToString:selectorUploadAutomaticAll])
         [app loadTableAutomaticUploadForSelector:selector];
@@ -1555,9 +1546,6 @@
 
 - (void)uploadFileSuccess:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost
 {
-    // Activity
-    [CCCoreData addActivityFile:metadataNet.fileName action:k_activityDebugActionUpload note:[NSString stringWithFormat:@"Selector : %@", selector] type:k_activityTypeSuccess verbose:k_activityVerboseDefault account:metadataNet.account];
-    
     // Automatic upload
     if([selector isEqualToString:selectorUploadAutomatic] || [selector isEqualToString:selectorUploadAutomaticAll])
         [app loadTableAutomaticUploadForSelector:selector];

iOSClient/MenuAccount+ControlCenter/CCControlCenterActivity.m

@@ -84,7 +84,7 @@
         if ([CCUtility getActivityVerboseHigh])
             _sectionDataSource = [CCCoreData getAllTableActivityWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@)", app.activeAccount]];
         else
-            _sectionDataSource = [CCCoreData getAllTableActivityWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (verbose == %lu)", app.activeAccount, k_activityVerboseDefault]];
+            _sectionDataSource = [CCCoreData getAllTableActivityWithPredicate:[NSPredicate predicateWithFormat:@"((account == %@) || (account == '')) AND (verbose == %lu)", app.activeAccount, k_activityVerboseDefault]];
         
         if ([[app.controlCenter getActivePage] isEqualToString:k_pageControlCenterActivity]) {
             

iOSClient/Networking/CCNetworking.m

@@ -382,7 +382,7 @@
     NSString *serverUrl = [self getServerUrlFromUrl:url];
     
     CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(session = %@) AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))",session.sessionDescription, task.taskIdentifier, task.taskIdentifier] context:_context];
-    
+
     NSInteger errorCode;
     NSString *fileID = metadata.fileID;
     NSString *rev = metadata.rev;
@@ -419,8 +419,17 @@
         NSDictionary *fields = [httpResponse allHeaderFields];
             
         if (errorCode == 0) {
+            
             rev = [CCUtility removeForbiddenCharacters:[fields objectForKey:@"OC-ETag"] hasServerForbiddenCharactersSupport:NO];
             date = [dateFormatter dateFromString:[fields objectForKey:@"Date"]];
+
+            // Activity
+            [CCCoreData addActivityFile:fileName action:k_activityDebugActionDownload note:[NSString stringWithFormat:@"Server : %@", serverUrl] type:k_activityTypeSuccess verbose:k_activityVerboseDefault account:metadata.account];
+            
+        } else {
+            
+            // Activity
+            [CCCoreData addActivityFile:fileName action:k_activityDebugActionDownload note:[NSString stringWithFormat:@"Server : %@ Error : %@", serverUrl, [error localizedDescription]] type:k_activityTypeFailure verbose:k_activityVerboseDefault account:metadata.account];
         }
         
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -442,9 +451,18 @@
         NSDictionary *fields = [httpResponse allHeaderFields];
             
         if (errorCode == 0) {
+            
             fileID = [CCUtility removeForbiddenCharacters:[fields objectForKey:@"OC-FileId"] hasServerForbiddenCharactersSupport:NO];
             rev = [CCUtility removeForbiddenCharacters:[fields objectForKey:@"OC-ETag"] hasServerForbiddenCharactersSupport:NO];
             date = [dateFormatter dateFromString:[fields objectForKey:@"Date"]];
+            
+            // Activity
+            [CCCoreData addActivityFile:fileName action:k_activityDebugActionUpload note:[NSString stringWithFormat:@"Server : %@", serverUrl] type:k_activityTypeSuccess verbose:k_activityVerboseDefault account:metadata.account];
+
+        } else {
+            
+            // Activity
+            [CCCoreData addActivityFile:fileName action:k_activityDebugActionUpload note:[NSString stringWithFormat:@"Server : %@ Error : %@", serverUrl, [error localizedDescription]] type:k_activityTypeFailure verbose:k_activityVerboseDefault account:metadata.account];
         }
         
         dispatch_async(dispatch_get_main_queue(), ^{

iOSClient/Offline/CCOfflinePageContent.m

@@ -231,12 +231,7 @@
 #pragma --------------------------------------------------------------------------------------------
 
 - (void)downloadFileFailure:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector message:(NSString *)message errorCode:(NSInteger)errorCode
-{
-    CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
-    
-    // Activity
-    [CCCoreData addActivityFile:metadata.fileNamePrint action:k_activityDebugActionDownload note:[NSString stringWithFormat:@"Selector : %@ - Error : %@", selector, message] type:k_activityTypeFailure verbose:k_activityVerboseDefault account:metadata.account];
-    
+{    
     [app messageNotification:@"_download_file_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
     
     [app updateApplicationIconBadgeNumber];
@@ -246,9 +241,6 @@
 {
     _metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
     
-    // Activity
-    [CCCoreData addActivityFile:_metadata.fileNamePrint action:k_activityDebugActionDownload note:[NSString stringWithFormat:@"Selector : %@", selector] type:k_activityTypeSuccess verbose:k_activityVerboseDefault account:_metadata.account];
-    
     // File exists
     if ([self shouldPerformSegue])
         [self performSegueWithIdentifier:@"segueDetail" sender:self];

iOSClient/Settings/CCManageHelp.m

@@ -185,7 +185,7 @@
     // Email Recipents
     NSArray *toRecipents;
     
-    NSArray *activities = [CCCoreData getAllTableActivityWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@)", app.activeAccount]];
+    NSArray *activities = [CCCoreData getAllTableActivityWithPredicate:[NSPredicate predicateWithFormat:@"((account == %@) || (account == ''))", app.activeAccount]];
     
     if ([activities count] == 0) {