fix: handle different strings for multiple selection and different file type.

Author: mykh-hailo

owncloudApp/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

@@ -183,6 +183,9 @@ class FileDisplayActivity : FileActivity(),
     private var waitingToOpen: OCFile? = null
 
     private var copyMoveTargetFolder: OCFile? = null
+    private var copyMoveItemsCount: Int = 1
+    private var copyMoveFilesCount: Int = 0
+    private var copyMoveFoldersCount: Int = 0
 
     private var localBroadcastManager: LocalBroadcastManager? = null
 
@@ -711,6 +714,7 @@ class FileDisplayActivity : FileActivity(),
         val folderToMoveAt = data.getParcelableExtra<OCFile>(FolderPickerActivity.EXTRA_FOLDER) ?: return
         val files = data.getParcelableArrayListExtra<OCFile>(FolderPickerActivity.EXTRA_FILES) ?: return
         copyMoveTargetFolder = folderToMoveAt
+        updateCopyMoveSelectionCounters(files)
         val moveOperation = FileOperation.MoveOperation(
             listOfFilesToMove = files.toList(),
             targetFolder = folderToMoveAt,
@@ -728,6 +732,7 @@ class FileDisplayActivity : FileActivity(),
         val folderToCopyAt = data.getParcelableExtra<OCFile>(FolderPickerActivity.EXTRA_FOLDER) ?: return
         val files = data.getParcelableArrayListExtra<OCFile>(FolderPickerActivity.EXTRA_FILES) ?: return
         copyMoveTargetFolder = folderToCopyAt
+        updateCopyMoveSelectionCounters(files)
         val copyOperation = FileOperation.CopyOperation(
             listOfFilesToCopy = files.toList(),
             targetFolder = folderToCopyAt,
@@ -1086,7 +1091,7 @@ class FileDisplayActivity : FileActivity(),
                     spacesListViewModel.refreshSpacesFromServer()
                 }
                 if (uiResult.data.isNullOrEmpty()) {
-                    showCopyMoveSuccessSnackbar(isCopy = false)
+                    showCopyMoveSuccessSnackbar(isCopy = false, itemsCount = copyMoveItemsCount)
                 }
             }
 
@@ -1137,7 +1142,7 @@ class FileDisplayActivity : FileActivity(),
                 // Refresh the spaces and update the quota
                 spacesListViewModel.refreshSpacesFromServer()
                 if (uiResult.data.isNullOrEmpty()) {
-                    showCopyMoveSuccessSnackbar(isCopy = true)
+                    showCopyMoveSuccessSnackbar(isCopy = true, itemsCount = copyMoveItemsCount)
                 }
             }
 
@@ -1157,8 +1162,19 @@ class FileDisplayActivity : FileActivity(),
         }
     }
 
