#407

iOSClient/Create/CCCreateCloud.swift

@@ -405,7 +405,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
             if valueRenameTrimming.count > 0 {
                 
                 self.form.delegate = nil
-                CCUtility.setFileNameMask(valueRenameTrimming, key: k_keyFileNameMask)
+                CCUtility.setFileNameMask(valueRename, key: k_keyFileNameMask)
                 self.form.delegate = self
                 
                 returnString = CCUtility.createFileName(asset.value(forKey: "filename"), fileDate: asset.creationDate, fileType: asset.mediaType, keyFileName: k_keyFileNameMask, keyFileNameType: k_keyFileNameType)

iOSClient/Settings/NCManageAutoUploadFileName.swift

@@ -195,7 +195,7 @@ class NCManageAutoUploadFileName: XLFormViewController {
             if valueRenameTrimming.count > 0 {
                 
                 self.form.delegate = nil
-                CCUtility.setFileNameMask(valueRenameTrimming, key: k_keyFileNameAutoUploadMask)
+                CCUtility.setFileNameMask(valueRename, key: k_keyFileNameAutoUploadMask)
                 self.form.delegate = self
                 
                 returnString = CCUtility.createFileName("IMG_0001.JPG", fileDate: dateExample, fileType: PHAssetMediaType.image, keyFileName: k_keyFileNameAutoUploadMask, keyFileNameType: k_keyFileNameAutoUploadType)

iOSClient/Utility/CCUtility.m

@@ -689,10 +689,12 @@
             fileName = [fileName stringByReplacingOccurrencesOfString:@"ampm" withString:ampm];
 
             if (addFileNameType)
-                fileName = [NSString stringWithFormat:@"%@ %@%@.%@", fileNameType, fileName, numberFileName, fileNameExt];
+                fileName = [NSString stringWithFormat:@"%@%@%@.%@", fileNameType, fileName, numberFileName, fileNameExt];
             else
                 fileName = [NSString stringWithFormat:@"%@%@.%@", fileName, numberFileName, fileNameExt];
             
+            fileName = [fileName stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+            
         } else {
             
             if (addFileNameType)