new name k_

Picker/DocumentPickerViewController.swift

@@ -303,7 +303,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
                 metadataNet.downloadPlist = true
                 metadataNet.selector = selectorLoadPlist
                 metadataNet.serverUrl = self.serverUrl
-                metadataNet.session = download_session_foreground
+                metadataNet.session = k_download_session_foreground
                 metadataNet.taskStatus = Int(k_taskStatusResume)
                 
                 let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, withTypeCloud: typeCloud, activityIndicator: false)
@@ -528,7 +528,7 @@ extension DocumentPickerViewController {
                     metadataNet.fileName = fileName
                     metadataNet.fileNamePrint = fileName
                     metadataNet.serverUrl = self!.serverUrl
-                    metadataNet.session = upload_session_foreground
+                    metadataNet.session = k_upload_session_foreground
                     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)
@@ -762,7 +762,7 @@ extension DocumentPickerViewController: UITableViewDataSource {
                 metadataNet.metadata = metadata
                 metadataNet.selector = selectorLoadFileView
                 metadataNet.serverUrl = self.serverUrl
-                metadataNet.session = download_session_foreground
+                metadataNet.session = k_download_session_foreground
                 metadataNet.taskStatus = Int(k_taskStatusResume)
             
                 let ocNetworking : OCnetworking = OCnetworking.init(delegate: self, metadataNet: metadataNet, withUser: activeUser, withPassword: activePassword, withUrl: activeUrl, withTypeCloud: typeCloud, activityIndicator: false)

Share Ext/ShareViewController.m

@@ -240,7 +240,7 @@
         metadataNet.fileName = fileName;
         metadataNet.fileNamePrint = fileName;
         metadataNet.serverUrl = _serverUrl;
-        metadataNet.session = upload_session_foreground;
+        metadataNet.session = k_upload_session_foreground;
         metadataNet.taskStatus = k_taskStatusResume;
         
         [self addNetworkingQueue:metadataNet];

iOSClient/Actions/CCActions.swift

@@ -123,7 +123,7 @@ class CCActions: NSObject {
 
         if message.length > 0 {
             
-            appDelegate.messageNotification("_delete_", description: message as String, visible: true, delay:TimeInterval(dismissAfterSecond), type:TWMessageBarMessageType.error)
+            appDelegate.messageNotification("_delete_", description: message as String, visible: true, delay:TimeInterval(k_dismissAfterSecond), type:TWMessageBarMessageType.error)
         }
         
         metadataNet.delegate?.deleteFileOrFolderFailure(metadataNet, message: message, errorCode: errorCode)
@@ -160,7 +160,7 @@ class CCActions: NSObject {
                 
                 print("[LOG] Rename cryptated error \(fileName)")
                 
-                appDelegate.messageNotification("_rename_", description: "_file_not_found_reload_", visible: true, delay: TimeInterval(dismissAfterSecond), type: TWMessageBarMessageType.error)
+                appDelegate.messageNotification("_rename_", description: "_file_not_found_reload_", visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error)
                 
                 return
             }
@@ -203,7 +203,7 @@ class CCActions: NSObject {
             metadataNet.metadata = metadata
             metadataNet.selectorPost = selectorReadFolderForced
             metadataNet.serverUrl = serverUrl
-            metadataNet.session = upload_session_foreground
+            metadataNet.session = k_upload_session_foreground
             metadataNet.taskStatus = Int(k_taskStatusResume)
             
             if CCCoreData.isOfflineLocalFileID(metadata.fileID, activeAccount: appDelegate.activeAccount) {
@@ -267,7 +267,7 @@ class CCActions: NSObject {
                 title = "_move_"
             }
             
-            appDelegate.messageNotification(title, description: message as String, visible: true, delay:TimeInterval(dismissAfterSecond), type:TWMessageBarMessageType.error)
+            appDelegate.messageNotification(title, description: message as String, visible: true, delay:TimeInterval(k_dismissAfterSecond), type:TWMessageBarMessageType.error)
         }
         
         metadataNet.delegate?.renameMoveFileOrFolderFailure(metadataNet, message: message as NSString, errorCode: errorCode)

iOSClient/AppDelegate.m

@@ -134,7 +134,7 @@
     _netQueueUploadWWan.maxConcurrentOperationCount = k_maxConcurrentOperationDownloadUpload;
     
     // Add notification change session
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sessionChanged:) name:networkingSessionNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sessionChanged:) name:k_networkingSessionNotification object:nil];
         
     // Initialization Share
     self.sharesID = [[NSMutableDictionary alloc] init];
