FileNameTextWatcher: More descriptive parameter and variable names

Addressing the review comments on the PR

Signed-off-by: Philipp Hasper <vcs@hasper.info>

Author: PhilLab

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

@@ -24,35 +24,45 @@ import com.owncloud.android.lib.resources.status.OCCapability
 class FileNameTextWatcher(
     private val previousFileName: String?,
     private val context: Context,
-    private val getCapabilities: () -> OCCapability,
-    private val getExistingFileNames: () -> Set<String>?,
-    private val onError: Consumer<String>,
-    private val onWarning: Consumer<String>,
-    private val onOkay: Runnable
+    private val capabilitiesProvider: () -> OCCapability,
+    private val existingFileNamesProvider: () -> Set<String>?,
+    private val onValidationError: Consumer<String>,
+    private val onValidationWarning: Consumer<String>,
+    private val onValidationSuccess: Runnable
 ) : TextWatcher {
 
-    private var isOkay: Boolean = true // Used to trigger the onOkay callback only once
+    // Used to trigger the onValidationSuccess callback only once (on "error/warn -> valid" transition)
+    private var isNameCurrentlyValid: Boolean = true
 
     override fun afterTextChanged(s: Editable?) {
-        var newFileName = ""
-        if (s != null) {
-            newFileName = s.toString()
-        }
+        val currentFileName = s?.toString().orEmpty()
+        val validationError = checkFileName(
+            currentFileName,
+            capabilitiesProvider(),
+            context,
+            existingFileNamesProvider()
+        )
+
+        when {
+            isFileHidden(currentFileName) -> {
+                isNameCurrentlyValid = false
+                onValidationWarning.accept(context.getString(R.string.hidden_file_name_warning))
+            }
+
+            validationError != null -> {
+                isNameCurrentlyValid = false
+                onValidationError.accept(validationError)
+            }
+
+            isExtensionChanged(previousFileName, currentFileName) -> {
+                isNameCurrentlyValid = false
+                onValidationWarning.accept(context.getString(R.string.warn_rename_extension))
+            }
 
-        val errorMessage = checkFileName(newFileName, getCapabilities(), context, getExistingFileNames())
-
-        if (isFileHidden(newFileName)) {
-            isOkay = false
-            onWarning.accept(context.getString(R.string.hidden_file_name_warning))
-        } else if (errorMessage != null) {
-            isOkay = false
-            onError.accept(errorMessage)
-        } else if (isExtensionChanged(previousFileName, newFileName)) {
-            isOkay = false
-            onWarning.accept(context.getString(R.string.warn_rename_extension))
-        } else if (!isOkay) {
-            isOkay = true
-            onOkay.run()
+            !isNameCurrentlyValid -> {
+                isNameCurrentlyValid = true
+                onValidationSuccess.run()
+            }
         }
     }
 

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

@@ -867,15 +867,15 @@ private void setupFileNameInputField() {
             this,
             this::getCapabilities,
             () -> receiveExternalFilesAdapter.getFileNames(),
-            s -> {
-                binding.userInputContainer.setError(s);
+            validationError -> {
+                binding.userInputContainer.setError(validationError);
                 binding.uploaderChooseFolder.setEnabled(false);
             },
-            s -> {
-                binding.userInputContainer.setError(s);
+            validationWarning -> {
+                binding.userInputContainer.setError(validationWarning);
                 binding.uploaderChooseFolder.setEnabled(true);
             },
-            () -> {
+            () -> { // onValidationSuccess
                 binding.userInputContainer.setError(null);
                 binding.userInputContainer.setErrorEnabled(false);
                 binding.uploaderChooseFolder.setEnabled(true);

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

@@ -97,19 +97,19 @@ class RenameFileDialogFragment :
 
         binding.userInput.addTextChangedListener(
             FileNameTextWatcher(
-                mTargetFile?.fileName,
-                binding.userInputContainer.context,
-                { oCCapability },
-                { fileNames },
-                { s: String? ->
-                    binding.userInputContainer.error = s
+                previousFileName = mTargetFile?.fileName,
+                context = binding.userInputContainer.context,
+                capabilitiesProvider = { oCCapability },
+                existingFileNamesProvider = { fileNames },
+                onValidationError = { validationError: String ->
+                    binding.userInputContainer.error = validationError
                     positiveButton?.isEnabled = false
                 },
-                { s: String? ->
-                    binding.userInputContainer.error = s
+                onValidationWarning = { validationWarning: String ->
+                    binding.userInputContainer.error = validationWarning
                     positiveButton?.isEnabled = true
                 },
-                {
+                onValidationSuccess = {
                     binding.userInputContainer.error = null
                     // Called to remove extra padding
                     binding.userInputContainer.isErrorEnabled = false