new name k_

Picker/DocumentPickerViewController.swift

@@ -69,7 +69,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
     lazy var networkingOperationQueue: OperationQueue = {
         
         var queue = OperationQueue()
-        queue.name = netQueueName
+        queue.name = k_netQueueName
         queue.maxConcurrentOperationCount = 10
         
         return queue
@@ -551,7 +551,7 @@ extension DocumentPickerViewController {
     func appGroupContainerURL() -> URL? {
         
         guard let groupURL = FileManager.default
-            .containerURL(forSecurityApplicationGroupIdentifier: capabilitiesGroups) else {
+            .containerURL(forSecurityApplicationGroupIdentifier: k_capabilitiesGroups) else {
                 return nil
         }
         
@@ -844,7 +844,7 @@ class providerSessionDB {
     
     private init() {
     
-        let dirGroup = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: capabilitiesGroups)
+        let dirGroup = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: k_capabilitiesGroups)
         let pathDB = dirGroup?.appendingPathComponent(appDatabase).appendingPathComponent("cryptocloud")
         
         MagicalRecord.setupCoreDataStackWithAutoMigratingSqliteStore(at: pathDB!)

Share Ext/ShareViewController.m

@@ -50,7 +50,7 @@
 
 -(void)viewDidLoad
 {
-    dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:capabilitiesGroups];
+    dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:k_capabilitiesGroups];
     
     [MagicalRecord setupCoreDataStackWithAutoMigratingSqliteStoreNamed:(id)[dirGroup URLByAppendingPathComponent:[appDatabase stringByAppendingPathComponent:@"cryptocloud"]]];
     [MagicalRecord setLoggingLevel:MagicalRecordLoggingLevelOff];
@@ -103,8 +103,8 @@
     _filesSendCryptated = [[NSMutableArray alloc] init];
     _hud = [[CCHud alloc] initWithView:self.navigationController.view];
     
-    _networkingOperationQueue = [[NSOperationQueue alloc] init];
-    _networkingOperationQueue.name = netQueueName;
+    _networkingOperationQueue = [NSOperationQueue new];
+    _networkingOperationQueue.name = k_netQueueName;
     _networkingOperationQueue.maxConcurrentOperationCount = 1;
     
     [[CCNetworking sharedNetworking] settingDelegate:self];

iOSClient/AppDelegate.m

@@ -60,7 +60,7 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {    
     NSString *dir;
-    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:capabilitiesGroups];
+    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:k_capabilitiesGroups];
     
     NSLog(@"[LOG] Start program group -----------------");
     NSLog(@"%@", dirGroup);    
@@ -114,23 +114,23 @@
     
     // Operation Queue OC Networking
     _netQueue = [[NSOperationQueue alloc] init];
-    _netQueue.name = netQueueName;
+    _netQueue.name = k_netQueueName;
     _netQueue.maxConcurrentOperationCount = k_maxConcurrentOperation;
    
     _netQueueDownload = [[NSOperationQueue alloc] init];
-    _netQueueDownload.name = netQueueDownloadName;
+    _netQueueDownload.name = k_netQueueDownloadName;
     _netQueueDownload.maxConcurrentOperationCount = k_maxConcurrentOperationDownloadUpload;
 
     _netQueueDownloadWWan = [[NSOperationQueue alloc] init];
-    _netQueueDownloadWWan.name = netQueueDownloadWWanName;
+    _netQueueDownloadWWan.name = k_netQueueDownloadWWanName;
     _netQueueDownloadWWan.maxConcurrentOperationCount = k_maxConcurrentOperationDownloadUpload;
     
     _netQueueUpload = [[NSOperationQueue alloc] init];
-    _netQueueUpload.name = netQueueUploadName;
+    _netQueueUpload.name = k_netQueueUploadName;
     _netQueueUpload.maxConcurrentOperationCount = k_maxConcurrentOperationDownloadUpload;
     
     _netQueueUploadWWan = [[NSOperationQueue alloc] init];
-    _netQueueUploadWWan.name = netQueueUploadWWanName;
+    _netQueueUploadWWan.name = k_netQueueUploadWWanName;
     _netQueueUploadWWan.maxConcurrentOperationCount = k_maxConcurrentOperationDownloadUpload;
     
     // Add notification change session

iOSClient/CCGlobal.h

@@ -49,14 +49,14 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #endif
 
 // Version Protocol plist
-#define versionProtocolPlist @"1.3"
+#define k_versionProtocolPlist      @"1.3"
 
 // UUID
-#define UUID_SIM @"4BACFE4A-61A6-44B1-9A85-13FD167565AB"
+#define k_UUID_SIM                  @"4BACFE4A-61A6-44B1-9A85-13FD167565AB"
 
 // Capabilities Group & Service Key Share
-#define capabilitiesGroups @"group.it.twsweb.Crypto-Cloud"
-#define serviceShareKeyChain @"Crypto Cloud"
+#define k_capabilitiesGroups        @"group.it.twsweb.Crypto-Cloud"
+#define k_serviceShareKeyChain      @"Crypto Cloud"
 
 // BRAND
 #ifdef CC
@@ -142,10 +142,10 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define RalewayThin(s) [UIFont fontWithName:@"Raleway-Thin" size:s]
 
 // File Name Const
-#define folderDefaultCameraUpload   @"Photos"
+#define k_folderDefaultCameraUpload                     @"Photos"
 
 // Picker select image
-#define pickerControllerMax  500.0
+#define k_pickerControllerMax                           500.0
 
 // define ownCloud IOS
 #define server_version_with_new_shared_schema 8
@@ -153,15 +153,15 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define k_share_link_middle_part_url_after_version_8    @"index.php/s/"
 
 // Constants to identify the different permissions of a file
-#define k_permission_shared @"S"
-#define k_permission_can_share @"R"
-#define k_permission_mounted @"M"
-#define k_permission_file_can_write @"W"
-#define k_permission_can_create_file @"C"
-#define k_permission_can_create_folder @"K"
-#define k_permission_can_delete @"D"
-#define k_permission_can_rename @"N"
-#define k_permission_can_move @"V"
+#define k_permission_shared             @"S"
+#define k_permission_can_share          @"R"
+#define k_permission_mounted            @"M"
+#define k_permission_file_can_write     @"W"
+#define k_permission_can_create_file    @"C"
+#define k_permission_can_create_folder  @"K"
+#define k_permission_can_delete         @"D"
+#define k_permission_can_rename         @"N"
+#define k_permission_can_move           @"V"
 
 // Session
 #define download_session                @"it.twsweb.download.session"
@@ -189,11 +189,11 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define k_timerVerifySession            15.0
 
 // OperationQueue
-#define netQueueName                    @"it.twsweb.cryptocloud.queue"
-#define netQueueDownloadName            @"it.twsweb.cryptocloud.queueDownload"
-#define netQueueDownloadWWanName        @"it.twsweb.cryptocloud.queueDownloadWWan"
-#define netQueueUploadName              @"it.twsweb.cryptocloud.queueUpload"
-#define netQueueUploadWWanName          @"it.twsweb.cryptocloud.queueUploadWWan"
+#define k_netQueueName                          @"it.twsweb.cryptocloud.queue"
+#define k_netQueueDownloadName                  @"it.twsweb.cryptocloud.queueDownload"
+#define k_netQueueDownloadWWanName              @"it.twsweb.cryptocloud.queueDownloadWWan"
+#define k_netQueueUploadName                    @"it.twsweb.cryptocloud.queueUpload"
+#define k_netQueueUploadWWanName                @"it.twsweb.cryptocloud.queueUploadWWan"
 
 #define k_maxConcurrentOperation                10
 #define k_maxConcurrentOperationDownloadUpload  10

iOSClient/FileSystem/CCCoreData.m

@@ -202,7 +202,7 @@
     if (record) {
         
         if ([record.cameraUploadFolderName length] > 0 ) return record.cameraUploadFolderName;
-        else return folderDefaultCameraUpload;
+        else return k_folderDefaultCameraUpload;
         
     } else return @"";
 }
@@ -2003,7 +2003,7 @@
 + (void)moveCoreDataToGroup
 {
     NSString *applicationName = [[[NSBundle mainBundle] infoDictionary] valueForKey:(NSString *)kCFBundleNameKey];
-    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:capabilitiesGroups];
+    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:k_capabilitiesGroups];
     NSString *dirToPath = [[dirGroup URLByAppendingPathComponent:appDatabase] path];
 
     NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);

