Marino Faggiana 1 năm trước cách đây
mục cha
commit
8db54c5004

+ 1 - 1
iOSClient/Extensions/UIAlertController+Extension.swift

@@ -74,7 +74,7 @@ extension UIAlertController {
             object: alertController.textFields?.first,
             queue: .main) { _ in
                 guard let text = alertController.textFields?.first?.text else { return }
-                let folderName = NCUtility.shared.removeForbiddenCharactersServer(text).trimmingCharacters(in: .whitespaces)
+                let folderName = NCUtility.shared.removeForbiddenCharacters(text).trimmingCharacters(in: .whitespaces)
                 okAction.isEnabled = !folderName.isEmpty && folderName != "." && folderName != ".."
             }
 

+ 1 - 1
iOSClient/Main/Create cloud/NCCreateFormUploadVoiceNote.swift

@@ -168,7 +168,7 @@ class NCCreateFormUploadVoiceNote: XLFormViewController, NCSelectDelegate, AVAud
             self.form.delegate = nil
 
             if let fileNameNew = formRow.value as? String {
-                self.fileName = NCUtility.shared.removeForbiddenCharactersServer(fileNameNew)
+                self.fileName = NCUtility.shared.removeForbiddenCharacters(fileNameNew)
             }
 
             formRow.value = self.fileName

+ 1 - 1
iOSClient/Networking/E2EE/NCNetworkingE2EECreateFolder.swift

@@ -32,7 +32,7 @@ class NCNetworkingE2EECreateFolder: NSObject {
 
         let fileNameIdentifier = NCNetworkingE2EE.shared.generateRandomIdentifier()
         let serverUrlFileName = serverUrl + "/" + fileNameIdentifier
-        let fileNameFolder = NCUtilityFileSystem.shared.createFileName(NCUtility.shared.removeForbiddenCharactersServer(fileName), serverUrl: serverUrl, account: account)
+        let fileNameFolder = NCUtilityFileSystem.shared.createFileName(NCUtility.shared.removeForbiddenCharacters(fileName), serverUrl: serverUrl, account: account)
         if fileNameFolder.isEmpty {
             return NKError(errorCode: NCGlobal.shared.errorUnexpectedResponseFromDB, errorDescription: NSLocalizedString("_e2e_error_", comment: ""))
         }

+ 2 - 2
iOSClient/Networking/NCNetworking.swift

@@ -1197,7 +1197,7 @@ class NCNetworking: NSObject, NKCommonDelegate {
 
     private func createFolderPlain(fileName: String, serverUrl: String, account: String, urlBase: String, overwrite: Bool, withPush: Bool, completion: @escaping (_ error: NKError) -> Void) {
 
-        var fileNameFolder = NCUtility.shared.removeForbiddenCharactersServer(fileName)
+        var fileNameFolder = NCUtility.shared.removeForbiddenCharacters(fileName)
 
         if !overwrite {
             fileNameFolder = NCUtilityFileSystem.shared.createFileName(fileNameFolder, serverUrl: serverUrl, account: account)
@@ -1490,7 +1490,7 @@ class NCNetworking: NSObject, NKCommonDelegate {
         if !metadata.permissions.isEmpty && !permission {
             return completion(NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_no_permission_modify_file_"))
         }
-        let fileNameNew = NCUtility.shared.removeForbiddenCharactersServer(fileNameNew)
+        let fileNameNew = NCUtility.shared.removeForbiddenCharacters(fileNameNew)
         if fileNameNew.isEmpty || fileNameNew == metadata.fileNameView {
             return completion(NKError())
         }

+ 1 - 1
iOSClient/Settings/NCManageAutoUploadFileName.swift

@@ -156,7 +156,7 @@ class NCManageAutoUploadFileName: XLFormViewController {
             self.form.delegate = nil
 
             if let fileName = fileName {
-                formRow.value = NCUtility.shared.removeForbiddenCharactersServer(fileName)
+                formRow.value = NCUtility.shared.removeForbiddenCharacters(fileName)
             }
 
             self.form.delegate = self

+ 1 - 1
iOSClient/Utility/NCUtility.swift

@@ -696,7 +696,7 @@ class NCUtility: NSObject {
         return (usedmegabytes, totalmegabytes)
     }
 
-    func removeForbiddenCharactersServer(_ fileName: String) -> String {
+    func removeForbiddenCharacters(_ fileName: String) -> String {
 
         var fileName = fileName
         let arrayForbiddenCharacters = ["/"]