Merge branch 'master' of https://github.com/nextcloud/ios

Author: mpivchev

iOSClient/Utility/FileAutoRenamer+Extensions.swift

@@ -8,7 +8,7 @@ import NextcloudKit
 
 extension FileAutoRenamer {
     static func rename(_ filename: String, isFolderPath: Bool = false, capabilities: NKCapabilities.Capabilities) -> String {
-        let autoRenamer = FileAutoRenamer(forbiddenFileNameCharacters: capabilities.forbiddenFileNameCharacters, forbiddenFileNameExtensions: capabilities.forbiddenFileNameExtensions)
+        let autoRenamer = FileAutoRenamer(capabilities: capabilities)
         return autoRenamer.rename(filename: filename, isFolderPath: isFolderPath)
     }
 }

iOSClient/Utility/FileNameValidator+Extensions.swift

@@ -8,12 +8,12 @@ import NextcloudKit
 
 extension FileNameValidator {
     static func checkFileName(_ filename: String, account: String?, capabilities: NKCapabilities.Capabilities) -> NKError? {
-        let fileNameValidator = FileNameValidator(forbiddenFileNames: capabilities.forbiddenFileNames, forbiddenFileNameBasenames: capabilities.forbiddenFileNameBasenames, forbiddenFileNameCharacters: capabilities.forbiddenFileNameCharacters, forbiddenFileNameExtensions: capabilities.forbiddenFileNameExtensions)
+        let fileNameValidator = FileNameValidator(capabilities: capabilities)
         return fileNameValidator.checkFileName(filename)
     }
 
     static func checkFolderPath(_ folderPath: String, account: String?, capabilities: NKCapabilities.Capabilities) -> Bool {
-        let fileNameValidator = FileNameValidator(forbiddenFileNames: capabilities.forbiddenFileNames, forbiddenFileNameBasenames: capabilities.forbiddenFileNameBasenames, forbiddenFileNameCharacters: capabilities.forbiddenFileNameCharacters, forbiddenFileNameExtensions: capabilities.forbiddenFileNameExtensions)
+        let fileNameValidator = FileNameValidator(capabilities: capabilities)
         return fileNameValidator.checkFolderPath(folderPath)
     }
 }