new name k_

Picker/DocumentPickerViewController.swift

@@ -304,7 +304,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
                 metadataNet.selector = selectorLoadPlist
                 metadataNet.serverUrl = self.serverUrl
                 metadataNet.session = download_session_foreground
-                metadataNet.taskStatus = Int(taskStatusResume)
+                metadataNet.taskStatus = Int(k_taskStatusResume)
                 
                 let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, withTypeCloud: typeCloud, activityIndicator: false)
                 networkingOperationQueue.addOperation(ocNetworking)
@@ -529,7 +529,7 @@ extension DocumentPickerViewController {
                     metadataNet.fileNamePrint = fileName
                     metadataNet.serverUrl = self!.serverUrl
                     metadataNet.session = upload_session_foreground
-                    metadataNet.taskStatus = Int(taskStatusResume)
+                    metadataNet.taskStatus = Int(k_taskStatusResume)
                     
                     let ocNetworking : OCnetworking = OCnetworking.init(delegate: self!, metadataNet: metadataNet, withUser: self!.activeUser, withPassword: self!.activePassword, withUrl: self!.activeUrl, withTypeCloud: self!.typeCloud, activityIndicator: false)
                     self!.networkingOperationQueue.addOperation(ocNetworking)
@@ -763,7 +763,7 @@ extension DocumentPickerViewController: UITableViewDataSource {
                 metadataNet.selector = selectorLoadFileView
                 metadataNet.serverUrl = self.serverUrl
                 metadataNet.session = download_session_foreground
-                metadataNet.taskStatus = Int(taskStatusResume)
+                metadataNet.taskStatus = Int(k_taskStatusResume)
             
                 let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, withTypeCloud: typeCloud, activityIndicator: false)
                 networkingOperationQueue.addOperation(ocNetworking)

Share Ext/ShareViewController.m

@@ -241,7 +241,7 @@
         metadataNet.fileNamePrint = fileName;
         metadataNet.serverUrl = _serverUrl;
         metadataNet.session = upload_session_foreground;
-        metadataNet.taskStatus = taskStatusResume;
+        metadataNet.taskStatus = k_taskStatusResume;
         
         [self addNetworkingQueue:metadataNet];
         
@@ -450,8 +450,8 @@
         if (fileSize > 0 && ((UTTypeConformsTo(fileUTI, kUTTypeImage)) || (UTTypeConformsTo(fileUTI, kUTTypeMovie)))) {
             
             NSString *typeFile;
-            if (UTTypeConformsTo(fileUTI, kUTTypeImage)) typeFile = metadataTypeFile_image;
-            if (UTTypeConformsTo(fileUTI, kUTTypeMovie)) typeFile = metadataTypeFile_video;
+            if (UTTypeConformsTo(fileUTI, kUTTypeImage)) typeFile = k_metadataTypeFile_image;
+            if (UTTypeConformsTo(fileUTI, kUTTypeMovie)) typeFile = k_metadataTypeFile_video;
             
             [CCGraphics createNewImageFrom:file directoryUser:self.directoryUser fileNameTo:file fileNamePrint:nil size:@"m" imageForUpload:NO typeFile:typeFile writePreview:YES optimizedFileName:NO];
         }

iOSClient/Actions/CCActions.swift

@@ -204,7 +204,7 @@ class CCActions: NSObject {
             metadataNet.selectorPost = selectorReadFolderForced
             metadataNet.serverUrl = serverUrl
             metadataNet.session = upload_session_foreground
-            metadataNet.taskStatus = Int(taskStatusResume)
+            metadataNet.taskStatus = Int(k_taskStatusResume)
             
             if CCCoreData.isOfflineLocalFileID(metadata.fileID, activeAccount: appDelegate.activeAccount) {
                 metadataNet.selectorPost = selectorAddOffline

iOSClient/AppDelegate.m

@@ -115,23 +115,23 @@
     // Operation Queue OC Networking
     _netQueue = [[NSOperationQueue alloc] init];
     _netQueue.name = netQueueName;
-    _netQueue.maxConcurrentOperationCount = maxConcurrentOperation;
+    _netQueue.maxConcurrentOperationCount = k_maxConcurrentOperation;
    
     _netQueueDownload = [[NSOperationQueue alloc] init];
     _netQueueDownload.name = netQueueDownloadName;
-    _netQueueDownload.maxConcurrentOperationCount = maxConcurrentOperationDownloadUpload;
+    _netQueueDownload.maxConcurrentOperationCount = k_maxConcurrentOperationDownloadUpload;
 
     _netQueueDownloadWWan = [[NSOperationQueue alloc] init];
     _netQueueDownloadWWan.name = netQueueDownloadWWanName;
-    _netQueueDownloadWWan.maxConcurrentOperationCount = maxConcurrentOperationDownloadUpload;
+    _netQueueDownloadWWan.maxConcurrentOperationCount = k_maxConcurrentOperationDownloadUpload;
     
     _netQueueUpload = [[NSOperationQueue alloc] init];
     _netQueueUpload.name = netQueueUploadName;
-    _netQueueUpload.maxConcurrentOperationCount = maxConcurrentOperationDownloadUpload;
+    _netQueueUpload.maxConcurrentOperationCount = k_maxConcurrentOperationDownloadUpload;
     
     _netQueueUploadWWan = [[NSOperationQueue alloc] init];
     _netQueueUploadWWan.name = netQueueUploadWWanName;
-    _netQueueUploadWWan.maxConcurrentOperationCount = maxConcurrentOperationDownloadUpload;
+    _netQueueUploadWWan.maxConcurrentOperationCount = k_maxConcurrentOperationDownloadUpload;
     
     // Add notification change session
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sessionChanged:) name:networkingSessionNotification object:nil];
@@ -147,7 +147,7 @@
     // Verify Session in progress and Init date task
     self.sessionDateLastDownloadTasks = [NSDate date];
     self.sessionDateLastUploadTasks = [NSDate date];
-    self.timerVerifySessionInProgress = [NSTimer scheduledTimerWithTimeInterval:timerVerifySession target:self selector:@selector(verifyDownloadUploadInProgress) userInfo:nil repeats:YES];
+    self.timerVerifySessionInProgress = [NSTimer scheduledTimerWithTimeInterval:k_timerVerifySession target:self selector:@selector(verifyDownloadUploadInProgress) userInfo:nil repeats:YES];
     
     // Background Fetch
     [application setMinimumBackgroundFetchInterval:UIApplicationBackgroundFetchIntervalMinimum];
@@ -291,7 +291,7 @@
 {    
     // facciamo partire il timer per il controllo delle sessioni
     [self.timerVerifySessionInProgress invalidate];
-    self.timerVerifySessionInProgress = [NSTimer scheduledTimerWithTimeInterval:timerVerifySession target:self selector:@selector(verifyDownloadUploadInProgress) userInfo:nil repeats:YES];
+    self.timerVerifySessionInProgress = [NSTimer scheduledTimerWithTimeInterval:k_timerVerifySession target:self selector:@selector(verifyDownloadUploadInProgress) userInfo:nil repeats:YES];
     
     // refresh active Main
     if (_activeMain)
@@ -535,7 +535,7 @@
                             [nvc popToRootViewControllerAnimated:NO];
                     }
                     
-                    [tbc setSelectedIndex:TabBarApplicationIndexFile];
+                    [tbc setSelectedIndex: k_tabBarApplicationIndexFile];
                     
                 } else {
                     
@@ -543,7 +543,7 @@
                     [nvcDetail popToRootViewControllerAnimated:NO];
                     
                     UITabBarController *tbc = splitViewController.viewControllers.firstObject;
-                    [tbc setSelectedIndex:TabBarApplicationIndexFile];
+                    [tbc setSelectedIndex: k_tabBarApplicationIndexFile];
                 }
 
                 [_activeMain.navigationController popToRootViewControllerAnimated:NO];
@@ -574,7 +574,7 @@
                             [nvc popToRootViewControllerAnimated:NO];
                     }
                     
-                    [tbc setSelectedIndex:TabBarApplicationIndexFile];
+                    [tbc setSelectedIndex: k_tabBarApplicationIndexFile];
                     
                 } else {
                     
@@ -582,7 +582,7 @@
                     [nvcDetail popToRootViewControllerAnimated:NO];
                     
                     UITabBarController *tbc = splitViewController.viewControllers.firstObject;
-                    [tbc setSelectedIndex:TabBarApplicationIndexFile];
+                    [tbc setSelectedIndex: k_tabBarApplicationIndexFile];
                 }
                 
                 [_activeMain.navigationController popToRootViewControllerAnimated:NO];
@@ -611,7 +611,7 @@
                         [nvc popToRootViewControllerAnimated:NO];
                 }
             
-                [tbc setSelectedIndex:TabBarApplicationIndexPhotos];
+                [tbc setSelectedIndex: k_tabBarApplicationIndexPhotos];
 
             } else {
             
@@ -619,7 +619,7 @@
                 [nvcDetail popToRootViewControllerAnimated:NO];
             
                 UITabBarController *tbc = splitViewController.viewControllers.firstObject;
-                [tbc setSelectedIndex:TabBarApplicationIndexPhotos];
+                [tbc setSelectedIndex: k_tabBarApplicationIndexPhotos];
             }
         });
         
@@ -726,31 +726,31 @@
     [CCAspect aspectTabBar:tabBarController.tabBar hidden:NO];
     
     // File
-    item = [tabBarController.tabBar.items objectAtIndex:TabBarApplicationIndexFile];
+    item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexFile];
     [item setTitle:NSLocalizedString(@"_home_", nil)];
     item.image = [UIImage imageNamed:image_tabBarFile];
     item.selectedImage = [UIImage imageNamed:image_tabBarFile];
     
     // Offline
-    item = [tabBarController.tabBar.items objectAtIndex:TabBarApplicationIndexOffline];
+    item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexOffline];
     [item setTitle:NSLocalizedString(@"_offline_", nil)];
     item.image = [UIImage imageNamed:image_tabBarOffline];
     item.selectedImage = [UIImage imageNamed:image_tabBarOffline];
     
     // Hide (PLUS)
-    item = [tabBarController.tabBar.items objectAtIndex:TabBarApplicationIndexHide];
+    item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexHide];
     item.title = nil;
     item.image = nil;
     item.enabled = false;
     
     // Photos
-    item = [tabBarController.tabBar.items objectAtIndex:TabBarApplicationIndexPhotos];
+    item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexPhotos];
     [item setTitle:NSLocalizedString(@"_photo_camera_", nil)];
     item.image = [UIImage imageNamed:image_tabBarPhotos];
     item.selectedImage = [UIImage imageNamed:image_tabBarPhotos];
     
     // Settings
-    item = [tabBarController.tabBar.items objectAtIndex:TabBarApplicationIndexSettings];
+    item = [tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexSettings];
     [item setTitle:NSLocalizedString(@"_settings_", nil)];
     item.image = [UIImage imageNamed:image_tabBarSettings];
     item.selectedImage = [UIImage imageNamed:image_tabBarSettings];
@@ -1158,11 +1158,11 @@
     // Verify num error if selectorUploadAutomaticAll
     if ([selector isEqualToString:selectorUploadAutomaticAll]) {
     
-        NSUInteger count = [TableMetadata MR_countOfEntitiesWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (sessionSelector == %@) AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))", app.activeAccount, selectorUploadAutomaticAll,taskIdentifierError, taskIdentifierError]];
+        NSUInteger count = [TableMetadata MR_countOfEntitiesWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (sessionSelector == %@) AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))", app.activeAccount, selectorUploadAutomaticAll,k_taskIdentifierError, k_taskIdentifierError]];
         
 #ifdef DEBUG
         NSArray *records = [[NSArray alloc] init];
-        records = [TableMetadata MR_findAllWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (sessionSelector == %@) AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))", app.activeAccount, selectorUploadAutomaticAll,taskIdentifierError, taskIdentifierError]];
+        records = [TableMetadata MR_findAllWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (sessionSelector == %@) AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))", app.activeAccount, selectorUploadAutomaticAll,k_taskIdentifierError, k_taskIdentifierError]];
 #endif
         
         if (count >= 10) {
@@ -1196,15 +1196,15 @@
     
     if ([[UIApplication sharedApplication] applicationState] != UIApplicationStateBackground) {
         
-        NSLog(@"[LOG] Verify Download/Upload in progress now : %@ - Download %@ - Upload %@", [NSDate date], [self.sessionDateLastDownloadTasks dateByAddingTimeInterval:timerVerifySession], [self.sessionDateLastUploadTasks dateByAddingTimeInterval:timerVerifySession]);
+        NSLog(@"[LOG] Verify Download/Upload in progress now : %@ - Download %@ - Upload %@", [NSDate date], [self.sessionDateLastDownloadTasks dateByAddingTimeInterval:k_timerVerifySession], [self.sessionDateLastUploadTasks dateByAddingTimeInterval:k_timerVerifySession]);
         
-        if ([[NSDate date] compare:[self.sessionDateLastDownloadTasks dateByAddingTimeInterval:timerVerifySession]] == NSOrderedDescending) {
+        if ([[NSDate date] compare:[self.sessionDateLastDownloadTasks dateByAddingTimeInterval:k_timerVerifySession]] == NSOrderedDescending) {
             
             callVerifyDownload = YES;
             [[CCNetworking sharedNetworking] verifyDownloadInProgress];
         }
         
-        if ([[NSDate date] compare:[self.sessionDateLastUploadTasks dateByAddingTimeInterval:timerVerifySession]] == NSOrderedDescending) {
+        if ([[NSDate date] compare:[self.sessionDateLastUploadTasks dateByAddingTimeInterval:k_timerVerifySession]] == NSOrderedDescending) {
             
             callVerifyUpload = YES;
             [[CCNetworking sharedNetworking] verifyUploadInProgress];
@@ -1272,7 +1272,7 @@
     if ([[_listChangeTask objectForKey:metadata.fileID] isEqualToString:@"stopUpload"]) {
         
         // sessionTaskIdentifier on Stop
-        [CCCoreData setMetadataSession:nil sessionError:@"" sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:taskIdentifierStop sessionTaskIdentifierPlist:taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, self.activeAccount] context:nil];
+        [CCCoreData setMetadataSession:nil sessionError:@"" sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:k_taskIdentifierStop sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, self.activeAccount] context:nil];
     }
     else if ([[_listChangeTask objectForKey:metadata.fileID] isEqualToString:@"reloadUpload"]) {
         
@@ -1280,19 +1280,19 @@
         if ([metadata.session isEqualToString:upload_session_wwan])
             metadata.session = upload_session;
         
-        [[CCNetworking sharedNetworking] uploadFileMetadata:metadata taskStatus:taskStatusResume];
+        [[CCNetworking sharedNetworking] uploadFileMetadata:metadata taskStatus:k_taskStatusResume];
     }
     else if ([[_listChangeTask objectForKey:metadata.fileID] isEqualToString:@"reloadDownload"]) {
         
         BOOL downloadData = NO, downloadPlist = NO;
             
-        if (metadata.sessionTaskIdentifier != taskIdentifierDone) downloadData = YES;
-        if (metadata.sessionTaskIdentifierPlist != taskIdentifierDone) downloadPlist = YES;
+        if (metadata.sessionTaskIdentifier != k_taskIdentifierDone) downloadData = YES;
+        if (metadata.sessionTaskIdentifierPlist != k_taskIdentifierDone) downloadPlist = YES;
             
         NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
         
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.2 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
-            [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:downloadData downloadPlist:downloadPlist selector:metadata.sessionSelector selectorPost:metadata.sessionSelectorPost session:download_session taskStatus:taskStatusResume delegate:nil];
+            [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:downloadData downloadPlist:downloadPlist selector:metadata.sessionSelector selectorPost:metadata.sessionSelectorPost session:download_session taskStatus:k_taskStatusResume delegate:nil];
         });
     }
     else if ([[_listChangeTask objectForKey:metadata.fileID] isEqualToString:@"cancelUpload"]) {
@@ -1305,7 +1305,7 @@
     }
     else if ([[_listChangeTask objectForKey:metadata.fileID] isEqualToString:@"cancelDownload"]) {
         
-        [CCCoreData setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:taskIdentifierDone sessionTaskIdentifierPlist:taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, self.activeAccount] context:nil];
+        [CCCoreData setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:k_taskIdentifierDone sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, self.activeAccount] context:nil];
     }
     
     // remove ChangeTask (fileID) from the list

iOSClient/CCGlobal.h

@@ -175,18 +175,18 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define networkingSessionNotification   @"networkingSessionNotification"
 
 // TaskIdentifier
