Activity event

Picker/DocumentPickerViewController.swift

@@ -399,6 +399,9 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         
         hud.hideHud()
         
+        // Activity
+        CCCoreData.addActivityFile(fileID, action: "Download File Document Picker", note: "Selector : \(selector) Error : \(message)", session: CCUtility.createRandomString(16), type: k_activityTypeFailure, verbose: Int(k_activityVerboseDebug), account: self.activeAccount)
+
         if selector == selectorLoadFileView && errorCode != -999 {
             
             let alert = UIAlertController(title: NSLocalizedString("_error_", comment: ""), message: message, preferredStyle: .alert)
@@ -416,6 +419,9 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         
         let metadata = CCCoreData.getMetadataWithPreficate(NSPredicate(format: "(account == '\(activeAccount!)') AND (fileID == '\(fileID!)')"), context: nil)
         
+        // Activity
+        CCCoreData.addActivityFile(metadata!.fileName, action: "Download File Document Picker", note: "Selector : \(selector)", session: CCUtility.createRandomString(16), type: k_activityTypeSuccess, verbose: Int(k_activityVerboseDebug), account: metadata!.account)
+        
         switch selector {
             
         case selectorLoadFileView :
@@ -459,6 +465,9 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         
         hud.hideHud()
         
+        // Activity
+        CCCoreData.addActivityFile(metadataNet.fileName, action: "Upload File Document Picker", note: "Selector : \(selector) Error : \(message)", session: CCUtility.createRandomString(16), type: k_activityTypeFailure, verbose: Int(k_activityVerboseDebug), account: metadataNet.account)
+        
         // remove file
         CCCoreData.deleteMetadata(with: NSPredicate(format: "(account == '\(activeAccount!)') AND (fileID == '\(fileID)')"))
         
@@ -478,6 +487,9 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         
         hud.hideHud()
         
+        // Activity
+        CCCoreData.addActivityFile(metadataNet.fileName, action: "Upload File Document Picker", note: "Selector : \(selector)", session: CCUtility.createRandomString(16), type: k_activityTypeSuccess, verbose: Int(k_activityVerboseDebug), account: metadataNet.account)
+        
         dismissGrantingAccess(to: self.destinationURL)
     }
 }

Share Ext/ShareViewController.m

@@ -303,6 +303,9 @@
 {
     [self.hud hideHud];
     
+    // Activity
+    [CCCoreData addActivityFile:metadataNet.fileName action:@"Upload File" note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadataNet.account];
+    
     // remove file 
     [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount]];
     
@@ -331,6 +334,9 @@
     
     CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount] context:nil];
     
+    // Activity
+    [CCCoreData addActivityFile:metadataNet.fileName action:@"Upload File" note:[NSString stringWithFormat:@"Selector : %@", selector] session:[CCUtility createRandomString:16] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:metadataNet.account];
+    
     [self.filesName removeObject:metadata.fileNamePrint];
     [self.shareTable performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:NO];
     

iOSClient/Main/CCMain.m

@@ -1255,7 +1255,7 @@
     CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
     
     // Activity
-    [CCCoreData addActivityFile:metadata.fileNamePrint action:@"Download File" note:[NSString stringWithFormat:@"Selector : %@ - Error : %@", selector, message] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadata.account];
+    [CCCoreData addActivityFile:metadata.fileNamePrint action:@"Download File" note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadata.account];
 
     // File do not exists on server, remove in local
     if (errorCode == kOCErrorServerPathNotFound || errorCode == kCFURLErrorBadServerResponse) {
@@ -1530,6 +1530,9 @@
 
 - (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:@"Upload File" note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadataNet.account];
+
     // Automatic upload
     if([selector isEqualToString:selectorUploadAutomatic] || [selector isEqualToString:selectorUploadAutomaticAll])
         [app loadTableAutomaticUploadForSelector:selector];
@@ -1555,6 +1558,9 @@
 
 - (void)uploadFileSuccess:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost
 {
+    // Activity
+    [CCCoreData addActivityFile:metadataNet.fileName action:@"Upload File" note:[NSString stringWithFormat:@"Selector : %@", selector] session:[CCUtility createRandomString:16] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:metadataNet.account];
+    
     // Automatic upload
     if([selector isEqualToString:selectorUploadAutomatic] || [selector isEqualToString:selectorUploadAutomaticAll])
         [app loadTableAutomaticUploadForSelector:selector];