From 3b28c7acaf065769002e7cef9259aba8c5fa31c1 Mon Sep 17 00:00:00 2001
From: Philipp Hasper <vcs@hasper.info>
Date: Sun, 28 Dec 2025 17:39:46 +0100
Subject: [PATCH 1/8] When uploading a single file, offer input field to change
 file name

This streamlines the upload from files, e.g. from email attachments.
Closes #9215.
The approach via the listener mFileDisplayNameTransformer was chosen
because this allows a potential extension to multiple files (with multiple
input fields). Alternatively, ReceiveExternalFilesActivity#uploadFile()
could've been used, which requires the storage to a temporary file
first.

nextFocusForward and nextFocusDown are both needed to support navigation
with the Tab key as well as the Enter key

Signed-off-by: Philipp Hasper <vcs@hasper.info>
---
 .../ReceiveExternalFilesActivity.java         | 31 +++++++++++++++++--
 .../android/ui/helpers/UriUploader.kt         | 10 ++++--
 .../res/layout/receive_external_files.xml     | 23 ++++++++++++++
 3 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
index 2e8a6a27cdbf..13d9c16cfc9c 100755
--- a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -1,6 +1,7 @@
 /*
  * Nextcloud - Android Client
  *
+ * SPDX-FileCopyrightText: 2025 Philipp Hasper <vcs@hasper.info>
  * SPDX-FileCopyrightText: 2023 TSI-mc
  * SPDX-FileCopyrightText: 2016-2023 Tobias Kaminsky <tobias@kaminsky.me>
  * SPDX-FileCopyrightText: 2019 Chris Narkiewicz <hello@ezaquarii.com>
@@ -24,6 +25,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources.NotFoundException;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -96,6 +98,7 @@
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
+import java.util.Objects;
 import java.util.Stack;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -110,6 +113,7 @@
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog.Builder;
 import androidx.appcompat.widget.SearchView;
+import androidx.core.util.Function;
 import androidx.core.view.MenuItemCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentManager;
@@ -117,6 +121,7 @@
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import static com.owncloud.android.utils.DisplayUtils.openSortingOrderDialogFragment;
+import static com.owncloud.android.utils.UriUtils.getDisplayNameForUri;
 
 /**
  * This can be used to upload things to an Nextcloud instance.
@@ -141,10 +146,13 @@ public class ReceiveExternalFilesActivity extends FileActivity
 
     private AccountManager mAccountManager;
     private Stack<String> mParents = new Stack<>();
-    private List<Parcelable> mStreamsToUpload;
+    @Nullable private List<Parcelable> mStreamsToUpload;
     private String mUploadPath;
     private OCFile mFile;
 
+    @Nullable
+    private Function<Uri, String> mFileDisplayNameTransformer = null;
+
     private SyncBroadcastReceiver mSyncBroadcastReceiver;
     private ReceiveExternalFilesAdapter receiveExternalFilesAdapter;
 
@@ -785,6 +793,7 @@ private void populateDirectoryList(OCFile file) {
             files = sortFileList(files);
             setupReceiveExternalFilesAdapter(files);
         }
+        setupFileNameInputField();
 
         MaterialButton btnChooseFolder = binding.uploaderChooseFolder;
         viewThemeUtils.material.colorMaterialButtonPrimaryFilled(btnChooseFolder);
@@ -838,6 +847,23 @@ public void setMessageForEmptyList(@StringRes final int headline, @StringRes fin
         });
     }
 
+    private void setupFileNameInputField() {
+        binding.userInput.setVisibility(View.GONE);
+        mFileDisplayNameTransformer = null;
+        if (mStreamsToUpload == null || mStreamsToUpload.size() != 1) {
+            return;
+        }
+        final String fileName = getDisplayNameForUri((Uri) mStreamsToUpload.get(0), getActivity());
+        if (fileName == null) {
+            return;
+        }
+        mFileDisplayNameTransformer = uri ->
+            Objects.requireNonNullElse(binding.userInput.getText(), fileName).toString();
+
+        binding.userInput.setVisibility(View.VISIBLE);
+        binding.userInput.setText(fileName);
+    }
+
     @Override
     public void onSavedCertificate() {
         startSyncFolderOperation(getCurrentDir());
@@ -961,7 +987,8 @@ public void uploadFiles() {
             getUser().orElseThrow(RuntimeException::new),
             FileUploadWorker.LOCAL_BEHAVIOUR_DELETE,
             true, // Show waiting dialog while file is being copied from private storage
-            this  // Copy temp task listener
+            this,  // Listener for copying to temporary files
+            mFileDisplayNameTransformer
         );
 
         UriUploader.UriUploaderResultCode resultCode = uploader.uploadUris();
diff --git a/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt b/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt
index 9f08ad99bbce..6b4c63cd71d2 100644
--- a/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt
+++ b/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt
@@ -13,6 +13,7 @@ package com.owncloud.android.ui.helpers
 import android.content.ContentResolver
 import android.net.Uri
 import android.os.Parcelable
+import androidx.core.util.Function
 import com.nextcloud.client.account.User
 import com.nextcloud.client.jobs.upload.FileUploadHelper
 import com.owncloud.android.R
@@ -42,14 +43,16 @@ import com.owncloud.android.utils.UriUtils.getDisplayNameForUri
     "Detekt.SpreadOperator",
     "Detekt.TooGenericExceptionCaught"
 ) // legacy code
-class UriUploader(
+class UriUploader @JvmOverloads constructor(
     private val mActivity: FileActivity,
     private val mUrisToUpload: List<Parcelable?>,
     private val mUploadPath: String,
     private val user: User,
     private val mBehaviour: Int,
     private val mShowWaitingDialog: Boolean,
-    private val mCopyTmpTaskListener: OnCopyTmpFilesTaskListener?
+    private val mCopyTmpTaskListener: OnCopyTmpFilesTaskListener?,
+    /** If non-null, this function is called to determine the desired display name (i.e. filename) after upload**/
+    private val mFileDisplayNameTransformer: Function<Uri, String?>? = null
 ) {
 
     enum class UriUploaderResultCode {
@@ -113,7 +116,8 @@ class UriUploader(
     }
 
     private fun getRemotePathForUri(sourceUri: Uri): String {
-        val displayName = getDisplayNameForUri(sourceUri, mActivity)
+        val displayName = mFileDisplayNameTransformer?.apply(sourceUri)
+            ?: getDisplayNameForUri(sourceUri, mActivity)
         require(displayName != null) { "Display name cannot be null" }
         return mUploadPath + displayName
     }
diff --git a/app/src/main/res/layout/receive_external_files.xml b/app/src/main/res/layout/receive_external_files.xml
index 1f85eae78a32..29d630f0d922 100644
--- a/app/src/main/res/layout/receive_external_files.xml
+++ b/app/src/main/res/layout/receive_external_files.xml
@@ -1,6 +1,7 @@
 <!--
   ~ Nextcloud - Android Client
   ~
+  ~ SPDX-FileCopyrightText: 2025 Philipp Hasper <vcs@hasper.info>
   ~ SPDX-FileCopyrightText: 2020-2023 Tobias Kaminsky <tobias@kaminsky.me>
   ~ SPDX-FileCopyrightText: 2018 Nextcloud GmbH
   ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only
@@ -46,6 +47,28 @@
         android:layout_height="1dp"
         android:background="@color/list_divider_background" />
 
+    <com.google.android.material.textfield.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/bg_default"
+        android:hint="@string/hint_name"
+        android:paddingStart="@dimen/standard_half_margin"
+        android:paddingEnd="@dimen/standard_half_margin">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/user_input"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:gravity="top"
+            android:importantForAutofill="no"
+            android:inputType="textNoSuggestions|textCapSentences"
+            android:scrollbars="vertical"
+            android:nextFocusForward="@id/uploader_choose_folder"
+            android:nextFocusDown="@id/uploader_choose_folder"/>
+
+    </com.google.android.material.textfield.TextInputLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

From d7ef0779bf5b79ed66a1a4be59f09de7a55e9e4a Mon Sep 17 00:00:00 2001
From: Philipp Hasper <vcs@hasper.info>
Date: Mon, 29 Dec 2025 16:22:29 +0100
Subject: [PATCH 2/8] Added convenient pre-selection of filename (excluding
 extension)

This streamlines the renaming and speeds up the process.

Signed-off-by: Philipp Hasper <vcs@hasper.info>
---
 .../ReceiveExternalFilesActivity.java         | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
index 13d9c16cfc9c..475907254404 100755
--- a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -857,11 +857,26 @@ private void setupFileNameInputField() {
         if (fileName == null) {
             return;
         }
-        mFileDisplayNameTransformer = uri ->
-            Objects.requireNonNullElse(binding.userInput.getText(), fileName).toString();
 
         binding.userInput.setVisibility(View.VISIBLE);
         binding.userInput.setText(fileName);
+        mFileDisplayNameTransformer = uri ->
+            Objects.requireNonNullElse(binding.userInput.getText(), fileName).toString();
+
+        // When entering the text field, pre-select the name (without extension if present), for convenient editing
+        binding.userInput.setOnFocusChangeListener((v, hasFocus) -> {
+            if (hasFocus) {
+                final String currentText = Objects.requireNonNullElse(binding.userInput.getText(), "").toString();
+                binding.userInput.post(() -> {
+                    if (currentText.lastIndexOf('.') != -1) {
+                        binding.userInput.setSelection(0, currentText.lastIndexOf('.'));
+                    } else {
+                        // No file extension - select all
+                        binding.userInput.selectAll();
+                    }
+                });
+            }
+        });
     }
 
     @Override

From 55acbba190fbf02c09e0de4a3b2384cf699fb1fd Mon Sep 17 00:00:00 2001
From: Philipp Hasper <vcs@hasper.info>
Date: Sat, 3 Jan 2026 14:17:30 +0100
Subject: [PATCH 3/8] Fixed ReceiveExternalFilesActivityIT not separating the
 screenshots

When running the screenshot tests, the following error was raised:

com.owncloud.android.ui.activity.ReceiveExternalFilesActivityIT > openMultiAccount[uiComparison(AVD) - 9] FAILED
java.lang.AssertionError: Can't create multiple screenshots with the same name: com.owncloud.android.ui.activity.ReceiveExternalFilesActivityIT_open
at com.facebook.testing.screenshot.internal.AlbumImpl.addRecord

This happened because openMultiAccount() simply calls the open() test which
"hardcodes" the screenshot name

Signed-off-by: Philipp Hasper <vcs@hasper.info>
---
 .../android/ui/activity/ReceiveExternalFilesActivityIT.kt    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt
index d915379aa970..d206d71d261a 100644
--- a/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt
@@ -13,18 +13,19 @@ import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import com.facebook.testing.screenshot.internal.TestNameDetector
 import com.owncloud.android.AbstractIT
 import com.owncloud.android.utils.ScreenshotTest
 import org.junit.Test
 
 class ReceiveExternalFilesActivityIT : AbstractIT() {
-    private val testClassName = "com.owncloud.android.ui.activity.ReceiveExternalFilesActivityIT"
 
     @Test
     @ScreenshotTest
     fun open() {
+        // Screenshot name must be constructed outside of the scenario, otherwise it will not be reliably detected
+        val screenShotName = TestNameDetector.getTestClass() + "_" + TestNameDetector.getTestName()
         launchActivity<ReceiveExternalFilesActivity>().use { scenario ->
-            val screenShotName = createName(testClassName + "_" + "open", "")
             onView(isRoot()).check(matches(isDisplayed()))
 
             scenario.onActivity { sut ->

From 9430771fe5975902fb1aeaa758bc8d9c7c71306f Mon Sep 17 00:00:00 2001
From: Philipp Hasper <vcs@hasper.info>
Date: Sat, 3 Jan 2026 18:49:28 +0100
Subject: [PATCH 4/8] Added automated test for renaming during file upload

The UI only allows to proceed with the upload, if the permissions are
given accordingly, so the test setup needs access to the corresponding
permission keys.
Instead of only making one of the keys available, all were made public.
Because why should these magic strings be private after all? This only
invites duplication and hinders maintenance.

Signed-off-by: Philipp Hasper <vcs@hasper.info>
---
 .../nextcloud/test/NextcloudViewMatchers.kt   | 29 ++++++
 .../ReceiveExternalFilesActivityIT.kt         | 89 +++++++++++++++++++
 .../owncloud/android/datamodel/OCFile.java    | 20 ++---
 3 files changed, 128 insertions(+), 10 deletions(-)
 create mode 100644 app/src/androidTest/java/com/nextcloud/test/NextcloudViewMatchers.kt

diff --git a/app/src/androidTest/java/com/nextcloud/test/NextcloudViewMatchers.kt b/app/src/androidTest/java/com/nextcloud/test/NextcloudViewMatchers.kt
new file mode 100644
index 000000000000..1fc46c4a137c
--- /dev/null
+++ b/app/src/androidTest/java/com/nextcloud/test/NextcloudViewMatchers.kt
@@ -0,0 +1,29 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2025 Philipp Hasper <vcs@hasper.info>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.test
+
+import android.view.View
+import android.widget.TextView
+import org.hamcrest.Description
+import org.hamcrest.Matcher
+import org.hamcrest.TypeSafeMatcher
+
+fun withSelectedText(expected: String): Matcher<View> = object : TypeSafeMatcher<View>() {
+    override fun describeTo(description: Description) {
+        description.appendText("with selected text \"$expected\"")
+    }
+
+    override fun matchesSafely(view: View): Boolean {
+        if (view !is TextView) return false
+        val text = view.text?.toString() ?: ""
+        val s = view.selectionStart
+        val e = view.selectionEnd
+        if (s < 0 || e < 0 || s > e || e > text.length) return false
+        return text.substring(s, e) == expected
+    }
+}
diff --git a/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt
index d206d71d261a..0af3ed2c9536 100644
--- a/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt
@@ -1,6 +1,7 @@
 /*
  * Nextcloud - Android Client
  *
+ * SPDX-FileCopyrightText: 2025 Philipp Hasper <vcs@hasper.info>
  * SPDX-FileCopyrightText: 2025 Alper Ozturk <alper.ozturk@nextcloud.com>
  * SPDX-FileCopyrightText: 2022 Tobias Kaminsky <tobias@kaminsky.me>
  * SPDX-FileCopyrightText: 2022 Nextcloud GmbH
@@ -8,18 +9,38 @@
  */
 package com.owncloud.android.ui.activity
 
+import android.content.Intent
+import android.net.Uri
+import android.view.KeyEvent
 import androidx.test.core.app.launchActivity
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.hasDescendant
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isEnabled
 import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
 import com.facebook.testing.screenshot.internal.TestNameDetector
+import com.nextcloud.client.preferences.AppPreferencesImpl
+import com.nextcloud.test.GrantStoragePermissionRule
+import com.nextcloud.test.withSelectedText
+import com.nextcloud.utils.extensions.removeFileExtension
 import com.owncloud.android.AbstractIT
+import com.owncloud.android.R
+import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.utils.ScreenshotTest
+import org.junit.Rule
 import org.junit.Test
+import org.junit.rules.TestRule
+import java.io.File
 
 class ReceiveExternalFilesActivityIT : AbstractIT() {
 
+    @get:Rule
+    var storagePermissionRule: TestRule = GrantStoragePermissionRule.grant()
+
     @Test
     @ScreenshotTest
     fun open() {
@@ -41,4 +62,72 @@ class ReceiveExternalFilesActivityIT : AbstractIT() {
         open()
         removeAccount(secondAccount)
     }
+
+
+    fun createSendIntent(file: File): Intent = Intent(targetContext, ReceiveExternalFilesActivity::class.java).apply {
+        action = Intent.ACTION_SEND
+        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+        putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file))
+    }
+
+    @Test
+    fun renameSingleFileUpload() {
+        val imageFile = getDummyFile("image.jpg")
+        val intent = createSendIntent(imageFile)
+
+        // Create folders with the necessary permissions
+        val mainFolder = OCFile("/folder/").apply {
+            permissions = OCFile.PERMISSION_CAN_CREATE_FILE_AND_FOLDER
+            setFolder()
+            fileDataStorageManager.saveNewFile(this)
+        }
+        val subFolder = OCFile("${mainFolder.remotePath}sub folder/").apply {
+            permissions = OCFile.PERMISSION_CAN_CREATE_FILE_AND_FOLDER
+            setFolder()
+            fileDataStorageManager.saveNewFile(this)
+        }
+
+        // Store the folder in preferences, so the activity starts from there.
+        @Suppress("DEPRECATION")
+        val preferences = AppPreferencesImpl.fromContext(targetContext)
+        preferences.setLastUploadPath(mainFolder.remotePath)
+
+        launchActivity<ReceiveExternalFilesActivity>(intent).use {
+            val expectedMainFolderTitle = (getCurrentActivity() as ToolbarActivity).getActionBarTitle(mainFolder, false)
+            // Verify that the test starts in the expected folder. If this fails, change the setup calls above
+            onView(withId(R.id.toolbar))
+                .check(matches(hasDescendant(withText(expectedMainFolderTitle))))
+
+            onView(withText(R.string.uploader_btn_upload_text))
+                .check(matches(isDisplayed()))
+                .check(matches(isEnabled()))
+
+            // Test the pre-selection behavior (filename, but without extension, shall be selected)
+            onView(withId(R.id.user_input))
+                .check(matches(withText(imageFile.name)))
+                .perform(ViewActions.click())
+                .check(matches(withSelectedText(imageFile.name.removeFileExtension())))
+
+            // Set a new file name
+            val secondFileName = "New filename.jpg"
+            onView(withId(R.id.user_input))
+                .perform(ViewActions.typeTextIntoFocusedView(secondFileName.removeFileExtension()))
+                .check(matches(withText(secondFileName)))
+                // Leave the field and come back to verify the pre-selection behavior correctly handles the new name
+                .perform(ViewActions.pressKey(KeyEvent.KEYCODE_TAB))
+                .perform(ViewActions.click())
+                .check(matches(withSelectedText(secondFileName.removeFileExtension())))
+
+            // Set a file name without file extension
+            val thirdFileName = "No extension"
+            onView(withId(R.id.user_input))
+                .perform(ViewActions.clearText())
+                .perform(ViewActions.typeTextIntoFocusedView(thirdFileName))
+                .check(matches(withText(thirdFileName)))
+                // Leave the field and come back to verify the pre-selection behavior correctly handles the new name
+                .perform(ViewActions.pressKey(KeyEvent.KEYCODE_TAB))
+                .perform(ViewActions.click())
+                .check(matches(withSelectedText(thirdFileName)))
+        }
+    }
 }
diff --git a/app/src/main/java/com/owncloud/android/datamodel/OCFile.java b/app/src/main/java/com/owncloud/android/datamodel/OCFile.java
index 03d85e22a902..7aaf0e05924f 100644
--- a/app/src/main/java/com/owncloud/android/datamodel/OCFile.java
+++ b/app/src/main/java/com/owncloud/android/datamodel/OCFile.java
@@ -47,16 +47,16 @@
 public class OCFile implements Parcelable, Comparable<OCFile>, ServerFileInterface {
 
     public final static String PERMISSION_CAN_RESHARE = "R";
-    private final static String PERMISSION_SHARED = "S";
-    private final static String PERMISSION_MOUNTED = "M";
-    private final static String PERMISSION_CAN_CREATE_FILE_INSIDE_FOLDER = "C";
-    private final static String PERMISSION_CAN_CREATE_FOLDER_INSIDE_FOLDER = "K";
-    private final static String PERMISSION_CAN_READ = "G";
-    private final static String PERMISSION_CAN_WRITE = "W";
-    private final static String PERMISSION_CAN_DELETE_OR_LEAVE_SHARE = "D";
-    private final static String PERMISSION_CAN_RENAME = "N";
-    private final static String PERMISSION_CAN_MOVE = "V";
-    private final static String PERMISSION_CAN_CREATE_FILE_AND_FOLDER = PERMISSION_CAN_CREATE_FILE_INSIDE_FOLDER + PERMISSION_CAN_CREATE_FOLDER_INSIDE_FOLDER;
+    public final static String PERMISSION_SHARED = "S";
+    public final static String PERMISSION_MOUNTED = "M";
+    public final static String PERMISSION_CAN_CREATE_FILE_INSIDE_FOLDER = "C";
+    public final static String PERMISSION_CAN_CREATE_FOLDER_INSIDE_FOLDER = "K";
+    public final static String PERMISSION_CAN_READ = "G";
+    public final static String PERMISSION_CAN_WRITE = "W";
+    public final static String PERMISSION_CAN_DELETE_OR_LEAVE_SHARE = "D";
+    public final static String PERMISSION_CAN_RENAME = "N";
+    public final static String PERMISSION_CAN_MOVE = "V";
+    public final static String PERMISSION_CAN_CREATE_FILE_AND_FOLDER = PERMISSION_CAN_CREATE_FILE_INSIDE_FOLDER + PERMISSION_CAN_CREATE_FOLDER_INSIDE_FOLDER;
 
     private final static int MAX_FILE_SIZE_FOR_IMMEDIATE_PREVIEW_BYTES = 1024000;
 

From 22ac09f75c562cf07496d9a20b4d0b509f819ced Mon Sep 17 00:00:00 2001
From: Philipp Hasper <vcs@hasper.info>
Date: Wed, 31 Dec 2025 16:29:09 +0100
Subject: [PATCH 5/8] 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>
---
 .../ReceiveExternalFilesActivityIT.kt         | 38 ++++++++++++-
 .../ReceiveExternalFilesActivity.java         | 54 ++++++++++++++++++-
 .../ui/adapter/ReceiveExternalFilesAdapter.kt |  3 ++
 .../res/layout/receive_external_files.xml     |  1 +
 4 files changed, 94 insertions(+), 2 deletions(-)

diff --git a/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt
index 0af3ed2c9536..640fbbc23915 100644
--- a/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt
+++ b/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()))
         }
     }
 }
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
index 475907254404..52911986727a 100755
--- a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
+++ b/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();
 
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/ReceiveExternalFilesAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/ReceiveExternalFilesAdapter.kt
index 12736f80f651..a6b48b20c60e 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/ReceiveExternalFilesAdapter.kt
+++ b/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()
 }