-#define taskIdentifierDone -1
-#define taskIdentifierStop -2
-#define taskIdentifierError -9999
-#define taskIdentifierNULL 9999
+#define k_taskIdentifierDone            -1
+#define k_taskIdentifierStop            -2
+#define k_taskIdentifierError           -9999
+#define k_taskIdentifierNULL            9999
 
 // TaskStatus
-#define taskStatusNone 0
-#define taskStatusCancel -1
-#define taskStatusResume -2
-#define taskStatusSuspend -3
+#define k_taskStatusNone                0
+#define k_taskStatusCancel              -1
+#define k_taskStatusResume              -2
+#define k_taskStatusSuspend             -3
 
-#define timerVerifySession 15.0
+#define k_timerVerifySession            15.0
 
 // OperationQueue
 #define netQueueName                    @"it.twsweb.cryptocloud.queue"
@@ -195,14 +195,14 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define netQueueUploadName              @"it.twsweb.cryptocloud.queueUpload"
 #define netQueueUploadWWanName          @"it.twsweb.cryptocloud.queueUploadWWan"
 
-#define maxConcurrentOperation 10
-#define maxConcurrentOperationDownloadUpload 10
+#define k_maxConcurrentOperation                10
+#define k_maxConcurrentOperationDownloadUpload  10
 
 // Error
-#define CCErrorTaskNil -9999
-#define CCErrorTaskDownloadNotFound -9998
-#define CCErrorFileUploadNotFound -9997
-#define CCErrorInternalError -9996
+#define k_CCErrorTaskNil                        -9999
+#define k_CCErrorTaskDownloadNotFound           -9998
+#define k_CCErrorFileUploadNotFound             -9997
+#define k_CCErrorInternalError                  -9996
 
 // Metadata ed ID
 #define uploadSessionID @"ID_UPLOAD_"
@@ -278,40 +278,40 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define actionUploadOnlyPlist           @"uploadOnlyPlist"
 
 // Metadata : FileType
-#define metadataTypeFile_audio          @"audio"
-#define metadataTypeFile_compress       @"compress"
-#define metadataTypeFile_directory      @"directory"
-#define metadataTypeFile_document       @"document"
-#define metadataTypeFile_image          @"image"
-#define metadataTypeFile_template       @"template"
-#define metadataTypeFile_unknown        @"unknow"
-#define metadataTypeFile_video          @"video"
+#define k_metadataTypeFile_audio            @"audio"
+#define k_metadataTypeFile_compress         @"compress"
+#define k_metadataTypeFile_directory        @"directory"
+#define k_metadataTypeFile_document         @"document"
+#define k_metadataTypeFile_image            @"image"
+#define k_metadataTypeFile_template         @"template"
+#define k_metadataTypeFile_unknown          @"unknow"
+#define k_metadataTypeFile_video            @"video"
 
 // Metadata : Type
-#define metadataType_file               @"file"
-#define metadataType_model              @"model"
-#define metadataType_local              @"local"
+#define k_metadataType_file                 @"file"
+#define k_metadataType_model                @"model"
+#define k_metadataType_local                @"local"
 
 // Metadata : Filename Type
-#define metadataTypeFilenamePlain       0
-#define metadataTypeFilenamePlist       1
-#define metadataTypeFilenameCrypto      2
+#define k_metadataTypeFilenamePlain         0
+#define k_metadataTypeFilenamePlist         1
+#define k_metadataTypeFilenameCrypto        2
 
-#define TabBarApplicationIndexFile      0
-#define TabBarApplicationIndexOffline   1
-#define TabBarApplicationIndexHide      2
-#define TabBarApplicationIndexPhotos    3
-#define TabBarApplicationIndexSettings  4
+#define k_tabBarApplicationIndexFile        0
+#define k_tabBarApplicationIndexOffline     1
+#define k_tabBarApplicationIndexHide        2
+#define k_tabBarApplicationIndexPhotos      3
+#define k_tabBarApplicationIndexSettings    4
 
-#define keyFileNameMask                 @"fileNameMask"
-#define keyFileNameMaskAutomaticPhotos  @"fileNameMaskAutomaticPhotos"
+#define k_keyFileNameMask                   @"fileNameMask"
+#define k_keyFileNameMaskAutomaticPhotos    @"fileNameMaskAutomaticPhotos"
 
 // Type of page Offline
-#define pageOfflineOffline              @"Offline"
-#define pageOfflineLocal                @"Local"
+#define k_pageOfflineOffline                @"Offline"
+#define k_pageOfflineLocal                  @"Local"
 
 // Search
-#define k_minCharsSearch                3
+#define k_minCharsSearch                    3
 
 @interface CCAspect : NSObject
 

iOSClient/Create/CCCreateCloud.swift

@@ -272,7 +272,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         
         row = XLFormRowDescriptor(tag: "maskFileName", rowType: XLFormRowDescriptorTypeAccount, title: NSLocalizedString("_filename_", comment: ""))
         
-        let fileNameMask : String = CCUtility.getFileNameMask(keyFileNameMask)
+        let fileNameMask : String = CCUtility.getFileNameMask(k_keyFileNameMask)
         if fileNameMask.characters.count > 0 {
             row.value = fileNameMask
         }
@@ -478,20 +478,20 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
             if valueRenameTrimming.characters.count > 0 {
                 
                 self.form.delegate = nil
-                CCUtility.setFileNameMask(valueRenameTrimming, key: keyFileNameMask)
+                CCUtility.setFileNameMask(valueRenameTrimming, key: k_keyFileNameMask)
                 self.form.delegate = self
                 
-                returnString = CCUtility.createFileName(from: assets[0] as! PHAsset, key: keyFileNameMask)
+                returnString = CCUtility.createFileName(from: assets[0] as! PHAsset, key: k_keyFileNameMask)
                 
             } else {
                 
-                CCUtility.setFileNameMask("", key: keyFileNameMask)
+                CCUtility.setFileNameMask("", key: k_keyFileNameMask)
                 returnString = CCUtility.createFileName(from: assets[0] as! PHAsset, key: nil)
             }
             
         } else {
             
-            CCUtility.setFileNameMask("", key: keyFileNameMask)
+            CCUtility.setFileNameMask("", key: k_keyFileNameMask)
             returnString = CCUtility.createFileName(from: assets[0] as! PHAsset, key: nil)
         }
         

iOSClient/FileSystem/CCCoreData.m

@@ -597,8 +597,8 @@
     TableMetadata *record = [TableMetadata MR_createEntityInContext:context];
 
     // set default value
-    metadata.sessionTaskIdentifier = taskIdentifierDone;
-    metadata.sessionTaskIdentifierPlist = taskIdentifierDone;
+    metadata.sessionTaskIdentifier = k_taskIdentifierDone;
+    metadata.sessionTaskIdentifierPlist = k_taskIdentifierDone;
     [record setValue:[NSDate date] forKey:@"dateRecord"];
 
     // Insert metdata -> entity
@@ -683,8 +683,8 @@
         if (sessionError) record.sessionError = sessionError;
         if (sessionSelector) record.sessionSelector = sessionSelector;
         if (sessionSelectorPost) record.sessionSelectorPost = sessionSelectorPost;
-        if (sessionTaskIdentifier != taskIdentifierNULL) record.sessionTaskIdentifier = [NSNumber numberWithInteger:sessionTaskIdentifier];
-        if (sessionTaskIdentifierPlist != taskIdentifierNULL) record.sessionTaskIdentifierPlist = [NSNumber numberWithInteger:sessionTaskIdentifierPlist];
+        if (sessionTaskIdentifier != k_taskIdentifierNULL) record.sessionTaskIdentifier = [NSNumber numberWithInteger:sessionTaskIdentifier];
+        if (sessionTaskIdentifierPlist != k_taskIdentifierNULL) record.sessionTaskIdentifierPlist = [NSNumber numberWithInteger:sessionTaskIdentifierPlist];
         
         [directoryIDs addObject:record.directoryID];
         