@@ -997,7 +997,7 @@
         
         if (self.lastReachability == NO) {
             
-            [self messageNotification:@"_network_available_" description:nil visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
+            [self messageNotification:@"_network_available_" description:nil visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
             
             if (_activeMain)
                 [_activeMain performSelector:@selector(requestServerInformation) withObject:nil afterDelay:3];
@@ -1010,7 +1010,7 @@
     } else {
         
         if (self.lastReachability == YES) {
-            [self messageNotification:@"_network_not_available_" description:nil visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
+            [self messageNotification:@"_network_not_available_" description:nil visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
         }
         
         NSLog(@"[LOG] Reachability Changed: NOT Reachable");
@@ -1167,7 +1167,7 @@
         
         if (count >= 10) {
             
-            [app messageNotification:@"_error_" description:@"_too_errors_automatic_all_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+            [app messageNotification:@"_error_" description:@"_too_errors_automatic_all_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
             
             return;
         }
@@ -1277,8 +1277,8 @@
     else if ([[_listChangeTask objectForKey:metadata.fileID] isEqualToString:@"reloadUpload"]) {
         
         // V 1.8 if upload_session_wwan change in upload_session
-        if ([metadata.session isEqualToString:upload_session_wwan])
-            metadata.session = upload_session;
+        if ([metadata.session isEqualToString:k_upload_session_wwan])
+            metadata.session = k_upload_session;
         
         [[CCNetworking sharedNetworking] uploadFileMetadata:metadata taskStatus:k_taskStatusResume];
     }
@@ -1292,7 +1292,7 @@
         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:k_taskStatusResume delegate:nil];
+            [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:downloadData downloadPlist:downloadPlist selector:metadata.sessionSelector selectorPost:metadata.sessionSelectorPost session:k_download_session taskStatus:k_taskStatusResume delegate:nil];
         });
     }
     else if ([[_listChangeTask objectForKey:metadata.fileID] isEqualToString:@"cancelUpload"]) {

iOSClient/CCGlobal.h

@@ -61,14 +61,14 @@ extern NSString *const BKPasscodeKeychainServiceName;
 // BRAND
 #ifdef CC
 
-#define _brand_     @"Crypto Cloud"
-#define _mail_me_   @"cryptocloud@twsweb.it"
+#define _brand_                     @"Crypto Cloud"
+#define _mail_me_                   @"cryptocloud@twsweb.it"
 #endif
 
 #ifdef NC
 
-#define _brand_     @"Nextcloud"
-#define _mail_me_   @"ios@nextcloud.com"
+#define _brand_                     @"Nextcloud"
+#define _mail_me_                   @"ios@nextcloud.com"
 
 #endif
 
@@ -107,29 +107,29 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define COLOR_NO_CONNECTION [UIColor colorWithRed:204.0/255.0 green:204.0/255.0 blue:204.0/255.0 alpha:1.0]
 #define COLOR_NAVBAR_IOS7 [UIColor colorWithRed:247.0/255.0 green:247.0/255.0 blue:247.0/255.0 alpha:1.0]
 
-#define dismissAfterSecond 4
+#define k_dismissAfterSecond                    4
 
-#define MaxDimensionUpload 524288000       // 500 MB
+#define k_MaxDimensionUpload                    524288000       // 500 MB
 
-#define dayForceReadFolder 3
+#define k_dayForceReadFolder                    3
 
-#define MaxGroupBySessionUploadDatasource 50
-#define MaxGroupBySessionDownloadDatasource 50
+#define k_MaxGroupBySessionUploadDatasource     50
+#define k_MaxGroupBySessionDownloadDatasource   50
 
-#define returnCreateFolderPlain 0
-#define returnCreateFotoVideoPlain 1
-#define returnCreateFilePlain 2
-#define returnCreateFolderEncrypted 3
-#define returnCreateFotoVideoEncrypted 4
-#define returnCreateFileEncrypted 5
-#define returnCartaDiCredito 6
-#define returnBancomat 7
-#define returnContoCorrente 8
-#define returnAccountWeb 9
-#define returnNote 10
-#define returnPatenteGuida 11
-#define returnCartaIdentita 12
-#define returnPassaporto 13
+#define k_returnCreateFolderPlain               0
+#define k_returnCreateFotoVideoPlain            1
+#define k_returnCreateFilePlain                 2
+#define k_returnCreateFolderEncrypted           3
+#define k_returnCreateFotoVideoEncrypted        4
+#define k_returnCreateFileEncrypted             5
+#define k_returnCartaDiCredito                  6
+#define k_returnBancomat                        7
+#define k_returnContoCorrente                   8
+#define k_returnAccountWeb                      9
+#define k_returnNote                            10
+#define k_returnPatenteGuida                    11
+#define k_returnCartaIdentita                   12
+#define k_returnPassaporto                      13
 
 #define RalewayBold(s) [UIFont fontWithName:@"Raleway-Bold" size:s]
 #define RalewayExtraBold(s) [UIFont fontWithName:@"Raleway-ExtraBold" size:s]
@@ -153,40 +153,40 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define k_share_link_middle_part_url_after_version_8    @"index.php/s/"
 
 // Constants to identify the different permissions of a file
-#define k_permission_shared             @"S"
-#define k_permission_can_share          @"R"
-#define k_permission_mounted            @"M"
-#define k_permission_file_can_write     @"W"
-#define k_permission_can_create_file    @"C"
-#define k_permission_can_create_folder  @"K"
-#define k_permission_can_delete         @"D"
-#define k_permission_can_rename         @"N"
-#define k_permission_can_move           @"V"
+#define k_permission_shared                     @"S"
+#define k_permission_can_share                  @"R"
+#define k_permission_mounted                    @"M"
+#define k_permission_file_can_write             @"W"
+#define k_permission_can_create_file            @"C"
+#define k_permission_can_create_folder          @"K"
+#define k_permission_can_delete                 @"D"
+#define k_permission_can_rename                 @"N"
+#define k_permission_can_move                   @"V"
 
 // Session
-#define download_session                @"it.twsweb.download.session"
-#define download_session_foreground     @"it.twsweb.download.sessionforeground"
-#define download_session_wwan           @"it.twsweb.download.sessionwwan"
+#define k_download_session                      @"it.twsweb.download.session"
+#define k_download_session_foreground           @"it.twsweb.download.sessionforeground"
+#define k_download_session_wwan                 @"it.twsweb.download.sessionwwan"
 
-#define upload_session                  @"it.twsweb.upload.session"
-#define upload_session_foreground       @"it.twsweb.upload.sessionforeground"
-#define upload_session_wwan             @"it.twsweb.upload.sessionwwan"
+#define k_upload_session                        @"it.twsweb.upload.session"
+#define k_upload_session_foreground             @"it.twsweb.upload.sessionforeground"
+#define k_upload_session_wwan                   @"it.twsweb.upload.sessionwwan"
 
-#define networkingSessionNotification   @"networkingSessionNotification"
+#define k_networkingSessionNotification         @"networkingSessionNotification"
 
 // TaskIdentifier
-#define k_taskIdentifierDone            -1
-#define k_taskIdentifierStop            -2
-#define k_taskIdentifierError           -9999
-#define k_taskIdentifierNULL            9999
+#define k_taskIdentifierDone                    -1
+#define k_taskIdentifierStop                    -2
+#define k_taskIdentifierError                   -99999
+#define k_taskIdentifierNULL                    99999
 
 // TaskStatus
-#define k_taskStatusNone                0
-#define k_taskStatusCancel              -1
-#define k_taskStatusResume              -2
-#define k_taskStatusSuspend             -3
+#define k_taskStatusNone                        0
+#define k_taskStatusCancel                      -1
+#define k_taskStatusResume                      -2
+#define k_taskStatusSuspend                     -3
 
-#define k_timerVerifySession            15.0
+#define k_timerVerifySession                    15.0
 
 // OperationQueue
 #define k_netQueueName                          @"it.twsweb.cryptocloud.queue"
@@ -205,77 +205,77 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define k_CCErrorInternalError                  -9996
 
 // Metadata ed ID
-#define uploadSessionID @"ID_UPLOAD_"
+#define k_uploadSessionID                   @"ID_UPLOAD_"
 
 // Metadata.Net SELECTOR
-#define selectorAddOffline              @"addOffline"
-#define selectorAddLocal                @"addLocal"
-#define selectorCreateFolder            @"createFolder"
-#define selectorDecryptFile             @"decryptFile"
-#define selectorDelete                  @"delete"
-#define selectorDeleteCrypto            @"deleteCrypto"
-#define selectorDeletePlist             @"deletePlist"
-#define selectorDownloadThumbnail       @"downloadThumbnail"
-#define selectorDownloadOffline         @"downloadOffline"
-#define selectorEncryptFile             @"encryptFile"
-#define selectorGetUserAndGroup         @"getUserAndGroup"
-#define selectorLoadFileView            @"loadFileView"
-#define selectorLoadModelView           @"loadModelView"
-#define selectorLoadPlist               @"loadPlist"
-#define selectorLoadViewImage           @"loadViewImage"
-#define selectorLoadCopy                @"loadCopy"
-#define selectorMove                    @"move"
-#define selectorMoveCrypto              @"moveCrypto"
-#define selectorMovePlist               @"movePlist"
-#define selectorOpenIn                  @"openIn"
-#define selectorOpenWindowShare         @"openWindowShare"
-#define selectorReadFile                @"readFile"
-#define selectorReadFileOffline         @"readFileOffline"
-#define selectorReadFileFolder          @"readFileFolder"
-#define selectorReadFileUploadFile      @"readFileUploadFile"
-#define selectorReadFileVerifyUpload    @"readFileVerifyUpload"
-#define selectorReadFileQuota           @"readFileQuota"
-#define selectorReadFolder              @"readFolder"
-#define selectorReadFolderForced        @"readFolderForced"
-#define selectorReadShare               @"readShare"
-#define selectorReload                  @"reload"
-#define selectorRename                  @"rename"
-#define selectorSave                    @"save"
-#define selectorShare                   @"share"
-#define selectorSearch                  @"search"
-#define selectorOfflineFolder           @"offlineFolder"
-#define selectorUnshare                 @"unshare"
-#define selectorUpdateShare             @"updateShare"
-#define selectorUploadAutomatic         @"uploadAutomatic"
-#define selectorUploadAutomaticAll      @"uploadAutomaticAll"
-#define selectorUploadFile              @"uploadFile"
-#define selectorUploadFileCrypto        @"uploadFileCrypto"
-#define selectorUploadFilePlist         @"uploadFilePlist"
-#define selectorUploadRemovePhoto       @"uploadRemovePhoto"
+#define selectorAddOffline                  @"addOffline"
+#define selectorAddLocal                    @"addLocal"
+#define selectorCreateFolder                @"createFolder"
+#define selectorDecryptFile                 @"decryptFile"
+#define selectorDelete                      @"delete"
+#define selectorDeleteCrypto                @"deleteCrypto"
+#define selectorDeletePlist                 @"deletePlist"
+#define selectorDownloadThumbnail           @"downloadThumbnail"
+#define selectorDownloadOffline             @"downloadOffline"
+#define selectorEncryptFile                 @"encryptFile"
+#define selectorGetUserAndGroup             @"getUserAndGroup"
+#define selectorLoadFileView                @"loadFileView"
+#define selectorLoadModelView               @"loadModelView"
+#define selectorLoadPlist                   @"loadPlist"
+#define selectorLoadViewImage               @"loadViewImage"
+#define selectorLoadCopy                    @"loadCopy"
+#define selectorMove                        @"move"
+#define selectorMoveCrypto                  @"moveCrypto"
+#define selectorMovePlist                   @"movePlist"
+#define selectorOpenIn                      @"openIn"
+#define selectorOpenWindowShare             @"openWindowShare"
+#define selectorReadFile                    @"readFile"
+#define selectorReadFileOffline             @"readFileOffline"
+#define selectorReadFileFolder              @"readFileFolder"
+#define selectorReadFileUploadFile          @"readFileUploadFile"
+#define selectorReadFileVerifyUpload        @"readFileVerifyUpload"
+#define selectorReadFileQuota               @"readFileQuota"
+#define selectorReadFolder                  @"readFolder"
+#define selectorReadFolderForced            @"readFolderForced"
+#define selectorReadShare                   @"readShare"
+#define selectorReload                      @"reload"
+#define selectorRename                      @"rename"
+#define selectorSave                        @"save"
+#define selectorShare                       @"share"
+#define selectorSearch                      @"search"
+#define selectorOfflineFolder               @"offlineFolder"
+#define selectorUnshare                     @"unshare"
+#define selectorUpdateShare                 @"updateShare"
+#define selectorUploadAutomatic             @"uploadAutomatic"
+#define selectorUploadAutomaticAll          @"uploadAutomaticAll"
+#define selectorUploadFile                  @"uploadFile"
+#define selectorUploadFileCrypto            @"uploadFileCrypto"
+#define selectorUploadFilePlist             @"uploadFilePlist"
+#define selectorUploadRemovePhoto           @"uploadRemovePhoto"
 
 // Metadata.Net ACTION
-#define actionCreateFolder              @"createFolder"
-#define actionDeleteFileDirectory       @"deleteFileOrFolder"
-#define actionDownloadFile              @"downloadFile"
-#define actionDownloadThumbnail         @"downloadThumbnail"
-#define actionGetCapabilities           @"getCapabilitiesOfServer"
-#define actionGetFeaturesSuppServer     @"getFeaturesSupportedByServer"
-#define actionGetUserAndGroup           @"getUserAndGroup"
-#define actionGetNotificationsOfServer  @"getNotificationsOfServer"
-#define actionSetNotificationServer     @"setNotificationServer"
-#define actionMoveFileOrFolder          @"moveFileOrFolder"
-#define actionReadFile                  @"readFile"
-#define actionReadFolder                @"readFolder"
-#define actionReadShareServer           @"readShareServer"
-#define actionSearch                    @"search"
-#define actionShare                     @"share"
-#define actionShareWith                 @"shareWith"
-#define actionUnShare                   @"unShare"
-#define actionUpdateShare               @"updateShare"
-#define actionUploadFile                @"uploadFile"
-#define actionUploadAsset               @"uploadAsset"
-#define actionUploadTemplate            @"uploadTemplate"
-#define actionUploadOnlyPlist           @"uploadOnlyPlist"
+#define actionCreateFolder                  @"createFolder"
+#define actionDeleteFileDirectory           @"deleteFileOrFolder"
+#define actionDownloadFile                  @"downloadFile"
+#define actionDownloadThumbnail             @"downloadThumbnail"
+#define actionGetCapabilities               @"getCapabilitiesOfServer"
+#define actionGetFeaturesSuppServer         @"getFeaturesSupportedByServer"
+#define actionGetUserAndGroup               @"getUserAndGroup"
+#define actionGetNotificationsOfServer      @"getNotificationsOfServer"
+#define actionSetNotificationServer         @"setNotificationServer"
+#define actionMoveFileOrFolder              @"moveFileOrFolder"
+#define actionReadFile                      @"readFile"
+#define actionReadFolder                    @"readFolder"
+#define actionReadShareServer               @"readShareServer"
+#define actionSearch                        @"search"
+#define actionShare                         @"share"
+#define actionShareWith                     @"shareWith"
+#define actionUnShare                       @"unShare"
+#define actionUpdateShare                   @"updateShare"
+#define actionUploadFile                    @"uploadFile"
+#define actionUploadAsset                   @"uploadAsset"
+#define actionUploadTemplate                @"uploadTemplate"
+#define actionUploadOnlyPlist               @"uploadOnlyPlist"
 
 // Metadata : FileType
 #define k_metadataTypeFile_audio            @"audio"

iOSClient/Create/CCCreateCloud.swift

@@ -59,15 +59,15 @@ class CreateMenuAdd: NSObject {
         actionSheet.cancelButtonTitle = NSLocalizedString("_cancel_", comment: "")
 
         actionSheet.addButton(withTitle: NSLocalizedString("_create_folder_", comment: ""), image: UIImage(named: "createFolderNextcloud"), backgroundColor: UIColor.white, height: 50.0 ,type: AHKActionSheetButtonType.default, handler: {(AHKActionSheet) -> Void in
-            appDelegate.activeMain.returnCreate(Int(returnCreateFolderPlain))
+            appDelegate.activeMain.returnCreate(Int(k_returnCreateFolderPlain))
         })
         
         actionSheet.addButton(withTitle: NSLocalizedString("_upload_photos_videos_", comment: ""), image: UIImage(named: "uploadPhotoNextcloud"), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.default, handler: {(AHKActionSheet) -> Void in
-            appDelegate.activeMain.returnCreate(Int(returnCreateFotoVideoPlain))
+            appDelegate.activeMain.returnCreate(Int(k_returnCreateFotoVideoPlain))
         })
         
         actionSheet.addButton(withTitle: NSLocalizedString("_upload_file_", comment: ""), image: UIImage(named: "uploadFileNextcloud"), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.default, handler: {(AHKActionSheet) -> Void in
-            appDelegate.activeMain.returnCreate(Int(returnCreateFilePlain))
+            appDelegate.activeMain.returnCreate(Int(k_returnCreateFilePlain))
         })
         
         actionSheet.addButton(withTitle: NSLocalizedString("_upload_encrypted_mode", comment: ""), image: UIImage(named: "actionSheetLock"), backgroundColor: colorLightGray, height: 50.0, type: AHKActionSheetButtonType.encrypted, handler: {(AHKActionSheet) -> Void in
@@ -103,15 +103,15 @@ class CreateMenuAdd: NSObject {
         actionSheet.cancelButtonTitle = NSLocalizedString("_cancel_", comment: "")
         
         actionSheet.addButton(withTitle: NSLocalizedString("_create_folder_", comment: ""), image: UIImage(named: "foldercrypto"), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.encrypted, handler: {(AHKActionSheet) -> Void in
-            appDelegate.activeMain.returnCreate(Int(returnCreateFolderEncrypted))
+            appDelegate.activeMain.returnCreate(Int(k_returnCreateFolderEncrypted))
         })
         
         actionSheet.addButton(withTitle: NSLocalizedString("_upload_photos_videos_", comment: ""), image: UIImage(named: "photocrypto"), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.encrypted, handler: {(AHKActionSheet) -> Void in
-            appDelegate.activeMain.returnCreate(Int(returnCreateFotoVideoEncrypted))
+            appDelegate.activeMain.returnCreate(Int(k_returnCreateFotoVideoEncrypted))
         })
         
         actionSheet.addButton(withTitle: NSLocalizedString("_upload_file_", comment: ""), image: UIImage(named: "importCloudCrypto"), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.encrypted, handler: {(AHKActionSheet) -> Void in
-            appDelegate.activeMain.returnCreate(Int(returnCreateFileEncrypted))
+            appDelegate.activeMain.returnCreate(Int(k_returnCreateFileEncrypted))
         })
 
         actionSheet.addButton(withTitle: NSLocalizedString("_upload_template_", comment: ""), image: UIImage(named: "template"), backgroundColor: colorLightGray, height: 50.0, type: AHKActionSheetButtonType.encrypted, handler: {(AHKActionSheet) -> Void in
@@ -151,11 +151,11 @@ class CreateMenuAdd: NSObject {
         actionSheet.cancelButtonTitle = NSLocalizedString("_cancel_", comment: "")
         
         actionSheet.addButton(withTitle: NSLocalizedString("_add_notes_", comment: ""), image: UIImage(named: "note"), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.encrypted, handler: {(AHKActionSheet) -> Void in
-            appDelegate.activeMain.returnCreate(Int(returnNote))
+            appDelegate.activeMain.returnCreate(Int(k_returnNote))
         })
         
         actionSheet.addButton(withTitle: NSLocalizedString("_add_web_account_", comment: ""), image: UIImage(named: "baseurl"), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.encrypted, handler: {(AHKActionSheet) -> Void in
-            appDelegate.activeMain.returnCreate(Int(returnAccountWeb))
+            appDelegate.activeMain.returnCreate(Int(k_returnAccountWeb))
         })
         
         actionSheet.addButton(withTitle: "", image: nil, backgroundColor: UIColor(colorLiteralRed: 250.0/255.0, green: 250.0/255.0, blue: 250.0/255.0, alpha: 1), height: 10.0, type: AHKActionSheetButtonType.disabled, handler: {(AHKActionSheet) -> Void in
@@ -163,15 +163,15 @@ class CreateMenuAdd: NSObject {
         })
         
         actionSheet.addButton(withTitle: NSLocalizedString("_add_credit_card_", comment: ""), image: UIImage(named: "cartadicredito"), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.encrypted, handler: {(AHKActionSheet) -> Void in
-            appDelegate.activeMain.returnCreate(Int(returnCartaDiCredito))
+            appDelegate.activeMain.returnCreate(Int(k_returnCartaDiCredito))
         })
         
         actionSheet.addButton(withTitle: NSLocalizedString("_add_atm_", comment: ""), image: UIImage(named: "bancomat"), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.encrypted, handler: {(AHKActionSheet) -> Void in
-            appDelegate.activeMain.returnCreate(Int(returnBancomat))
+            appDelegate.activeMain.returnCreate(Int(k_returnBancomat))
         })
         
         actionSheet.addButton(withTitle: NSLocalizedString("_add_bank_account_", comment: ""), image: UIImage(named: "contocorrente"), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.encrypted, handler: {(AHKActionSheet) -> Void in
-            appDelegate.activeMain.returnCreate(Int(returnContoCorrente))
+            appDelegate.activeMain.returnCreate(Int(k_returnContoCorrente))
         })
         
         actionSheet.addButton(withTitle: "", image: nil, backgroundColor: UIColor(colorLiteralRed: 250.0/255.0, green: 250.0/255.0, blue: 250.0/255.0, alpha: 1), height: 10.0, type: AHKActionSheetButtonType.disabled, handler: {(AHKActionSheet) -> Void in
@@ -179,15 +179,15 @@ class CreateMenuAdd: NSObject {
         })
         
         actionSheet.addButton(withTitle: NSLocalizedString("_add_driving_license_", comment: ""), image: UIImage(named: "patenteguida"), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.encrypted, handler: {(AHKActionSheet) -> Void in
-            appDelegate.activeMain.returnCreate(Int(returnPatenteGuida))
+            appDelegate.activeMain.returnCreate(Int(k_returnPatenteGuida))
         })
         
         actionSheet.addButton(withTitle: NSLocalizedString("_add_id_card_", comment: ""), image: UIImage(named: "cartaidentita"), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.encrypted, handler: {(AHKActionSheet) -> Void in
-            appDelegate.activeMain.returnCreate(Int(returnCartaIdentita))
+            appDelegate.activeMain.returnCreate(Int(k_returnCartaIdentita))
         })
         
         actionSheet.addButton(withTitle: NSLocalizedString("_add_passport_", comment: ""), image: UIImage(named: "passaporto"), backgroundColor: UIColor.white, height: 50.0, type: AHKActionSheetButtonType.encrypted, handler: {(AHKActionSheet) -> Void in
-            appDelegate.activeMain.returnCreate(Int(returnPassaporto))
+            appDelegate.activeMain.returnCreate(Int(k_returnPassaporto))
         })
         
         actionSheet.show()
@@ -342,7 +342,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
                     
                     self.reloadFormRow(formRow)
                     
-                    appDelegate.messageNotification("_info_", description: "_forbidden_characters_", visible: true, delay: TimeInterval(dismissAfterSecond), type: TWMessageBarMessageType.info)
+                    appDelegate.messageNotification("_info_", description: "_forbidden_characters_", visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.info)
                 }
             }
             

iOSClient/FileSystem/CCCoreData.m

@@ -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, k_taskIdentifierDone, k_taskIdentifierDone] context:nil];
+    return [self getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND ((session == %@) || (session == %@)) AND ((sessionTaskIdentifier != %i) OR (sessionTaskIdentifierPlist != %i))", activeAccount, k_download_session, k_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, k_taskIdentifierDone, k_taskIdentifierDone] context:nil];
+    return [self getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (session == %@) AND ((sessionTaskIdentifier != %i) OR (sessionTaskIdentifierPlist != %i))", activeAccount, k_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, k_taskIdentifierDone, k_taskIdentifierDone] context:nil];
+    return [self getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND ((session == %@) || (session == %@)) AND ((sessionTaskIdentifier != %i) OR (sessionTaskIdentifierPlist != %i))", activeAccount, k_upload_session, k_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, k_taskIdentifierDone, k_taskIdentifierDone] context:nil];
+    return [self getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (session == %@) AND ((sessionTaskIdentifier != %i) OR (sessionTaskIdentifierPlist != %i))", activeAccount, k_upload_session_wwan, k_taskIdentifierDone, k_taskIdentifierDone] context:nil];
 }
 
 + (NSArray *)getRecordsTableMetadataPhotosCameraUpload:(NSString *)serverUrl activeAccount:(NSString *)activeAccount

iOSClient/Login/CCSecurityOptions.m

@@ -136,17 +136,17 @@
     switch (result) {
             
         case MFMailComposeResultCancelled:
-            [app messageNotification:@"_info_" description:@"_mail_deleted_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
+            [app messageNotification:@"_info_" description:@"_mail_deleted_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
             break;
         case MFMailComposeResultSaved:
-            [app messageNotification:@"_info_" description:@"_mail_saved_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
+            [app messageNotification:@"_info_" description:@"_mail_saved_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
             break;
         case MFMailComposeResultSent:
-            [app messageNotification:@"_info_" description:@"_mail_sent_" visible:YES  delay:dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
+            [app messageNotification:@"_info_" description:@"_mail_sent_" visible:YES  delay:k_dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
             break;
         case MFMailComposeResultFailed: {
             NSString *msg = [NSString stringWithFormat:NSLocalizedString(@"_mail_failure_", nil), [error localizedDescription]];
-            [app messageNotification:@"_error_" description:msg visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+            [app messageNotification:@"_error_" description:msg visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
         }
             break;
         default:

iOSClient/Main/CCDetail.m

@@ -678,7 +678,7 @@
     CCMetadata *metadata = [self.dataSourceImagesVideos objectAtIndex:index];
     if (metadata == nil || [[NSFileManager defaultManager] fileExistsAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID]] == NO) {
         
-        [app messageNotification:@"_info_" description:@"_file_not_found_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
+        [app messageNotification:@"_info_" description:@"_file_not_found_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
         
         return;
     }
@@ -715,7 +715,7 @@
 
 - (void)downloadPhotoBrowserFailure:(NSInteger)errorCode
 {
-    [app messageNotification:@"_download_selected_files_" description:@"_error_download_photobrowser_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+    [app messageNotification:@"_download_selected_files_" description:@"_error_download_photobrowser_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
     
     [self.photoBrowser reloadData];
     
@@ -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:k_taskStatusResume delegate:nil];
+    [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorLoadViewImage selectorPost:nil session:k_download_session taskStatus:k_taskStatusResume delegate:nil];
 }
 
 - (void)insertGeocoderLocation:(NSNotification *)notification

iOSClient/Main/CCMain.m

@@ -665,16 +665,16 @@
                 if ([data writeToFile:fileNamePath options:NSDataWritingAtomic error:&error]) {
                     
                     // Upload File
-                    [[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];
+                    [[CCNetworking sharedNetworking] uploadFile:fileName serverUrl:_serverUrl cryptated:_isPickerCriptate onlyPlist:NO session:k_upload_session taskStatus: k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
                     
                 } else {
                     
-                    [app messageNotification:@"_error_" description:error.description visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+                    [app messageNotification:@"_error_" description:error.description visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
                 }
                 
             } else {
                 
-                [app messageNotification:@"_error_" description:@"_read_file_error_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+                [app messageNotification:@"_error_" description:@"_read_file_error_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
             }
         }];
     }
@@ -761,7 +761,7 @@
 {
     [picker dismissViewControllerAnimated:YES completion:^{
         
-        CreateFormUploadAssets *form = [[CreateFormUploadAssets alloc] init:_titleMain serverUrl:_serverUrl assets:assets cryptated:_isPickerCriptate session:upload_session];
+        CreateFormUploadAssets *form = [[CreateFormUploadAssets alloc] init:_titleMain serverUrl:_serverUrl assets:assets cryptated:_isPickerCriptate session:k_upload_session];
         form.title = NSLocalizedString(@"_upload_photos_videos_", nil);
         
         UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:form];
@@ -813,8 +813,8 @@
                 
                 [_hudDeterminate hideHud];
                 
-                if (succeeded) [app messageNotification:@"_info_" description:@"_file_unpacked_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
-                else [app messageNotification:@"_error_" description:[NSString stringWithFormat:@"Error %ld", (long)error.code] visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+                if (succeeded) [app messageNotification:@"_info_" description:@"_file_unpacked_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
+                else [app messageNotification:@"_error_" description:[NSString stringWithFormat:@"Error %ld", (long)error.code] visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
             });
                         
         }];
@@ -902,21 +902,21 @@
     switch (type) {
             
         /* PLAIN */
-        case returnCreateFolderPlain: {
+        case k_returnCreateFolderPlain: {
             UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"_create_folder_",nil) message:nil delegate:self cancelButtonTitle:NSLocalizedString(@"_cancel_",nil) otherButtonTitles:NSLocalizedString(@"_save_", nil), nil];
             [alertView setAlertViewStyle:UIAlertViewStylePlainTextInput];
             alertView.tag = alertCreateFolder;
             [alertView show];
         }
             break;
-        case returnCreateFotoVideoPlain: {
+        case k_returnCreateFotoVideoPlain: {
             
             _isPickerCriptate = false;
             
             [self openAssetsPickerController];
         }
             break;
-        case returnCreateFilePlain: {
+        case k_returnCreateFilePlain: {
             
             _isPickerCriptate = false;
             
@@ -926,7 +926,7 @@
             
             
         /* ENCRYPTED */
-        case returnCreateFolderEncrypted: {
+        case k_returnCreateFolderEncrypted: {
             
             UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"_create_folder_",nil) message:nil delegate:self cancelButtonTitle:NSLocalizedString(@"_cancel_",nil) otherButtonTitles:NSLocalizedString(@"_save_", nil), nil];
             [alertView setAlertViewStyle:UIAlertViewStylePlainTextInput];
@@ -934,14 +934,14 @@
             [alertView show];
         }
             break;
-        case returnCreateFotoVideoEncrypted: {
+        case k_returnCreateFotoVideoEncrypted: {
             
             _isPickerCriptate = true;
             
             [self openAssetsPickerController];
         }
             break;
-        case returnCreateFileEncrypted: {
+        case k_returnCreateFileEncrypted: {
             
             _isPickerCriptate = true;
             
@@ -950,32 +950,32 @@
             break;
     
         /* UTILITY */
-        case returnNote:
+        case k_returnNote:
             [self openModel:@"note" isNew:true];
             break;
-        case returnAccountWeb:
+        case k_returnAccountWeb:
             [self openModel:@"accountweb" isNew:true];
             break;
             
          /* BANK */
-        case returnCartaDiCredito:
+        case k_returnCartaDiCredito:
             [self openModel:@"cartadicredito" isNew:true];
             break;
-        case returnBancomat:
+        case k_returnBancomat:
             [self openModel:@"bancomat" isNew:true];
             break;
-        case returnContoCorrente:
+        case k_returnContoCorrente:
             [self openModel:@"contocorrente" isNew:true];
             break;
        
         /* DOCUMENT */
-        case returnPatenteGuida:
+        case k_returnPatenteGuida:
             [self openModel:@"patenteguida" isNew:true];
             break;
-        case returnCartaIdentita:
+        case k_returnCartaIdentita:
             [self openModel:@"cartaidentita" isNew:true];
             break;
-        case returnPassaporto:
+        case k_returnPassaporto:
             [self openModel:@"passaporto" isNew:true];
             break;
     }
@@ -988,9 +988,9 @@
 -(void)saveSelectedFilesSelector:(NSString *)path didFinishSavingWithError:(NSError *)error contextInfo:(void *)contextInfo
 {
     if (error)
-        [app messageNotification:@"_save_selected_files_" description:@"_file_not_saved_cameraroll_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+        [app messageNotification:@"_save_selected_files_" description:@"_file_not_saved_cameraroll_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
     else
-        [app messageNotification:@"_save_selected_files_" description:@"_file_saved_cameraroll_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
+        [app messageNotification:@"_save_selected_files_" description:@"_file_saved_cameraroll_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
 }
 
 - (void)saveSelectedFiles
@@ -1009,7 +1009,7 @@
                 
                 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: k_taskStatusResume delegate:self];
+                [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorSave selectorPost:nil session:k_download_session taskStatus: k_taskStatusResume delegate:self];
             }
         }
         
@@ -1266,7 +1266,7 @@
     } else {
         
         if (errorCode != kCFURLErrorCancelled)
-            [app messageNotification:@"_download_file_" description:message visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+            [app messageNotification:@"_download_file_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
     }
 
     [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
@@ -1336,7 +1336,7 @@
         UIImage *image = [UIImage imageWithContentsOfFile:[NSString stringWithFormat:@"%@/%@.ico", app.directoryUser, metadata.fileID]];
         [CCGraphics saveIcoWithFileID:metadata.fileNamePrint image:image writeToFile:nil copy:YES move:NO fromPath:[NSString stringWithFormat:@"%@/%@.ico", app.directoryUser, metadata.fileID] toPath:[NSString stringWithFormat:@"%@/.%@.ico", [CCUtility getDirectoryLocal], metadata.fileNamePrint]];
         
-        [app messageNotification:@"_add_local_" description:@"_file_saved_local_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
+        [app messageNotification:@"_add_local_" description:@"_file_saved_local_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
         
         [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
     }
@@ -1371,7 +1371,7 @@
             if (image)
                 UIImageWriteToSavedPhotosAlbum(image, self, @selector(saveSelectedFilesSelector: didFinishSavingWithError: contextInfo:), nil);
             else
-                [app messageNotification:@"_save_selected_files_" description:@"_file_not_saved_cameraroll_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+                [app messageNotification:@"_save_selected_files_" description:@"_file_not_saved_cameraroll_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
         }
         
         if ([metadata.typeFile isEqualToString: k_metadataTypeFile_video]) {
@@ -1385,7 +1385,7 @@
                 
                 UISaveVideoAtPathToSavedPhotosAlbum([NSTemporaryDirectory() stringByAppendingString:metadata.fileNamePrint], self, @selector(saveSelectedFilesSelector: didFinishSavingWithError: contextInfo:), nil);
             } else {
-                [app messageNotification:@"_save_selected_files_" description:@"_file_not_saved_cameraroll_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+                [app messageNotification:@"_save_selected_files_" description:@"_file_not_saved_cameraroll_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
             }
         }
         
@@ -1471,7 +1471,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: k_taskStatusResume delegate:self];
+                [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorReload selectorPost:nil session:k_download_session taskStatus: k_taskStatusResume delegate:self];
             }
         }
         
@@ -1497,7 +1497,7 @@
             metadataNet.downloadPlist = YES;
             metadataNet.selector = selectorLoadPlist;
             metadataNet.serverUrl = serverUrl;
-            metadataNet.session = download_session_foreground;
+            metadataNet.session = k_download_session_foreground;
             metadataNet.taskStatus = k_taskStatusResume;
             
             [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
@@ -1528,7 +1528,7 @@
     // Print error
     else if (errorCode != kCFURLErrorCancelled && errorCode != 403) {
         
-        [app messageNotification:@"_upload_file_" description:message visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+        [app messageNotification:@"_upload_file_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
     }
     
     [self reloadDatasource:serverUrl fileID:nil selector:selector];
@@ -1583,7 +1583,7 @@
             
             [_hud hideHud];
             
-            [app messageNotification:@"_error_" description:@"_error_createsubfolders_upload_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
+            [app messageNotification:@"_error_" description:@"_error_createsubfolders_upload_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
             
             return;
         }
@@ -1598,7 +1598,7 @@
                 
                 [_hud hideHud];
                 
-                [app messageNotification:@"_error_" description:@"_error_createsubfolders_upload_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
+                [app messageNotification:@"_error_" description:@"_error_createsubfolders_upload_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
                     
                 return;
             }
@@ -1692,7 +1692,7 @@
             } else {
                 
                 // STOP check file, view message error
-                [app messageNotification:@"_upload_file_" description:message visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];                
+                [app messageNotification:@"_upload_file_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
             }
         }
     }
@@ -1757,7 +1757,7 @@
     [_ImageTitleHomeCryptoCloud setUserInteractionEnabled:YES];
     
     if (message && [record.account isEqualToString:metadataNet.account])
-        [app messageNotification:@"_error_" description:message visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+        [app messageNotification:@"_error_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
     
     [self reloadDatasource:metadataNet.serverUrl fileID:nil selector:metadataNet.selector];
     
@@ -1892,7 +1892,7 @@
     
     NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:_serverUrl activeAccount:app.activeAccount];
     
-    if ([CCCoreData isDirectoryOutOfDate:dayForceReadFolder directoryID:directoryID activeAccount:app.activeAccount] || forced) {
+    if ([CCCoreData isDirectoryOutOfDate:k_dayForceReadFolder directoryID:directoryID activeAccount:app.activeAccount] || forced) {
         
         if (_refreshControl.isRefreshing == NO)
             [_hud visibleIndeterminateHud];
@@ -1956,7 +1956,7 @@
 - (void)searchFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
 {
     if (message)
-        [app messageNotification:@"_error_" description:message visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+        [app messageNotification:@"_error_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
 }
 
 - (void)searchSuccess:(CCMetadataNet *)metadataNet metadatas:(NSArray *)metadatas
@@ -2086,7 +2086,7 @@
         metadataNet.fileNamePrint = fileName;
         metadataNet.rev = metadata.rev;
         metadataNet.serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
-        metadataNet.session = upload_session_foreground;
+        metadataNet.session = k_upload_session_foreground;
         metadataNet.taskStatus = k_taskStatusResume;
         
         if ([CCCoreData isOfflineLocalFileID:metadata.fileID activeAccount:app.activeAccount])
@@ -2103,7 +2103,7 @@
         [_hud hideHud];
     
         if (message)
-            [app messageNotification:@"_move_" description:message visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+            [app messageNotification:@"_move_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
         
         [_selectedMetadatas removeAllObjects];
         [_queueSelector removeAllObjects];
@@ -2276,7 +2276,7 @@
     [_hud hideHud];
     
     if (message)
-        [app messageNotification:@"_create_folder_" description:message visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+        [app messageNotification:@"_create_folder_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
 }
 
 - (void)createFolderSuccess:(CCMetadataNet *)metadataNet
@@ -2352,7 +2352,7 @@
     metadataNet.priority = NSOperationQueuePriorityVeryLow;
     metadataNet.selectorPost = selectorReadFolderForced;
     metadataNet.serverUrl = _serverUrl;
-    metadataNet.session = upload_session_foreground;
+    metadataNet.session = k_upload_session_foreground;
     metadataNet.taskStatus = k_taskStatusResume;
     
     [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
@@ -2436,7 +2436,7 @@
         metadataNet.priority = NSOperationQueuePriorityVeryLow;
         metadataNet.selectorPost = selectorReadFolderForced;
         metadataNet.serverUrl = serverUrl;
-        metadataNet.session = upload_session_foreground;
+        metadataNet.session = k_upload_session_foreground;
         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: k_taskStatusResume delegate:self];
+            [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorEncryptFile selectorPost:nil session:k_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: k_taskStatusResume delegate:self];
+            [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorDecryptFile selectorPost:nil session:k_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:k_taskStatusResume delegate:self];
+    [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selector selectorPost:nil session:k_download_session taskStatus:k_taskStatusResume delegate:self];
 }
 
 - (void)encryptedFile:(CCMetadata *)metadata
@@ -2522,13 +2522,13 @@
         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:k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
+            [[CCNetworking sharedNetworking] uploadFile:metadata.fileName serverUrl:serverUrl cryptated:YES onlyPlist:NO session:k_upload_session taskStatus:k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
             [self performSelector:@selector(reloadDatasource) withObject:nil afterDelay:0.1];
         });
         
     } else {
             
-        [app messageNotification:@"_encrypted_selected_files_" description:@"_file_not_present_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+        [app messageNotification:@"_encrypted_selected_files_" description:@"_file_not_present_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
     }
 }
 
@@ -2544,13 +2544,13 @@
         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:k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
+            [[CCNetworking sharedNetworking] uploadFile:metadata.fileNamePrint serverUrl:serverUrl cryptated:NO onlyPlist:NO session:k_upload_session taskStatus:k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
             [self performSelector:@selector(reloadDatasource) withObject:nil afterDelay:0.1];
         });
         
     } else {
             
-        [app messageNotification:@"_decrypted_selected_files_" description:@"_file_not_present_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+        [app messageNotification:@"_decrypted_selected_files_" description:@"_file_not_present_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
     }
 }
 
@@ -2619,7 +2619,7 @@
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [app.listChangeTask setObject:@"reloadDownload" forKey:metadata.fileID];
                     NSArray *object = [[NSArray alloc] initWithObjects:session, metadata, findTask, nil];
-                    [[NSNotificationCenter defaultCenter] postNotificationName:networkingSessionNotification object:object];
+                    [[NSNotificationCenter defaultCenter] postNotificationName:k_networkingSessionNotification object:object];
                 });
             }
         }];
@@ -2641,7 +2641,7 @@
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [app.listChangeTask setObject:@"reloadUpload" forKey:metadata.fileID];
                     NSArray *object = [[NSArray alloc] initWithObjects:session, metadata, findTask, nil];
-                    [[NSNotificationCenter defaultCenter] postNotificationName:networkingSessionNotification object:object];
+                    [[NSNotificationCenter defaultCenter] postNotificationName:k_networkingSessionNotification object:object];
                 });
             }
         }];
@@ -2683,7 +2683,7 @@
             if (!findTask) {
                 [app.listChangeTask setObject:@"cancelDownload" forKey:metadata.fileID];
                 NSArray *object = [[NSArray alloc] initWithObjects:session, metadata, findTask, nil];
-                [[NSNotificationCenter defaultCenter] postNotificationName:networkingSessionNotification object:object];
+                [[NSNotificationCenter defaultCenter] postNotificationName:k_networkingSessionNotification object:object];
             }
         }];
     }
@@ -2704,7 +2704,7 @@
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [app.listChangeTask setObject:@"cancelUpload" forKey:metadata.fileID];
                     NSArray *object = [[NSArray alloc] initWithObjects:session, metadata, findTask, nil];
-                    [[NSNotificationCenter defaultCenter] postNotificationName:networkingSessionNotification object:object];
+                    [[NSNotificationCenter defaultCenter] postNotificationName:k_networkingSessionNotification object:object];
                 });
             }
         }];
@@ -2747,7 +2747,7 @@
                 dispatch_async(dispatch_get_main_queue(), ^{
                     [app.listChangeTask setObject:@"stopUpload" forKey:metadata.fileID];
                     NSArray *object = [[NSArray alloc] initWithObjects:session, metadata, findTask, nil];
-                    [[NSNotificationCenter defaultCenter] postNotificationName:networkingSessionNotification object:object];
+                    [[NSNotificationCenter defaultCenter] postNotificationName:k_networkingSessionNotification object:object];
                 });
             }
         }];
@@ -2810,7 +2810,7 @@
 {
     [_hud hideHud];
     
-    [app messageNotification:@"_share_" description:message visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+    [app messageNotification:@"_share_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
 
     if (_shareOC)
         [_shareOC reloadData];
@@ -2907,7 +2907,7 @@
 {
     [_hud hideHud];
     
-    [app messageNotification:@"_error_" description:message visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+    [app messageNotification:@"_error_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
 }
 
 - (void)getUserAndGroup:(NSString *)find
@@ -3002,7 +3002,7 @@
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
     
     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];
+        [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorAddOffline selectorPost:nil session:k_download_session taskStatus:k_taskStatusResume delegate:self];
     
     if ([metadata.type isEqualToString: k_metadataType_model])
         [CCCoreData setOfflineLocalFileID:metadata.fileID offline:YES activeAccount:app.activeAccount];
@@ -3030,13 +3030,13 @@
     NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
 
     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];
+        [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorAddLocal selectorPost:nil session:k_download_session taskStatus:k_taskStatusResume delegate:self];
     
     if ([metadata.type isEqualToString: k_metadataType_model]) {
         
         [CCUtility copyFileAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileName] toPath:[NSString stringWithFormat:@"%@/%@", [CCUtility getDirectoryLocal], metadata.fileName]];
         
-        [app messageNotification:@"_add_local_" description:@"_file_saved_local_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
+        [app messageNotification:@"_add_local_" description:@"_file_saved_local_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
     }
     
     NSIndexPath *indexPath = [_sectionDataSource.fileIDIndexPath objectForKey:metadata.fileID];
@@ -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:k_taskStatusResume delegate:self];
+    [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorReload selectorPost:nil session:k_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:k_taskStatusResume delegate:self];
+    [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorOpenIn selectorPost:nil session:k_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];
@@ -3135,7 +3135,7 @@
     
     if ([app.netQueue operationCount] > 0 || [app.netQueueDownload operationCount] > 0 || [app.netQueueDownloadWWan operationCount] > 0 || [app.netQueueUpload operationCount] > 0 || [app.netQueueUploadWWan operationCount] > 0 || [CCCoreData countTableAutomaticUploadForAccount:app.activeAccount selector:nil] > 0) {
         
-        [app messageNotification:@"_transfers_in_queue_" description:nil visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
+        [app messageNotification:@"_transfers_in_queue_" description:nil visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
         return;
     }
     
@@ -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:k_taskStatusResume delegate:self];
+        [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorLoadCopy selectorPost:nil session:k_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:k_taskStatusResume delegate:self];
+            [[CCNetworking sharedNetworking] downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorLoadCopy selectorPost:nil session:k_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:k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
+                [[CCNetworking sharedNetworking] uploadFile:metadata.fileNamePrint serverUrl:_serverUrl cryptated:cryptated onlyPlist:NO session:k_upload_session taskStatus:k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
             }
         }
     }
@@ -4008,7 +4008,7 @@
                 
                 if ([CCCoreData setDirectoryUnLock:lockServerUrl activeAccount:app.activeAccount] == NO) {
                     
-                    [app messageNotification:@"_error_" description:@"_error_operation_canc_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+                    [app messageNotification:@"_error_" description:@"_error_operation_canc_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
                 }
                 
                 [self.tableView reloadData];
@@ -4076,7 +4076,7 @@
         
     } else {
         
-        [app messageNotification:@"_error_" description:@"_error_operation_canc_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+        [app messageNotification:@"_error_" description:@"_error_operation_canc_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
     }
 }
 
@@ -4583,7 +4583,7 @@
     
     if (lockDirectory && editingStyle == UITableViewCellEditingStyleDelete) {
         
-        [app messageNotification:@"_error_" description:@"_folder_blocked_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+        [app messageNotification:@"_error_" description:@"_folder_blocked_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
         
         return;
     }
@@ -5472,7 +5472,7 @@
         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:k_taskStatusResume delegate:self];
+        [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:NO downloadPlist:YES selector:selector selectorPost:nil session:k_download_session taskStatus:k_taskStatusResume delegate:self];
         
         return;
     }
@@ -5490,7 +5490,7 @@
             
         } else {
                 
-            [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorLoadFileView selectorPost:nil session:download_session taskStatus:k_taskStatusResume delegate:self];
+            [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorLoadFileView selectorPost:nil session:k_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];

iOSClient/Main/CCSection.m

@@ -111,14 +111,14 @@
         // how many download underway (only for groupSession)
         if ([metadata.session containsString:@"download"] && [groupByField isEqualToString:@"session"]) {
             counterSessionDownload++;
-            if (counterSessionDownload > MaxGroupBySessionDownloadDatasource)
+            if (counterSessionDownload > k_MaxGroupBySessionDownloadDatasource)
                 continue;
         }
 
         // how many upload underway (only for groupSession)
         if ([metadata.session containsString:@"upload"] && [groupByField isEqualToString:@"session"]) {
             counterSessionUpload++;
-            if (counterSessionUpload > MaxGroupBySessionUploadDatasource)
+            if (counterSessionUpload > k_MaxGroupBySessionUploadDatasource)
                 continue;
         }
         

iOSClient/Move/CCMove.m

@@ -306,7 +306,7 @@
                     metadataNet.downloadPlist = YES;
                     metadataNet.selector = selectorLoadPlist;
                     metadataNet.serverUrl = _serverUrl;
-                    metadataNet.session = download_session_foreground;
+                    metadataNet.session = k_download_session_foreground;
                     metadataNet.taskStatus = k_taskStatusResume;
                     
                     [self addNetworkingQueue:metadataNet];

iOSClient/Networking/CCNetworking.m

@@ -114,7 +114,7 @@
     
     if (sessionDownload == nil) {
         
-        NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:download_session];
+        NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:k_download_session];
         
         configuration.allowsCellularAccess = YES;
         configuration.sessionSendsLaunchEvents = YES;
@@ -123,7 +123,7 @@
         configuration.requestCachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
         
         sessionDownload = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil];
-        sessionDownload.sessionDescription = download_session;
+        sessionDownload.sessionDescription = k_download_session;
     }
     return sessionDownload;
 }
@@ -142,7 +142,7 @@
         configuration.requestCachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
     
         sessionDownloadForeground = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil];
-        sessionDownloadForeground.sessionDescription = download_session_foreground;
+        sessionDownloadForeground.sessionDescription = k_download_session_foreground;
     }
     return sessionDownloadForeground;
 }
@@ -153,7 +153,7 @@
     
     if (sessionWWanDownload == nil) {
         
-        NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:download_session_wwan];
+        NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:k_download_session_wwan];
         
         configuration.allowsCellularAccess = NO;
         configuration.sessionSendsLaunchEvents = YES;
@@ -162,7 +162,7 @@
         configuration.requestCachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
         
         sessionWWanDownload = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil];
-        sessionWWanDownload.sessionDescription = download_session_wwan;
+        sessionWWanDownload.sessionDescription = k_download_session_wwan;
     }
     return sessionWWanDownload;
 }
@@ -173,7 +173,7 @@
     
     if (sessionUpload == nil) {
         
-        NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:upload_session];
+        NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:k_upload_session];
         
         configuration.allowsCellularAccess = YES;
         configuration.sessionSendsLaunchEvents = YES;
@@ -182,7 +182,7 @@
         configuration.requestCachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
         
         sessionUpload = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil];
-        sessionUpload.sessionDescription = upload_session;
+        sessionUpload.sessionDescription = k_upload_session;
     }
     return sessionUpload;
 }
@@ -201,7 +201,7 @@
         configuration.requestCachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
         
         sessionUploadForeground = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil];
