new Rename file View

iOSClient/Main/Rename file/NCRenameFile.storyboard

@@ -17,7 +17,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="t26-3S-4T4">
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="t26-3S-4T4">
                                 <rect key="frame" x="132" y="138" width="150" height="150"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="150" id="PaU-P7-coi"/>

iOSClient/Main/Rename file/NCRenameFile.swift

@@ -24,13 +24,16 @@ class NCRenameFile: UIViewController {
         super.viewDidLoad()
         
         if let metadata = self.metadata {
-            
-            fileNameWithoutExt.text = metadata.fileNameWithoutExt
-            ext.text = metadata.ext
-            
+                        
             if metadata.directory {
+                
                 previewFile.image = NCCollectionCommon.images.cellFolderImage
+                
+                fileNameWithoutExt.text = metadata.fileName
+                ext.isHidden = true
+                
             } else {
+                
                 if FileManager().fileExists(atPath: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag)) {
                     previewFile.image =  UIImage(contentsOfFile: CCUtility.getDirectoryProviderStorageIconOcId(metadata.ocId, etag: metadata.etag))
                 } else {
@@ -40,9 +43,12 @@ class NCRenameFile: UIViewController {
                         previewFile.image = NCCollectionCommon.images.cellFileImage
                     }
                 }
+                
+                fileNameWithoutExt.text = metadata.fileNameWithoutExt
+                ext.text = metadata.ext
             }
         }
-        
+                
         title = NSLocalizedString("_rename_file_", comment: "")
         
         navigationItem.leftBarButtonItem = UIBarButtonItem(title: NSLocalizedString("_cancel_", comment: ""), style: UIBarButtonItem.Style.plain, target: self, action: #selector(cancel))
@@ -69,6 +75,7 @@ class NCRenameFile: UIViewController {
         guard let metadata = metadata else { return }
         var newFileNameWithoutExt = ""
         var newExt = ""
+        var fileNameNew = ""
         
         if fileNameWithoutExt.text == nil || fileNameWithoutExt.text?.count == 0 {
             self.fileNameWithoutExt.text = metadata.fileNameWithoutExt
@@ -77,15 +84,26 @@ class NCRenameFile: UIViewController {
             newFileNameWithoutExt = fileNameWithoutExt.text!
         }
         
-        if ext.text == nil || ext.text?.count == 0 {
-            self.ext.text = metadata.ext
-            return
+        if metadata.directory {
+            
+            fileNameNew = newFileNameWithoutExt
+            
         } else {
-            newExt = ext.text!
+            
+            if ext.text == nil || ext.text?.count == 0 {
+                self.ext.text = metadata.ext
+                return
+            } else {
+                newExt = ext.text!
+            }
+            
+            if newExt != metadata.ext {
+                
+            }
+            
+            fileNameNew = newFileNameWithoutExt + "." + newExt
         }
         
-        let fileNameNew = newFileNameWithoutExt + "." + newExt
-        
         NCNetworking.shared.renameMetadata(metadata, fileNameNew: fileNameNew, urlBase: metadata.urlBase, viewController: self) { (errorCode, errorDescription) in
             if errorCode == 0 {
                 self.dismiss(animated: true)