Skip to content

fix(delete-files): delete all #16941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 1 commit into from
Apr 30, 2026
Merged

fix(delete-files): delete all #16941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/java/com/nextcloud/utils/fileNameValidator/FileNameValidator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ object FileNameValidator {
* @return An error message if the filename is invalid, null otherwise.
*/
@Suppress("ReturnCount", "NestedBlockDepth")
@JvmOverloads
fun checkFileName(
filename: String,
capability: OCCapability,
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/owncloud/android/providers/DocumentsStorageProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ private boolean checkFolderPath(String filename) {
}

private String checkFileName(String filename) {
return FileNameValidator.INSTANCE.checkFileName(filename, getCapabilities(), getNonNullContext(),null);
return FileNameValidator.INSTANCE.checkFileName(filename, getCapabilities(), getNonNullContext());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ public void selectFile(OCFile file) {
return;
}

String filenameErrorMessage = FileNameValidator.INSTANCE.checkFileName(file.getFileName(), optionalCapabilities.get(), this, null);
String filenameErrorMessage = FileNameValidator.INSTANCE.checkFileName(file.getFileName(), optionalCapabilities.get(), this);
if (filenameErrorMessage != null) {
DisplayUtils.showSnackMessage(this, filenameErrorMessage);
return;
Expand Down
13 changes: 6 additions & 7 deletions app/src/main/java/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import javax.inject.Inject

/**
* Dialog requiring confirmation before removing a collection of given OCFiles.
* Triggers the removal according to the user response.
*/
class RemoveFilesDialogFragment :
ConfirmationDialogFragment(),
ConfirmationDialogFragmentListener,
Expand Down Expand Up @@ -110,8 +106,9 @@ class RemoveFilesDialogFragment :
offlineFiles.forEach(fileDataStorageManager::deleteOfflineOperation)

val listener = getTypedActivity(OnFilesRemovedListener::class.java)
val fileActivity = getTypedActivity(FileActivity::class.java)

lifecycleScope.launch(Dispatchers.IO) {
fileActivity?.lifecycleScope?.launch(Dispatchers.IO) {
val (autoUploadEntities, filesToRemove) =
FileUploadHelper.instance().splitFilesByAutoUpload(files, userAccountManager.user.accountName)
withContext(Dispatchers.Main) {
Expand All @@ -123,10 +120,11 @@ class RemoveFilesDialogFragment :
)
}

val fileActivity = getTypedActivity(FileActivity::class.java)
fileActivity?.removeFiles(offlineFiles, filesToRemove, onlyLocalCopy, listener)
fileActivity.removeFiles(offlineFiles, filesToRemove, onlyLocalCopy, listener)
finishActionMode()
}
} ?: run {
finishActionMode()
}
}

Expand Down Expand Up @@ -222,6 +220,7 @@ class RemoveFilesDialogFragment :
val list = ArrayList<OCFile>().apply {
add(file)
}

return newInstance(list)
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1108,7 +1108,7 @@ public boolean onLongItemClicked(OCFile file) {

private void folderOnItemClick(OCFile file, int position) {
if (requireActivity() instanceof FolderPickerActivity fpa) {
String filenameErrorMessage = FileNameValidator.INSTANCE.checkFileName(file.getFileName(), getCapabilities(), requireContext(), null);
String filenameErrorMessage = FileNameValidator.INSTANCE.checkFileName(file.getFileName(), getCapabilities(), requireContext());
Copy link
Copy Markdown
Collaborator Author

@alperozturk96 alperozturk96 Apr 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Crash fix

if (filenameErrorMessage != null) {
DisplayUtils.showSnackMessage(fpa, filenameErrorMessage);
return;
Expand Down Expand Up @@ -1463,7 +1463,7 @@ private OCCapability getCapabilities() {

private String checkInvalidFilenames(Set<OCFile> checkedFiles) {
for (OCFile file : checkedFiles) {
String errorMessage = FileNameValidator.INSTANCE.checkFileName(file.getFileName(), getCapabilities(), requireContext(), null);
String errorMessage = FileNameValidator.INSTANCE.checkFileName(file.getFileName(), getCapabilities(), requireContext());
if (errorMessage != null) {
return errorMessage;
}
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/owncloud/android/ui/navigation/NavigatorActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ class NavigatorActivity : DrawerActivity() {
/**
* Handles action bar leading button action
*/
@Suppress("NestedBlockDepth")
Copy link
Copy Markdown
Collaborator Author

@alperozturk96 alperozturk96 Apr 29, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to supress kotlin spotless

override fun onOptionsItemSelected(item: MenuItem): Boolean {
if (item.itemId == android.R.id.home) {
val onBackPressListener =
Expand Down
Loading