-        sessionUploadForeground.sessionDescription = upload_session_foreground;
+        sessionUploadForeground.sessionDescription = k_upload_session_foreground;
     }
     return sessionUploadForeground;
 }
@@ -212,7 +212,7 @@
     
     if (sessionWWanUpload == nil) {
         
-        NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:upload_session_wwan];
+        NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration backgroundSessionConfigurationWithIdentifier:k_upload_session_wwan];
         
         configuration.allowsCellularAccess = NO;
         configuration.sessionSendsLaunchEvents = YES;
@@ -221,7 +221,7 @@
         configuration.requestCachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
         
         sessionWWanUpload = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil];
-        sessionWWanUpload.sessionDescription = upload_session_wwan;
+        sessionWWanUpload.sessionDescription = k_upload_session_wwan;
     }
     return sessionWWanUpload;
 }
@@ -251,13 +251,13 @@
 
 - (NSURLSession *)getSessionfromSessionDescription:(NSString *)sessionDescription
 {
-    if ([sessionDescription isEqualToString:download_session]) return [self sessionDownload];
-    if ([sessionDescription isEqualToString:download_session_foreground]) return [self sessionDownloadForeground];
-    if ([sessionDescription isEqualToString:download_session_wwan]) return [self sessionWWanDownload];
+    if ([sessionDescription isEqualToString:k_download_session]) return [self sessionDownload];
+    if ([sessionDescription isEqualToString:k_download_session_foreground]) return [self sessionDownloadForeground];
+    if ([sessionDescription isEqualToString:k_download_session_wwan]) return [self sessionWWanDownload];
     
-    if ([sessionDescription isEqualToString:upload_session]) return [self sessionUpload];
-    if ([sessionDescription isEqualToString:upload_session_foreground]) return [self sessionUploadForeground];
-    if ([sessionDescription isEqualToString:upload_session_wwan]) return [self sessionWWanUpload];
+    if ([sessionDescription isEqualToString:k_upload_session]) return [self sessionUpload];
+    if ([sessionDescription isEqualToString:k_upload_session_foreground]) return [self sessionUploadForeground];
+    if ([sessionDescription isEqualToString:k_upload_session_wwan]) return [self sessionWWanUpload];
     
     return nil;
 }
