Browse Source

Remove unnecessary check for move or copy

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 10 months ago
parent
commit
e197d8733a

+ 1 - 1
app/src/main/java/com/nextcloud/utils/fileNameValidator/FileNameValidator.kt

@@ -116,7 +116,7 @@ object FileNameValidator {
         return checkFolderPath(folderPath, capability, context) && checkFilePaths(filePaths, capability, context)
     }
 
-    fun checkFilePaths(filePaths: List<String>, capability: OCCapability, context: Context): Boolean {
+    private fun checkFilePaths(filePaths: List<String>, capability: OCCapability, context: Context): Boolean {
         return filePaths.all { checkFileName(it, capability, context) == null }
     }
 

+ 0 - 18
app/src/main/java/com/owncloud/android/ui/activity/FolderPickerActivity.kt

@@ -455,18 +455,6 @@ open class FolderPickerActivity :
         }
 
         targetFilePaths?.let { filePaths ->
-            if (!isFolderAndFilePathsValid(filePaths)) {
-                DisplayUtils.showSnackMessage(
-                    this,
-                    R.string.file_name_validator_error_contains_reserved_names_or_invalid_characters
-                )
-                Handler(Looper.getMainLooper()).postDelayed({
-                    setResult(RESULT_CANCELED, resultData)
-                    finish()
-                }, 1000L)
-                return
-            }
-
             action?.let { action ->
                 fileOperationsHelper.moveOrCopyFiles(action, filePaths, file)
             }
@@ -478,12 +466,6 @@ open class FolderPickerActivity :
         finish()
     }
 
-    private fun isFolderAndFilePathsValid(filePaths: List<String>): Boolean {
-        val isFolderPathValid = FileNameValidator.checkFolderPath(file.remotePath, capabilities, this)
-        val isFilePathsValid = FileNameValidator.checkFilePaths(filePaths, capabilities, this)
-        return isFilePathsValid && isFolderPathValid
-    }
-
     override fun onRemoteOperationFinish(operation: RemoteOperation<*>?, result: RemoteOperationResult<*>) {
         super.onRemoteOperationFinish(operation, result)
         if (operation is CreateFolderOperation) {