change function fileNameMask

iOSClient/CCGlobal.h

@@ -303,6 +303,10 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define TabBarApplicationIndexPhotos    3
 #define TabBarApplicationIndexSettings  4
 
+#define keyFileNameMask                 @"fileNameMask"
+#define keyFileNameMaskAutomaticPhotos  @"fileNameMaskAutomaticPhotos"
+
+
 @interface CCAspect : NSObject
 
 + (void)aspectNavigationControllerBar:(UINavigationBar *)nav hidden:(BOOL)hidden;

iOSClient/Create/CCCreateCloud.swift

@@ -286,7 +286,7 @@ class CreateFormUpload: XLFormViewController, CCMoveDelegate {
         
         row = XLFormRowDescriptor(tag: "maskFileName", rowType: XLFormRowDescriptorTypeName, title: NSLocalizedString("_filename_", comment: ""))
         
-        let fileNameMask : String = CCUtility.getFileNameMask()
+        let fileNameMask : String = CCUtility.getFileNameMask(keyFileNameMask)
         if fileNameMask.characters.count > 0 {
             row.value = fileNameMask
         }
@@ -389,6 +389,7 @@ class CreateFormUpload: XLFormViewController, CCMoveDelegate {
         let maskFileName : XLFormRowDescriptor = self.form.formRow(withTag: "maskFileName")!
         let previewFileName : XLFormRowDescriptor  = self.form.formRow(withTag: "previewFileName")!
         previewFileName.value = self.previewFileName(valueRename: maskFileName.value as? String)
+        previewFileName.cellConfig.setObject(UIColor.clear, forKey: "backgroundColor" as NSCopying)
         
         self.tableView.reloadData()
         self.form.delegate = self
@@ -405,16 +406,16 @@ class CreateFormUpload: XLFormViewController, CCMoveDelegate {
             if valueRenameTrimming.characters.count > 0 {
                 
                 self.form.delegate = nil
-                CCUtility.setFileNameMask(valueRenameTrimming)
+                CCUtility.setFileNameMask(valueRenameTrimming, key: keyFileNameMask)
                 self.form.delegate = self
                 
-                returnString = CCUtility.createFileName(from: assets[0] as! PHAsset, withMask: true)
+                returnString = CCUtility.createFileName(from: assets[0] as! PHAsset, key: keyFileNameMask)
             }
             
         } else {
             
-            CCUtility.setFileNameMask("")
-            returnString = CCUtility.createFileName(from: assets[0] as! PHAsset, withMask: false)
+            CCUtility.setFileNameMask("", key: keyFileNameMask)
+            returnString = CCUtility.createFileName(from: assets[0] as! PHAsset, key: nil)
         }
         
         return returnString

iOSClient/Main/CCMain.m

@@ -1463,7 +1463,7 @@
     
     for (PHAsset *asset in assets) {
         
-        NSString *fileName = [CCUtility createFileNameFromAsset:asset withMask:true];
+        NSString *fileName = [CCUtility createFileNameFromAsset:asset key: keyFileNameMask];
         
         NSDate *assetDate = asset.creationDate;
         NSDateFormatter *formatter = [[NSDateFormatter alloc] init];

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -1193,7 +1193,7 @@
         NSDate *assetDate = asset.creationDate;
         PHAssetMediaType assetMediaType = asset.mediaType;
         NSString *session;
-        NSString *fileName = [CCUtility createFileNameFromAsset:asset withMask:false];
+        NSString *fileName = [CCUtility createFileNameFromAsset:asset key:nil];
         
         // Select type of session
         

iOSClient/Utility/CCUtility.h

@@ -80,7 +80,7 @@
 
 + (void)setDirectoryOnTop:(BOOL)directoryOnTop;
 
-+ (void)setFileNameMask:(NSString *)fileNameMask;
++ (void)setFileNameMask:(NSString *)mask key:(NSString *)key;
 
 + (void)setCreateMenuEncrypted:(BOOL)encrypted;
 
@@ -119,7 +119,7 @@
 
 + (BOOL)getDirectoryOnTop;
 
-+ (NSString *)getFileNameMask;
++ (NSString *)getFileNameMask:(NSString *)key;
 
 + (BOOL)getCreateMenuEncrypted;
 
@@ -134,7 +134,7 @@
 + (NSString *)stringAppendServerUrl:(NSString *)serverUrl addServerUrl:(NSString *)addServerUrl;
 
 + (NSString *)createID;
-+ (NSString *)createFileNameFromAsset:(PHAsset *)asset withMask:(BOOL)withMask;
++ (NSString *)createFileNameFromAsset:(PHAsset *)asset key:(NSString *)key;
 
 + (NSString *)getHomeServerUrlActiveUrl:(NSString *)activeUrl typeCloud:(NSString *)typeCloud;
 + (NSString *)getDirectoryActiveUser:(NSString *)activeUser activeUrl:(NSString *)activeUrl;

iOSClient/Utility/CCUtility.m

@@ -190,9 +190,9 @@
     [UICKeyChainStore setString:sDirectoryOnTop forKey:@"directoryOnTop" service:serviceShareKeyChain];
 }
 
-+ (void)setFileNameMask:(NSString *)fileNameMask
++ (void)setFileNameMask:(NSString *)mask key:(NSString *)key
 {
-    [UICKeyChainStore setString:fileNameMask forKey:@"fileNameMask" service:serviceShareKeyChain];
+    [UICKeyChainStore setString:mask forKey:key service:serviceShareKeyChain];
 }
 
 + (void)setCreateMenuEncrypted:(BOOL)encrypted
@@ -367,9 +367,9 @@
     return [[UICKeyChainStore stringForKey:@"directoryOnTop" service:serviceShareKeyChain] boolValue];
 }
 
-+ (NSString *)getFileNameMask
++ (NSString *)getFileNameMask:(NSString *)key
 {
-    NSString *mask = [UICKeyChainStore stringForKey:@"fileNameMask" service:serviceShareKeyChain];
+    NSString *mask = [UICKeyChainStore stringForKey:key service:serviceShareKeyChain];
     
     if (mask == nil)
         mask = @"";
@@ -477,7 +477,7 @@
     return [NSString stringWithFormat:@"%@", randomString];
 }
 
-+ (NSString *)createFileNameFromAsset:(PHAsset *)asset withMask:(BOOL)withMask
++ (NSString *)createFileNameFromAsset:(PHAsset *)asset key:(NSString *)key
 {
     NSDate *assetDate = asset.creationDate;
     NSString *fileName;
@@ -494,8 +494,8 @@
     
     NSString *fileNameExt = [[assetFileName pathExtension] lowercaseString];
     
-    if (withMask) {
-        fileName = [CCUtility getFileNameMask];
+    if (key) {
+        fileName = [CCUtility getFileNameMask:key];
         if ([fileName length] > 0)
             fileName = [NSString stringWithFormat:@"%@-%@.%@", fileName, numberFileName, fileNameExt];
         else

iOSClient/en.lproj/Localizable.strings

@@ -480,7 +480,7 @@
 "_use_folder_photos_"               = "Use the folder Photos as destination";
 "_rename_filename_"                 = "Rename file name";
 "_filename_"                        = "File name";
-"_preview_filename_"                = "Preview File name";
+"_preview_filename_"                = "Example preview file name";
 
 // -----------------------------------------------------------------------------------------------------------