@@ -436,7 +436,7 @@
         
             // Notification change session
             NSArray *object = [[NSArray alloc] initWithObjects:session, metadata, task, nil];
-            [[NSNotificationCenter defaultCenter] postNotificationName:networkingSessionNotification object:object];
+            [[NSNotificationCenter defaultCenter] postNotificationName:k_networkingSessionNotification object:object];
         
             [self downloadFileSuccessFailure:fileName fileID:metadata.fileID rev:rev date:date serverUrl:serverUrl selector:metadata.sessionSelector selectorPost:metadata.sessionSelectorPost errorCode:errorCode];
         });
@@ -461,7 +461,7 @@
             
             // Notification change session
             NSArray *object = [[NSArray alloc] initWithObjects:session, metadata, task, nil];
-            [[NSNotificationCenter defaultCenter] postNotificationName:networkingSessionNotification object:object];
+            [[NSNotificationCenter defaultCenter] postNotificationName:k_networkingSessionNotification object:object];
             
             [self uploadFileSuccessFailure:metadata fileName:fileName fileID:fileID rev:rev date:date serverUrl:serverUrl errorCode:errorCode];
         });
@@ -549,9 +549,9 @@
         [request setValue:authValue forHTTPHeaderField:@"Authorization"];
     }
     
-    if ([session isEqualToString:download_session]) sessionDownload = [self sessionDownload];
-    else if ([session isEqualToString:download_session_foreground]) sessionDownload = [self sessionDownloadForeground];
-    else if ([session isEqualToString:download_session_wwan]) sessionDownload = [self sessionWWanDownload];
+    if ([session isEqualToString:k_download_session]) sessionDownload = [self sessionDownload];
+    else if ([session isEqualToString:k_download_session_foreground]) sessionDownload = [self sessionDownloadForeground];
+    else if ([session isEqualToString:k_download_session_wwan]) sessionDownload = [self sessionWWanDownload];
     
     NSURLSessionDownloadTask *downloadTask = [sessionDownload downloadTaskWithRequest:request];
     
