Constant for Activity Debug

Picker/DocumentPickerViewController.swift

@@ -400,7 +400,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         hud.hideHud()
         
         // Activity
-        CCCoreData.addActivityFile(fileID, action: "Download File Document Picker", note: "Selector : \(selector) Error : \(message)", type: k_activityTypeFailure, verbose: Int(k_activityVerboseDebug), account: self.activeAccount)
+        CCCoreData.addActivityFile(fileID, action: k_activityDebugActionDownloadPicker, note: "Selector : \(selector) Error : \(message)", type: k_activityTypeFailure, verbose: Int(k_activityVerboseDebug), account: self.activeAccount)
 
         if selector == selectorLoadFileView && errorCode != -999 {
             
@@ -420,7 +420,7 @@ 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)", type: k_activityTypeSuccess, verbose: Int(k_activityVerboseDebug), account: metadata!.account)
+        CCCoreData.addActivityFile(metadata!.fileName, action: k_activityDebugActionDownloadPicker, note: "Selector : \(selector)", type: k_activityTypeSuccess, verbose: Int(k_activityVerboseDebug), account: metadata!.account)
         
         switch selector {
             
@@ -466,7 +466,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         hud.hideHud()
         
         // Activity
-        CCCoreData.addActivityFile(metadataNet.fileName, action: "Upload File Document Picker", note: "Selector : \(selector) Error : \(message)", type: k_activityTypeFailure, verbose: Int(k_activityVerboseDebug), account: metadataNet.account)
+        CCCoreData.addActivityFile(metadataNet.fileName, action: k_activityDebugActionUploadPicker, note: "Selector : \(selector) Error : \(message)", type: k_activityTypeFailure, verbose: Int(k_activityVerboseDebug), account: metadataNet.account)
         
         // remove file
         CCCoreData.deleteMetadata(with: NSPredicate(format: "(account == '\(activeAccount!)') AND (fileID == '\(fileID)')"))
@@ -488,7 +488,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
         hud.hideHud()
         
         // Activity
-        CCCoreData.addActivityFile(metadataNet.fileName, action: "Upload File Document Picker", note: "Selector : \(selector)", type: k_activityTypeSuccess, verbose: Int(k_activityVerboseDebug), account: metadataNet.account)
+        CCCoreData.addActivityFile(metadataNet.fileName, action: k_activityDebugActionUploadPicker, note: "Selector : \(selector)", type: k_activityTypeSuccess, verbose: Int(k_activityVerboseDebug), account: metadataNet.account)
         
         dismissGrantingAccess(to: self.destinationURL)
     }

Share Ext/ShareViewController.m

@@ -304,7 +304,7 @@
     [self.hud hideHud];
     
     // Activity
-    [CCCoreData addActivityFile:metadataNet.fileName action:@"Upload File" note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadataNet.account];
+    [CCCoreData addActivityFile:metadataNet.fileName action:k_activityDebugActionUploadShare note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadataNet.account];
     
     // remove file 
     [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount]];
@@ -335,7 +335,7 @@
     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] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:metadataNet.account];
+    [CCCoreData addActivityFile:metadataNet.fileName action:k_activityDebugActionUploadShare note:[NSString stringWithFormat:@"Selector : %@", selector] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:metadataNet.account];
     
     [self.filesName removeObject:metadata.fileNamePrint];
     [self.shareTable performSelectorOnMainThread:@selector(reloadData) withObject:nil waitUntilDone:NO];

iOSClient/CCGlobal.h

@@ -250,6 +250,22 @@ extern NSString *const urlBaseUploadDB;
 #define k_activityTypeSuccess                           @"success"
 #define k_activityTypeFailure                           @"error"
 