-    private fun showCopyMoveSuccessSnackbar(isCopy: Boolean) {
-        val message = getString(if (isCopy) R.string.copy_file_correctly else R.string.move_file_correctly)
+    private fun showCopyMoveSuccessSnackbar(isCopy: Boolean, itemsCount: Int) {
+        val safeItemsCount = itemsCount.coerceAtLeast(1)
+        val pluralRes = when {
+            copyMoveFilesCount > 0 && copyMoveFoldersCount > 0 ->
+                if (isCopy) R.plurals.copy_items_correctly else R.plurals.move_items_correctly
+
+            copyMoveFoldersCount > 0 ->
+                if (isCopy) R.plurals.copy_folders_correctly else R.plurals.move_folders_correctly
+
+            else ->
+                if (isCopy) R.plurals.copy_files_correctly else R.plurals.move_files_correctly
+        }
+        val message = copyMoveSuccessQuantityString(pluralRes, safeItemsCount)
         val targetFolderId = copyMoveTargetFolder?.id
         if (targetFolderId != null) {
             showSnackbarWithAction(
@@ -1176,6 +1192,36 @@ class FileDisplayActivity : FileActivity(),
         }
     }
 
+    /** Singular plural forms have no `%d`; avoid passing format args for quantity `one`. */
+    private fun copyMoveSuccessQuantityString(pluralRes: Int, count: Int): String =
+        if (count == 1) {
+            resources.getQuantityString(pluralRes, 1)
+        } else {
+            resources.getQuantityString(pluralRes, count, count)
+        }
+
+    /** If [replace] is null, sets counters from [files]; otherwise subtracts skipped conflict entries. */
+    private fun updateCopyMoveSelectionCounters(files: List<OCFile>, replace: List<Boolean?>? = null) {
+        if (replace == null) {
+            copyMoveItemsCount = files.size
+            copyMoveFoldersCount = files.count { it.isFolder }
+            copyMoveFilesCount = copyMoveItemsCount - copyMoveFoldersCount
+            return
+        }
+        if (replace.isEmpty()) return
+
+        val conflictFiles = files.asReversed()
+        val skippedConflictFiles = conflictFiles.filterIndexed { index, _ -> replace.getOrNull(index) == null }
+        if (skippedConflictFiles.isEmpty()) return
+
+        val skippedFolders = skippedConflictFiles.count { it.isFolder }
+        val skippedFiles = skippedConflictFiles.size - skippedFolders
+
+        copyMoveItemsCount = (copyMoveItemsCount - skippedConflictFiles.size).coerceAtLeast(0)
+        copyMoveFoldersCount = (copyMoveFoldersCount - skippedFolders).coerceAtLeast(0)
+        copyMoveFilesCount = (copyMoveFilesCount - skippedFiles).coerceAtLeast(0)
+    }
+
     private fun showConflictDecisionDialog(
         uiResult: UIResult.Success<List<OCFile>>,
         data: List<OCFile>,
@@ -1317,6 +1363,7 @@ class FileDisplayActivity : FileActivity(),
     }
 
     private fun launchCopyFile(files: List<OCFile>, replace: List<Boolean?>) {
+        updateCopyMoveSelectionCounters(files, replace)
         fileOperationsViewModel.performOperation(
             FileOperation.CopyOperation(
                 listOfFilesToCopy = files,
@@ -1328,6 +1375,7 @@ class FileDisplayActivity : FileActivity(),
     }
 
     private fun launchMoveFile(files: List<OCFile>, replace: List<Boolean?>) {
+        updateCopyMoveSelectionCounters(files, replace)
         fileOperationsViewModel.performOperation(
             FileOperation.MoveOperation(
                 listOfFilesToMove = files,

owncloudApp/src/main/res/values/strings.xml

@@ -543,14 +543,36 @@
     <string name="move_file_invalid_into_descendent">It is not possible to move a folder into a descendant.</string>
     <string name="move_file_invalid_overwrite">The file exists already in the destination folder.</string>
     <string name="move_file_error">An error occurred while trying to move this file or folder.</string>
-    <string name="move_file_correctly">File moved correctly</string>
+    <plurals name="move_files_correctly">
+        <item quantity="one">File moved correctly</item>
+        <item quantity="other">%d files moved correctly</item>
+    </plurals>
+    <plurals name="move_folders_correctly">
+        <item quantity="one">Folder moved correctly</item>
+        <item quantity="other">%d folders moved correctly</item>
+    </plurals>
+    <plurals name="move_items_correctly">
+        <item quantity="one">Item moved correctly</item>
+        <item quantity="other">%d items moved correctly</item>
+    </plurals>
     <string name="forbidden_permissions_move">to move this file</string>
 
     <string name="copy_file_not_found">Unable to copy. Please check whether the file exists.</string>
     <string name="copy_file_invalid_into_descendent">It is not possible to copy a folder into a descendant.</string>
     <string name="copy_file_invalid_overwrite">The file exists already in the destination folder.</string>
     <string name="copy_file_error">An error occurred while trying to copy this file or folder.</string>
-    <string name="copy_file_correctly">File copied correctly</string>
+    <plurals name="copy_files_correctly">
+        <item quantity="one">File copied correctly</item>
+        <item quantity="other">%d files copied correctly</item>
+    </plurals>
+    <plurals name="copy_folders_correctly">
+        <item quantity="one">Folder copied correctly</item>
+        <item quantity="other">%d folders copied correctly</item>
+    </plurals>
+    <plurals name="copy_items_correctly">
+        <item quantity="one">Item copied correctly</item>
+        <item quantity="other">%d items copied correctly</item>
+    </plurals>
     <string name="forbidden_permissions_copy">to copy this file</string>
 
     <string name="go_to_destination_folder">Open Folder</string>