iOSClient/QuickActions/CCQuickActions.m

@@ -139,7 +139,7 @@
         }];
     }
     
-    if (imageSize > MaxDimensionUpload || (picker.selectedAssets.count >= (pickerControllerMax - _numTaskUploadInProgress))) {
+    if (imageSize > MaxDimensionUpload || (picker.selectedAssets.count >= (k_pickerControllerMax - _numTaskUploadInProgress))) {
         
         [app messageNotification:@"_info_" description:@"_limited_dimension_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
         

iOSClient/Security/CCCrypto.m

@@ -82,11 +82,11 @@
         data = [[NSMutableDictionary alloc] init];
     
     [data setObject: [NSNumber numberWithBool:directory] forKey:@"dir"];
-    if ([hint length] > 0) [data setObject:[AESCrypt encrypt:hint password:UUID_SIM] forKey:@"hint"];
+    if ([hint length] > 0) [data setObject:[AESCrypt encrypt:hint password:k_UUID_SIM] forKey:@"hint"];
     if ([icon length] > 0) [data setObject:icon forKey:@"icon"];
     [data setObject: [NSString stringWithFormat:@"%li", (unsigned long)len] forKey:@"len"];
     [data setObject: nameCurrentDevice forKey:@"namecurrentdevice"];
-    [data setObject: versionProtocolPlist forKey:@"protocol"];
+    [data setObject: k_versionProtocolPlist forKey:@"protocol"];
     [data setObject: title forKey:@"title"];
     [data setObject: k_metadataType_file forKey:@"type"];
     [data setObject: uuid forKey:@"uuid"];
@@ -155,10 +155,10 @@
         data = [[NSMutableDictionary alloc] init];
     
     [data setObject: [NSNumber numberWithBool:true] forKey:@"dir"];
-    if ([hint length] > 0) [data setObject: [AESCrypt encrypt:hint password:UUID_SIM] forKey:@"hint"];
+    if ([hint length] > 0) [data setObject: [AESCrypt encrypt:hint password:k_UUID_SIM] forKey:@"hint"];
     [data setObject: @"0" forKey:@"len"];
     [data setObject: metadata.nameCurrentDevice forKey:@"namecurrentdevice"];
-    [data setObject: versionProtocolPlist forKey:@"protocol"];
+    [data setObject: k_versionProtocolPlist forKey:@"protocol"];
     [data setObject: title forKey:@"title"];
     [data setObject: k_metadataType_file forKey:@"type"];
     [data setObject: metadata.uuid forKey:@"uuid"];
@@ -186,11 +186,11 @@
     }
     
     [data setObject: dictionary forKey:@"field"];
-    if ([hint length] > 0) [data setObject: [AESCrypt encrypt:hint password:UUID_SIM] forKey:@"hint"];
+    if ([hint length] > 0) [data setObject: [AESCrypt encrypt:hint password:k_UUID_SIM] forKey:@"hint"];
     [data setObject: icon forKey:@"icon"];
     [data setObject: model forKey:@"model"];
     [data setObject: [CCUtility getNameCurrentDevice] forKey:@"namecurrentdevice"];
-    [data setObject: versionProtocolPlist forKey:@"protocol"];
+    [data setObject: k_versionProtocolPlist forKey:@"protocol"];
     [data setObject: title forKey:@"title"];
     [data setObject: k_metadataType_model forKey:@"type"];
     [data setObject: uuid forKey:@"uuid"];
@@ -255,7 +255,7 @@
     
     NSString *hintCryptated = [data objectForKey:@"hint"];
     
-    if ([hintCryptated length] > 0) return [AESCrypt decrypt:hintCryptated password:UUID_SIM];
+    if ([hintCryptated length] > 0) return [AESCrypt decrypt:hintCryptated password:k_UUID_SIM];
     else return nil;
 }
 

iOSClient/Settings/CCSettings.m

@@ -836,7 +836,7 @@
 - (void)emptyGroupApplicationSupport
 {
     NSString *file;
-    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:capabilitiesGroups];
+    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:k_capabilitiesGroups];
     NSString *dirIniziale = [[dirGroup URLByAppendingPathComponent:appApplicationSupport] path];
     
     NSDirectoryEnumerator *enumerator = [[NSFileManager defaultManager] enumeratorAtPath:dirIniziale];
