activity protocol

iOSClient/Images.xcassets/activityTypeFailure.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "activityTypeFailure@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iOSClient/Images.xcassets/activityTypeInfo.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "activityTypeInfo@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iOSClient/Images.xcassets/activityTypeSucces.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "activityTypeSucces@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

iOSClient/MenuAccount+ControlCenter/CCControlCenterActivity.m

@@ -78,10 +78,10 @@
     
     if (app.controlCenter.isOpen) {
         
-         _sectionDataSource = [CCCoreData getAllTableActivityWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (idActivity != 0)", app.activeAccount]];
-        
-        //_sectionDataSource = [CCSectionActivity creataDataSourseSectionActivity:records activeAccount:app.activeAccount];
+         //_sectionDataSource = [CCCoreData getAllTableActivityWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (idActivity != 0)", app.activeAccount]];
         
+        _sectionDataSource = [CCCoreData getAllTableActivityWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@)", app.activeAccount]];
+                
         if ([[app.controlCenter getActivePage] isEqualToString:k_pageControlCenterActivity]) {
             
             if ([_sectionDataSource count] == 0) {
@@ -158,7 +158,13 @@
     [dataLabel setFont:fontSizeData];
     
     if ([activity.type length] == 0 || [activity.type isEqualToString:k_activityTypeInfo])
-        typeImage.image = [UIImage imageNamed:image_user];
+        typeImage.image = [UIImage imageNamed:@"activityTypeInfo"];
+    
+    if ([activity.type isEqualToString:k_activityTypeSucces])
+        typeImage.image = [UIImage imageNamed:@"activityTypeSuccess"];
+    
+    if ([activity.type isEqualToString:k_activityTypeFailure])
+        typeImage.image = [UIImage imageNamed:@"activityTypeFailure"];
         
     subjectLabel.textColor = COLOR_TEXT_ANTHRACITE;
     subjectLabel.numberOfLines = 0;

iOSClient/Networking/OCNetworking.m

@@ -140,11 +140,13 @@
             
             _fileActivityLog = [NSString stringWithFormat:@"%@/%@", _metadataNet.serverUrl, _metadataNet.fileName];
             _messageActivityLog = [CCUtility returnFileNamePathFromFileName:_metadataNet.fileName serverUrl:_metadataNet.serverUrl activeUrl:_activeUrl];
+            _subjectActivityLog = _metadataNet.action;
 
         } else {
             
             _fileActivityLog = _metadataNet.serverUrl;
             _messageActivityLog = [CCUtility returnFileNamePathFromFileName:@"" serverUrl:_metadataNet.serverUrl activeUrl:_activeUrl];
+            _subjectActivityLog = _metadataNet.action;
         }
     }
 }
@@ -168,7 +170,7 @@
 
 - (void)createActivityType:(NSString *)type Verbose:(NSInteger)verbose
 {
-    [CCCoreData addActivityFile:_fileActivityLog subject:[NSString stringWithFormat:@"%@ : %@",_metadataNet.selector, _subjectActivityLog] message:_metadataNet.action session:[CCUtility createRandomString:16] type:type verbose:verbose account:_metadataNet.account];
+    [CCCoreData addActivityFile:_fileActivityLog subject:_metadataNet.selector message:_metadataNet.action session:[CCUtility createRandomString:16] type:type verbose:verbose account:_metadataNet.account];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -429,6 +431,7 @@
         if ([error code] == NSURLErrorServerCertificateUntrusted)
             [[CCCertificate sharedManager] presentViewControllerCertificateWithTitle:[error localizedDescription] viewController:(UIViewController *)self.delegate delegate:self];
         
+        [self createActivityType:k_activityTypeFailure Verbose:k_activityVerboseClientDebug];
         [self complete];
     }];
 }