Verify file name validity during user input.

The automated test only tests this partially, because the only invalid
name was an emtpy name. All other characters which are typically unsuitable
for a filename, like the directory separator '/' are not properly rejected
during the test run, because the FileNameValidator is based on the user
capabilities, which are null because this is a sever-less test.

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

Author: PhilLab

app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt

@@ -31,6 +31,7 @@ import com.owncloud.android.AbstractIT
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.utils.ScreenshotTest
+import org.hamcrest.Matchers.not
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestRule
@@ -75,7 +76,7 @@ class ReceiveExternalFilesActivityIT : AbstractIT() {
         val imageFile = getDummyFile("image.jpg")
         val intent = createSendIntent(imageFile)
 
-        // Create folders with the necessary permissions
+        // Create folders with the necessary permissions and another test file
         val mainFolder = OCFile("/folder/").apply {
             permissions = OCFile.PERMISSION_CAN_CREATE_FILE_AND_FOLDER
             setFolder()
@@ -86,6 +87,9 @@ class ReceiveExternalFilesActivityIT : AbstractIT() {
             setFolder()
             fileDataStorageManager.saveNewFile(this)
         }
+        val otherFile = OCFile("${mainFolder.remotePath}Other Image File.jpg").apply {
+            fileDataStorageManager.saveNewFile(this)
+        }
 
         // Store the folder in preferences, so the activity starts from there.
         @Suppress("DEPRECATION")
@@ -117,6 +121,9 @@ class ReceiveExternalFilesActivityIT : AbstractIT() {
                 .perform(ViewActions.pressKey(KeyEvent.KEYCODE_TAB))
                 .perform(ViewActions.click())
                 .check(matches(withSelectedText(secondFileName.removeFileExtension())))
+            onView(withText(R.string.uploader_btn_upload_text))
+                .check(matches(isDisplayed()))
+                .check(matches(isEnabled()))
 
             // Set a file name without file extension
             val thirdFileName = "No extension"
@@ -128,6 +135,35 @@ class ReceiveExternalFilesActivityIT : AbstractIT() {
                 .perform(ViewActions.pressKey(KeyEvent.KEYCODE_TAB))
                 .perform(ViewActions.click())
                 .check(matches(withSelectedText(thirdFileName)))
+            onView(withText(R.string.uploader_btn_upload_text))
+                .check(matches(isDisplayed()))
+                .check(matches(isEnabled()))
+
+            // Test an invalid filename. Note: as the user is null, the capabilities are also null, so the name checker
+            // will not reject any special characters like '/'. So we only test empty and an existing file name
+            onView(withId(R.id.user_input))
+                .perform(ViewActions.clearText())
+                .check(matches(withText("")))
+            onView(withText(R.string.uploader_btn_upload_text))
+                .check(matches(isDisplayed()))
+                .check(matches(not(isEnabled())))
+            onView(withId(R.id.user_input))
+                .perform(ViewActions.click())
+                .perform(ViewActions.typeTextIntoFocusedView(otherFile.fileName))
+                .check(matches(withText(otherFile.fileName)))
+            onView(withText(R.string.uploader_btn_upload_text))
+                .check(matches(isDisplayed()))
+                .check(matches(not(isEnabled())))
+
+            val fourthFileName = "New file name.jpg"
+            onView(withId(R.id.user_input))
+                .perform(ViewActions.click())
+                .perform(ViewActions.clearText())
+                .perform(ViewActions.typeTextIntoFocusedView(fourthFileName))
+                .check(matches(withText(fourthFileName)))
+            onView(withText(R.string.uploader_btn_upload_text))
+                .check(matches(isDisplayed()))
+                .check(matches(isEnabled()))
         }
     }
 }

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

@@ -30,7 +30,9 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Parcelable;
+import android.text.Editable;
 import android.text.TextUtils;
+import android.text.TextWatcher;
 import android.text.format.DateFormat;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -89,6 +91,8 @@
 import com.owncloud.android.utils.MimeType;
 import com.owncloud.android.utils.theme.ViewThemeUtils;
 
+import org.apache.commons.io.FilenameUtils;
+
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -129,7 +133,7 @@
 public class ReceiveExternalFilesActivity extends FileActivity
     implements View.OnClickListener, CopyAndUploadContentUrisTask.OnCopyTmpFilesTaskListener,
     SortingOrderDialogFragment.OnSortingOrderListener, Injectable, AccountChooserInterface,
-    ReceiveExternalFilesAdapter.OnItemClickListener {
+    ReceiveExternalFilesAdapter.OnItemClickListener, TextWatcher {
 
     private static final String TAG = ReceiveExternalFilesActivity.class.getSimpleName();
 
@@ -330,6 +334,53 @@ public void selectFile(OCFile file) {
         }
     }
 
+    @Override
+    public void afterTextChanged(Editable editable) {}
+
+    @Override
+    public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {}
+
+    // TODO: this is copy-paste from RenameFileDialogFragment.kt
+    @Override
+    public void onTextChanged(CharSequence s, int start, int before, int count) {
+        final var newFileName = Objects.requireNonNullElse(binding.userInput.getText(), "").toString();
+        final var positiveButton = binding.uploaderChooseFolder;
+
+        final var existingFiles = receiveExternalFilesAdapter.getFileNames();
+        final var errorMessage = FileNameValidator.INSTANCE.checkFileName(newFileName, getCapabilities(), this, existingFiles);
+
+        if (FileNameValidator.INSTANCE.isFileHidden(newFileName)) {
+            binding.userInputContainer.setError(getText(R.string.hidden_file_name_warning));
+            positiveButton.setEnabled(true);
+        } else if (errorMessage != null) {
+            binding.userInputContainer.setError(errorMessage);
+            positiveButton.setEnabled(false);
+        } else if (checkExtensionRenamed(newFileName)) {
+            binding.userInputContainer.setError(getText(R.string.warn_rename_extension));
+            positiveButton.setEnabled(true);
+        } else if (binding.userInputContainer.getError() != null) {
+            binding.userInputContainer.setError(null);
+            // Called to remove extra padding
+            binding.userInputContainer.setErrorEnabled(false);
+            positiveButton.setEnabled(true);
+        }
+    }
+
+    private boolean checkExtensionRenamed(@NonNull String newFileName) {
+        if (mStreamsToUpload == null || mStreamsToUpload.size() != 1) {
+            return false;
+        }
+        final String previousFileName = getDisplayNameForUri((Uri) mStreamsToUpload.get(0), getActivity());
+        if (previousFileName == null) {
+            return false;
+        }
+
+        var previousExtension = FilenameUtils.getExtension(previousFileName);
+        var newExtension = FilenameUtils.getExtension(newFileName);
+
+        return !Objects.equals(previousExtension, newExtension);
+    }
+
     public static class DialogNoAccount extends DialogFragment {
         private final ViewThemeUtils viewThemeUtils;
 
@@ -860,6 +911,7 @@ private void setupFileNameInputField() {
 
         binding.userInput.setVisibility(View.VISIBLE);
         binding.userInput.setText(fileName);
+        binding.userInput.addTextChangedListener(this);
         mFileDisplayNameTransformer = uri ->
             Objects.requireNonNullElse(binding.userInput.getText(), fileName).toString();
 

app/src/main/java/com/owncloud/android/ui/adapter/ReceiveExternalFilesAdapter.kt

@@ -26,6 +26,7 @@ import com.owncloud.android.datamodel.ThumbnailsCacheManager.ThumbnailGeneration
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.MimeTypeUtil
 import com.owncloud.android.utils.theme.ViewThemeUtils
+import java.util.Objects
 
 @Suppress("LongParameterList")
 class ReceiveExternalFilesAdapter(
@@ -159,4 +160,6 @@ class ReceiveExternalFilesAdapter(
     }
 
     override fun getItemCount() = filteredFiles.size
+
+    fun getFileNames(): Set<String> = files.map { it.fileName }.toSet()
 }

app/src/main/res/layout/receive_external_files.xml

@@ -48,6 +48,7 @@
         android:background="@color/list_divider_background" />
 
     <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/user_input_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/bg_default"