@@ -932,7 +932,7 @@
 {
     [self deselectFormRow:sender];
 
-    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:capabilitiesGroups];
+    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:k_capabilitiesGroups];
     dirGroup = [dirGroup URLByAppendingPathComponent:@"Library"];
     dirGroup = [dirGroup URLByAppendingPathComponent:@"Application Support"];
     dirGroup = [dirGroup URLByAppendingPathComponent:@"Crypto Cloud"];

iOSClient/Utility/CCUtility.m

@@ -40,7 +40,7 @@
 + (void)deleteAllChainStore
 {
     [UICKeyChainStore removeAllItems];
-    [UICKeyChainStore removeAllItemsForService:serviceShareKeyChain];
+    [UICKeyChainStore removeAllItemsForService:k_serviceShareKeyChain];
 }
 
 + (void)storeAllChainInService
@@ -51,7 +51,7 @@
     
     for (NSDictionary *item in items) {
         
-        [UICKeyChainStore setString:[item objectForKey:@"value"] forKey:[item objectForKey:@"key"] service:serviceShareKeyChain]; 
+        [UICKeyChainStore setString:[item objectForKey:@"value"] forKey:[item objectForKey:@"key"] service:k_serviceShareKeyChain];
         [UICKeyChainStore removeItemForKey:[item objectForKey:@"key"]];
     }
 }