@@ -851,7 +851,7 @@
     CCMetadata *metadata = [CCUtility insertFileSystemInMetadata:fileName directory:_directoryUser activeAccount:_activeAccount cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
     
     //fileID
-    NSString *uploadID =  [uploadSessionID stringByAppendingString:[CCUtility createID]];
+    NSString *uploadID =  [k_uploadSessionID stringByAppendingString:[CCUtility createID]];
     
     //add delegate
     if (delegate)
@@ -1214,9 +1214,9 @@
         return;
     }
     
-    if ([session isEqualToString:upload_session]) sessionUpload = [self sessionUpload];
-    else if ([session isEqualToString:upload_session_foreground]) sessionUpload = [self sessionUploadForeground];
-    else if ([session isEqualToString:upload_session_wwan]) sessionUpload = [self sessionWWanUpload];
+    if ([session isEqualToString:k_upload_session]) sessionUpload = [self sessionUpload];
+    else if ([session isEqualToString:k_upload_session_foreground]) sessionUpload = [self sessionUploadForeground];
+    else if ([session isEqualToString:k_upload_session_wwan]) sessionUpload = [self sessionWWanUpload];
 
     NSURLSessionUploadTask *uploadTask = [sessionUpload uploadTaskWithRequest:request fromFile:[NSURL fileURLWithPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, fileNameForUpload]]];
     
