new Icons

iOSClient/CCStandardImages.h

@@ -119,6 +119,8 @@
 #define image_saveSelectedFiles                 @"saveSelectedFiles"
 #define image_settingsDebug                     @"settingsDebug"
 #define image_settingsIntroduction              @"settingsIntroduction"
+#define image_settingsSendActivity              @"settingsSendActivity"
+#define image_settingsClearActivity             @"settingsClearActivity"
 #define image_settingsMail                      @"settingsMail"
 #define image_settingsManagePhotos              @"settingsManagePhotos"
 #define image_settingsManagePhotosChange        @"settingsManagePhotosChange"

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

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

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

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

iOSClient/Settings/CCManageHelp.h

@@ -25,7 +25,7 @@
 #import "XLForm.h"
 #import "CCIntro.h"
 
-@interface CCManageHelp : XLFormViewController <CCIntroDelegate>
+@interface CCManageHelp : XLFormViewController <CCIntroDelegate, MFMailComposeViewControllerDelegate>
 
 @property (nonatomic, strong) CCIntro *intro;
 

iOSClient/Settings/CCManageHelp.m

@@ -76,10 +76,18 @@
     [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
     [row.cellConfig setObject:COLOR_BRAND forKey:@"textLabel.textColor"];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:[UIImage imageNamed:image_settingsKeyMail] forKey:@"imageView.image"];
+    [row.cellConfig setObject:[UIImage imageNamed:image_settingsSendActivity] forKey:@"imageView.image"];
     row.action.formSelector = @selector(sendMail:);
     [section addFormRow:row];
 
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"clearActivityLog" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_help_debug_Activity_clear_", nil)];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    [row.cellConfig setObject:[UIColor redColor] forKey:@"textLabel.textColor"];
+    [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
+    [row.cellConfig setObject:[UIImage imageNamed:image_settingsClearActivity] forKey:@"imageView.image"];
+    row.action.formSelector = @selector(clearActivity:);
+    [section addFormRow:row];
+
 
     section = [XLFormSectionDescriptor formSection];
     [form addFormSection:section];
@@ -173,6 +181,8 @@
     // Email Recipents
     NSArray *toRecipents;
     
+    
+    
     messageBody = [NSString stringWithFormat:@"\n\n\n%@ Version %@ (%@)", k_brand,[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"], [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]];
     toRecipents = [NSArray arrayWithObject:k_mailMe];
     
@@ -186,4 +196,20 @@
     [self presentViewController:mc animated:YES completion:NULL];
 }
 
+#pragma --------------------------------------------------------------------------------------------
+#pragma mark === Clear ===
+#pragma --------------------------------------------------------------------------------------------
+
+- (void)clearActivity:(XLFormRowDescriptor *)sender
+{
+    [self deselectFormRow:sender];
+    
+    [CCCoreData flushTableActivityAccount:app.activeAccount];
+    
+    CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
+    
+    metadataNet.action = actionGetActivityServer;
+    [app addNetworkingOperationQueue:app.netQueue delegate:app.activeMain metadataNet:metadataNet];
+}
+
 @end

iOSClient/en.lproj/Localizable.strings

@@ -188,6 +188,7 @@
 "_help_debug_section_"          = "Debug";
 "_help_debug_Activity_verbose_" = "Activity verbose debug";
 "_help_debug_Activity_mail_"    = "Send activity debug at Mail";
+"_help_debug_Activity_clear_"   = "Clear activity";
 
 // Manage Optimizations