+#define k_activityDebugActionDownload                   @"Download"
+#define k_activityDebugActionDownloadPicker             @"Download Picker"
+#define k_activityDebugActionUpload                     @"Upload"
+#define k_activityDebugActionUploadPicker               @"Upload Picker"
+#define k_activityDebugActionUploadShare                @"Upload Share"
+#define k_activityDebugActionAutomaticUpload            @"Automatic Upload"
+#define k_activityDebugActionReadFolder                 @"Read Folder"
+#define k_activityDebugActionGetNotification            @"Get Notification Server"
+#define k_activityDebugActionPushProxy                  @"Subscribing Push Proxy"
+#define k_activityDebugActionServerPush                 @"Subscribing Server Push"
+#define k_activityDebugActionFeatures                   @"Features Supported By Server"
+#define k_activityDebugActionCapabilities               @"Capabilities Of Server"
+
+
+
+
 // -----------------------------------------------------------------------------------------------------------
 // -----------------------------------------------------------------------------------------------------------
 

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] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadata.account];
+    [CCCoreData addActivityFile:metadata.fileNamePrint action:k_activityDebugActionDownload note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadata.account];
 
     // File do not exists on server, remove in local
     if (errorCode == kOCErrorServerPathNotFound || errorCode == kCFURLErrorBadServerResponse) {
@@ -1291,7 +1291,7 @@
     if (metadata == nil) return;
     
     // Activity
-    [CCCoreData addActivityFile:metadata.fileNamePrint action:@"Download File" note:[NSString stringWithFormat:@"Selector : %@", selector] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:metadata.account];
+    [CCCoreData addActivityFile:metadata.fileNamePrint action:k_activityDebugActionDownload note:[NSString stringWithFormat:@"Selector : %@", selector] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:metadata.account];
 
     // Download
     if ([selector isEqualToString:selectorDownloadFile]) {
@@ -1531,7 +1531,7 @@
 - (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] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadataNet.account];
+    [CCCoreData addActivityFile:metadataNet.fileName action:k_activityDebugActionUpload note:[NSString stringWithFormat:@"Selector : %@ Error : %@", selector, message] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadataNet.account];
 
     // Automatic upload
     if([selector isEqualToString:selectorUploadAutomatic] || [selector isEqualToString:selectorUploadAutomaticAll])
@@ -1559,7 +1559,7 @@
 - (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] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:metadataNet.account];
+    [CCCoreData addActivityFile:metadataNet.fileName action:k_activityDebugActionUpload note:[NSString stringWithFormat:@"Selector : %@", selector] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:metadataNet.account];
     
     // Automatic upload
     if([selector isEqualToString:selectorUploadAutomatic] || [selector isEqualToString:selectorUploadAutomaticAll])

iOSClient/Networking/OCNetworking.m

@@ -285,9 +285,6 @@
         if ([self.delegate respondsToSelector:@selector(downloadThumbnailFailure:message:errorCode:)] && [_metadataNet.action isEqualToString:actionDownloadThumbnail])
             [self.delegate downloadThumbnailFailure:_metadataNet message:[CCError manageErrorOC:response.statusCode error:error] errorCode:errorCode];
         
-        // Activity
-        [CCCoreData addActivityFile:_metadataNet.fileName action:@"Get Thumbnail" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
-        
         [self complete];
     }];
 }
@@ -405,7 +402,7 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
         // Activity
-        [CCCoreData addActivityFile:_metadataNet.serverUrl action:@"Read Folder" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
+        [CCCoreData addActivityFile:_metadataNet.serverUrl action:k_activityDebugActionReadFolder note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
         
         [self complete];
     }];
@@ -1172,7 +1169,7 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
         // Activity
-        [CCCoreData addActivityFile:_activeUrl action:@"Get Notification Server" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
+        [CCCoreData addActivityFile:_activeUrl action:k_activityDebugActionGetNotification note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
         
         [self complete];
     }];
