Эх сурвалжийг харах

Activity Download File Success

Marino Faggiana 8 жил өмнө
parent
commit
c288566552

+ 1 - 1
iOSClient/CCGlobal.h

@@ -247,7 +247,7 @@ extern NSString *const urlBaseUploadDB;
 #define k_activityVerboseDefault                        0
 #define k_activityVerboseDebug                          1
 #define k_activityTypeInfo                              @"info"
-#define k_activityTypeSucces                            @"success"
+#define k_activityTypeSuccess                           @"success"
 #define k_activityTypeFailure                           @"error"
 
 // -----------------------------------------------------------------------------------------------------------

+ 0 - 0
iOSClient/Images.xcassets/activityTypeSucces.imageset/Contents.json → iOSClient/Images.xcassets/activityTypeSuccess.imageset/Contents.json


+ 0 - 0
iOSClient/Images.xcassets/activityTypeSucces.imageset/activityTypeSucces@2x.png → iOSClient/Images.xcassets/activityTypeSuccess.imageset/activityTypeSucces@2x.png


+ 3 - 0
iOSClient/Main/CCMain.m

@@ -1286,6 +1286,9 @@
     CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
     
     if (metadata == nil) return;
+    
+    // Activity
+    [CCCoreData addActivityFile:metadata.fileNamePrint action:@"Download File" note:[NSString stringWithFormat:@"Selector : %@", selector] session:[CCUtility createRandomString:16] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:metadata.account];
 
     // Download
     if ([selector isEqualToString:selectorDownloadFile]) {

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

@@ -177,8 +177,8 @@
         typeImage.image = [UIImage imageNamed:@"activityTypeInfo"];
     }
     
-    if ([activity.type isEqualToString:k_activityTypeSucces]) {
-        actionLabel.textColor = [UIColor greenColor];
+    if ([activity.type isEqualToString:k_activityTypeSuccess]) {
+        actionLabel.textColor = [UIColor colorWithRed:87.0/255.0 green:187.0/255.0 blue:57.0/255.0 alpha:1.0];;
         typeImage.image = [UIImage imageNamed:@"activityTypeSuccess"];
     }
     

+ 1 - 1
iOSClient/Networking/OCNetworking.m

@@ -1236,7 +1236,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." session:[CCUtility createRandomString:16] type:k_activityTypeSucces verbose:k_activityVerboseDebug account:_metadataNet.account];
+            [CCCoreData addActivityFile:k_pushNotificationServer action:@"Subscribing Push Proxy" note:@"Service registered." session:[CCUtility createRandomString:16] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:_metadataNet.account];
             
             [self complete];
             

+ 3 - 0
iOSClient/Offline/CCOfflinePageContent.m

@@ -244,6 +244,9 @@
 {
     _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] session:[CCUtility createRandomString:16] type:k_activityTypeSuccess verbose:k_activityVerboseDebug account:_metadata.account];
+    
     // File exists
     if ([self shouldPerformSegue])
         [self performSegueWithIdentifier:@"segueDetail" sender:self];