@@ -61,138 +61,138 @@
 + (void)adminRemoveIntro
 {
     NSString *version = [self getVersionCryptoCloud];
-    [UICKeyChainStore setString:nil forKey:version service:serviceShareKeyChain];
+    [UICKeyChainStore setString:nil forKey:version service:k_serviceShareKeyChain];
 }
 
 + (void)adminRemovePasscode
 {
     NSString *uuid = [self getUUID];
-    [UICKeyChainStore setString:nil forKey:uuid service:serviceShareKeyChain];
+    [UICKeyChainStore setString:nil forKey:uuid service:k_serviceShareKeyChain];
 }
 
 + (void)adminRemoveVersion
 {
-    [UICKeyChainStore setString:@"0.0" forKey:@"version" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:@"0.0" forKey:@"version" service:k_serviceShareKeyChain];
 }
 
 #pragma ------------------------------ SET
 
 + (void)setKeyChainPasscodeForUUID:(NSString *)uuid conPasscode:(NSString *)passcode
 {
-    [UICKeyChainStore setString:passcode forKey:uuid service:serviceShareKeyChain];
+    [UICKeyChainStore setString:passcode forKey:uuid service:k_serviceShareKeyChain];
 }
 
 + (NSString *)setVersionCryptoCloud
 {
     NSString *version = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
     
-    [UICKeyChainStore setString:version forKey:@"version" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:version forKey:@"version" service:k_serviceShareKeyChain];
     
     return version;
 }
 
 + (void)setBlockCode:(NSString *)blockcode
 {
-    [UICKeyChainStore setString:blockcode forKey:@"blockcode" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:blockcode forKey:@"blockcode" service:k_serviceShareKeyChain];
 }
 
 + (void)setSimplyBlockCode:(BOOL)simply
 {
     NSString *sSimply = (simply) ? @"true" : @"false";
-    [UICKeyChainStore setString:sSimply forKey:@"simplyblockcode" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:sSimply forKey:@"simplyblockcode" service:k_serviceShareKeyChain];
 }
 
 + (void)setOnlyLockDir:(BOOL)lockDir
 {
     NSString *sLockDir = (lockDir) ? @"true" : @"false";
-    [UICKeyChainStore setString:sLockDir forKey:@"onlylockdir" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:sLockDir forKey:@"onlylockdir" service:k_serviceShareKeyChain];
 }
 
 + (void)setOptimizedPhoto:(BOOL)resize
 {
     NSString *sOptimizedPhoto = (resize) ? @"true" : @"false";
-    [UICKeyChainStore setString:sOptimizedPhoto forKey:@"optimizedphoto" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:sOptimizedPhoto forKey:@"optimizedphoto" service:k_serviceShareKeyChain];
 }
 
 + (void)setUploadAndRemovePhoto:(BOOL)remove
 {
     NSString *sRemovePhoto = (remove) ? @"true" : @"false";
-    [UICKeyChainStore setString:sRemovePhoto forKey:@"uploadremovephoto" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:sRemovePhoto forKey:@"uploadremovephoto" service:k_serviceShareKeyChain];
 }
 
 + (void)setOrderSettings:(NSString *)order
 {
-    [UICKeyChainStore setString:order forKey:@"order" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:order forKey:@"order" service:k_serviceShareKeyChain];
 }
 
 + (void)setAscendingSettings:(BOOL)ascendente
 {
     NSString *sAscendente = (ascendente) ? @"true" : @"false";
-    [UICKeyChainStore setString:sAscendente forKey:@"ascending" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:sAscendente forKey:@"ascending" service:k_serviceShareKeyChain];
 }
 
 + (void)setGroupBySettings:(NSString *)groupby
 {
-    [UICKeyChainStore setString:groupby forKey:@"groupby" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:groupby forKey:@"groupby" service:k_serviceShareKeyChain];
 }
 
 + (void)setIntro:(NSString *)version
 {
-    [UICKeyChainStore setString:@"true" forKey:version service:serviceShareKeyChain];
+    [UICKeyChainStore setString:@"true" forKey:version service:k_serviceShareKeyChain];
 }
 
 + (void)setMessageJailbroken:(BOOL)message
 {
     NSString *sMessage = (message) ? @"true" : @"false";
-    [UICKeyChainStore setString:sMessage forKey:@"jailbroken" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:sMessage forKey:@"jailbroken" service:k_serviceShareKeyChain];
 }
 
 + (void)setActiveAccountShareExt:(NSString *)activeAccount
 {
-    [UICKeyChainStore setString:activeAccount forKey:@"activeAccountShareExt" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:activeAccount forKey:@"activeAccountShareExt" service:k_serviceShareKeyChain];
 }
 
 + (void)setCryptatedShareExt:(BOOL)cryptated
 {
     NSString *sCryptated = (cryptated) ? @"true" : @"false";
-    [UICKeyChainStore setString:sCryptated forKey:@"cryptatedShareExt" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:sCryptated forKey:@"cryptatedShareExt" service:k_serviceShareKeyChain];
 }
 
 + (void)setServerUrlShareExt:(NSString *)serverUrl
 {
-    [UICKeyChainStore setString:serverUrl forKey:@"serverUrlShareExt" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:serverUrl forKey:@"serverUrlShareExt" service:k_serviceShareKeyChain];
 }
 
 + (void)setTitleServerUrlShareExt:(NSString *)titleServerUrl
 {
-    [UICKeyChainStore setString:titleServerUrl forKey:@"titleServerUrlShareExt" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:titleServerUrl forKey:@"titleServerUrlShareExt" service:k_serviceShareKeyChain];
 }
 
 + (void)setEmail:(NSString *)email
 {
-    [UICKeyChainStore setString:email forKey:@"email" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:email forKey:@"email" service:k_serviceShareKeyChain];
 }
 
 + (void)setHint:(NSString *)hint
 {
-    [UICKeyChainStore setString:hint forKey:@"hint" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:hint forKey:@"hint" service:k_serviceShareKeyChain];
 }
 
 + (void)setDirectoryOnTop:(BOOL)directoryOnTop
 {
     NSString *sDirectoryOnTop = (directoryOnTop) ? @"true" : @"false";
-    [UICKeyChainStore setString:sDirectoryOnTop forKey:@"directoryOnTop" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:sDirectoryOnTop forKey:@"directoryOnTop" service:k_serviceShareKeyChain];
 }
 
 + (void)setFileNameMask:(NSString *)mask key:(NSString *)key
 {
-    [UICKeyChainStore setString:mask forKey:key service:serviceShareKeyChain];
+    [UICKeyChainStore setString:mask forKey:key service:k_serviceShareKeyChain];
 }
 
 + (void)setCreateMenuEncrypted:(BOOL)encrypted
 {
     NSString *sEncrypted = (encrypted) ? @"true" : @"false";
-    [UICKeyChainStore setString:sEncrypted forKey:@"createMenuEncrypted" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:sEncrypted forKey:@"createMenuEncrypted" service:k_serviceShareKeyChain];
 }
 
 #pragma ------------------------------ GET
