clear code

iOSClient/Create/CCCreateCloud.swift

@@ -189,10 +189,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         section.addFormRow(row)
         
         // Section: Preview File Name
-        
-        //section = XLFormSectionDescriptor.formSection()
-        //form.addFormSection(section)
-        
+                
         row = XLFormRowDescriptor(tag: "previewFileName", rowType: XLFormRowDescriptorTypeTextView, title: "")
         row.height = 180
         row.cellConfig.setObject(NCBrandColor.sharedInstance.backgroundView, forKey: "backgroundColor" as NSCopying)
@@ -398,12 +395,13 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
     func previewFileName(valueRename : String?) -> String {
         
         var returnString: String = ""
-        var originalFileName: String = ""
         let asset = assets[0] as! PHAsset
         
-        let resources = PHAssetResource.assetResources(for: asset)
-        if let resource = resources.first {
-            originalFileName = resource.originalFilename
+        if CCUtility.getOriginalFileName() {
+            let resources = PHAssetResource.assetResources(for: asset)
+            if let resource = resources.first {
+                return resource.originalFilename
+            }
         }
         
         if let valueRename = valueRename {

iOSClient/Utility/CCUtility.h

@@ -111,6 +111,9 @@
 + (BOOL)getDirectoryOnTop;
 + (void)setDirectoryOnTop:(BOOL)directoryOnTop;
 
++ (BOOL)getOriginalFileName;
++ (void)setOriginalFileName:(BOOL)value;
+
 + (NSString *)getFileNameMask:(NSString *)key;
 + (void)setFileNameMask:(NSString *)mask key:(NSString *)key;
 

iOSClient/Utility/CCUtility.m

@@ -373,6 +373,17 @@
     [UICKeyChainStore setString:sDirectoryOnTop forKey:@"directoryOnTop" service:k_serviceShareKeyChain];
 }
 
++ (BOOL)getOriginalFileName
+{
+    return [[UICKeyChainStore stringForKey:@"originalFileName" service:k_serviceShareKeyChain] boolValue];
+}
+
++ (void)setOriginalFileName:(BOOL)value
+{
+    NSString *sValue = (value) ? @"true" : @"false";
+    [UICKeyChainStore setString:sValue forKey:@"originalFileName" service:k_serviceShareKeyChain];
+}
+
 + (NSString *)getFileNameMask:(NSString *)key
 {
     NSString *mask = [UICKeyChainStore stringForKey:key service:k_serviceShareKeyChain];