@@ -777,22 +777,22 @@
 
 + (NSArray *)getTableMetadataDownloadAccount:(NSString *)activeAccount
 {
-    return [self getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND ((session == %@) || (session == %@)) AND ((sessionTaskIdentifier != %i) OR (sessionTaskIdentifierPlist != %i))", activeAccount, download_session, download_session_foreground, taskIdentifierDone, taskIdentifierDone] context:nil];
+    return [self getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND ((session == %@) || (session == %@)) AND ((sessionTaskIdentifier != %i) OR (sessionTaskIdentifierPlist != %i))", activeAccount, download_session, download_session_foreground, k_taskIdentifierDone, k_taskIdentifierDone] context:nil];
 }
 
 + (NSArray *)getTableMetadataDownloadWWanAccount:(NSString *)activeAccount
 {
-    return [self getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (session == %@) AND ((sessionTaskIdentifier != %i) OR (sessionTaskIdentifierPlist != %i))", activeAccount, download_session_wwan, taskIdentifierDone, taskIdentifierDone] context:nil];
+    return [self getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (session == %@) AND ((sessionTaskIdentifier != %i) OR (sessionTaskIdentifierPlist != %i))", activeAccount, download_session_wwan, k_taskIdentifierDone, k_taskIdentifierDone] context:nil];
 }
 
 + (NSArray *)getTableMetadataUploadAccount:(NSString *)activeAccount
 {
-    return [self getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND ((session == %@) || (session == %@)) AND ((sessionTaskIdentifier != %i) OR (sessionTaskIdentifierPlist != %i))", activeAccount, upload_session, upload_session_foreground, taskIdentifierDone, taskIdentifierDone] context:nil];
+    return [self getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND ((session == %@) || (session == %@)) AND ((sessionTaskIdentifier != %i) OR (sessionTaskIdentifierPlist != %i))", activeAccount, upload_session, upload_session_foreground, k_taskIdentifierDone, k_taskIdentifierDone] context:nil];
 }
 
 + (NSArray *)getTableMetadataUploadWWanAccount:(NSString *)activeAccount
 {
-    return [self getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (session == %@) AND ((sessionTaskIdentifier != %i) OR (sessionTaskIdentifierPlist != %i))", activeAccount, upload_session_wwan, taskIdentifierDone, taskIdentifierDone] context:nil];
+    return [self getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (session == %@) AND ((sessionTaskIdentifier != %i) OR (sessionTaskIdentifierPlist != %i))", activeAccount, upload_session_wwan, k_taskIdentifierDone, k_taskIdentifierDone] context:nil];
 }
 
 + (NSArray *)getRecordsTableMetadataPhotosCameraUpload:(NSString *)serverUrl activeAccount:(NSString *)activeAccount
@@ -804,7 +804,7 @@
     
     for (TableDirectory *record in tableDirectoryes) {
         
-        NSArray *records = [TableMetadata MR_findAllWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@) AND ((session == NULL) OR (session == '')) AND (type == 'file') AND ((typeFile == %@) OR (typeFile == %@))", activeAccount, record.directoryID, metadataTypeFile_image, metadataTypeFile_video] inContext:context];
+        NSArray *records = [TableMetadata MR_findAllWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@) AND ((session == NULL) OR (session == '')) AND (type == 'file') AND ((typeFile == %@) OR (typeFile == %@))", activeAccount, record.directoryID, k_metadataTypeFile_image, k_metadataTypeFile_video] inContext:context];
         
         if ([records count] > 0)
             [recordsPhotosCameraUpload addObjectsFromArray:records];
@@ -915,10 +915,10 @@
                 // remove if in session
                 if ([recordMetadata.session length] >0) {
                     if (recordMetadata.sessionTaskIdentifier >= 0)
-                        [[CCNetworking sharedNetworking] settingSession:recordMetadata.session sessionTaskIdentifier:[recordMetadata.sessionTaskIdentifier integerValue] taskStatus:taskStatusCancel];
+                        [[CCNetworking sharedNetworking] settingSession:recordMetadata.session sessionTaskIdentifier:[recordMetadata.sessionTaskIdentifier integerValue] taskStatus: k_taskStatusCancel];
                     
                     if (recordMetadata.sessionTaskIdentifierPlist >= 0)
-                        [[CCNetworking sharedNetworking] settingSession:recordMetadata.session sessionTaskIdentifier:[recordMetadata.sessionTaskIdentifierPlist integerValue] taskStatus:taskStatusCancel];
+                        [[CCNetworking sharedNetworking] settingSession:recordMetadata.session sessionTaskIdentifier:[recordMetadata.sessionTaskIdentifierPlist integerValue] taskStatus: k_taskStatusCancel];
 
                 }
                 
@@ -1497,7 +1497,7 @@
         metadataNet.selectorPost = record.selectorPost;
         metadataNet.serverUrl = record.serverUrl;
         metadataNet.session = record.session;
-        metadataNet.taskStatus = taskStatusResume;                          // Default
+        metadataNet.taskStatus = k_taskStatusResume;                          // Default
         
         [record MR_deleteEntityInContext:context];                          // Remove record
         [context MR_saveToPersistentStoreAndWait];
@@ -1825,7 +1825,7 @@
     [self addLocalFile:metadata activeAccount:activeAccount];
     
     // EXIF
-    if ([metadata.typeFile isEqualToString:metadataTypeFile_image])
+    if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image])
         [CCExifGeo setExifLocalTableFileID:metadata directoryUser:directoryUser activeAccount:activeAccount];
     
     // Icon
@@ -1843,7 +1843,7 @@
     [self updateMetadata:metadata predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, activeAccount] activeAccount:activeAccount activeUrl:activeUrl typeCloud:typeCloud context:nil];
     
     // se è un modello aggiorniamo anche nel FileSystem
-    if ([metadata.type isEqualToString:metadataType_model]){
+    if ([metadata.type isEqualToString: k_metadataType_model]){
         [self updateLocalFileModel:metadata activeAccount:activeAccount];
     }
 }

iOSClient/Main/CCDetail.m

@@ -211,13 +211,13 @@
         });
     }
     
-    if ([self.metadataDetail.typeFile isEqualToString:metadataTypeFile_image] || [self.metadataDetail.typeFile isEqualToString:metadataTypeFile_video]) {
+    if ([self.metadataDetail.typeFile isEqualToString: k_metadataTypeFile_image] || [self.metadataDetail.typeFile isEqualToString: k_metadataTypeFile_video]) {
         
         self.edgesForExtendedLayout = UIRectEdgeAll;
         [self viewImage];
     }
     
-    if ([self.metadataDetail.typeFile isEqualToString:metadataTypeFile_audio]) {
+    if ([self.metadataDetail.typeFile isEqualToString: k_metadataTypeFile_audio]) {
         
         self.edgesForExtendedLayout = UIRectEdgeBottom;
         [self viewAudio];
@@ -225,7 +225,7 @@
         [CCAspect aspectNavigationControllerBar:self.navigationController.navigationBar hidden:NO];
     }
     
-    if ([self.metadataDetail.typeFile isEqualToString:metadataTypeFile_document]) {
+    if ([self.metadataDetail.typeFile isEqualToString: k_metadataTypeFile_document]) {
         
         NSString *ext = [[self.metadataDetail.fileNamePrint pathExtension] lowercaseString];
         
@@ -397,7 +397,7 @@
             [self.photos addObject:[MWPhoto photoWithImage:[UIImage imageNamed:image_filePreviewDownload]]];
             
             MWPhoto *thumb = [MWPhoto photoWithImage:[UIImage imageNamed:image_filePreviewDownload]];
-            if ([metadata.typeFile isEqualToString:metadataTypeFile_video]) thumb.isVideo = YES;
+            if ([metadata.typeFile isEqualToString: k_metadataTypeFile_video]) thumb.isVideo = YES;
             [self.thumbs addObject:thumb];
         }
         
@@ -488,7 +488,7 @@
         
         if (metadata.fileID) {
             
-            if ([metadata.typeFile isEqualToString:metadataTypeFile_image]) {
+            if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image]) {
                 
                 NSString *fileImage = [NSString stringWithFormat:@"%@/%@", directory, metadata.fileID];
                 NSString *ext = [CCUtility getExtension:metadata.fileNamePrint];
@@ -522,7 +522,7 @@
                 }
             }
             
-            if ([metadata.typeFile isEqualToString:metadataTypeFile_video]) {
+            if ([metadata.typeFile isEqualToString: k_metadataTypeFile_video]) {
                 
                 if ([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", directory, metadata.fileID]]) {
                     
@@ -636,7 +636,7 @@
             if (image) {
                 
                 MWPhoto *thumb = [MWPhoto photoWithImage:image];
-                if ([metadata.typeFile isEqualToString:metadataTypeFile_video]) thumb.isVideo = YES;
+                if ([metadata.typeFile isEqualToString: k_metadataTypeFile_video]) thumb.isVideo = YES;
                 [self.thumbs replaceObjectAtIndex:index withObject:thumb];
             }
         }
@@ -765,7 +765,7 @@
 {
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
     
-    [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorLoadViewImage selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:nil];
+    [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorLoadViewImage selectorPost:nil session:download_session taskStatus:k_taskStatusResume delegate:nil];
 }
 
 - (void)insertGeocoderLocation:(NSNotification *)notification
@@ -960,7 +960,7 @@
     // if we are not in browserPhoto and it's removed photo/video in preview then "< Back"
     if (!self.photoBrowser && [self.metadataDetail.fileID isEqualToString:metadataNet.metadata.fileID]) {
         
-        if ([metadataNet.metadata.typeFile isEqualToString:metadataTypeFile_audio])
+        if ([metadataNet.metadata.typeFile isEqualToString: k_metadataTypeFile_audio])
             [app.player.mediaPlayer stop];
         
         NSArray *viewsToRemove = [self.view subviews];

iOSClient/Main/CCMain.m

@@ -665,7 +665,7 @@
                 if ([data writeToFile:fileNamePath options:NSDataWritingAtomic error:&error]) {
                     
                     // Upload File
-                    [[CCNetworking sharedNetworking] uploadFile:fileName serverUrl:_serverUrl cryptated:_isPickerCriptate onlyPlist:NO session:upload_session taskStatus:taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
+                    [[CCNetworking sharedNetworking] uploadFile:fileName serverUrl:_serverUrl cryptated:_isPickerCriptate onlyPlist:NO session:upload_session taskStatus: k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
                     
                 } else {
                     
@@ -1005,11 +1005,11 @@
         
         for (CCMetadata *metadata in metadatas) {
             
-            if (metadata.directory == NO && [metadata.type isEqualToString:metadataType_file] && ([metadata.typeFile isEqualToString:metadataTypeFile_image] || [metadata.typeFile isEqualToString:metadataTypeFile_video])) {
+            if (metadata.directory == NO && [metadata.type isEqualToString: k_metadataType_file] && ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])) {
                 
                 NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
                 
-                [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorSave selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
+                [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorSave selectorPost:nil session:download_session taskStatus: k_taskStatusResume delegate:self];
             }
         }
         
@@ -1310,11 +1310,11 @@
         
         [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
         
-        if ([metadata.typeFile isEqualToString:metadataTypeFile_compress]) {
+        if ([metadata.typeFile isEqualToString: k_metadataTypeFile_compress]) {
             
             [self performSelector:@selector(unZipFile:) withObject:metadata.fileID afterDelay:0.1];
             
-        } else if ([metadata.typeFile isEqualToString:metadataTypeFile_unknown]) {
+        } else if ([metadata.typeFile isEqualToString: k_metadataTypeFile_unknown]) {
             
             selector = selectorOpenIn;
            
@@ -1361,7 +1361,7 @@
         
         NSString *file = [NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID];
         
-        if ([metadata.typeFile isEqualToString:metadataTypeFile_image]) {
+        if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image]) {
             
             // evitiamo il rimando photo
             [CCCoreData setCameraUploadDatePhoto:[NSDate date]];
@@ -1374,7 +1374,7 @@
                 [app messageNotification:@"_save_selected_files_" description:@"_file_not_saved_cameraroll_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
         }
         
-        if ([metadata.typeFile isEqualToString:metadataTypeFile_video]) {
+        if ([metadata.typeFile isEqualToString: k_metadataTypeFile_video]) {
             
             // we avoid the cross-reference video
             [CCCoreData setCameraUploadDateVideo:[NSDate date]];
@@ -1425,7 +1425,7 @@
             }
         }
         
-        if ((countSelectorLoadPlist == 0 || countSelectorLoadPlist % maxConcurrentOperation == 0) && [metadata.directoryID isEqualToString:[CCCoreData getDirectoryIDFromServerUrl:_serverUrl activeAccount:app.activeAccount]]) {
+        if ((countSelectorLoadPlist == 0 || countSelectorLoadPlist % k_maxConcurrentOperation == 0) && [metadata.directoryID isEqualToString:[CCCoreData getDirectoryIDFromServerUrl:_serverUrl activeAccount:app.activeAccount]]) {
             
             dispatch_async(dispatch_get_main_queue(), ^{
                 [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
@@ -1467,11 +1467,11 @@
         
         for (CCMetadata *metadata in selectedMetadatas) {
             
-            if (metadata.directory == NO && [metadata.type isEqualToString:metadataType_file]) {
+            if (metadata.directory == NO && [metadata.type isEqualToString: k_metadataType_file]) {
                 
                 NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
                 
-                [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorReload selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
+                [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorReload selectorPost:nil session:download_session taskStatus: k_taskStatusResume delegate:self];
             }
         }
         
@@ -1498,7 +1498,7 @@
             metadataNet.selector = selectorLoadPlist;
             metadataNet.serverUrl = serverUrl;
             metadataNet.session = download_session_foreground;
-            metadataNet.taskStatus = taskStatusResume;
+            metadataNet.taskStatus = k_taskStatusResume;
             
             [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
         }
@@ -1516,13 +1516,13 @@
         [app loadTableAutomaticUploadForSelector:selector];
 
     // Read File test do not exists
-    if (errorCode == CCErrorFileUploadNotFound && fileID) {
+    if (errorCode == k_CCErrorFileUploadNotFound && fileID) {
        
         CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, app.activeAccount] context:nil];
         
         // reUpload
         if (metadata)
-            [[CCNetworking sharedNetworking] uploadFileMetadata:metadata taskStatus:taskStatusResume];
+            [[CCNetworking sharedNetworking] uploadFileMetadata:metadata taskStatus:k_taskStatusResume];
     }
     
     // Print error
@@ -1609,7 +1609,7 @@
     
     for (PHAsset *asset in assets) {
         
-        NSString *fileName = [CCUtility createFileNameFromAsset:asset key: keyFileNameMask];
+        NSString *fileName = [CCUtility createFileNameFromAsset:asset key: k_keyFileNameMask];
         
         NSDate *assetDate = asset.creationDate;
         NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
@@ -1674,7 +1674,7 @@
             metadataNet.errorCode = 0;
             metadataNet.selector = selectorUploadFile;
             metadataNet.selectorPost = nil;
-            metadataNet.taskStatus = taskStatusResume;
+            metadataNet.taskStatus = k_taskStatusResume;
             
             if ([metadataNet.session containsString:@"wwan"])
                 [app addNetworkingOperationQueue:app.netQueueUploadWWan delegate:self metadataNet:metadataNet];
@@ -1725,7 +1725,7 @@
         metadataNet.errorCode = 403;                // File exists 403 Forbidden
         metadataNet.selector = selectorUploadFile;
         metadataNet.selectorPost = nil;
-        metadataNet.taskStatus = taskStatusResume;
+        metadataNet.taskStatus = k_taskStatusResume;
         
         if ([metadataNet.session containsString:@"wwan"])
             [app addNetworkingOperationQueue:app.netQueueUploadWWan delegate:self metadataNet:metadataNet];
@@ -1788,10 +1788,10 @@
         NSInteger typeFilename = [CCUtility getTypeFileName:metadata.fileName];
         
         // if crypto do not insert
-        if (typeFilename == metadataTypeFilenameCrypto) continue;
+        if (typeFilename == k_metadataTypeFilenameCrypto) continue;
         
         // verify if the record encrypted has plist + crypto
-        if (typeFilename == metadataTypeFilenamePlist && metadata.directory == NO) {
+        if (typeFilename == k_metadataTypeFilenamePlist && metadata.directory == NO) {
             
             BOOL isCryptoComplete = NO;
             NSString *fileNameCrypto = [CCUtility trasformedFileNamePlistInCrypto:metadata.fileName];
@@ -1826,8 +1826,8 @@
                 metadataDB.rev = metadata.fileID;
                 metadataDB.sessionError = @"";
                 metadataDB.sessionID = @"";
-                metadataDB.sessionTaskIdentifier = taskIdentifierDone;
-                metadataDB.sessionTaskIdentifierPlist = taskIdentifierDone;
+                metadataDB.sessionTaskIdentifier = k_taskIdentifierDone;
+                metadataDB.sessionTaskIdentifierPlist = k_taskIdentifierDone;
                 
                 [CCCoreData updateMetadata:metadataDB predicate:[NSPredicate predicateWithFormat:@"(sessionID == %@) AND (account == %@)", sessionID, app.activeAccount] activeAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud context:nil];
                 
@@ -2087,7 +2087,7 @@
         metadataNet.rev = metadata.rev;
         metadataNet.serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
         metadataNet.session = upload_session_foreground;
-        metadataNet.taskStatus = taskStatusResume;
+        metadataNet.taskStatus = k_taskStatusResume;
         
         if ([CCCoreData isOfflineLocalFileID:metadata.fileID activeAccount:app.activeAccount])
             metadataNet.selectorPost = selectorAddOffline;
@@ -2353,7 +2353,7 @@
     metadataNet.selectorPost = selectorReadFolderForced;
     metadataNet.serverUrl = _serverUrl;
     metadataNet.session = upload_session_foreground;
-    metadataNet.taskStatus = taskStatusResume;
+    metadataNet.taskStatus = k_taskStatusResume;
     
     [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
     
@@ -2437,7 +2437,7 @@
         metadataNet.selectorPost = selectorReadFolderForced;
         metadataNet.serverUrl = serverUrl;
         metadataNet.session = upload_session_foreground;
-        metadataNet.taskStatus = taskStatusResume;
+        metadataNet.taskStatus = k_taskStatusResume;
         
         [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
     }
@@ -2466,7 +2466,7 @@
             
             NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
             
-            [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorEncryptFile selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
+            [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorEncryptFile selectorPost:nil session:download_session taskStatus: k_taskStatusResume delegate:self];
         }
     }
     
@@ -2492,7 +2492,7 @@
             
             NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
             
-            [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorDecryptFile selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
+            [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorDecryptFile selectorPost:nil session:download_session taskStatus: k_taskStatusResume delegate:self];
         }
     }
     
@@ -2508,7 +2508,7 @@
     
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:_metadata.directoryID activeAccount:_metadata.account];
     
-    [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selector selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
+    [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selector selectorPost:nil session:download_session taskStatus:k_taskStatusResume delegate:self];
 }
 
 - (void)encryptedFile:(CCMetadata *)metadata
@@ -2522,7 +2522,7 @@
         NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:app.activeAccount];
                 
         dispatch_async(dispatch_get_main_queue(), ^{
-            [[CCNetworking sharedNetworking] uploadFile:metadata.fileName serverUrl:serverUrl cryptated:YES onlyPlist:NO session:upload_session taskStatus:taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
+            [[CCNetworking sharedNetworking] uploadFile:metadata.fileName serverUrl:serverUrl cryptated:YES onlyPlist:NO session:upload_session taskStatus:k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
             [self performSelector:@selector(reloadDatasource) withObject:nil afterDelay:0.1];
         });
         
@@ -2544,7 +2544,7 @@
         NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:app.activeAccount];
         
         dispatch_async(dispatch_get_main_queue(), ^{
-            [[CCNetworking sharedNetworking] uploadFile:metadata.fileNamePrint serverUrl:serverUrl cryptated:NO onlyPlist:NO session:upload_session taskStatus:taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
+            [[CCNetworking sharedNetworking] uploadFile:metadata.fileNamePrint serverUrl:serverUrl cryptated:NO onlyPlist:NO session:upload_session taskStatus:k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
             [self performSelector:@selector(reloadDatasource) withObject:nil afterDelay:0.1];
         });
         
@@ -3001,10 +3001,10 @@
     
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
     
-    if ([metadata.type isEqualToString:metadataType_file])
-        [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorAddOffline selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
+    if ([metadata.type isEqualToString: k_metadataType_file])
+        [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorAddOffline selectorPost:nil session:download_session taskStatus:k_taskStatusResume delegate:self];
     
-    if ([metadata.type isEqualToString:metadataType_model])
+    if ([metadata.type isEqualToString: k_metadataType_model])
         [CCCoreData setOfflineLocalFileID:metadata.fileID offline:YES activeAccount:app.activeAccount];
     
     NSIndexPath *indexPath = [_sectionDataSource.fileIDIndexPath objectForKey:metadata.fileID];
@@ -3029,10 +3029,10 @@
     
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
 
-    if ([metadata.type isEqualToString:metadataType_file])
-        [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorAddLocal selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
+    if ([metadata.type isEqualToString: k_metadataType_file])
+        [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorAddLocal selectorPost:nil session:download_session taskStatus:k_taskStatusResume delegate:self];
     
-    if ([metadata.type isEqualToString:metadataType_model]) {
+    if ([metadata.type isEqualToString: k_metadataType_model]) {
         
         [CCUtility copyFileAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileName] toPath:[NSString stringWithFormat:@"%@/%@", [CCUtility getDirectoryLocal], metadata.fileName]];
         
@@ -3051,7 +3051,7 @@
 {
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
 
-    [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorReload selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
+    [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorReload selectorPost:nil session:download_session taskStatus:k_taskStatusResume delegate:self];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -3062,7 +3062,7 @@
 {
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
 
-    [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorOpenIn selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
+    [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorOpenIn selectorPost:nil session:download_session taskStatus:k_taskStatusResume delegate:self];
     
     NSIndexPath *indexPath = [_sectionDataSource.fileIDIndexPath objectForKey:metadata.fileID];
     if (indexPath) [self.tableView reloadRowsAtIndexPaths:[NSArray arrayWithObjects:indexPath, nil] withRowAnimation:UITableViewRowAnimationAutomatic];
@@ -3196,7 +3196,7 @@
     
     // STOP, erase all in  queue networking
     [app cancelAllOperations];
-    [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
+    [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:k_taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
 
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.2 * NSEC_PER_SEC), dispatch_get_main_queue(), ^{
     
@@ -3732,7 +3732,7 @@
     
     if (@selector(copyFile:) == action || @selector(openinFile:) == action) {
         
-        if (_isSelectedMode == NO && _metadata && !_metadata.directory && !_metadata.errorPasscode && [_metadata.session length] == 0 && ![_metadata.typeFile isEqualToString:metadataTypeFile_template])  {
+        if (_isSelectedMode == NO && _metadata && !_metadata.directory && !_metadata.errorPasscode && [_metadata.session length] == 0 && ![_metadata.typeFile isEqualToString: k_metadataTypeFile_template])  {
             
             // NO Cryptated with Title lenght = 0
             if (!_metadata.cryptated || (_metadata.cryptated && _metadata.title.length > 0))
@@ -3749,7 +3749,7 @@
             
             for (CCMetadata *metadata in selectedMetadatas) {
                 
-                if (!metadata.directory && !metadata.errorPasscode && metadata.session.length == 0 && ![metadata.typeFile isEqualToString:metadataTypeFile_template])  {
+                if (!metadata.directory && !metadata.errorPasscode && metadata.session.length == 0 && ![metadata.typeFile isEqualToString: k_metadataTypeFile_template])  {
                     
                     // NO Cryptated with Title lenght = 0
                     if (!metadata.cryptated || (metadata.cryptated && metadata.title.length > 0))
@@ -3834,7 +3834,7 @@
         
         NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:_metadata.directoryID activeAccount:_metadata.account];
         
-        [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorLoadCopy selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
+        [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorLoadCopy selectorPost:nil session:download_session taskStatus:k_taskStatusResume delegate:self];
     }
 }
 
@@ -3856,7 +3856,7 @@
 
             NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:_metadata.directoryID activeAccount:_metadata.account];
 
-            [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorLoadCopy selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
+            [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorLoadCopy selectorPost:nil session:download_session taskStatus:k_taskStatusResume delegate:self];
         }
     }
     
@@ -3928,7 +3928,7 @@
                 
                 [CCUtility copyFileAtPath:[NSString stringWithFormat:@"%@/%@", directoryUser, metadata.fileID] toPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileNamePrint]];
             
-                [[CCNetworking sharedNetworking] uploadFile:metadata.fileNamePrint serverUrl:_serverUrl cryptated:cryptated onlyPlist:NO session:upload_session taskStatus:taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
+                [[CCNetworking sharedNetworking] uploadFile:metadata.fileNamePrint serverUrl:_serverUrl cryptated:cryptated onlyPlist:NO session:upload_session taskStatus:k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
             }
         }
     }
@@ -4327,7 +4327,7 @@
     
     /******************************************* FILE *******************************************/
     
-    if ([_metadata.type isEqualToString:metadataType_file] && !_metadata.directory) {
+    if ([_metadata.type isEqualToString: k_metadataType_file] && !_metadata.directory) {
         
         // assegnamo l'immagine anteprima se esiste, altrimenti metti quella standars
         if ([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@.ico", app.directoryUser, _metadata.fileID]])
@@ -4471,7 +4471,7 @@
     
     /******************************************* TEMPLATE *******************************************/
     
-    if ([_metadata.type isEqualToString:metadataType_model]) {
+    if ([_metadata.type isEqualToString: k_metadataType_model]) {
         
         iconHeader = [UIImage imageNamed:_metadata.iconName];
      
@@ -5072,10 +5072,10 @@
         [dateFormatter setDateStyle:NSDateFormatterShortStyle];
         [dateFormatter setTimeStyle:NSDateFormatterShortStyle];
         
-        if ([metadata.type isEqualToString:metadataType_model] && [dataFile isEqualToString:@" "] == NO && [lunghezzaFile isEqualToString:@" "] == NO)
+        if ([metadata.type isEqualToString: k_metadataType_model] && [dataFile isEqualToString:@" "] == NO && [lunghezzaFile isEqualToString:@" "] == NO)
             cell.labelInfoFile.text = [NSString stringWithFormat:@"%@", dataFile];
         
-        if ([metadata.type isEqualToString:metadataType_file] && [dataFile isEqualToString:@" "] == NO && [lunghezzaFile isEqualToString:@" "] == NO) {            
+        if ([metadata.type isEqualToString: k_metadataType_file] && [dataFile isEqualToString:@" "] == NO && [lunghezzaFile isEqualToString:@" "] == NO) {
             if (recordLocalFile && [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID]])
                 cell.labelInfoFile.text = [NSString stringWithFormat:@"%@ • %@", dataFile, lunghezzaFile];
             else
@@ -5129,7 +5129,7 @@
     // ----------------------------------------------------------------------------------------------------------
     
     // File Cyptated
-    if (metadata.cryptated && metadata.directory == NO && [metadata.type isEqualToString:metadataType_model] == NO) {
+    if (metadata.cryptated && metadata.directory == NO && [metadata.type isEqualToString: k_metadataType_model] == NO) {
      
         cell.statusImageView.image = [UIImage imageNamed:image_lock];
     }
@@ -5213,7 +5213,7 @@
         else cell.statusImageView.image = [UIImage imageNamed:image_statusdownload];
 
         // sessionTaskIdentifier : RELOAD + STOP
-        if (metadata.sessionTaskIdentifier != taskIdentifierDone) {
+        if (metadata.sessionTaskIdentifier != k_taskIdentifierDone) {
             
             if (metadata.cryptated)[cell.cancelTaskButton setBackgroundImage:[UIImage imageNamed:image_stoptaskcrypto] forState:UIControlStateNormal];
             else [cell.cancelTaskButton setBackgroundImage:[UIImage imageNamed:image_stoptask] forState:UIControlStateNormal];
@@ -5228,7 +5228,7 @@
         }
         
         // sessionTaskIdentifierPlist : RELOAD
-        if (metadata.sessionTaskIdentifierPlist != taskIdentifierDone) {
+        if (metadata.sessionTaskIdentifierPlist != k_taskIdentifierDone) {
             
             if (metadata.cryptated)[cell.reloadTaskButton setBackgroundImage:[UIImage imageNamed:image_reloadtaskcrypto] forState:UIControlStateNormal];
             else [cell.reloadTaskButton setBackgroundImage:[UIImage imageNamed:image_reloadtask] forState:UIControlStateNormal];
@@ -5252,7 +5252,7 @@
         // downloadFile Error
         // ----------------------------------------------------------------------------------------------------------
         
-        if (metadata.sessionTaskIdentifier == taskIdentifierError || metadata.sessionTaskIdentifierPlist == taskIdentifierError) {
+        if (metadata.sessionTaskIdentifier == k_taskIdentifierError || metadata.sessionTaskIdentifierPlist == k_taskIdentifierError) {
             
             cell.statusImageView.image = [UIImage imageNamed:image_statuserror];
             
@@ -5276,7 +5276,7 @@
         else [cell.cancelTaskButton setBackgroundImage:[UIImage imageNamed:image_removetask] forState:UIControlStateNormal];
         cell.cancelTaskButton.hidden = NO;
         
-        if (metadata.sessionTaskIdentifier == taskIdentifierStop) {
+        if (metadata.sessionTaskIdentifier == k_taskIdentifierStop) {
             
             if (metadata.cryptated)[cell.reloadTaskButton setBackgroundImage:[UIImage imageNamed:image_reloadtaskcrypto] forState:UIControlStateNormal];
             else [cell.reloadTaskButton setBackgroundImage:[UIImage imageNamed:image_reloadtask] forState:UIControlStateNormal];
@@ -5317,7 +5317,7 @@
         // uploadFileError
         // ----------------------------------------------------------------------------------------------------------
     
-        if (metadata.sessionTaskIdentifier == taskIdentifierError || metadata.sessionTaskIdentifierPlist == taskIdentifierError) {
+        if (metadata.sessionTaskIdentifier == k_taskIdentifierError || metadata.sessionTaskIdentifierPlist == k_taskIdentifierError) {
         
             cell.labelTitle.enabled = NO;
             cell.statusImageView.image = [UIImage imageNamed:image_statuserror];
@@ -5469,19 +5469,19 @@
     
         NSString* selector;
         
-        if ([_metadata.type isEqualToString:metadataType_model]) selector = selectorLoadModelView;
+        if ([_metadata.type isEqualToString: k_metadataType_model]) selector = selectorLoadModelView;
         else selector = selectorLoadPlist;
         
-        [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:NO downloadPlist:YES selector:selector selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
+        [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:NO downloadPlist:YES selector:selector selectorPost:nil session:download_session taskStatus:k_taskStatusResume delegate:self];
         
         return;
     }
         
     // se il plist è caricato ed è un modello aprilo
-    if ([_metadata.type isEqualToString:metadataType_model]) [self openModel:_metadata.model isNew:false];
+    if ([_metadata.type isEqualToString:k_metadataType_model]) [self openModel:_metadata.model isNew:false];
     
     // file
-    if (_metadata.directory == NO && _metadata.errorPasscode == NO && [_metadata.type isEqualToString:metadataType_file]) {
+    if (_metadata.directory == NO && _metadata.errorPasscode == NO && [_metadata.type isEqualToString: k_metadataType_file]) {
         
         // se il file esiste andiamo direttamente al delegato altrimenti carichiamolo
         if ([[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, _metadata.fileID]]) {
@@ -5490,7 +5490,7 @@
             
         } else {
                 
-            [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorLoadFileView selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self];
+            [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorLoadFileView selectorPost:nil session:download_session taskStatus:k_taskStatusResume delegate:self];
             
             NSIndexPath *indexPath = [_sectionDataSource.fileIDIndexPath objectForKey:_metadata.fileID];
             if (indexPath) [self.tableView reloadRowsAtIndexPaths:[NSArray arrayWithObjects:indexPath, nil] withRowAnimation:UITableViewRowAnimationAutomatic];
@@ -5591,7 +5591,7 @@
     NSMutableArray *allRecordsDataSourceImagesVideos = [[NSMutableArray alloc] init];
     for (NSString *fileID in _sectionDataSource.allFileID) {
         CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
-        if ([metadata.typeFile isEqualToString:metadataTypeFile_image] || [metadata.typeFile isEqualToString:metadataTypeFile_video])
+        if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])
             [allRecordsDataSourceImagesVideos addObject:metadata];
     }
 

iOSClient/Main/CCSection.m

@@ -94,7 +94,7 @@
             [copyRecords insertObject:metadata atIndex:0];
         } else {
             
-            if ([metadata.typeFile isEqualToString:metadataTypeFile_directory] && directoryOnTop) {
+            if ([metadata.typeFile isEqualToString: k_metadataTypeFile_directory] && directoryOnTop) {
                 [copyRecords insertObject:metadata atIndex:numDirectory++];
             } else {
                 [copyRecords addObject:metadata];
@@ -174,8 +174,8 @@
         }
         
         // Directory at Top
-        if ([obj1 isKindOfClass:[NSString class]] && [obj1 containsString:metadataTypeFile_directory]) return NSOrderedAscending;
-        if ([obj2 isKindOfClass:[NSString class]] && [obj2 containsString:metadataTypeFile_directory]) return NSOrderedDescending;
+        if ([obj1 isKindOfClass:[NSString class]] && [obj1 containsString: k_metadataTypeFile_directory]) return NSOrderedAscending;
+        if ([obj2 isKindOfClass:[NSString class]] && [obj2 containsString: k_metadataTypeFile_directory]) return NSOrderedDescending;
         
         if (ascending) return [obj1 compare:obj2];
         else return [obj2 compare:obj1];
@@ -204,9 +204,9 @@
                 [sectionDataSource.allRecordsDataSource setObject:metadata forKey:metadata.fileID];
                 [sectionDataSource.fileIDIndexPath setObject:[NSIndexPath indexPathForRow:indexRow inSection:indexSection] forKey:metadata.fileID];
                 
-                if ([metadata.typeFile isEqualToString:metadataTypeFile_image])
+                if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image])
                     sectionDataSource.image++;
-                if ([metadata.typeFile isEqualToString:metadataTypeFile_video])
+                if ([metadata.typeFile isEqualToString: k_metadataTypeFile_video])
                     sectionDataSource.video++;
                 if (metadata.directory)
                     sectionDataSource.directories++;

iOSClient/MenuAccount+ControlCenter/CCControlCenter.m

@@ -423,10 +423,10 @@
         
         CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:key];
         
-        if ([metadata.session containsString:@"download"] && (metadata.sessionTaskIdentifierPlist != taskIdentifierDone))
+        if ([metadata.session containsString:@"download"] && (metadata.sessionTaskIdentifierPlist != k_taskIdentifierDone))
             continue;
         
-        if ([metadata.session containsString:@"upload"] && (metadata.sessionTaskIdentifier != taskIdentifierStop))
+        if ([metadata.session containsString:@"upload"] && (metadata.sessionTaskIdentifier != k_taskIdentifierStop))
             continue;
         
         [app.activeMain reloadTaskButton:metadata];
@@ -466,7 +466,7 @@
 
         CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:key];
         
-        if ([metadata.session containsString:@"upload"] && metadata.cryptated && ((metadata.sessionTaskIdentifier == taskIdentifierDone && metadata.sessionTaskIdentifierPlist >= 0) || (metadata.sessionTaskIdentifier >= 0 && metadata.sessionTaskIdentifierPlist == taskIdentifierDone)))
+        if ([metadata.session containsString:@"upload"] && metadata.cryptated && ((metadata.sessionTaskIdentifier == k_taskIdentifierDone && metadata.sessionTaskIdentifierPlist >= 0) || (metadata.sessionTaskIdentifier >= 0 && metadata.sessionTaskIdentifierPlist == k_taskIdentifierDone)))
             continue;
         
         [app.activeMain cancelTaskButton:metadata reloadTable:lastAndRefresh];
@@ -506,7 +506,7 @@
             continue;
         }
         
-        if ([metadata.session containsString:@"upload"] && metadata.cryptated && ((metadata.sessionTaskIdentifier == taskIdentifierDone && metadata.sessionTaskIdentifierPlist >= 0) || (metadata.sessionTaskIdentifier >= 0 && metadata.sessionTaskIdentifierPlist == taskIdentifierDone)))
+        if ([metadata.session containsString:@"upload"] && metadata.cryptated && ((metadata.sessionTaskIdentifier == k_taskIdentifierDone && metadata.sessionTaskIdentifierPlist >= 0) || (metadata.sessionTaskIdentifier >= 0 && metadata.sessionTaskIdentifierPlist == k_taskIdentifierDone)))
             continue;
         
         [app.activeMain stopTaskButton:metadata];
@@ -833,7 +833,7 @@
     // ----------------------------------------------------------------------------------------------------------
     
     // File Cyptated
-    if (metadata.cryptated && metadata.directory == NO && [metadata.type isEqualToString:metadataType_model] == NO) {
+    if (metadata.cryptated && metadata.directory == NO && [metadata.type isEqualToString: k_metadataType_model] == NO) {
         
         cell.statusImageView.image = [UIImage imageNamed:image_lock];
     }
@@ -848,7 +848,7 @@
         else cell.statusImageView.image = [UIImage imageNamed:image_statusdownload];
         
         // Fai comparire il RELOAD e lo STOP solo se non è un Task Plist
-        if (metadata.sessionTaskIdentifierPlist == taskIdentifierDone) {
+        if (metadata.sessionTaskIdentifierPlist == k_taskIdentifierDone) {
             
             if (metadata.cryptated)[cell.cancelTaskButton setBackgroundImage:[UIImage imageNamed:image_stoptaskcrypto] forState:UIControlStateNormal];
             else [cell.cancelTaskButton setBackgroundImage:[UIImage imageNamed:image_stoptask] forState:UIControlStateNormal];
@@ -877,7 +877,7 @@
         // downloadFile Error
         // ----------------------------------------------------------------------------------------------------------
         
-        if (metadata.sessionTaskIdentifier == taskIdentifierError || metadata.sessionTaskIdentifierPlist == taskIdentifierError) {
+        if (metadata.sessionTaskIdentifier == k_taskIdentifierError || metadata.sessionTaskIdentifierPlist == k_taskIdentifierError) {
             
             cell.statusImageView.image = [UIImage imageNamed:image_statuserror];
             
@@ -901,7 +901,7 @@
         else [cell.cancelTaskButton setBackgroundImage:[UIImage imageNamed:image_removetask] forState:UIControlStateNormal];
         cell.cancelTaskButton.hidden = NO;
         
-        if (metadata.sessionTaskIdentifier == taskIdentifierStop) {
+        if (metadata.sessionTaskIdentifier == k_taskIdentifierStop) {
             
             if (metadata.cryptated)[cell.reloadTaskButton setBackgroundImage:[UIImage imageNamed:image_reloadtaskcrypto] forState:UIControlStateNormal];
             else [cell.reloadTaskButton setBackgroundImage:[UIImage imageNamed:image_reloadtask] forState:UIControlStateNormal];
@@ -942,7 +942,7 @@
         // uploadFileError
         // ----------------------------------------------------------------------------------------------------------
         
-        if (metadata.sessionTaskIdentifier == taskIdentifierError || metadata.sessionTaskIdentifierPlist == taskIdentifierError) {
+        if (metadata.sessionTaskIdentifier == k_taskIdentifierError || metadata.sessionTaskIdentifierPlist == k_taskIdentifierError) {
             
             cell.labelTitle.enabled = NO;
             cell.statusImageView.image = [UIImage imageNamed:image_statuserror];

iOSClient/Move/CCMove.m

@@ -227,7 +227,7 @@
         
         OCnetworking *operation = [[OCnetworking alloc] initWithDelegate:self metadataNet:metadataNet withUser:activeUser withPassword:activePassword withUrl:activeUrl withTypeCloud:typeCloud activityIndicator:NO];
         
-        _networkingOperationQueue.maxConcurrentOperationCount = maxConcurrentOperation;
+        _networkingOperationQueue.maxConcurrentOperationCount = k_maxConcurrentOperation;
         [_networkingOperationQueue addOperation:operation];
     }
 }
@@ -307,7 +307,7 @@
                     metadataNet.selector = selectorLoadPlist;
                     metadataNet.serverUrl = _serverUrl;
                     metadataNet.session = download_session_foreground;
-                    metadataNet.taskStatus = taskStatusResume;
+                    metadataNet.taskStatus = k_taskStatusResume;
                     
                     [self addNetworkingQueue:metadataNet];
                 }

iOSClient/Networking/CCNetworking.m

@@ -236,11 +236,11 @@
         
         configuration.allowsCellularAccess = YES;
         configuration.discretionary = NO;
-        configuration.HTTPMaximumConnectionsPerHost = maxConcurrentOperation;
+        configuration.HTTPMaximumConnectionsPerHost = k_maxConcurrentOperation;
         configuration.requestCachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
         
         OCURLSessionManager *networkSessionManager = [[OCURLSessionManager alloc] initWithSessionConfiguration:configuration];
-        [networkSessionManager.operationQueue setMaxConcurrentOperationCount:maxConcurrentOperation];
+        [networkSessionManager.operationQueue setMaxConcurrentOperationCount: k_maxConcurrentOperation];
         networkSessionManager.responseSerializer = [AFHTTPResponseSerializer serializer];
         
         sharedOCCommunication = [[OCCommunication alloc] initWithUploadSessionManager:nil andDownloadSessionManager:nil andNetworkSessionManager:networkSessionManager];
@@ -279,23 +279,23 @@
         
         [[self sessionDownload] getTasksWithCompletionHandler:^(NSArray *dataTasks, NSArray *uploadTasks, NSArray *downloadTasks) {
             for (NSURLSessionTask *task in downloadTasks)
-                if (taskStatus == taskStatusCancel) [task cancel];
-                else if (taskStatus == taskStatusSuspend) [task suspend];
-                else if (taskStatus == taskStatusResume) [task resume];
+                if (taskStatus == k_taskStatusCancel) [task cancel];
+                else if (taskStatus == k_taskStatusSuspend) [task suspend];
+                else if (taskStatus == k_taskStatusResume) [task resume];
         }];
         
         [[self sessionDownloadForeground] getTasksWithCompletionHandler:^(NSArray *dataTasks, NSArray *uploadTasks, NSArray *downloadTasks) {
             for (NSURLSessionTask *task in downloadTasks)
-                if (taskStatus == taskStatusCancel) [task cancel];
-                else if (taskStatus == taskStatusSuspend) [task suspend];
-                else if (taskStatus == taskStatusResume) [task resume];
+                if (taskStatus == k_taskStatusCancel) [task cancel];
+                else if (taskStatus == k_taskStatusSuspend) [task suspend];
+                else if (taskStatus == k_taskStatusResume) [task resume];
         }];
         
         [[self sessionWWanDownload] getTasksWithCompletionHandler:^(NSArray *dataTasks, NSArray *uploadTasks, NSArray *downloadTasks) {
             for (NSURLSessionTask *task in downloadTasks)
-                if (taskStatus == taskStatusCancel) [task cancel];
-                else if (taskStatus == taskStatusSuspend) [task suspend];
-                else if (taskStatus == taskStatusResume) [task resume];
+                if (taskStatus == k_taskStatusCancel) [task cancel];
+                else if (taskStatus == k_taskStatusSuspend) [task suspend];
+                else if (taskStatus == k_taskStatusResume) [task resume];
         }];
     }
         
@@ -303,33 +303,33 @@
         
         [[self sessionUpload] getTasksWithCompletionHandler:^(NSArray *dataTasks, NSArray *uploadTasks, NSArray *downloadTasks) {
             for (NSURLSessionTask *task in uploadTasks)
-                if (taskStatus == taskStatusCancel) [task cancel];
-                else if (taskStatus == taskStatusSuspend) [task suspend];
-                else if (taskStatus == taskStatusResume) [task resume];
+                if (taskStatus == k_taskStatusCancel) [task cancel];
+                else if (taskStatus == k_taskStatusSuspend) [task suspend];
+                else if (taskStatus == k_taskStatusResume) [task resume];
         }];
         
         [[self sessionUploadForeground] getTasksWithCompletionHandler:^(NSArray *dataTasks, NSArray *uploadTasks, NSArray *downloadTasks) {
             for (NSURLSessionTask *task in uploadTasks)
-                if (taskStatus == taskStatusCancel) [task cancel];
-                else if (taskStatus == taskStatusSuspend) [task suspend];
-                else if (taskStatus == taskStatusResume) [task resume];
+                if (taskStatus == k_taskStatusCancel) [task cancel];
+                else if (taskStatus == k_taskStatusSuspend) [task suspend];
+                else if (taskStatus == k_taskStatusResume) [task resume];
         }];
         
         [[self sessionWWanUpload] getTasksWithCompletionHandler:^(NSArray *dataTasks, NSArray *uploadTasks, NSArray *downloadTasks) {
             for (NSURLSessionTask *task in uploadTasks)
-                if (taskStatus == taskStatusCancel) [task cancel];
-                else if (taskStatus == taskStatusSuspend) [task suspend];
-                else if (taskStatus == taskStatusResume) [task resume];
+                if (taskStatus == k_taskStatusCancel) [task cancel];
+                else if (taskStatus == k_taskStatusSuspend) [task suspend];
+                else if (taskStatus == k_taskStatusResume) [task resume];
         }];
     }
 
     // COREDATA FILE SYSTEM
     
-    if (download && taskStatus == taskStatusCancel) {
-        [CCCoreData setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:taskIdentifierDone sessionTaskIdentifierPlist:taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (session CONTAINS 'download')", _activeAccount] context:_context];
+    if (download && taskStatus == k_taskStatusCancel) {
+        [CCCoreData setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier: k_taskIdentifierDone sessionTaskIdentifierPlist: k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (session CONTAINS 'download')", _activeAccount] context:_context];
     }
     
-    if (upload && taskStatus == taskStatusCancel) {
+    if (upload && taskStatus == k_taskStatusCancel) {
         [CCCoreData deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(session CONTAINS 'upload')"]];
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             [CCUtility removeAllFileID_UPLOAD_ActiveUser:activeUser activeUrl:activeUrl];
@@ -352,16 +352,16 @@
         if ([sessionDescription containsString:@"download"])
             for (NSURLSessionTask *task in downloadTasks)
                 if (task.taskIdentifier == sessionTaskIdentifier) {
-                    if (taskStatus == taskStatusCancel) [task cancel];
-                    else if (taskStatus == taskStatusSuspend) [task suspend];
-                    else if (taskStatus == taskStatusResume) [task resume];
+                    if (taskStatus == k_taskStatusCancel) [task cancel];
+                    else if (taskStatus == k_taskStatusSuspend) [task suspend];
+                    else if (taskStatus == k_taskStatusResume) [task resume];
                 }
         if ([sessionDescription containsString:@"upload"])
             for (NSURLSessionTask *task in uploadTasks)
                 if (task.taskIdentifier == sessionTaskIdentifier) {
-                    if (taskStatus == taskStatusCancel) [task cancel];
-                    else if (taskStatus == taskStatusSuspend) [task suspend];
-                    else if (taskStatus == taskStatusResume) [task resume];
+                    if (taskStatus == k_taskStatusCancel) [task cancel];
+                    else if (taskStatus == k_taskStatusSuspend) [task suspend];
+                    else if (taskStatus == k_taskStatusResume) [task resume];
                 }
     }];
 }
@@ -495,7 +495,7 @@
                 
                 NSLog(@"[LOG] Download file already exists %@ - %@", metadata.fileNameData, metadata.fileNamePrint);
                 
-                [CCCoreData setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:taskIdentifierDone sessionTaskIdentifierPlist:taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, _activeAccount] context:_context];
+                [CCCoreData setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier: k_taskIdentifierDone sessionTaskIdentifierPlist: k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, _activeAccount] context:_context];
                 
                 if ([[self getDelegate:metadata.fileID] respondsToSelector:@selector(downloadFileSuccess:serverUrl:selector:selectorPost:)])
                     [[self getDelegate:metadata.fileID] downloadFileSuccess:metadata.fileID serverUrl:serverUrl selector:selector selectorPost:selectorPost];
@@ -509,7 +509,7 @@
         
         [self downloaURLSession:metadata.fileNameData fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl fileID:metadata.fileID session:metadata.session taskStatus:taskStatus selector:selector];
         
-        [CCCoreData setMetadataSession:metadata.session sessionError:@"" sessionSelector:selector sessionSelectorPost:selectorPost sessionTaskIdentifier:taskIdentifierNULL sessionTaskIdentifierPlist:taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)",metadata.fileID, _activeAccount] context:_context];
+        [CCCoreData setMetadataSession:metadata.session sessionError:@"" sessionSelector:selector sessionSelectorPost:selectorPost sessionTaskIdentifier: k_taskIdentifierNULL sessionTaskIdentifierPlist:k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)",metadata.fileID, _activeAccount] context:_context];
     }
     
     if (downloadPlist) {
@@ -527,7 +527,7 @@
         
         [self downloaURLSession:metadata.fileName fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl fileID:metadata.fileID session:metadata.session taskStatus:taskStatus selector:selector];
         
-        [CCCoreData setMetadataSession:metadata.session sessionError:@"" sessionSelector:selector sessionSelectorPost:selectorPost sessionTaskIdentifier:taskIdentifierNULL sessionTaskIdentifierPlist:taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)",metadata.fileID, _activeAccount] context:_context];
+        [CCCoreData setMetadataSession:metadata.session sessionError:@"" sessionSelector:selector sessionSelectorPost:selectorPost sessionTaskIdentifier: k_taskIdentifierNULL sessionTaskIdentifierPlist: k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)",metadata.fileID, _activeAccount] context:_context];
     }
 }
 
@@ -555,29 +555,29 @@
     
     NSURLSessionDownloadTask *downloadTask = [sessionDownload downloadTaskWithRequest:request];
     
-    if (taskStatus == taskStatusCancel) [downloadTask cancel];
-    else if (taskStatus == taskStatusSuspend) [downloadTask suspend];
-    else if (taskStatus == taskStatusResume) [downloadTask resume];
+    if (taskStatus == k_taskStatusCancel) [downloadTask cancel];
+    else if (taskStatus == k_taskStatusSuspend) [downloadTask suspend];
+    else if (taskStatus == k_taskStatusResume) [downloadTask resume];
 
     if ([[self getDelegate:fileID] respondsToSelector:@selector(downloadTaskSave:)])
         [[self getDelegate:fileID] downloadTaskSave:downloadTask];
     
     if (downloadTask == nil) {
         
-        NSUInteger sessionTaskIdentifier = taskIdentifierNULL;
-        NSUInteger sessionTaskIdentifierPlist = taskIdentifierNULL;
+        NSUInteger sessionTaskIdentifier = k_taskIdentifierNULL;
+        NSUInteger sessionTaskIdentifierPlist = k_taskIdentifierNULL;
         
-        if ([CCUtility isFileNotCryptated:fileName] || [CCUtility isCryptoString:fileName]) sessionTaskIdentifier = taskIdentifierError;
-        if ([CCUtility isCryptoPlistString:fileName]) sessionTaskIdentifierPlist = taskIdentifierError;
+        if ([CCUtility isFileNotCryptated:fileName] || [CCUtility isCryptoString:fileName]) sessionTaskIdentifier = k_taskIdentifierError;
+        if ([CCUtility isCryptoPlistString:fileName]) sessionTaskIdentifierPlist = k_taskIdentifierError;
         
-        [CCCoreData setMetadataSession:nil sessionError:[NSString stringWithFormat:@"%@", @CCErrorTaskNil] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount] context:_context];
+        [CCCoreData setMetadataSession:nil sessionError:[NSString stringWithFormat:@"%@", @k_CCErrorTaskNil] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount] context:_context];
         
         NSLog(@"[LOG] downloadFileSession TaskIdentifier [error CCErrorTaskNil] - %@ - %@", fileName, fileNamePrint);
         
     } else {
         
-        NSUInteger sessionTaskIdentifier = taskIdentifierNULL;
-        NSUInteger sessionTaskIdentifierPlist = taskIdentifierNULL;
+        NSUInteger sessionTaskIdentifier = k_taskIdentifierNULL;
+        NSUInteger sessionTaskIdentifierPlist = k_taskIdentifierNULL;
         
         if ([CCUtility isCryptoString:fileName] || [CCUtility isFileNotCryptated:fileName]) sessionTaskIdentifier = downloadTask.taskIdentifier;
         if ([CCUtility isCryptoPlistString:fileName]) sessionTaskIdentifierPlist = downloadTask.taskIdentifier;
@@ -602,7 +602,7 @@
     NSString *serverUrl = [self getServerUrlFromUrl:url];
     
     // if plist return
-    if ([CCUtility getTypeFileName:fileName] == metadataTypeFilenamePlist)
+    if ([CCUtility getTypeFileName:fileName] == k_metadataTypeFilenamePlist)
         return;
 
     float progress = (float) totalBytesWritten / (float)totalBytesExpectedToWrite;
@@ -672,11 +672,11 @@
         //
         if (errorCode == kCFURLErrorCancelled || [CCUtility isCryptoPlistString:fileName]) {
             
-            [CCCoreData setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:taskIdentifierDone sessionTaskIdentifierPlist:taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount] context:_context];
+            [CCCoreData setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier: k_taskIdentifierDone sessionTaskIdentifierPlist: k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount] context:_context];
             
         } else {
             
-            [CCCoreData setMetadataSession:nil sessionError:[NSString stringWithFormat:@"%@", @(errorCode)] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:taskIdentifierError sessionTaskIdentifierPlist:taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount] context:_context];
+            [CCCoreData setMetadataSession:nil sessionError:[NSString stringWithFormat:@"%@", @(errorCode)] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier: k_taskIdentifierError sessionTaskIdentifierPlist: k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount] context:_context];
         }
         
         // Delegate downloadFileFailure:
@@ -692,10 +692,10 @@
         
         CCMetadata *metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount] context:_context];
         
-        if ([CCUtility isCryptoString:fileName] || [CCUtility isFileNotCryptated:fileName]) metadata.sessionTaskIdentifier = taskIdentifierDone;
-        if ([CCUtility isCryptoPlistString:fileName]) metadata.sessionTaskIdentifierPlist = taskIdentifierDone;
+        if ([CCUtility isCryptoString:fileName] || [CCUtility isFileNotCryptated:fileName]) metadata.sessionTaskIdentifier = k_taskIdentifierDone;
+        if ([CCUtility isCryptoPlistString:fileName]) metadata.sessionTaskIdentifierPlist = k_taskIdentifierDone;
         
-        if (metadata.sessionTaskIdentifier == taskIdentifierDone && metadata.sessionTaskIdentifierPlist == taskIdentifierDone) {
+        if (metadata.sessionTaskIdentifier == k_taskIdentifierDone && metadata.sessionTaskIdentifierPlist == k_taskIdentifierDone) {
             
             [CCCoreData setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:metadata.sessionTaskIdentifier sessionTaskIdentifierPlist:metadata.sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", fileID, _activeAccount] context:_context];
             
@@ -732,7 +732,7 @@
     if (!result.count) {
         
         if ([delegate respondsToSelector:@selector(uploadFileFailure:fileID:serverUrl:selector:message:errorCode:)])
-            [delegate uploadFileFailure:nil fileID:nil serverUrl:serverUrl selector:selector message:@"Internal error" errorCode:CCErrorInternalError];
+            [delegate uploadFileFailure:nil fileID:nil serverUrl:serverUrl selector:selector message:@"Internal error" errorCode: k_CCErrorInternalError];
         return;
     }
     
@@ -873,7 +873,7 @@
         metadata.sessionSelector = selector;
         metadata.sessionSelectorPost = selectorPost;
         metadata.typeCloud = _typeCloud;
-        metadata.typeFile = metadataTypeFile_unknown;
+        metadata.typeFile = k_metadataTypeFile_unknown;
         
         [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
         
@@ -904,7 +904,7 @@
             metadata.sessionSelector = selector;
             metadata.sessionSelectorPost = selectorPost;
             metadata.typeCloud = _typeCloud;
-            metadata.typeFile = metadataTypeFile_template;
+            metadata.typeFile = k_metadataTypeFile_template;
             
             [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
             
@@ -966,7 +966,7 @@
             metadata.sessionSelectorPost = selectorPost;
             metadata.typeCloud = _typeCloud;
             metadata.title = [self getTitleFromPlistName:fileNameCrypto];
-            metadata.type = metadataType_file;
+            metadata.type = k_metadataType_file;
             
             if (errorCode == 403) {
                 
@@ -998,7 +998,7 @@
                     [CCGraphics createNewImageFrom:fileName directoryUser:_directoryUser fileNameTo:uploadID fileNamePrint:fileName size:@"m" imageForUpload:YES typeFile:metadata.typeFile writePreview:YES optimizedFileName:NO];
 #endif
 
-                    if ([metadata.typeFile isEqualToString:metadataTypeFile_image] || [metadata.typeFile isEqualToString:metadataTypeFile_video])
+                    if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])
                         [crypto addPlistImage:[NSString stringWithFormat:@"%@/%@", _directoryUser, [fileNameCrypto stringByAppendingString:@".plist"]] fileNamePathImage:[NSTemporaryDirectory() stringByAppendingString:uploadID]];
                     
                     [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
@@ -1027,7 +1027,7 @@
                 [CCGraphics createNewImageFrom:fileName directoryUser:_directoryUser fileNameTo:uploadID fileNamePrint:fileName size:@"m" imageForUpload:YES typeFile:metadata.typeFile writePreview:YES optimizedFileName:NO];
 #endif
                 
-                if ([metadata.typeFile isEqualToString:metadataTypeFile_image] || [metadata.typeFile isEqualToString:metadataTypeFile_video])
+                if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])
                     [crypto addPlistImage:[NSString stringWithFormat:@"%@/%@", _directoryUser, [fileNameCrypto stringByAppendingString:@".plist"]] fileNamePathImage:[NSTemporaryDirectory() stringByAppendingString:uploadID]];
                 
                 [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
@@ -1055,7 +1055,7 @@
         metadata.sessionID = uploadID;
         metadata.sessionSelector = selector;
         metadata.sessionSelectorPost = selectorPost;
-        metadata.type = metadataType_file;
+        metadata.type = k_metadataType_file;
         metadata.typeCloud = _typeCloud;
         
         // File exists ???
@@ -1152,7 +1152,7 @@
         NSLog(@"[LOG] Re-upload File : %@ - fileID : %@", metadata.fileNamePrint, metadata.fileID);
         
         // update Coredata
-        [CCCoreData setMetadataSession:nil sessionError:@"" sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:taskIdentifierNULL sessionTaskIdentifierPlist:taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"(sessionID == %@) AND (account == %@)", metadata.sessionID, _activeAccount] context:_context];
+        [CCCoreData setMetadataSession:nil sessionError:@"" sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier: k_taskIdentifierNULL sessionTaskIdentifierPlist: k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"(sessionID == %@) AND (account == %@)", metadata.sessionID, _activeAccount] context:_context];
         
     } else {
         
@@ -1220,9 +1220,9 @@
 
     NSURLSessionUploadTask *uploadTask = [sessionUpload uploadTaskWithRequest:request fromFile:[NSURL fileURLWithPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, fileNameForUpload]]];
     
-    if (taskStatus == taskStatusCancel) [uploadTask cancel];
-    else if (taskStatus == taskStatusSuspend) [uploadTask suspend];
-    else if (taskStatus == taskStatusResume) [uploadTask resume];
+    if (taskStatus == k_taskStatusCancel) [uploadTask cancel];
+    else if (taskStatus == k_taskStatusSuspend) [uploadTask suspend];
+    else if (taskStatus == k_taskStatusResume) [uploadTask resume];
     
     if ([[self getDelegate:sessionID] respondsToSelector:@selector(uploadTaskSave:)])
         [[self getDelegate:sessionID] uploadTaskSave:uploadTask];
@@ -1231,20 +1231,20 @@
     
     if (uploadTask == nil) {
         
-        NSUInteger sessionTaskIdentifier = taskIdentifierNULL;
-        NSUInteger sessionTaskIdentifierPlist = taskIdentifierNULL;
+        NSUInteger sessionTaskIdentifier = k_taskIdentifierNULL;
+        NSUInteger sessionTaskIdentifierPlist = k_taskIdentifierNULL;
         
-        if ([CCUtility isFileNotCryptated:fileName] || [CCUtility isCryptoString:fileName]) sessionTaskIdentifier = taskIdentifierError;
-        if ([CCUtility isCryptoPlistString:fileName]) sessionTaskIdentifierPlist = taskIdentifierError;
+        if ([CCUtility isFileNotCryptated:fileName] || [CCUtility isCryptoString:fileName]) sessionTaskIdentifier = k_taskIdentifierError;
+        if ([CCUtility isCryptoPlistString:fileName]) sessionTaskIdentifierPlist = k_taskIdentifierError;
         
-        [CCCoreData setMetadataSession:session sessionError:[NSString stringWithFormat:@"%@", @CCErrorTaskNil] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"(sessionID == %@) AND (account == %@)", sessionID, _activeAccount] context:_context];
+        [CCCoreData setMetadataSession:session sessionError:[NSString stringWithFormat:@"%@", @k_CCErrorTaskNil] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"(sessionID == %@) AND (account == %@)", sessionID, _activeAccount] context:_context];
         
         NSLog(@"[LOG] Upload file TaskIdentifier [error CCErrorTaskNil] - %@ - %@", fileName, fileNamePrint);
         
     } else {
         
-        NSUInteger sessionTaskIdentifier = taskIdentifierNULL;
-        NSUInteger sessionTaskIdentifierPlist = taskIdentifierNULL;
+        NSUInteger sessionTaskIdentifier = k_taskIdentifierNULL;
+        NSUInteger sessionTaskIdentifierPlist = k_taskIdentifierNULL;
         
         if ([CCUtility isCryptoString:fileName] || [CCUtility isFileNotCryptated:fileName]) sessionTaskIdentifier = uploadTask.taskIdentifier;
         if ([CCUtility isCryptoPlistString:fileName]) sessionTaskIdentifierPlist = uploadTask.taskIdentifier;
@@ -1286,7 +1286,7 @@
     NSString *serverUrl = [self getServerUrlFromUrl:url];
     
     // if plist return
-    if ([CCUtility getTypeFileName:fileName] == metadataTypeFilenamePlist)
+    if ([CCUtility getTypeFileName:fileName] == k_metadataTypeFilenamePlist)
         return;
     
     float progress = (float) totalBytesSent / (float)totalBytesExpectedToSend;
@@ -1326,11 +1326,11 @@
         // Mark error only if not Cancelled Task
         if (errorCode != kCFURLErrorCancelled)  {
 
-            NSUInteger sessionTaskIdentifier = taskIdentifierNULL;
-            NSUInteger sessionTaskIdentifierPlist = taskIdentifierNULL;
+            NSUInteger sessionTaskIdentifier = k_taskIdentifierNULL;
+            NSUInteger sessionTaskIdentifierPlist = k_taskIdentifierNULL;
         
-            if ([CCUtility isFileNotCryptated:fileName] || [CCUtility isCryptoString:fileName]) sessionTaskIdentifier = taskIdentifierError;
-            if ([CCUtility isCryptoPlistString:fileName]) sessionTaskIdentifierPlist = taskIdentifierError;
+            if ([CCUtility isFileNotCryptated:fileName] || [CCUtility isCryptoString:fileName]) sessionTaskIdentifier = k_taskIdentifierError;
+            if ([CCUtility isCryptoPlistString:fileName]) sessionTaskIdentifierPlist = k_taskIdentifierError;
         
             [CCCoreData setMetadataSession:nil sessionError:[NSString stringWithFormat:@"%@", @(errorCode)] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:sessionTaskIdentifier sessionTaskIdentifierPlist:sessionTaskIdentifierPlist predicate:[NSPredicate predicateWithFormat:@"(sessionID == %@) AND (account == %@)", metadata.sessionID, _activeAccount] context:_context];
         }
@@ -1350,10 +1350,10 @@
         metadata.fileID = fileID;
         metadata.rev = rev;
         metadata.date = date;
-        metadata.sessionTaskIdentifierPlist = taskIdentifierDone;
+        metadata.sessionTaskIdentifierPlist = k_taskIdentifierDone;
         
         if ([CCUtility isFileNotCryptated:fileName])
-            metadata.sessionTaskIdentifier = taskIdentifierDone;
+            metadata.sessionTaskIdentifier = k_taskIdentifierDone;
         
         // copy ico in new fileID
         [CCUtility copyFileAtPath:[NSString stringWithFormat:@"%@/%@.ico", _directoryUser, sessionID] toPath:[NSString stringWithFormat:@"%@/%@.ico", _directoryUser, fileID]];
@@ -1364,13 +1364,13 @@
     // CRYPTO
     if ([CCUtility isCryptoString:fileName]) {
         
-        metadata.sessionTaskIdentifier = taskIdentifierDone;
+        metadata.sessionTaskIdentifier = k_taskIdentifierDone;
         
         [CCCoreData updateMetadata:metadata predicate:[NSPredicate predicateWithFormat:@"(sessionID == %@) AND (account == %@)", sessionID, _activeAccount] activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
     }
     
     // ALL TASK DONE (PLAIN/CRYPTO)
-    if (metadata.sessionTaskIdentifier == taskIdentifierDone && metadata.sessionTaskIdentifierPlist == taskIdentifierDone) {
+    if (metadata.sessionTaskIdentifier == k_taskIdentifierDone && metadata.sessionTaskIdentifierPlist == k_taskIdentifierDone) {
         
 #ifndef EXTENSION
         if (sessionID)
@@ -1401,7 +1401,7 @@
             [CCCoreData addLocalFile:metadata activeAccount:_activeAccount];
         
         // EXIF
-        if ([metadata.typeFile isEqualToString:metadataTypeFile_image])
+        if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image])
             [CCExifGeo setExifLocalTableFileID:metadata directoryUser:_directoryUser activeAccount:_activeAccount];
         
         // Create ICON
@@ -1477,7 +1477,7 @@
                 
                 NSLog(@"[LOG] NOT Find metadata Task [%i] fileID : %@ - filename : %@", metadata.sessionTaskIdentifier, metadata.fileID, metadata.fileNameData);
                 
-                [CCCoreData setMetadataSession:nil sessionError:[NSString stringWithFormat:@"%@", @CCErrorTaskDownloadNotFound] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:taskIdentifierError sessionTaskIdentifierPlist:taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, _activeAccount] context:_context];
+                [CCCoreData setMetadataSession:nil sessionError:[NSString stringWithFormat:@"%@", @k_CCErrorTaskDownloadNotFound] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier: k_taskIdentifierError sessionTaskIdentifierPlist: k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, _activeAccount] context:_context];
                 
                 dispatch_async(dispatch_get_main_queue(), ^{
                     
@@ -1492,7 +1492,7 @@
                 
                 NSLog(@"[LOG] NOT Find metadata TaskPlist [%i] fileID : %@ - filename : %@", metadata.sessionTaskIdentifierPlist, metadata.fileID, metadata.fileName);
                 
-                [CCCoreData setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:taskIdentifierNULL sessionTaskIdentifierPlist:taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, _activeAccount] context:_context];
+                [CCCoreData setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier: k_taskIdentifierNULL sessionTaskIdentifierPlist: k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", metadata.fileID, _activeAccount] context:_context];
                 
                 dispatch_async(dispatch_get_main_queue(), ^{
                     
@@ -1511,7 +1511,7 @@
 {
     NSMutableSet *serversUrl = [[NSMutableSet alloc] init];
     
-    NSArray *records = [CCCoreData getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (session CONTAINS 'download') AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))", _activeAccount, taskIdentifierError, taskIdentifierError] context:nil];
+    NSArray *records = [CCCoreData getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (session CONTAINS 'download') AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))", _activeAccount, k_taskIdentifierError, k_taskIdentifierError] context:nil];
     
     NSLog(@"[LOG] Verify re download n. %lu", (unsigned long)[records count]);
     
@@ -1521,11 +1521,11 @@
         
         NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
             
-        if (metadata.sessionTaskIdentifier == taskIdentifierError)
-            [self downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:metadata.sessionSelector selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:nil];
+        if (metadata.sessionTaskIdentifier == k_taskIdentifierError)
+            [self downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:metadata.sessionSelector selectorPost:nil session:download_session taskStatus: k_taskStatusResume delegate:nil];
             
-        if (metadata.sessionTaskIdentifierPlist == taskIdentifierError)
-            [self downloadFile:metadata serverUrl:serverUrl downloadData:NO downloadPlist:YES selector:metadata.sessionSelector selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:nil];
+        if (metadata.sessionTaskIdentifierPlist == k_taskIdentifierError)
+            [self downloadFile:metadata serverUrl:serverUrl downloadData:NO downloadPlist:YES selector:metadata.sessionSelector selectorPost:nil session:download_session taskStatus: k_taskStatusResume delegate:nil];
             
         [serversUrl addObject:serverUrl];
             
@@ -1603,7 +1603,7 @@
 {
     NSMutableSet *directoryIDs = [[NSMutableSet alloc] init];
     
-    NSArray *records = [CCCoreData getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (session CONTAINS 'upload') AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))", _activeAccount, taskIdentifierError, taskIdentifierError] context:nil];
+    NSArray *records = [CCCoreData getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (session CONTAINS 'upload') AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))", _activeAccount, k_taskIdentifierError, k_taskIdentifierError] context:nil];
     
     NSLog(@"[LOG] Verify re upload n. %lu", (unsigned long)[records count]);
     
@@ -1611,7 +1611,7 @@
         
         CCMetadata *metadata = [CCCoreData insertEntityInMetadata:record];
         
-        [self uploadFileMetadata:metadata taskStatus:taskStatusResume];
+        [self uploadFileMetadata:metadata taskStatus: k_taskStatusResume];
             
         [directoryIDs addObject:metadata.directoryID];
             
@@ -1660,7 +1660,7 @@
     CCMetadata *metadataTemp = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileName == %@) AND (directoryID == %@) AND (account == %@)", fileName , directoryID, _activeAccount] context:_context];
     
     // is completed ?
-    if (metadataTemp.sessionTaskIdentifier == taskIdentifierDone && metadataTemp.sessionTaskIdentifierPlist == taskIdentifierDone) {
+    if (metadataTemp.sessionTaskIdentifier == k_taskIdentifierDone && metadataTemp.sessionTaskIdentifierPlist == k_taskIdentifierDone) {
         
         [CCGraphics createNewImageFrom:metadata.fileID directoryUser:_directoryUser fileNameTo:metadata.fileID fileNamePrint:metadata.fileNamePrint size:@"m" imageForUpload:NO typeFile:metadata.typeFile writePreview:YES optimizedFileName:[CCUtility getOptimizedPhoto]];
         
@@ -1696,7 +1696,7 @@
     
     NSInteger error;
     if (errorCode == kOCErrorServerPathNotFound)
-        error = CCErrorFileUploadNotFound;
+        error = k_CCErrorFileUploadNotFound;
     else
         error = errorCode;
     

iOSClient/Offline/CCOffline.m

@@ -60,8 +60,8 @@
     [super viewDidLoad];
     
     // Create data model
-    _pageType = @[pageOfflineOffline, pageOfflineLocal];
-    _currentPageType = pageOfflineOffline;
+    _pageType = @[k_pageOfflineOffline, k_pageOfflineLocal];
+    _currentPageType = k_pageOfflineOffline;
     self.title = NSLocalizedString(@"_offline_", nil);
     
     // Create page view controller
@@ -170,24 +170,24 @@
     NSString *serverUrl = vc.serverUrl;
     _currentPageType = vc.pageType;
 
-    if ([_currentPageType isEqualToString:pageOfflineOffline]) {
+    if ([_currentPageType isEqualToString:k_pageOfflineOffline]) {
         if (serverUrl)
             self.title = NSLocalizedString(@"_offline_", nil);
         else
             self.title = NSLocalizedString(@"_offline_", nil);
         
-        UITabBarItem *item = [self.tabBarController.tabBar.items objectAtIndex:TabBarApplicationIndexOffline];
+        UITabBarItem *item = [self.tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexOffline];
         item.selectedImage = [UIImage imageNamed:@"tabBarOffline"];
         item.image = [UIImage imageNamed:@"tabBarOffline"];
     }
     
-    if ([_currentPageType isEqualToString:pageOfflineLocal]) {
+    if ([_currentPageType isEqualToString:k_pageOfflineLocal]) {
         if ([serverUrl isEqualToString:[CCUtility getDirectoryLocal]])
             self.title = NSLocalizedString(@"_local_storage_", nil);
         else
             self.title = NSLocalizedString(@"_local_storage_", nil);
         
-        UITabBarItem *item = [self.tabBarController.tabBar.items objectAtIndex:TabBarApplicationIndexOffline];
+        UITabBarItem *item = [self.tabBarController.tabBar.items objectAtIndex: k_tabBarApplicationIndexOffline];
         item.selectedImage = [UIImage imageNamed:@"tabBarLocal"];
         item.image = [UIImage imageNamed:@"tabBarLocal"];
     }

iOSClient/Offline/CCOfflineFileFolder.m

@@ -225,10 +225,10 @@
                 NSInteger typeFilename = [CCUtility getTypeFileName:metadata.fileName];
             
                 // reject crypto
-                if (typeFilename == metadataTypeFilenameCrypto) continue;
+                if (typeFilename == k_metadataTypeFilenameCrypto) continue;
             
                 // Verify if the plist is complited
-                if (typeFilename == metadataTypeFilenamePlist) {
+                if (typeFilename == k_metadataTypeFilenamePlist) {
                 
                     BOOL isCryptoComplete = NO;
                     NSString *fileNameCrypto = [CCUtility trasformedFileNamePlistInCrypto:metadata.fileName];
@@ -371,14 +371,14 @@
         
         if (changeRev) {
             
-            if ([metadata.type isEqualToString:metadataType_file]) {
+            if ([metadata.type isEqualToString: k_metadataType_file]) {
                 
                 // remove file and ico
                 [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID] error:nil];
                 [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@.ico", app.directoryUser, metadata.fileID] error:nil];
             }
             
-            if ([metadata.type isEqualToString:metadataType_model]) {
+            if ([metadata.type isEqualToString: k_metadataType_model]) {
                 
                 // remove model
                 [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileName] error:nil];
@@ -416,12 +416,12 @@
             if (isOffline)
                 selectorPost = selectorAddOffline;
         
-            if ([metadata.type isEqualToString:metadataType_file]) {
+            if ([metadata.type isEqualToString: k_metadataType_file]) {
                 downloadData = YES;
                 selector = selectorDownloadOffline;
             }
         
-            if ([metadata.type isEqualToString:metadataType_model]) {
+            if ([metadata.type isEqualToString: k_metadataType_model]) {
                 downloadPlist = YES;
                 selector = selectorLoadPlist;
             }
@@ -438,7 +438,7 @@
             metadataNet.selectorPost = selectorPost;
             metadataNet.serverUrl = serverUrl;
             metadataNet.session = download_session;
-            metadataNet.taskStatus = taskStatusResume;
+            metadataNet.taskStatus = k_taskStatusResume;
 
             [app addNetworkingOperationQueue:app.netQueueDownload delegate:app.activeMain metadataNet:metadataNet];
         }

iOSClient/Offline/CCOfflinePageContent.m

@@ -57,11 +57,11 @@
     self.tableView.allowsMultipleSelectionDuringEditing = NO;
     
     // calculate _serverUrl
-    if ([self.pageType isEqualToString:pageOfflineOffline] && !_serverUrl) {
+    if ([self.pageType isEqualToString:k_pageOfflineOffline] && !_serverUrl) {
         _serverUrl = nil;
     }
     
-    if ([self.pageType isEqualToString:pageOfflineLocal] && !_serverUrl) {
+    if ([self.pageType isEqualToString:k_pageOfflineLocal] && !_serverUrl) {
         _serverUrl = [CCUtility getDirectoryLocal];
     }
     
@@ -127,10 +127,10 @@
 
 - (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
 {
-    if ([self.pageType isEqualToString:pageOfflineOffline])
+    if ([self.pageType isEqualToString:k_pageOfflineOffline])
         return [UIImage imageNamed:image_brandOffline];
     
-    if ([self.pageType isEqualToString:pageOfflineLocal])
+    if ([self.pageType isEqualToString:k_pageOfflineLocal])
         return [UIImage imageNamed:image_brandLocal];
     
     return nil;
@@ -140,10 +140,10 @@
 {
     NSString *text;
     
-    if ([self.pageType isEqualToString:pageOfflineOffline])
+    if ([self.pageType isEqualToString:k_pageOfflineOffline])
         text = NSLocalizedString(@"_no_files_uploaded_", nil);
     
-    if ([self.pageType isEqualToString:pageOfflineLocal])
+    if ([self.pageType isEqualToString:k_pageOfflineLocal])
         text = NSLocalizedString(@"_no_files_uploaded_", nil);
     
     NSDictionary *attributes = @{NSFontAttributeName:[UIFont boldSystemFontOfSize:20.0f], NSForegroundColorAttributeName:COLOR_BRAND};
@@ -155,10 +155,10 @@
 {
     NSString *text;
     
-    if ([self.pageType isEqualToString:pageOfflineOffline])
+    if ([self.pageType isEqualToString:k_pageOfflineOffline])
         text = NSLocalizedString(@"_tutorial_offline_view_", nil);
         
-    if ([self.pageType isEqualToString:pageOfflineLocal])
+    if ([self.pageType isEqualToString:k_pageOfflineLocal])
         text = NSLocalizedString(@"_tutorial_local_view_", nil);
     
     NSMutableParagraphStyle *paragraph = [NSMutableParagraphStyle new];
@@ -206,7 +206,7 @@
 - (NSString *)tableView:(UITableView *)tableView titleForSwipeAccessoryButtonForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     // No Local
-    if ([_pageType isEqualToString:pageOfflineLocal])
+    if ([_pageType isEqualToString:k_pageOfflineLocal])
         return nil;
     
     // Root
@@ -281,7 +281,7 @@
     }
     
     // ONLY Root Offline : Remove file/folder offline
-    if (_serverUrl == nil && [_pageType isEqualToString:pageOfflineOffline]) {
+    if (_serverUrl == nil && [_pageType isEqualToString:k_pageOfflineOffline]) {
         
         [actionSheet addButtonWithTitle:NSLocalizedString(@"_remove_offline_", nil)
                                   image:[UIImage imageNamed:image_actionSheetOffline]
@@ -329,12 +329,12 @@
                                                              style:UIAlertActionStyleDestructive
                                                            handler:^(UIAlertAction *action) {
                                                                
-                                                               if ([_pageType isEqualToString:pageOfflineOffline]) {
+                                                               if ([_pageType isEqualToString:k_pageOfflineOffline]) {
                                                                    
                                                                    [[CCActions sharedInstance] deleteFileOrFolder:_metadata delegate:self];
                                                                }
                                                                
-                                                               if ([_pageType isEqualToString:pageOfflineLocal]) {
+                                                               if ([_pageType isEqualToString:k_pageOfflineLocal]) {
                                                                    
                                                                    NSString *fileNamePath = [NSString stringWithFormat:@"%@/%@", _serverUrl, _metadata.fileNameData];
                                                                    NSString *iconPath = [NSString stringWithFormat:@"%@/.%@.ico", _serverUrl, _metadata.fileNameData];
@@ -372,13 +372,13 @@
 {
     CCMetadata *metadata;
     
-    if ([_pageType isEqualToString:pageOfflineOffline]) {
+    if ([_pageType isEqualToString:k_pageOfflineOffline]) {
         
         NSManagedObject *record = [dataSource objectAtIndex:indexPath.row];
         metadata = [CCCoreData getMetadataWithPreficate:[NSPredicate predicateWithFormat:@"(fileID == %@) AND (account == %@)", [record valueForKey:@"fileID"], app.activeAccount] context:nil];
     }
     
-    if ([_pageType isEqualToString:pageOfflineLocal]) {
+    if ([_pageType isEqualToString:k_pageOfflineLocal]) {
         
         NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:app.activeAccount];
         NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud];
@@ -391,7 +391,7 @@
 
 - (void)reloadTable
 {
-    if ([_pageType isEqualToString:pageOfflineOffline]) {
+    if ([_pageType isEqualToString:k_pageOfflineOffline]) {
         
         NSMutableArray *metadatas = [NSMutableArray new];
         NSArray *recordsTableMetadata ;
@@ -415,7 +415,7 @@
         dataSource = [NSArray arrayWithArray:metadatas];
     }
     
-    if ([_pageType isEqualToString:pageOfflineLocal]) {
+    if ([_pageType isEqualToString:k_pageOfflineLocal]) {
         
         NSArray *subpaths = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:_serverUrl error:nil];
         NSMutableArray *metadatas = [NSMutableArray new];
@@ -460,7 +460,7 @@
     cell.selectedBackgroundView = selectionColor;
     
     // i am in Offline
-    if ([_pageType isEqualToString:pageOfflineOffline]) {
+    if ([_pageType isEqualToString:k_pageOfflineOffline]) {
         
         metadata = [dataSource objectAtIndex:indexPath.row];
         cell.fileImageView.image = [UIImage imageWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.ico", app.directoryUser, metadata.fileID]];
@@ -472,7 +472,7 @@
     }
     
     // i am in local
-    if ([_pageType isEqualToString:pageOfflineLocal]) {
+    if ([_pageType isEqualToString:k_pageOfflineLocal]) {
         
         NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:app.activeAccount];
         NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud];
@@ -519,7 +519,7 @@
         cell.fileImageView.image = [UIImage imageNamed:metadata.iconName];
     
     // it's encrypted ???
-    if (metadata.cryptated && [metadata.type isEqualToString:metadataType_model] == NO)
+    if (metadata.cryptated && [metadata.type isEqualToString: k_metadataType_model] == NO)
         cell.statusImageView.image = [UIImage imageNamed:image_lock];
     
     // it's in download mode
@@ -537,10 +537,10 @@
         NSString *date = [CCUtility dateDiff:metadata.date];
         NSString *length = [CCUtility transformedSize:metadata.size];
         
-        if ([metadata.type isEqualToString:metadataType_model])
+        if ([metadata.type isEqualToString: k_metadataType_model])
             cell.labelInfoFile.text = [NSString stringWithFormat:@"%@", date];
         
-        if ([metadata.type isEqualToString:metadataType_file] || [metadata.type isEqualToString:metadataType_local])
+        if ([metadata.type isEqualToString: k_metadataType_file] || [metadata.type isEqualToString: k_metadataType_local])
             cell.labelInfoFile.text = [NSString stringWithFormat:@"%@, %@", date, length];
         
         cell.accessoryType = UITableViewCellAccessoryNone;
@@ -560,13 +560,13 @@
     // if is in download [do not touch]
     if ([_metadata.session length] > 0 && [_metadata.session rangeOfString:@"download"].location != NSNotFound) return;
     
-    if (([_metadata.type isEqualToString:metadataType_file] || [_metadata.type isEqualToString:metadataType_local]) && _metadata.directory == NO) {
+    if (([_metadata.type isEqualToString: k_metadataType_file] || [_metadata.type isEqualToString: k_metadataType_local]) && _metadata.directory == NO) {
         
         if ([self shouldPerformSegue])
             [self performSegueWithIdentifier:@"segueDetail" sender:self];
     }
     
-    if ([self.metadata.type isEqualToString:metadataType_model])
+    if ([self.metadata.type isEqualToString: k_metadataType_model])
         [self openModel:self.metadata];
     
     if (_metadata.directory)
@@ -579,7 +579,7 @@
     
     NSString *serverUrl;
     
-    if ([_pageType isEqualToString:pageOfflineOffline] && !_serverUrl) {
+    if ([_pageType isEqualToString:k_pageOfflineOffline] && !_serverUrl) {
     
         serverUrl = [CCCoreData getServerUrlFromDirectoryID:_metadata.directoryID activeAccount:app.activeAccount];
         
@@ -604,7 +604,7 @@
     UIViewController *viewController;
     BOOL isLocal = NO;
     
-    if ([self.pageType isEqualToString:pageOfflineLocal])
+    if ([self.pageType isEqualToString:k_pageOfflineLocal])
         isLocal = YES;
     
     if ([metadata.model isEqualToString:@"cartadicredito"])
@@ -689,15 +689,15 @@
     
     NSMutableArray *allRecordsDataSourceImagesVideos = [NSMutableArray new];
     
-    if ([self.pageType isEqualToString:pageOfflineOffline]) {
+    if ([self.pageType isEqualToString:k_pageOfflineOffline]) {
         
         for (CCMetadata *metadata in dataSource) {
-            if ([metadata.typeFile isEqualToString:metadataTypeFile_image] || [metadata.typeFile isEqualToString:metadataTypeFile_video])
+            if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])
                 [allRecordsDataSourceImagesVideos addObject:metadata];
         }
     }
     
-    if ([self.pageType isEqualToString:pageOfflineLocal]) {
+    if ([self.pageType isEqualToString:k_pageOfflineLocal]) {
         
         NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:app.activeAccount];
         NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl typeCloud:app.typeCloud];
@@ -707,7 +707,7 @@
             CCMetadata *metadata = [CCMetadata new];
             metadata = [CCUtility insertFileSystemInMetadata:fileName directory:_serverUrl activeAccount:app.activeAccount cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
             
-            if ([metadata.typeFile isEqualToString:metadataTypeFile_image] || [metadata.typeFile isEqualToString:metadataTypeFile_video])
+            if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])
                 [allRecordsDataSourceImagesVideos addObject:metadata];
         }
         

iOSClient/PeekPop/CCPeekPop.m

@@ -74,7 +74,7 @@
         
         NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:_metadata.directoryID activeAccount:_metadata.account];
         
-        [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorOpenIn selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:self.delegate];
+        [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorOpenIn selectorPost:nil session:download_session taskStatus:k_taskStatusResume delegate:self.delegate];
     }];
     
     return @[previewAction1];

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -335,13 +335,13 @@
         
         if ([[NSFileManager defaultManager] fileExistsAtPath:fileNamePath]) {
             
-            if ([metadata.typeFile isEqualToString:metadataTypeFile_image]) {
+            if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image]) {
                 
                 NSData *data = [NSData dataWithData:UIImageJPEGRepresentation([UIImage imageWithContentsOfFile:fileNamePath], 0.9)];
                 [dataToShare addObject:data];
             }
             
-            if ([metadata.typeFile isEqualToString:metadataTypeFile_video]) {
+            if ([metadata.typeFile isEqualToString: k_metadataTypeFile_video]) {
                 
                 [dataToShare addObject:[NSURL fileURLWithPath:fileNamePath]];
             }
@@ -722,7 +722,7 @@
     NSMutableArray *allRecordsDataSourceImagesVideos = [[NSMutableArray alloc] init];
     for (NSString *fileID in _sectionDataSource.allFileID) {
         CCMetadata *metadata = [_sectionDataSource.allRecordsDataSource objectForKey:fileID];
-        if ([metadata.typeFile isEqualToString:metadataTypeFile_image] || [metadata.typeFile isEqualToString:metadataTypeFile_video])
+        if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image] || [metadata.typeFile isEqualToString: k_metadataTypeFile_video])
             [allRecordsDataSourceImagesVideos addObject:metadata];
     }
     
@@ -1184,7 +1184,7 @@
         metadataNet.fileName = fileName;
         metadataNet.serverUrl = serverUrl;
         metadataNet.session = session;
-        metadataNet.taskStatus = taskStatusResume;
+        metadataNet.taskStatus = k_taskStatusResume;
         
         [CCCoreData addTableAutomaticUpload:metadataNet account:app.activeAccount context:nil];
         

iOSClient/Security/CCCrypto.m

@@ -81,16 +81,16 @@
     else
         data = [[NSMutableDictionary alloc] init];
     
-    [data setObject:[NSNumber numberWithBool:directory] forKey:@"dir"];
+    [data setObject: [NSNumber numberWithBool:directory] forKey:@"dir"];
     if ([hint length] > 0) [data setObject:[AESCrypt encrypt:hint password: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:title forKey:@"title"];
-    [data setObject:metadataType_file forKey:@"type"];
-    [data setObject:uuid forKey:@"uuid"];
-    [data setObject:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] forKey:@"version"];
+    [data setObject: [NSString stringWithFormat:@"%li", (unsigned long)len] forKey:@"len"];
+    [data setObject: nameCurrentDevice forKey:@"namecurrentdevice"];
+    [data setObject: versionProtocolPlist forKey:@"protocol"];
+    [data setObject: title forKey:@"title"];
+    [data setObject: k_metadataType_file forKey:@"type"];
+    [data setObject: uuid forKey:@"uuid"];
+    [data setObject: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] forKey:@"version"];
     
     return [data writeToFile:fileNamePath atomically:YES];
 }
@@ -154,15 +154,15 @@
     else
         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"];
-    [data setObject:@"0" forKey:@"len"];
-    [data setObject:metadata.nameCurrentDevice forKey:@"namecurrentdevice"];
-    [data setObject:versionProtocolPlist forKey:@"protocol"];
-    [data setObject:title forKey:@"title"];
-    [data setObject:metadataType_file forKey:@"type"];
-    [data setObject:metadata.uuid forKey:@"uuid"];
-    [data setObject:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] forKey:@"version"];
+    [data setObject: [NSNumber numberWithBool:true] forKey:@"dir"];
+    if ([hint length] > 0) [data setObject: [AESCrypt encrypt:hint password:UUID_SIM] forKey:@"hint"];
+    [data setObject: @"0" forKey:@"len"];
+    [data setObject: metadata.nameCurrentDevice forKey:@"namecurrentdevice"];
+    [data setObject: versionProtocolPlist forKey:@"protocol"];
+    [data setObject: title forKey:@"title"];
+    [data setObject: k_metadataType_file forKey:@"type"];
+    [data setObject: metadata.uuid forKey:@"uuid"];
+    [data setObject: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] forKey:@"version"];
     
     if ([data writeToFile:fileNamePath atomically:YES]) return fileName;
     else return nil;
@@ -185,16 +185,16 @@
         [dictionary setObject:encrypted forKey:key];
     }
     
-    [data setObject:dictionary forKey:@"field"];
-    if ([hint length] > 0) [data setObject:[AESCrypt encrypt:hint password: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:title forKey:@"title"];
-    [data setObject:metadataType_model forKey:@"type"];
-    [data setObject:uuid forKey:@"uuid"];
-    [data setObject:[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] forKey:@"version"];
+    [data setObject: dictionary forKey:@"field"];
+    if ([hint length] > 0) [data setObject: [AESCrypt encrypt:hint password: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: title forKey:@"title"];
+    [data setObject: k_metadataType_model forKey:@"type"];
+    [data setObject: uuid forKey:@"uuid"];
+    [data setObject: [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] forKey:@"version"];
 
     BOOL ritorno = [data writeToFile:fileNamePath atomically:YES];
     

iOSClient/Settings/CCManageAccount.m

@@ -134,7 +134,7 @@
     [self deselectFormRow:sender];
     
     [app cancelAllOperations];
-    [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
+    [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:k_taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
     
     CCLoginNCOC *loginVC = [[UIStoryboard storyboardWithName:@"CCLogin" bundle:nil] instantiateViewControllerWithIdentifier:@"CCLoginNextcloud"];
     
@@ -149,7 +149,7 @@
     [self deselectFormRow:sender];
     
     [app cancelAllOperations];
-    [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
+    [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:k_taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
 
     CCLoginNCOC *loginVC = [[UIStoryboard storyboardWithName:@"CCLogin" bundle:nil] instantiateViewControllerWithIdentifier:@"CCLoginOwnCloud"];
     
@@ -182,7 +182,7 @@
     [self deselectFormRow:sender];
     
     [app cancelAllOperations];
-    [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
+    [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:k_taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
     
     if ([app.typeCloud isEqualToString:typeCloudNextcloud] || [app.typeCloud isEqualToString:typeCloudOwnCloud]) {
     
@@ -220,7 +220,7 @@
         
         [app cancelAllOperations];
         
-        [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
+        [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:k_taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
 
         [self deleteAccount:accountNow];
         
@@ -277,7 +277,7 @@
 
     // removed  this -> ?????
     [app cancelAllOperations];
-    [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
+    [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:k_taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
     // removed  this -> ?????
     
     // change account

iOSClient/Settings/CCManageCameraUpload.h

@@ -27,6 +27,6 @@
 #import "CCManageLocation.h"
 #import "CCPhotosCameraUpload.h"
 
-@interface CCManageCameraUpload : XLFormViewController <CCMoveDelegate>
+@interface CCManageCameraUpload : XLFormViewController
 
 @end

iOSClient/Settings/CCSettings.m

@@ -649,7 +649,7 @@
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.01 * NSEC_PER_SEC), dispatch_get_main_queue(), ^(void) {
 
             [app cancelAllOperations];
-            [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
+            [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:k_taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
         
             [[NSURLCache sharedURLCache] setMemoryCapacity:0];
             [[NSURLCache sharedURLCache] setDiskCapacity:0];
@@ -684,7 +684,7 @@
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.01 * NSEC_PER_SEC), dispatch_get_main_queue(), ^(void) {
             
             [app cancelAllOperations];
-            [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
+            [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:k_taskStatusCancel activeAccount:app.activeAccount activeUser:app.activeUser activeUrl:app.activeUrl];
 
             [[NSURLCache sharedURLCache] setMemoryCapacity:0];
             [[NSURLCache sharedURLCache] setDiskCapacity:0];

iOSClient/Templates/CCAccountWeb.m

@@ -190,7 +190,7 @@
         metadataNet.pathFolder = NSTemporaryDirectory();
         metadataNet.rev = self.rev;
         metadataNet.session = upload_session_foreground;
-        metadataNet.taskStatus = taskStatusResume;
+        metadataNet.taskStatus = k_taskStatusResume;
         
         [app addNetworkingOperationQueue:app.netQueue delegate:self.delegate metadataNet:metadataNet];
         

iOSClient/Templates/CCBancomat.m

@@ -198,7 +198,7 @@
         metadataNet.pathFolder = NSTemporaryDirectory();
         metadataNet.rev = self.rev;
         metadataNet.session = upload_session_foreground;
-        metadataNet.taskStatus = taskStatusResume;
+        metadataNet.taskStatus = k_taskStatusResume;
         
         // 2
         [app addNetworkingOperationQueue:app.netQueue delegate:self.delegate metadataNet:metadataNet];

iOSClient/Templates/CCCartaDiCredito.m

@@ -218,7 +218,7 @@
         metadataNet.pathFolder = NSTemporaryDirectory();
         metadataNet.rev = self.rev;
         metadataNet.session = upload_session_foreground;
-        metadataNet.taskStatus = taskStatusResume;
+        metadataNet.taskStatus = k_taskStatusResume;
         
         [app addNetworkingOperationQueue:app.netQueue delegate:self.delegate metadataNet:metadataNet];
         

iOSClient/Templates/CCCartaIdentita.m

@@ -217,7 +217,7 @@
         metadataNet.pathFolder = NSTemporaryDirectory();
         metadataNet.rev = self.rev;
         metadataNet.session = upload_session_foreground;
-        metadataNet.taskStatus = taskStatusResume;
+        metadataNet.taskStatus = k_taskStatusResume;
         
         [app addNetworkingOperationQueue:app.netQueue delegate:self.delegate metadataNet:metadataNet];
         

iOSClient/Templates/CCContoCorrente.m

@@ -218,7 +218,7 @@
         metadataNet.pathFolder = NSTemporaryDirectory();
         metadataNet.rev = self.rev;
         metadataNet.session = upload_session_foreground;
-        metadataNet.taskStatus = taskStatusResume;
+        metadataNet.taskStatus = k_taskStatusResume;
         
         [app addNetworkingOperationQueue:app.netQueue delegate:self.delegate metadataNet:metadataNet];
         

iOSClient/Templates/CCNote.m

@@ -154,7 +154,7 @@
             metadataNet.pathFolder = NSTemporaryDirectory();
             metadataNet.rev = self.rev;
             metadataNet.session = upload_session_foreground;
-            metadataNet.taskStatus = taskStatusResume;
+            metadataNet.taskStatus = k_taskStatusResume;
             
             // 2
             [app addNetworkingOperationQueue:app.netQueue delegate:self.delegate metadataNet:metadataNet];

iOSClient/Templates/CCPassaporto.m

@@ -217,7 +217,7 @@
         metadataNet.pathFolder = NSTemporaryDirectory();
         metadataNet.rev = self.rev;
         metadataNet.session = upload_session_foreground;
-        metadataNet.taskStatus = taskStatusResume;
+        metadataNet.taskStatus = k_taskStatusResume;
         
         [app addNetworkingOperationQueue:app.netQueue delegate:self.delegate metadataNet:metadataNet];
         

iOSClient/Templates/CCPatenteGuida.m

@@ -210,7 +210,7 @@
         metadataNet.pathFolder = NSTemporaryDirectory();
         metadataNet.rev = self.rev;
         metadataNet.session = upload_session_foreground;
-        metadataNet.taskStatus = taskStatusResume;
+        metadataNet.taskStatus = k_taskStatusResume;
         
         [app addNetworkingOperationQueue:app.netQueue delegate:self.delegate metadataNet:metadataNet];
         

iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

@@ -170,7 +170,7 @@
 
 - (void)uploadEncrypted
 {
-    [[CCNetworking sharedNetworking] uploadFile:app.fileNameUpload serverUrl:serverUrlLocal cryptated:YES onlyPlist:NO session:upload_session taskStatus:taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
+    [[CCNetworking sharedNetworking] uploadFile:app.fileNameUpload serverUrl:serverUrlLocal cryptated:YES onlyPlist:NO session:upload_session taskStatus: k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
     
     [self dismissViewControllerAnimated:YES completion:nil];
 }
@@ -178,7 +178,7 @@
 
 -(void)uploadPlain
 {
-    [[CCNetworking sharedNetworking] uploadFile:app.fileNameUpload serverUrl:serverUrlLocal cryptated:NO onlyPlist:NO session:upload_session taskStatus:taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
+    [[CCNetworking sharedNetworking] uploadFile:app.fileNameUpload serverUrl:serverUrlLocal cryptated:NO onlyPlist:NO session:upload_session taskStatus: k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
     
     [self dismissViewControllerAnimated:YES completion:nil];
 }

iOSClient/Utility/CCGraphics.m

@@ -126,14 +126,14 @@
     if (![[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", directoryUser, fileName]]) return nil;
     
     // only viedo / image
-    if (![typeFile isEqualToString:metadataTypeFile_image] && ![typeFile isEqualToString:metadataTypeFile_video]) return nil;
+    if (![typeFile isEqualToString: k_metadataTypeFile_image] && ![typeFile isEqualToString: k_metadataTypeFile_video]) return nil;
     
-    if ([typeFile isEqualToString:metadataTypeFile_image]) {
+    if ([typeFile isEqualToString: k_metadataTypeFile_image]) {
         
         originalImage = [UIImage imageWithContentsOfFile:[NSString stringWithFormat:@"%@/%@", directoryUser, fileName]];
     }
     
-    if ([typeFile isEqualToString:metadataTypeFile_video]) {
+    if ([typeFile isEqualToString: k_metadataTypeFile_video]) {
         
         // create symbolik link for read video file in temp
         [[NSFileManager defaultManager] removeItemAtPath:[NSTemporaryDirectory() stringByAppendingString:@"tempvideo.mp4"] error:nil];
@@ -187,7 +187,7 @@
     }
     
     // Optimized photos resolution
-    if ([typeFile isEqualToString:metadataTypeFile_image] && [ext isEqualToString:@"gif"] == NO && optimizedFileName && scaleImage && (originalImage.size.width > width || originalImage.size.height > height)) {
+    if ([typeFile isEqualToString: k_metadataTypeFile_image] && [ext isEqualToString:@"gif"] == NO && optimizedFileName && scaleImage && (originalImage.size.width > width || originalImage.size.height > height)) {
         
         // conversion scale proportion
         if (height > width) {

iOSClient/Utility/CCUtility.m

@@ -788,17 +788,17 @@
     metadata.protocol = @"";
     metadata.rev = itemDto.etag;
     metadata.size = itemDto.size;
-    metadata.sessionTaskIdentifier = taskIdentifierDone;
-    metadata.sessionTaskIdentifierPlist = taskIdentifierDone;
+    metadata.sessionTaskIdentifier = k_taskIdentifierDone;
+    metadata.sessionTaskIdentifierPlist = k_taskIdentifierDone;
     metadata.title = @"";
-    metadata.type = metadataType_file;
+    metadata.type = k_metadataType_file;
     metadata.typeFile = @"";
     metadata.typeCloud = typeCloud;
     metadata.uuid = [CCUtility getUUID];
     
     switch ([self getTypeFileName:metadata.fileName]) {
             
-        case metadataTypeFilenamePlist:
+        case k_metadataTypeFilenamePlist:
             
             metadata.cryptated = YES;            
             metadata.fileNamePrint = NSLocalizedString(@"_download_plist_", nil);
@@ -807,7 +807,7 @@
             
             break;
             
-        case metadataTypeFilenameCrypto:
+        case k_metadataTypeFilenameCrypto:
             
             metadata.cryptated = YES;
             metadata.fileNamePrint = @"";
@@ -822,9 +822,9 @@
 
 + (void)insertTypeFileIconName:(CCMetadata *)metadata directory:(NSString *)directory cameraFolderName:(NSString *)cameraFolderName cameraFolderPath:(NSString *)cameraFolderPath
 {
-    if ([metadata.type isEqualToString:metadataType_model]) {
+    if ([metadata.type isEqualToString: k_metadataType_model]) {
         
-        metadata.typeFile = metadataTypeFile_template;
+        metadata.typeFile = k_metadataTypeFile_template;
         
     } else if (!metadata.directory) {
         
@@ -845,38 +845,38 @@
         }
         // if wrong code, icon protect
         if (metadata.errorPasscode) {
-            metadata.typeFile = metadataTypeFile_unknown;
+            metadata.typeFile = k_metadataTypeFile_unknown;
             metadata.iconName = image_plist;
             return;
         }
         // Type compress
         if (UTTypeConformsTo(fileUTI, kUTTypeZipArchive) && [(__bridge NSString *)fileUTI containsString:@"org.openxmlformats"] == NO && [(__bridge NSString *)fileUTI containsString:@"oasis"] == NO) {
-            metadata.typeFile = metadataTypeFile_compress;
+            metadata.typeFile = k_metadataTypeFile_compress;
             if (metadata.cryptated) metadata.iconName = image_typeFileCompress;
             else metadata.iconName = image_typeFileCompress;
         }
         // Type image
         else if (UTTypeConformsTo(fileUTI, kUTTypeImage)) {
-            metadata.typeFile = metadataTypeFile_image;
+            metadata.typeFile = k_metadataTypeFile_image;
             if (metadata.cryptated) metadata.iconName = image_photocrypto;
             else metadata.iconName = image_photo;
         }
         // Type Video
         else if (UTTypeConformsTo(fileUTI, kUTTypeMovie)) {
-            metadata.typeFile = metadataTypeFile_video;
+            metadata.typeFile = k_metadataTypeFile_video;
             if (metadata.cryptated) metadata.iconName = image_moviecrypto;
             else metadata.iconName = image_movie;
         }
         // Type Audio
         else if (UTTypeConformsTo(fileUTI, kUTTypeAudio)) {
-            metadata.typeFile = metadataTypeFile_audio;
+            metadata.typeFile = k_metadataTypeFile_audio;
             if (metadata.cryptated) metadata.iconName = image_audiocrypto;
             else metadata.iconName = image_audio;
         }
         // Type Document [DOC] [PDF] [XLS] [TXT] (RTF = "public.rtf" - ODT = "org.oasis-open.opendocument.text") [MD]
         else if (UTTypeConformsTo(fileUTI, kUTTypeContent) || [ext isEqualToString:@"MD"]) {
             
-            metadata.typeFile = metadataTypeFile_document;
+            metadata.typeFile = k_metadataTypeFile_document;
             if (metadata.cryptated) metadata.iconName = image_documentcrypto;
             else metadata.iconName = image_document;
             
@@ -910,7 +910,7 @@
         } else {
             
             // Type unknown
-            metadata.typeFile = metadataTypeFile_unknown;
+            metadata.typeFile = k_metadataTypeFile_unknown;
             
             // icon uTorrent
             if ([(__bridge NSString *)fileExtension isEqualToString:@"torrent"]) {
@@ -926,7 +926,7 @@
         
     } else {
         // icon directory
-        metadata.typeFile = metadataTypeFile_directory;
+        metadata.typeFile = k_metadataTypeFile_directory;
         
         if (metadata.cryptated) metadata.iconName = image_foldercrypto;
         else metadata.iconName = image_folder;
@@ -1053,7 +1053,7 @@
     metadata.protocol = versionProtocolPlist;
     metadata.size = [attributes[NSFileSize] longValue];
     metadata.thumbnailExists = false;
-    metadata.type = metadataType_local;
+    metadata.type = k_metadataType_local;
     metadata.title = @"";
     metadata.uuid = [CCUtility getUUID];
     
@@ -1129,23 +1129,23 @@
             
         case 70:
             
-            if ([[fileName substringWithRange:NSMakeRange(64, 6)] isEqualToString:@"crypto"]) return metadataTypeFilenameCrypto;
-            else return metadataTypeFilenamePlain;
+            if ([[fileName substringWithRange:NSMakeRange(64, 6)] isEqualToString:@"crypto"]) return k_metadataTypeFilenameCrypto;
+            else return k_metadataTypeFilenamePlain;
             break;
             
         case 76:
             
-            if ([[fileName substringWithRange:NSMakeRange(64, 12)] isEqualToString:@"crypto.plist"]) return metadataTypeFilenamePlist;
-            else return metadataTypeFilenamePlain;
+            if ([[fileName substringWithRange:NSMakeRange(64, 12)] isEqualToString:@"crypto.plist"]) return k_metadataTypeFilenamePlist;
+            else return k_metadataTypeFilenamePlain;
             break;
             
         default:
             
-            return metadataTypeFilenamePlain;
+            return k_metadataTypeFilenamePlain;
             break;
     }
     
-    return metadataTypeFilenamePlain;
+    return k_metadataTypeFilenamePlain;
 }
 
 #pragma --------------------------------------------------------------------------------------------