coding

iOSClient/Extensions/UIAlertController+Extension.swift

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

iOSClient/Main/Create cloud/NCCreateFormUploadVoiceNote.swift

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

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(CCUtility.removeForbiddenCharactersServer(fileName)!, serverUrl: serverUrl, account: account)
+        let fileNameFolder = NCUtilityFileSystem.shared.createFileName(NCUtility.shared.removeForbiddenCharactersServer(fileName), serverUrl: serverUrl, account: account)
         if fileNameFolder.isEmpty {
             return NKError(errorCode: NCGlobal.shared.errorUnexpectedResponseFromDB, errorDescription: NSLocalizedString("_e2e_error_", comment: ""))
         }

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 = CCUtility.removeForbiddenCharactersServer(fileName)!
+        var fileNameFolder = NCUtility.shared.removeForbiddenCharactersServer(fileName)
 
         if !overwrite {
             fileNameFolder = NCUtilityFileSystem.shared.createFileName(fileNameFolder, serverUrl: serverUrl, account: account)
@@ -1490,9 +1490,7 @@ class NCNetworking: NSObject, NKCommonDelegate {
         if !metadata.permissions.isEmpty && !permission {
             return completion(NKError(errorCode: NCGlobal.shared.errorInternalError, errorDescription: "_no_permission_modify_file_"))
         }
-        guard let fileNameNew = CCUtility.removeForbiddenCharactersServer(fileNameNew) else {
-            return completion(NKError())
-        }
+        let fileNameNew = NCUtility.shared.removeForbiddenCharactersServer(fileNameNew)
         if fileNameNew.isEmpty || fileNameNew == metadata.fileNameView {
             return completion(NKError())
         }

iOSClient/Settings/NCManageAutoUploadFileName.swift

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

iOSClient/Utility/CCUtility.h

@@ -35,18 +35,12 @@
 @interface CCUtility : NSObject
 
 + (NSString *)dateDiff:(NSDate *)convertedDate;
-
-+ (NSString *)removeForbiddenCharactersServer:(NSString *)fileName;
-
 + (NSString *)stringAppendServerUrl:(NSString *)serverUrl addFileName:(NSString *)addFileName;
-
 + (NSString *)createFileNameDate:(NSString *)fileName extension:(NSString *)extension;
 + (NSString *)createFileName:(NSString *)fileName fileDate:(NSDate *)fileDate fileType:(PHAssetMediaType)fileType keyFileName:(NSString *)keyFileName keyFileNameType:(NSString *)keyFileNameType keyFileNameOriginal:(NSString *)keyFileNameOriginal forcedNewFileName:(BOOL)forcedNewFileName;
-
 + (NSString *)getTitleSectionDate:(NSDate *)date;
 + (NSString *)returnPathfromServerUrl:(NSString *)serverUrl urlBase:(NSString *)urlBase userId:(NSString *)userId account:(NSString *)account;
 + (NSString *)returnFileNamePathFromFileName:(NSString *)metadataFileName serverUrl:(NSString *)serverUrl urlBase:(NSString *)urlBase userId:(NSString *)userId account:(NSString *)account;
-
 + (NSString *)getMimeType:(NSString *)fileNameView;
 
 // ===== Share Permissions =====

iOSClient/Utility/CCUtility.m

@@ -71,18 +71,6 @@
     }
 }
 
-// Remove do not forbidden characters for Nextcloud Server
-+ (NSString *)removeForbiddenCharactersServer:(NSString *)fileName
-{
-    NSArray *arrayForbiddenCharacters = [NSArray arrayWithObjects:@"/", nil];
-
-    for (NSString *currentCharacter in arrayForbiddenCharacters) {
-        fileName = [fileName stringByReplacingOccurrencesOfString:currentCharacter withString:@""];
-    }
-
-    return fileName;
-}
-
 + (NSString*)stringAppendServerUrl:(NSString *)serverUrl addFileName:(NSString *)addFileName
 {
     NSString *result;

iOSClient/Utility/NCUtility.swift

@@ -859,4 +859,16 @@ class NCUtility: NSObject {
             }
         }
     }
+
+    func removeForbiddenCharactersServer(_ fileName: String) -> String {
+
+        var fileName = fileName
+        let arrayForbiddenCharacters = ["/"];
+
+        for character in arrayForbiddenCharacters {
+            fileName = fileName.replacingOccurrences(of: character, with: "")
+        }
+        return fileName
+    }
+
 }