fix(files): make sure drag-and-drop and the upload menu behaves the same

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Author: susnux

apps/files/src/services/DropService.ts

@@ -95,9 +95,11 @@ export const onDropExternalFiles = async (root: RootDirectory, destination: Fold
 	// Check for conflicts on root elements
 	if (await hasConflict(root.contents, contents)) {
 		root.contents = await resolveConflict(root.contents, destination, contents)
-	}
-
-	if (root.contents.length === 0) {
+		if (root.contents.length === 0) {
+			// user cancelled the upload
+			return []
+		}
+	} else if (root.contents.length === 0) {
 		logger.info('No files to upload', { root })
 		showInfo(t('files', 'No files to upload'))
 		return []

apps/files/src/services/DropServiceUtils.ts

@@ -170,8 +170,8 @@ export const resolveConflict = async <T extends ((Directory|File)|Node)>(files:
 	} catch (error) {
 		console.error(error)
 		// User cancelled
-		showError(t('files', 'Upload cancelled'))
-		logger.error('User cancelled the upload')
+		logger.warn('User cancelled the upload', { error })
+		showWarning(t('files', 'Upload cancelled'))
 	}
 
 	return []