@@ -201,7 +201,7 @@
 {
     if (!uuid) return nil;
     
-    NSString *passcode = [UICKeyChainStore stringForKey:uuid service:serviceShareKeyChain];
+    NSString *passcode = [UICKeyChainStore stringForKey:uuid service:k_serviceShareKeyChain];
     
     return passcode;
 }
@@ -224,17 +224,17 @@
 
 + (NSString *)getVersionCryptoCloud
 {
-    return [UICKeyChainStore stringForKey:@"version" service:serviceShareKeyChain];
+    return [UICKeyChainStore stringForKey:@"version" service:k_serviceShareKeyChain];
 }
 
 + (NSString *)getBlockCode
 {
-    return [UICKeyChainStore stringForKey:@"blockcode" service:serviceShareKeyChain];
+    return [UICKeyChainStore stringForKey:@"blockcode" service:k_serviceShareKeyChain];
 }
 
 + (BOOL)getSimplyBlockCode
 {
-    NSString *simplyBlockCode = [UICKeyChainStore stringForKey:@"simplyblockcode" service:serviceShareKeyChain];
+    NSString *simplyBlockCode = [UICKeyChainStore stringForKey:@"simplyblockcode" service:k_serviceShareKeyChain];
     
     if (simplyBlockCode == nil) {
         
@@ -247,22 +247,22 @@
 
 + (BOOL)getOnlyLockDir
 {
-    return [[UICKeyChainStore stringForKey:@"onlylockdir" service:serviceShareKeyChain] boolValue];
+    return [[UICKeyChainStore stringForKey:@"onlylockdir" service:k_serviceShareKeyChain] boolValue];
 }
 
 + (BOOL)getOptimizedPhoto
 {
-    return [[UICKeyChainStore stringForKey:@"optimizedphoto" service:serviceShareKeyChain] boolValue];
+    return [[UICKeyChainStore stringForKey:@"optimizedphoto" service:k_serviceShareKeyChain] boolValue];
 }
 
 + (BOOL)getUploadAndRemovePhoto
 {
-    return [[UICKeyChainStore stringForKey:@"uploadremovephoto" service:serviceShareKeyChain] boolValue];
+    return [[UICKeyChainStore stringForKey:@"uploadremovephoto" service:k_serviceShareKeyChain] boolValue];
 }
 
 + (NSString *)getOrderSettings
 {
-    NSString *order = [UICKeyChainStore stringForKey:@"order" service:serviceShareKeyChain];
+    NSString *order = [UICKeyChainStore stringForKey:@"order" service:k_serviceShareKeyChain];
     
     if (order == nil) {
         
@@ -275,7 +275,7 @@
 
 + (BOOL)getAscendingSettings
 {
-    NSString *ascending = [UICKeyChainStore stringForKey:@"ascending" service:serviceShareKeyChain];
+    NSString *ascending = [UICKeyChainStore stringForKey:@"ascending" service:k_serviceShareKeyChain];
     
     if (ascending == nil) {
         
@@ -288,7 +288,7 @@
 
 + (NSString *)getGroupBySettings
 {
-    NSString *groupby = [UICKeyChainStore stringForKey:@"groupby" service:serviceShareKeyChain];
+    NSString *groupby = [UICKeyChainStore stringForKey:@"groupby" service:k_serviceShareKeyChain];
     
     if (groupby == nil) {
         
@@ -301,12 +301,12 @@
 
 + (BOOL)getIntro:(NSString *)version
 {
-    return [[UICKeyChainStore stringForKey:version service:serviceShareKeyChain] boolValue];
+    return [[UICKeyChainStore stringForKey:version service:k_serviceShareKeyChain] boolValue];
 }
 
 + (NSString *)getIncrementalNumber
 {
-    long number = [[UICKeyChainStore stringForKey:@"incrementalnumber" service:serviceShareKeyChain] intValue];
+    long number = [[UICKeyChainStore stringForKey:@"incrementalnumber" service:k_serviceShareKeyChain] intValue];
     
     number++;
     if (number >= 9999) number = 1;
@@ -318,47 +318,47 @@
 
 + (BOOL)getMessageJailbroken
 {
-    return [[UICKeyChainStore stringForKey:@"jailbroken" service:serviceShareKeyChain] boolValue];
+    return [[UICKeyChainStore stringForKey:@"jailbroken" service:k_serviceShareKeyChain] boolValue];
 }
 
 + (NSString *)getActiveAccountShareExt
 {
-    return [UICKeyChainStore stringForKey:@"activeAccountShareExt" service:serviceShareKeyChain];
+    return [UICKeyChainStore stringForKey:@"activeAccountShareExt" service:k_serviceShareKeyChain];
 }
 
 + (BOOL)getCryptatedShareExt
 {
-    return [[UICKeyChainStore stringForKey:@"cryptatedShareExt" service:serviceShareKeyChain] boolValue];
+    return [[UICKeyChainStore stringForKey:@"cryptatedShareExt" service:k_serviceShareKeyChain] boolValue];
 }
 
 + (NSString *)getServerUrlShareExt
 {
-    return [UICKeyChainStore stringForKey:@"serverUrlShareExt" service:serviceShareKeyChain];
+    return [UICKeyChainStore stringForKey:@"serverUrlShareExt" service:k_serviceShareKeyChain];
 }
 
 + (NSString *)getTitleServerUrlShareExt
 {
-    return [UICKeyChainStore stringForKey:@"titleServerUrlShareExt" service:serviceShareKeyChain];
+    return [UICKeyChainStore stringForKey:@"titleServerUrlShareExt" service:k_serviceShareKeyChain];
 }
 
 + (NSString *)getEmail
 {
-    return [UICKeyChainStore stringForKey:@"email" service:serviceShareKeyChain];
+    return [UICKeyChainStore stringForKey:@"email" service:k_serviceShareKeyChain];
 }
 
 + (NSString *)getHint
 {
-    return [UICKeyChainStore stringForKey:@"hint" service:serviceShareKeyChain];
+    return [UICKeyChainStore stringForKey:@"hint" service:k_serviceShareKeyChain];
 }
 
 + (BOOL)getDirectoryOnTop
 {
-    return [[UICKeyChainStore stringForKey:@"directoryOnTop" service:serviceShareKeyChain] boolValue];
+    return [[UICKeyChainStore stringForKey:@"directoryOnTop" service:k_serviceShareKeyChain] boolValue];
 }
 
 + (NSString *)getFileNameMask:(NSString *)key
 {
-    NSString *mask = [UICKeyChainStore stringForKey:key service:serviceShareKeyChain];
+    NSString *mask = [UICKeyChainStore stringForKey:key service:k_serviceShareKeyChain];
     
     if (mask == nil)
         mask = @"";
@@ -368,7 +368,7 @@
 
 + (BOOL)getCreateMenuEncrypted
 {
-    return [[UICKeyChainStore stringForKey:@"createMenuEncrypted" service:serviceShareKeyChain] boolValue];
+    return [[UICKeyChainStore stringForKey:@"createMenuEncrypted" service:k_serviceShareKeyChain] boolValue];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -537,7 +537,7 @@
 // Return path of User Crypto Cloud / <user dir>
 + (NSString *)getDirectoryActiveUser:(NSString *)activeUser activeUrl:(NSString *)activeUrl
 {
-    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:capabilitiesGroups];
+    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:k_capabilitiesGroups];
     NSString *user = activeUser;
     NSString *baseUrl = [activeUrl lowercaseString];
     NSString *dirUserBaseUrl = nil;
@@ -602,7 +602,7 @@
 // Return the path of directory Cetificates
 + (NSString *)getDirectoryCerificates
 {
-    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:capabilitiesGroups];
+    NSURL *dirGroup = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:k_capabilitiesGroups];
     
     NSString *dir = [[dirGroup URLByAppendingPathComponent:appCertificates] path];
     if (![[NSFileManager defaultManager] fileExistsAtPath:dir])
@@ -1050,7 +1050,7 @@
     metadata.fileNameData = fileName;
     metadata.fileNamePrint = fileName;
     metadata.nameCurrentDevice = [CCUtility getNameCurrentDevice];
-    metadata.protocol = versionProtocolPlist;
+    metadata.protocol = k_versionProtocolPlist;
     metadata.size = [attributes[NSFileSize] longValue];
     metadata.thumbnailExists = false;
     metadata.type = k_metadataType_local;