Browse Source

Activity LOG

Marino Faggiana 8 years ago
parent
commit
78d3d948b1

+ 1 - 1
iOSClient/Actions/CCActions.swift

@@ -384,7 +384,7 @@ class CCActions: NSObject {
         NSLog("[LOG] Thumbnail Error \(metadataNet.fileName!) \(message) error %\(errorCode))")
         
         // Activity
-        CCCoreData.addActivityFile(metadataNet.fileID, action: k_activityDebugActionDownloadThumbnail, selector: metadataNet.selector! , note: "Error : \(message)", type: k_activityTypeFailure, verbose: Int(k_activityVerboseHigh), account: appDelegate.activeAccount)
+        CCCoreData.addActivityFile(metadataNet.fileID, action: k_activityDebugActionDownloadThumbnail, selector: metadataNet.selector! , note: "Error: \(message)", type: k_activityTypeFailure, verbose: Int(k_activityVerboseHigh), account: appDelegate.activeAccount)
     }
 
     // --------------------------------------------------------------------------------------------

+ 2 - 2
iOSClient/MenuAccount+ControlCenter/CCControlCenterActivity.m

@@ -135,7 +135,7 @@
     [noteLabel setFont:fontSizeNote];
     [noteLabel sizeToFit];
     
-    if ([activity.verbose integerValue] == k_activityVerboseHigh) noteLabel.text = [NSString stringWithFormat:@"%@ Selector : %@", activity.note, activity.selector];
+    if ([CCUtility getActivityVerboseHigh]) noteLabel.text = [NSString stringWithFormat:@"%@ Selector : %@", activity.note, activity.selector];
     else noteLabel.text = activity.note;
     
     noteLabel.lineBreakMode = NSLineBreakByWordWrapping;
@@ -203,7 +203,7 @@
     noteLabel.numberOfLines = 0;
     noteLabel.lineBreakMode = NSLineBreakByWordWrapping;
     
-    if ([activity.verbose integerValue] == k_activityVerboseHigh) noteLabel.text = [NSString stringWithFormat:@"%@ Selector : %@", activity.note, activity.selector];
+    if ([CCUtility getActivityVerboseHigh]) noteLabel.text = [NSString stringWithFormat:@"%@ Selector: %@", activity.note, activity.selector];
     else noteLabel.text = activity.note;
 
     //headerView.backgroundColor = [UIColor blueColor];

+ 2 - 2
iOSClient/Networking/CCNetworking.m

@@ -429,7 +429,7 @@
         } else {
             
             // Activity
-            [CCCoreData addActivityFile:fileName action:k_activityDebugActionDownload selector:metadata.sessionSelector note:[NSString stringWithFormat:@"Server : %@ Error : %@", serverUrl, [error localizedDescription]] type:k_activityTypeFailure verbose:k_activityVerboseDefault account:metadata.account];
+            [CCCoreData addActivityFile:fileName action:k_activityDebugActionDownload selector:metadata.sessionSelector note:[NSString stringWithFormat:@"Server: %@ Error: %@", serverUrl, [error localizedDescription]] type:k_activityTypeFailure verbose:k_activityVerboseDefault account:metadata.account];
         }
         
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -462,7 +462,7 @@
         } else {
             
             // Activity
-            [CCCoreData addActivityFile:fileName action:k_activityDebugActionUpload selector:metadata.sessionSelector note:[NSString stringWithFormat:@"Server : %@ Error : %@", serverUrl, [error localizedDescription]] type:k_activityTypeFailure verbose:k_activityVerboseDefault account:metadata.account];
+            [CCCoreData addActivityFile:fileName action:k_activityDebugActionUpload selector:metadata.sessionSelector note:[NSString stringWithFormat:@"Server: %@ Error: %@", serverUrl, [error localizedDescription]] type:k_activityTypeFailure verbose:k_activityVerboseDefault account:metadata.account];
         }
         
         dispatch_async(dispatch_get_main_queue(), ^{

+ 2 - 2
iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -1105,7 +1105,7 @@
         return;
     
     // Activity
-    [CCCoreData addActivityFile:@"" action:k_activityDebugActionAutomaticUpload selector:@"" note:[NSString stringWithFormat:@"Number : %lu", [newItemsToUpload count]] type:k_activityTypeInfo verbose:k_activityVerboseHigh account:app.activeAccount];
+    [CCCoreData addActivityFile:@"" action:k_activityDebugActionAutomaticUpload selector:@"" note:[NSString stringWithFormat:@"Number: %lu", [newItemsToUpload count]] type:k_activityTypeInfo verbose:k_activityVerboseHigh account:app.activeAccount];
     
     // STOP new request : initStateCameraUpload
     //_AutomaticCameraUploadInProgress = YES;
@@ -1245,7 +1245,7 @@
         NSString *media = @"";
         if (assetMediaType == PHAssetMediaTypeImage) media = @"Image";
         if (assetMediaType == PHAssetMediaTypeVideo) media = @"Video";
-        [CCCoreData addActivityFile:fileName action:k_activityDebugActionAutomaticUpload selector:@"" note:[NSString stringWithFormat:@"Add TableAutomaticUpload on Session : %@, Set Data asset %@", session, media] type:k_activityTypeInfo verbose:k_activityVerboseHigh account:app.activeAccount];
+        [CCCoreData addActivityFile:fileName action:k_activityDebugActionAutomaticUpload selector:@"" note:[NSString stringWithFormat:@"Add TableAutomaticUpload on Session: %@, Set Data asset %@", session, media] type:k_activityTypeInfo verbose:k_activityVerboseHigh account:app.activeAccount];
         
         // Upldate Camera Upload data  
         if ([metadataNet.selector isEqualToString:selectorUploadAutomatic])