Add Activity verbose debug

iOSClient/CCGlobal.h

@@ -244,9 +244,8 @@ extern NSString *const urlBaseUploadDB;
 #define k_minCharsSearch                                2
 
 // Activity
-#define k_activityVerboseServer                         0
-#define k_activityVerboseClient                         1
-#define k_activityVerboseClientDebug                    2
+#define k_activityVerboseDefault                        0
+#define k_activityVerboseDebug                          1
 #define k_activityTypeInfo                              @"info"
 #define k_activityTypeSucces                            @"success"
 #define k_activityTypeFailure                           @"error"

iOSClient/FileSystem/CCCoreData.m

@@ -1860,7 +1860,7 @@
         TableActivity *record = [TableActivity MR_createEntityInContext:localContext];
 
         record.account = account;
-        record.action = @"Server Activity";
+        record.action = @"Activity";
         record.date = activity.date;
         record.file = activity.file;
         record.idActivity = [NSNumber numberWithInteger:activity.idActivity];
@@ -1868,7 +1868,7 @@
         record.note = activity.subject;
         record.session = @"";
         record.type = k_activityTypeInfo;
-        record.verbose = [NSNumber numberWithInteger:k_activityVerboseServer];
+        record.verbose = [NSNumber numberWithInteger:k_activityVerboseDefault];
     }];
 }
 

iOSClient/MenuAccount+ControlCenter/CCControlCenterActivity.m

@@ -12,7 +12,7 @@
 #import "CCSection.h"
 
 #define fontSizeData    [UIFont systemFontOfSize:16]
-#define fontSizeAction  [UIFont systemFontOfSize:15]
+#define fontSizeAction  [UIFont systemFontOfSize:14]
 #define fontSizeNote    [UIFont systemFontOfSize:14]
 
 @interface CCControlCenterActivity ()

iOSClient/Networking/OCNetworking.m

@@ -402,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"] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseClientDebug account:_metadataNet.account];
+        [CCCoreData addActivityFile:_metadataNet.serverUrl action:@"Read Folder" note:[error.userInfo valueForKey:@"NSLocalizedDescription"] session:[CCUtility createRandomString:16] type:k_activityTypeFailure verbose:k_activityVerboseDebug account:_metadataNet.account];
         
         [self complete];
     }];

iOSClient/Settings/CCManageHelp.m

@@ -61,6 +61,15 @@
     row.action.formSelector = @selector(intro:);
     [section addFormRow:row];
 
+    section = [XLFormSectionDescriptor formSectionWithTitle:NSLocalizedString(@"_help_debug_section_", nil)];
+    [form addFormSection:section];
+    
+    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"activityVerboseDebug" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_help_debug_Activity_verbose_", nil)];
+    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
+    if ([CCUtility getActivityVerboseDebug]) row.value = @"1";
+    else row.value = @"0";
+    [section addFormRow:row];
+
     section = [XLFormSectionDescriptor formSection];
     [form addFormSection:section];
     
@@ -89,6 +98,20 @@
     [CCAspect aspectTabBar:self.tabBarController.tabBar hidden:NO];
 }
 
+- (void)formRowDescriptorValueHasChanged:(XLFormRowDescriptor *)rowDescriptor oldValue:(id)oldValue newValue:(id)newValue
+{
+    [super formRowDescriptorValueHasChanged:rowDescriptor oldValue:oldValue newValue:newValue];
+    
+    if ([rowDescriptor.tag isEqualToString:@"activityVerboseDebug"]) {
+        
+        if ([[rowDescriptor.value valueData] boolValue] == YES) {
+            [CCUtility setActivityVerboseDebug:true];
+        } else {
+            [CCUtility setActivityVerboseDebug:false];
+        }
+    }
+}
+    
 - (void)intro:(XLFormRowDescriptor *)sender
 {
     [self deselectFormRow:sender];

iOSClient/Utility/CCUtility.h

@@ -82,7 +82,9 @@
 
 + (void)setCreateMenuEncrypted:(BOOL)encrypted;
 
-+ (void)setFavoriteOffline:(BOOL)encrypted;
++ (void)setFavoriteOffline:(BOOL)offline;
+
++ (void)setActivityVerboseDebug:(BOOL)debug;
 
 // GET
 
@@ -123,6 +125,8 @@
 
 + (BOOL)getFavoriteOffline;
 
++ (BOOL)getActivityVerboseDebug;
+
 // ===== Varius =====
 
 + (NSString *)getUserAgent;

iOSClient/Utility/CCUtility.m

@@ -189,12 +189,17 @@
     [UICKeyChainStore setString:sEncrypted forKey:@"createMenuEncrypted" service:k_serviceShareKeyChain];
 }
 
-+ (void)setFavoriteOffline:(BOOL)encrypted
++ (void)setFavoriteOffline:(BOOL)offline
 {
-    NSString *sFavoriteOffline = (encrypted) ? @"true" : @"false";
+    NSString *sFavoriteOffline = (offline) ? @"true" : @"false";
     [UICKeyChainStore setString:sFavoriteOffline forKey:@"favoriteOffline" service:k_serviceShareKeyChain];
 }
 
++ (void)setActivityVerboseDebug:(BOOL)debug
+{
+    NSString *sActivityVerboseDebug = (debug) ? @"true" : @"false";
+    [UICKeyChainStore setString:sActivityVerboseDebug forKey:@"activityVerboseDebug" service:k_serviceShareKeyChain];
+}
 
 #pragma ------------------------------ GET
 
@@ -375,6 +380,11 @@
     return [[UICKeyChainStore stringForKey:@"favoriteOffline" service:k_serviceShareKeyChain] boolValue];
 }
 
++ (BOOL)getActivityVerboseDebug
+{
+    return [[UICKeyChainStore stringForKey:@"activityVerboseDebug" service:k_serviceShareKeyChain] boolValue];
+}
+
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Varius =====
 #pragma --------------------------------------------------------------------------------------------

iOSClient/en.lproj/Localizable.strings

@@ -183,15 +183,10 @@
 
 // Manage Help
 
-"_help_tutorial_"           = "Tutorial";
-"_help_intro_"              = "Introduction _brand_";
-"_help_synchronizations_"   = "Synchronized folders";
-"_help_share_"              = "Sharing files or folders";
-"_help_itunes_share_"       = "iTunes files sharing & Fingerprint";
-"_help_share_ext_"          = "Share extension & Share permission";
-"_help_copy_paste_"         = "Copy & Paste Files";
-"_help_control_center_"     = "Control Center";
-"_help_switch_user_"        = "Quickly switch between your accounts";
+"_help_tutorial_"               = "Tutorial";
+"_help_intro_"                  = "Introduction _brand_";
+"_help_debug_section_"          = "Debug";
+"_help_debug_Activity_verbose_" = "Activity verbose debug";
 
 // Manage Optimizations