@@ -1236,7 +1233,7 @@
         [communication subscribingPushProxy:k_pushNotificationServer pushToken:pushToken deviceIdentifier:deviceIdentifier deviceIdentifierSignature:signature userPublicKey:devicePublicKey onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSString *publicKey, NSString *deviceIdentifier, NSString *signature, NSString *redirectedServer) {
             
             // Activity
-            [CCCoreData addActivityFile:k_pushNotificationServer action:@"Subscribing Push Proxy" note:@"Service registered." type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:_metadataNet.account];
+            [CCCoreData addActivityFile:k_pushNotificationServer action:k_activityDebugActionPushProxy note:@"Service registered." type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:_metadataNet.account];
             
             [self complete];
             
@@ -1251,7 +1248,7 @@
                 [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
 
             // Activity
-            [CCCoreData addActivityFile:k_pushNotificationServer action:@"Subscribing Push Proxy" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
+            [CCCoreData addActivityFile:k_pushNotificationServer action:k_activityDebugActionPushProxy note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
 
             [self complete];
         }];
@@ -1267,7 +1264,7 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
         // Activity
-        [CCCoreData addActivityFile:_activeUrl action:@"Subscribing Server Push" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
+        [CCCoreData addActivityFile:_activeUrl action:k_activityDebugActionServerPush note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
 
         [self complete];
     }];
@@ -1374,7 +1371,7 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
         // Activity
-        [CCCoreData addActivityFile:_activeUrl action:@"Features Supported By Server" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
+        [CCCoreData addActivityFile:_activeUrl action:k_activityDebugActionFeatures note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
 
         [self complete];
     }];
@@ -1410,7 +1407,7 @@
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
 
         // Activity
-        [CCCoreData addActivityFile:_activeUrl action:@"Capabilities Of Server" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
+        [CCCoreData addActivityFile:_activeUrl action:k_activityDebugActionCapabilities note:[error.userInfo valueForKey:@"NSLocalizedDescription"] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
         
         [self complete];
     }];

iOSClient/Offline/CCOfflinePageContent.m

@@ -238,7 +238,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] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadata.account];
+    [CCCoreData addActivityFile:metadata.fileNamePrint action:k_activityDebugActionDownload note:[NSString stringWithFormat:@"Selector : %@ - Error : %@", selector, message] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:metadata.account];
     
     [app messageNotification:@"_download_file_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
     
@@ -250,7 +250,7 @@
     _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 : %@", selector] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:_metadata.account];
+    [CCCoreData addActivityFile:_metadata.fileNamePrint action:k_activityDebugActionDownload note:[NSString stringWithFormat:@"Selector : %@", selector] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:_metadata.account];
     
     // File exists
     if ([self shouldPerformSegue])

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -1094,7 +1094,7 @@
         return;
     
     // Activity
-    [CCCoreData addActivityFile:@"" action:@"Automatic Upload" note:[NSString stringWithFormat:@"Number : %lu", [newItemsToUpload count]] type:k_activityTypeInfo verbose:k_activityVerboseDebug account:app.activeAccount];
+    [CCCoreData addActivityFile:@"" action:k_activityDebugActionAutomaticUpload note:[NSString stringWithFormat:@"Number : %lu", [newItemsToUpload count]] type:k_activityTypeInfo verbose:k_activityVerboseDebug account:app.activeAccount];
     
     // STOP new request : initStateCameraUpload
     //_AutomaticCameraUploadInProgress = YES;
@@ -1157,7 +1157,7 @@
         //_AutomaticCameraUploadInProgress = NO;
         
         // Activity
-        [CCCoreData addActivityFile:@"" action:@"Automatic Upload" note:description type:k_activityTypeFailure verbose:k_activityVerboseDebug account:app.activeAccount];
+        [CCCoreData addActivityFile:@"" action:k_activityDebugActionAutomaticUpload note:description type:k_activityTypeFailure verbose:k_activityVerboseDebug account:app.activeAccount];
         
         return;
     }
@@ -1175,7 +1175,7 @@
                     [app messageNotification:@"_error_" description:@"_error_createsubfolders_upload_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
                 
                 // Activity
-                [CCCoreData addActivityFile:@"" action:@"Automatic Upload" note:NSLocalizedString(@"_error_createsubfolders_upload_",nil) type:k_activityTypeFailure verbose:k_activityVerboseDebug account:app.activeAccount];
+                [CCCoreData addActivityFile:@"" action:k_activityDebugActionAutomaticUpload note:NSLocalizedString(@"_error_createsubfolders_upload_",nil) type:k_activityTypeFailure verbose:k_activityVerboseDebug account:app.activeAccount];
                 
                 return;
             }
@@ -1234,7 +1234,7 @@
         NSString *media = @"";
         if (assetMediaType == PHAssetMediaTypeImage) media = @"Image";
         if (assetMediaType == PHAssetMediaTypeVideo) media = @"Video";
-        [CCCoreData addActivityFile:[NSString stringWithFormat:@"%@/%@", serverUrl, fileName] action:@"Automatic Upload" note:[NSString stringWithFormat:@"Add TableAutomaticUpload on Session : %@, Set Data asset %@", session, media] type:k_activityTypeInfo verbose:k_activityVerboseDebug account:app.activeAccount];
+        [CCCoreData addActivityFile:fileName action:k_activityDebugActionAutomaticUpload note:[NSString stringWithFormat:@"Add TableAutomaticUpload on Session : %@, Set Data asset %@", session, media] type:k_activityTypeInfo verbose:k_activityVerboseDebug account:app.activeAccount];
         
         // Upldate Camera Upload data  
         if ([metadataNet.selector isEqualToString:selectorUploadAutomatic])