Merge pull request #16928 from nextcloud/fix/filename-text-watcher-existing-file-names-provider-npe

fix(filename text watcher): existing file names provider npe

Author: alperozturk96

app/src/main/java/com/nextcloud/utils/fileNameValidator/FileNameTextWatcher.kt

@@ -17,15 +17,12 @@ import com.nextcloud.utils.fileNameValidator.FileNameValidator.isFileHidden
 import com.owncloud.android.R
 import com.owncloud.android.lib.resources.status.OCCapability
 
-/**
- * A TextWatcher which wraps around [FileNameValidator]
- */
 @Suppress("LongParameterList")
 class FileNameTextWatcher(
     private val previousFileName: String?,
     private val context: Context,
     private val capabilitiesProvider: () -> OCCapability,
-    private val existingFileNamesProvider: () -> Set<String>?,
+    private val existingFileNamesProvider: () -> Set<String>,
     private val onValidationError: Consumer<String>,
     private val onValidationWarning: Consumer<String>,
     private val onValidationSuccess: Runnable

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

@@ -38,16 +38,14 @@ object FileNameValidator {
         filename: String,
         capability: OCCapability,
         context: Context,
-        existingFileNames: Set<String>? = null
+        existingFileNames: Set<String> = setOf()
     ): String? {
         if (filename.isBlank()) {
             return context.getString(R.string.filename_empty)
         }
 
-        existingFileNames?.let {
-            if (isFileNameAlreadyExist(filename, existingFileNames)) {
-                return context.getString(R.string.file_already_exists)
-            }
+        if (isFileNameAlreadyExist(filename, existingFileNames)) {
+            return context.getString(R.string.file_already_exists)
         }
 
         if (!capability.checkWCFRestrictions()) {

app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -99,6 +99,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.Stack;
@@ -909,7 +910,9 @@ private FileNameTextWatcher getFileNameTextWatcher(OCCapability capability, Stri
             fileName,
             this,
             () -> capability,
-            () -> receiveExternalFilesAdapter.getFileNames(),
+            () -> receiveExternalFilesAdapter != null
+                ? receiveExternalFilesAdapter.getFileNames()
+                : Collections.emptySet(),
             validationError -> {
                 binding.userInputContainer.setError(validationError);
                 binding.uploaderChooseFolder.setEnabled(false);

app/src/main/java/com/owncloud/android/ui/dialog/ChooseRichDocumentsTemplateDialogFragment.kt

@@ -251,7 +251,7 @@ class ChooseRichDocumentsTemplateDialogFragment :
             name,
             fileDataStorageManager.getCapability(currentAccount.user),
             requireContext(),
-            fileNames
+            fileNames ?: setOf()
         )
 
         if (selectedTemplate == null) {
@@ -301,7 +301,7 @@ class ChooseRichDocumentsTemplateDialogFragment :
             name,
             fileDataStorageManager.getCapability(currentAccount.user),
             requireContext(),
-            fileNames
+            fileNames ?: setOf()
         )
         val isExtension = (
             selectedTemplate == null ||

app/src/main/java/com/owncloud/android/ui/dialog/RenameFileDialogFragment.kt

@@ -100,7 +100,7 @@ class RenameFileDialogFragment :
                 previousFileName = mTargetFile?.fileName,
                 context = binding.userInputContainer.context,
                 capabilitiesProvider = { oCCapability },
-                existingFileNamesProvider = { fileNames },
+                existingFileNamesProvider = { fileNames ?: setOf() },
                 onValidationError = { validationError: String ->
                     binding.userInputContainer.error = validationError
                     positiveButton?.isEnabled = false
@@ -162,7 +162,7 @@ class RenameFileDialogFragment :
                 newFileName = binding.userInput.text.toString()
             }
 
-            val errorMessage = checkFileName(newFileName, oCCapability, requireContext(), null)
+            val errorMessage = checkFileName(newFileName, oCCapability, requireContext())
             if (errorMessage != null) {
                 DisplayUtils.showSnackMessage(requireActivity(), errorMessage)
                 return