diff --git a/app/src/main/res/layout/receive_external_files.xml b/app/src/main/res/layout/receive_external_files.xml
index 29d630f0d922..b3806bd9478a 100644
--- a/app/src/main/res/layout/receive_external_files.xml
+++ b/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"

From 760f2e3e63c67d97dd1d3065d6b1f49f821b3d23 Mon Sep 17 00:00:00 2001
From: Philipp Hasper <vcs@hasper.info>
Date: Wed, 31 Dec 2025 17:52:56 +0100
Subject: [PATCH 6/8] Fix that file renaming did not survive folder navigation

Signed-off-by: Philipp Hasper <vcs@hasper.info>
---
 .../ReceiveExternalFilesActivityIT.kt         | 38 +++++++++++++++++++
 .../ReceiveExternalFilesActivity.java         |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt
index 640fbbc23915..82395be4e1bf 100644
--- a/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt
@@ -164,6 +164,44 @@ class ReceiveExternalFilesActivityIT : AbstractIT() {
             onView(withText(R.string.uploader_btn_upload_text))
                 .check(matches(isDisplayed()))
                 .check(matches(isEnabled()))
+
+            // Enter the subfolder and verify that the text stays intact
+            val expectedSubFolderTitle = (getCurrentActivity() as ToolbarActivity).getActionBarTitle(subFolder, false)
+            onView(withText(expectedSubFolderTitle))
+                .perform(ViewActions.click())
+            onView(withId(R.id.toolbar))
+                .check(matches(hasDescendant(withText(expectedSubFolderTitle))))
+            onView(withId(R.id.user_input))
+                .check(matches(withText(fourthFileName)))
+                .perform(ViewActions.click())
+                .check(matches(withSelectedText(fourthFileName.removeFileExtension())))
+
+            // Set a new, shorter file name
+            val fifthFileName = "short.jpg"
+            onView(withId(R.id.user_input))
+                .perform(ViewActions.typeTextIntoFocusedView(fifthFileName.removeFileExtension()))
+                .check(matches(withText(fifthFileName)))
+
+            // Start the upload, so the folder is stored in the preferences.
+            // Even though the upload is expected to fail because the backend is not mocked (yet?)
+            onView(withText(R.string.uploader_btn_upload_text))
+                .check(matches(isDisplayed()))
+                .check(matches(isEnabled()))
+                .perform(ViewActions.click())
+        }
+
+        // Start a new file receive flow. Should now start in the sub folder, but with the original filename again
+        launchActivity<ReceiveExternalFilesActivity>(intent).use {
+            val expectedMainFolderTitle = (getCurrentActivity() as ToolbarActivity).getActionBarTitle(subFolder, false)
+            onView(withId(R.id.toolbar))
+                .check(matches(hasDescendant(withText(expectedMainFolderTitle))))
+
+            onView(withText(R.string.uploader_btn_upload_text))
+                .check(matches(isDisplayed()))
+                .check(matches(isEnabled()))
+
+            onView(withId(R.id.user_input))
+                .check(matches(withText(imageFile.name)))
         }
     }
 }
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
index 52911986727a..da85c4de4b5e 100755
--- a/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
@@ -908,9 +908,10 @@ private void setupFileNameInputField() {
         if (fileName == null) {
             return;
         }
+        final String userProvidedFileName = Objects.requireNonNullElse(binding.userInput.getText(), "").toString();
 
         binding.userInput.setVisibility(View.VISIBLE);
-        binding.userInput.setText(fileName);
+        binding.userInput.setText(userProvidedFileName.isEmpty() ? fileName : userProvidedFileName);
         binding.userInput.addTextChangedListener(this);
         mFileDisplayNameTransformer = uri ->
             Objects.requireNonNullElse(binding.userInput.getText(), fileName).toString();

From b2387fb4222d5f2a308c539f204d51829041f887 Mon Sep 17 00:00:00 2001
From: Philipp Hasper <vcs@hasper.info>
Date: Thu, 1 Jan 2026 10:31:54 +0100
Subject: [PATCH 7/8] Test that multi file upload does not offer the renaming
 UI

To reduce duplication, the file and folders are setup in a @Before method,
but this also affects the existing screenshot tests.

Signed-off-by: Philipp Hasper <vcs@hasper.info>
---
 .../java/com/owncloud/android/AbstractIT.java | 12 ++-
 .../ReceiveExternalFilesActivityIT.kt         | 75 ++++++++++++++-----
 2 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/app/src/androidTest/java/com/owncloud/android/AbstractIT.java b/app/src/androidTest/java/com/owncloud/android/AbstractIT.java
index 5ea27541062f..4b925618767c 100644
--- a/app/src/androidTest/java/com/owncloud/android/AbstractIT.java
+++ b/app/src/androidTest/java/com/owncloud/android/AbstractIT.java
@@ -68,7 +68,9 @@
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Optional;
@@ -234,7 +236,7 @@ protected Account[] getAllAccounts() {
         return AccountManager.get(targetContext).getAccounts();
     }
 
-    protected static void createDummyFiles() throws IOException {
+    protected static List<File> createDummyFiles() throws IOException {
         File tempPath = new File(FileStorageUtils.getTemporalPath(account.name));
         if (!tempPath.exists()) {
             assertTrue(tempPath.mkdirs());
@@ -242,9 +244,11 @@ protected static void createDummyFiles() throws IOException {
 
         assertTrue(tempPath.exists());
 
-        createFile("empty.txt", 0);
-        createFile("nonEmpty.txt", 100);
-        createFile("chunkedFile.txt", 500000);
+        return Arrays.asList(
+            createFile("empty.txt", 0),
+            createFile("nonEmpty.txt", 100),
+            createFile("chunkedFile.txt", 500000)
+        );
     }
 
     protected static File getDummyFile(String name) throws IOException {
diff --git a/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt b/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt
index 82395be4e1bf..a114c00dbdfa 100644
--- a/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt
+++ b/app/src/androidTest/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivityIT.kt
@@ -32,6 +32,7 @@ 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.Before
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TestRule
@@ -42,6 +43,28 @@ class ReceiveExternalFilesActivityIT : AbstractIT() {
     @get:Rule
     var storagePermissionRule: TestRule = GrantStoragePermissionRule.grant()
 
+    lateinit var mainFolder: OCFile
+    lateinit var subFolder: OCFile
+    lateinit var existingImageFile: OCFile
+
+    @Before
+    fun setupFolderAndFileStructure() {
+        // Create folders with the necessary permissions and another test file
+        mainFolder = OCFile("/folder/").apply {
+            permissions = OCFile.PERMISSION_CAN_CREATE_FILE_AND_FOLDER
+            setFolder()
+            fileDataStorageManager.saveNewFile(this)
+        }
+        subFolder = OCFile("${mainFolder.remotePath}sub folder/").apply {
+            permissions = OCFile.PERMISSION_CAN_CREATE_FILE_AND_FOLDER
+            setFolder()
+            fileDataStorageManager.saveNewFile(this)
+        }
+        existingImageFile = OCFile("${mainFolder.remotePath}Existing Image File.jpg").apply {
+            fileDataStorageManager.saveNewFile(this)
+        }
+    }
+
     @Test
     @ScreenshotTest
     fun open() {
@@ -64,33 +87,24 @@ class ReceiveExternalFilesActivityIT : AbstractIT() {
         removeAccount(secondAccount)
     }
 
-
     fun createSendIntent(file: File): Intent = Intent(targetContext, ReceiveExternalFilesActivity::class.java).apply {
         action = Intent.ACTION_SEND
         addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
         putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file))
     }
 
+    fun createSendIntent(files: Iterable<File>): Intent =
+        Intent(targetContext, ReceiveExternalFilesActivity::class.java).apply {
+            action = Intent.ACTION_SEND_MULTIPLE
+            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            putParcelableArrayListExtra(Intent.EXTRA_STREAM, ArrayList(files.map { Uri.fromFile(it) }))
+        }
+
     @Test
     fun renameSingleFileUpload() {
         val imageFile = getDummyFile("image.jpg")
         val intent = createSendIntent(imageFile)
 
-        // Create folders with the necessary permissions and another test file
-        val mainFolder = OCFile("/folder/").apply {
-            permissions = OCFile.PERMISSION_CAN_CREATE_FILE_AND_FOLDER
-            setFolder()
-            fileDataStorageManager.saveNewFile(this)
-        }
-        val subFolder = OCFile("${mainFolder.remotePath}sub folder/").apply {
-            permissions = OCFile.PERMISSION_CAN_CREATE_FILE_AND_FOLDER
-            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")
         val preferences = AppPreferencesImpl.fromContext(targetContext)
@@ -149,8 +163,8 @@ class ReceiveExternalFilesActivityIT : AbstractIT() {
                 .check(matches(not(isEnabled())))
             onView(withId(R.id.user_input))
                 .perform(ViewActions.click())
-                .perform(ViewActions.typeTextIntoFocusedView(otherFile.fileName))
-                .check(matches(withText(otherFile.fileName)))
+                .perform(ViewActions.typeTextIntoFocusedView(existingImageFile.fileName))
+                .check(matches(withText(existingImageFile.fileName)))
             onView(withText(R.string.uploader_btn_upload_text))
                 .check(matches(isDisplayed()))
                 .check(matches(not(isEnabled())))
@@ -204,4 +218,29 @@ class ReceiveExternalFilesActivityIT : AbstractIT() {
                 .check(matches(withText(imageFile.name)))
         }
     }
+
+    @Test
+    fun noRenameForMultiUpload() {
+        val testFiles = createDummyFiles()
+        val intent = createSendIntent(testFiles)
+
+        // Store the folder in preferences, so the activity starts from there.
+        @Suppress("DEPRECATION")
+        val preferences = AppPreferencesImpl.fromContext(targetContext)
+        preferences.setLastUploadPath(mainFolder.remotePath)
+
+        launchActivity<ReceiveExternalFilesActivity>(intent).use {
+            val expectedMainFolderTitle = (getCurrentActivity() as ToolbarActivity).getActionBarTitle(mainFolder, false)
+            // Verify that the test starts in the expected folder. If this fails, change the setup calls above
+            onView(withId(R.id.toolbar))
+                .check(matches(hasDescendant(withText(expectedMainFolderTitle))))
+
+            onView(withText(R.string.uploader_btn_upload_text))
+                .check(matches(isDisplayed()))
+                .check(matches(isEnabled()))
+
+            onView(withId(R.id.user_input))
+                .check(matches(not(isDisplayed())))
+        }
+    }
 }

From aec6581b4306d005e84c7bcba9b9d722f489907f Mon Sep 17 00:00:00 2001
From: Philipp Hasper <vcs@hasper.info>
Date: Fri, 2 Jan 2026 13:47:24 +0100
Subject: [PATCH 8/8] Suppress Codacy findings in NextcloudViewMatchers.kt

Working around the limitation of returns as well as the condition
complexity was attempted but made the code just less readable.
Ignoring these two specific findings is more appropriate here.

Signed-off-by: Philipp Hasper <vcs@hasper.info>
---
 .../java/com/nextcloud/test/NextcloudViewMatchers.kt            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/androidTest/java/com/nextcloud/test/NextcloudViewMatchers.kt b/app/src/androidTest/java/com/nextcloud/test/NextcloudViewMatchers.kt
index 1fc46c4a137c..11fa50fb90b0 100644
--- a/app/src/androidTest/java/com/nextcloud/test/NextcloudViewMatchers.kt
+++ b/app/src/androidTest/java/com/nextcloud/test/NextcloudViewMatchers.kt
@@ -18,11 +18,13 @@ fun withSelectedText(expected: String): Matcher<View> = object : TypeSafeMatcher
         description.appendText("with selected text \"$expected\"")
     }
 
+    @Suppress("ReturnCount")
     override fun matchesSafely(view: View): Boolean {
         if (view !is TextView) return false
         val text = view.text?.toString() ?: ""
         val s = view.selectionStart
         val e = view.selectionEnd
+        @Suppress("ComplexCondition")
         if (s < 0 || e < 0 || s > e || e > text.length) return false
         return text.substring(s, e) == expected
     }