@@ -1522,10 +1522,10 @@
         NSString *serverUrl = [CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account];
             
         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];
+            [self downloadFile:metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:metadata.sessionSelector selectorPost:nil session:k_download_session taskStatus: k_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];
+            [self downloadFile:metadata serverUrl:serverUrl downloadData:NO downloadPlist:YES selector:metadata.sessionSelector selectorPost:nil session:k_download_session taskStatus: k_taskStatusResume delegate:nil];
             
         [serversUrl addObject:serverUrl];
             
@@ -1592,7 +1592,7 @@
         // Notification change session
         dispatch_async(dispatch_get_main_queue(), ^{
             NSArray *object = [[NSArray alloc] initWithObjects:session, metadata, nil];
-            [[NSNotificationCenter defaultCenter] postNotificationName:networkingSessionNotification object:object];
+            [[NSNotificationCenter defaultCenter] postNotificationName:k_networkingSessionNotification object:object];
         });
     }
     

iOSClient/Networking/OCNetworking.m

@@ -312,7 +312,7 @@
         if ([items count] == 0) {
             
 #ifndef EXTENSION
-            [app messageNotification:@"Server error" description:@"Read Folder WebDAV : [items NULL] please fix" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+            [app messageNotification:@"Server error" description:@"Read Folder WebDAV : [items NULL] please fix" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
 #endif
 
             dispatch_async(dispatch_get_main_queue(), ^{
@@ -368,7 +368,7 @@
                 // ----- BUG #942 ---------
                 if ([itemDto.etag length] == 0) {
 #ifndef EXTENSION
-                    [app messageNotification:@"Server error" description:@"Metadata etag absent, record excluded, please fix" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+                    [app messageNotification:@"Server error" description:@"Metadata etag absent, record excluded, please fix" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
 #endif
                     continue;
                 }
@@ -669,7 +669,7 @@
         if ([items count] == 0) {
        
 #ifndef EXTENSION
-            [app messageNotification:@"Server error" description:@"Read File WebDAV : [items NULL] please fix" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+            [app messageNotification:@"Server error" description:@"Read File WebDAV : [items NULL] please fix" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
 #endif
         }
         
@@ -860,7 +860,7 @@
     } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
         
 #ifndef EXTENSION
-        [app messageNotification:@"_error_" description:[CCError manageErrorOC:response.statusCode error:error] visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+        [app messageNotification:@"_error_" description:[CCError manageErrorOC:response.statusCode error:error] visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
 #endif
         
         NSInteger errorCode = response.statusCode;
@@ -895,7 +895,7 @@
     } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
         
 #ifndef EXTENSION
-        [app messageNotification:@"_error_" description:[CCError manageErrorOC:response.statusCode error:error] visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+        [app messageNotification:@"_error_" description:[CCError manageErrorOC:response.statusCode error:error] visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
 #endif
         
         NSInteger errorCode = response.statusCode;

iOSClient/Notification/CCNotification.swift

@@ -198,7 +198,7 @@ class CCNotification: UITableViewController, OCNetworkingDelegate {
 
     func setNotificationServerFailure(_ metadataNet: CCMetadataNet!, message: String!, errorCode: Int) {
         
-        appDelegate.messageNotification("_error_", description: message, visible: true, delay: TimeInterval(dismissAfterSecond), type: TWMessageBarMessageType.error)
+        appDelegate.messageNotification("_error_", description: message, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error)
     }
     
     func setNotificationServerSuccess(_ metadataNet: CCMetadataNet!) {

iOSClient/Offline/CCOfflineFileFolder.m

@@ -437,7 +437,7 @@
             metadataNet.selector = selector;
             metadataNet.selectorPost = selectorPost;
             metadataNet.serverUrl = serverUrl;
-            metadataNet.session = download_session;
+            metadataNet.session = k_download_session;
             metadataNet.taskStatus = k_taskStatusResume;
 
             [app addNetworkingOperationQueue:app.netQueueDownload delegate:app.activeMain metadataNet:metadataNet];

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:k_taskStatusResume delegate:self.delegate];
+        [[CCNetworking sharedNetworking] downloadFile:_metadata serverUrl:serverUrl downloadData:YES downloadPlist:NO selector:selectorOpenIn selectorPost:nil session:k_download_session taskStatus:k_taskStatusResume delegate:self.delegate];
     }];
     
     return @[previewAction1];
@@ -97,7 +97,7 @@
 
 - (void)downloadThumbnailFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
 {    
-    [app messageNotification:@"_error_" description:message visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+    [app messageNotification:@"_error_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
     
     [self dismissViewControllerAnimated:YES completion:nil];
 }

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -389,7 +389,7 @@
 
 - (void)downloadFileFailure:(NSInteger)errorCode
 {
-    [app messageNotification:@"_download_selected_files_" description:@"_error_download_photobrowser_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+    [app messageNotification:@"_download_selected_files_" description:@"_error_download_photobrowser_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
 }
 
 - (void)downloadFileSuccess:(CCMetadata *)metadata
@@ -656,7 +656,7 @@
         if ([CCCoreData getLocalFileWithFileID:fileID activeAccount:app.activeAccount])
             [self cellSelect:YES indexPath:indexPath metadata:_metadata];
         else
-            [app messageNotification:@"_info_" description:@"_select_only_localfile_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
+            [app messageNotification:@"_info_" description:@"_select_only_localfile_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
         
     } else {
         
@@ -1070,7 +1070,7 @@
         
         // Full Upload ?
         if (assetsFull)
-            [app messageNotification:@"_error_" description:NSLocalizedStringFromTable(@"_not_possible_create_folder_", @"Error", nil) visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
+            [app messageNotification:@"_error_" description:NSLocalizedStringFromTable(@"_not_possible_create_folder_", @"Error", nil) visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
         
         // START new request : initStateCameraUpload
         _AutomaticCameraUploadInProgress = NO;
@@ -1133,7 +1133,7 @@
                 [self endLoadingAssets];
                 
                 if (assetsFull)
-                    [app messageNotification:@"_error_" description:@"_error_createsubfolders_upload_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
+                    [app messageNotification:@"_error_" description:@"_error_createsubfolders_upload_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
                 
                 return;
             }
@@ -1150,10 +1150,10 @@
         
         // Select type of session
         
-        if (assetMediaType == PHAssetMediaTypeImage && [CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount] == NO) session = upload_session;
-        if (assetMediaType == PHAssetMediaTypeVideo && [CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount] == NO) session = upload_session;
-        if (assetMediaType == PHAssetMediaTypeImage && [CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount]) session = upload_session_wwan;
-        if (assetMediaType == PHAssetMediaTypeVideo && [CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount]) session = upload_session_wwan;
+        if (assetMediaType == PHAssetMediaTypeImage && [CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount] == NO) session = k_upload_session;
+        if (assetMediaType == PHAssetMediaTypeVideo && [CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount] == NO) session = k_upload_session;
+        if (assetMediaType == PHAssetMediaTypeImage && [CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount]) session = k_upload_session_wwan;
+        if (assetMediaType == PHAssetMediaTypeVideo && [CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount]) session = k_upload_session_wwan;
 
         NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
         

iOSClient/QuickActions/CCQuickActions.m

@@ -139,9 +139,9 @@
         }];
     }
     
-    if (imageSize > MaxDimensionUpload || (picker.selectedAssets.count >= (k_pickerControllerMax - _numTaskUploadInProgress))) {
+    if (imageSize > k_MaxDimensionUpload || (picker.selectedAssets.count >= (k_pickerControllerMax - _numTaskUploadInProgress))) {
         
-        [app messageNotification:@"_info_" description:@"_limited_dimension_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
+        [app messageNotification:@"_info_" description:@"_limited_dimension_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
         
         return NO;
     }
@@ -171,7 +171,7 @@
 
 - (void)moveServerUrlTo:(NSString *)serverUrlTo title:(NSString *)title selectedMetadatas:(NSArray *)selectedMetadatas
 {    
-    [_mainVC uploadFileAsset:_assets serverUrl:serverUrlTo cryptated:_cryptated useSubFolder:NO session:upload_session];
+    [_mainVC uploadFileAsset:_assets serverUrl:serverUrlTo cryptated:_cryptated useSubFolder:NO session:k_upload_session];
 }
 
 - (void)moveOpenWindow:(NSArray *)indexPaths

iOSClient/Settings/CCManageAccount.m

@@ -270,7 +270,7 @@
 {
     if ([app.netQueue operationCount] > 0 || [app.netQueueDownload operationCount] > 0 || [app.netQueueDownloadWWan operationCount] > 0 || [app.netQueueUpload operationCount] > 0 || [app.netQueueUploadWWan operationCount] > 0 || [CCCoreData countTableAutomaticUploadForAccount:app.activeAccount selector:nil] > 0) {
         
-        [app messageNotification:@"_transfers_in_queue_" description:nil visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeInfo];
+        [app messageNotification:@"_transfers_in_queue_" description:nil visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeInfo];
         [self UpdateForm];
         return;
     }

iOSClient/Settings/CCSettings.m

@@ -587,17 +587,17 @@
     switch (result)
     {
         case MFMailComposeResultCancelled:
-            [app messageNotification:@"_info_" description:@"_mail_deleted_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
+            [app messageNotification:@"_info_" description:@"_mail_deleted_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
             break;
         case MFMailComposeResultSaved:
-            [app messageNotification:@"_info_" description:@"_mail_saved_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
+            [app messageNotification:@"_info_" description:@"_mail_saved_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
             break;
         case MFMailComposeResultSent:
-            [app messageNotification:@"_info_" description:@"_mail_sent_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
+            [app messageNotification:@"_info_" description:@"_mail_sent_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
             break;
         case MFMailComposeResultFailed: {
             NSString *msg = [NSString stringWithFormat:NSLocalizedString(@"_mail_failure_", nil), [error localizedDescription]];
-            [app messageNotification:@"_error_" description:msg visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
+            [app messageNotification:@"_error_" description:msg visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError];
         }
             break;
         default:

iOSClient/Templates/CCAccountWeb.m

@@ -189,7 +189,7 @@
         metadataNet.fileNamePrint = titolo.value;
         metadataNet.pathFolder = NSTemporaryDirectory();
         metadataNet.rev = self.rev;
-        metadataNet.session = upload_session_foreground;
+        metadataNet.session = k_upload_session_foreground;
         metadataNet.taskStatus = k_taskStatusResume;
         
         [app addNetworkingOperationQueue:app.netQueue delegate:self.delegate metadataNet:metadataNet];

iOSClient/Templates/CCBancomat.m

@@ -197,7 +197,7 @@
         metadataNet.fileNamePrint = titolo.value;
         metadataNet.pathFolder = NSTemporaryDirectory();
         metadataNet.rev = self.rev;
-        metadataNet.session = upload_session_foreground;
+        metadataNet.session = k_upload_session_foreground;
         metadataNet.taskStatus = k_taskStatusResume;
         
         // 2

iOSClient/Templates/CCCartaDiCredito.m

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

iOSClient/Templates/CCCartaIdentita.m

@@ -216,7 +216,7 @@
         metadataNet.fileNamePrint = titolo.value;
         metadataNet.pathFolder = NSTemporaryDirectory();
         metadataNet.rev = self.rev;
-        metadataNet.session = upload_session_foreground;
+        metadataNet.session = k_upload_session_foreground;
         metadataNet.taskStatus = k_taskStatusResume;
         
         [app addNetworkingOperationQueue:app.netQueue delegate:self.delegate metadataNet:metadataNet];

iOSClient/Templates/CCContoCorrente.m

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

iOSClient/Templates/CCNote.m

@@ -153,7 +153,7 @@
             metadataNet.fileNamePrint = _titolo;
             metadataNet.pathFolder = NSTemporaryDirectory();
             metadataNet.rev = self.rev;
-            metadataNet.session = upload_session_foreground;
+            metadataNet.session = k_upload_session_foreground;
             metadataNet.taskStatus = k_taskStatusResume;
             
             // 2

iOSClient/Templates/CCPassaporto.m

@@ -216,7 +216,7 @@
         metadataNet.fileNamePrint = titolo.value;
         metadataNet.pathFolder = NSTemporaryDirectory();
         metadataNet.rev = self.rev;
-        metadataNet.session = upload_session_foreground;
+        metadataNet.session = k_upload_session_foreground;
         metadataNet.taskStatus = k_taskStatusResume;
         
         [app addNetworkingOperationQueue:app.netQueue delegate:self.delegate metadataNet:metadataNet];

iOSClient/Templates/CCPatenteGuida.m

@@ -209,7 +209,7 @@
         metadataNet.fileNamePrint = titolo.value;
         metadataNet.pathFolder = NSTemporaryDirectory();
         metadataNet.rev = self.rev;
-        metadataNet.session = upload_session_foreground;
+        metadataNet.session = k_upload_session_foreground;
         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: k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
+    [[CCNetworking sharedNetworking] uploadFile:app.fileNameUpload serverUrl:serverUrlLocal cryptated:YES onlyPlist:NO session:k_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: k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
+    [[CCNetworking sharedNetworking] uploadFile:app.fileNameUpload serverUrl:serverUrlLocal cryptated:NO onlyPlist:NO session:k_upload_session taskStatus: k_taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
     
     [self dismissViewControllerAnimated:YES completion:nil];
 }