From a4ab96cd6b7dfb2916935237977b0c0784827b09 Mon Sep 17 00:00:00 2001
From: TommyDL-Infomaniak <tommy.diluna@infomaniak.com>
Date: Fri, 21 Feb 2025 12:38:06 +0100
Subject: [PATCH] fix: Show a snackbar when a conflict error occurs

---
 .../TrashedFileActionsBottomSheetDialog.kt               | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/TrashedFileActionsBottomSheetDialog.kt b/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/TrashedFileActionsBottomSheetDialog.kt
index e8964cfe43..fee242d8d3 100644
--- a/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/TrashedFileActionsBottomSheetDialog.kt
+++ b/app/src/main/java/com/infomaniak/drive/ui/bottomSheetDialogs/TrashedFileActionsBottomSheetDialog.kt
@@ -113,6 +113,12 @@ class TrashedFileActionsBottomSheetDialog : BottomSheetDialogFragment() {
         }
     }
 
+    private fun getErrorMessage(fileResult: FileResult) = when (fileResult.errorCode) {
+        ApiErrorCode.AN_ERROR_HAS_OCCURRED -> R.string.errorRestore
+        "conflict_error" -> R.string.errorConflict
+        else -> fileResult.errorResId
+    }
+
     private fun restoreResult(fileResult: FileResult, originalPlace: Boolean, folderName: String? = null) {
         if (fileResult.isSuccess) {
             val title = if (originalPlace) R.plurals.trashedFileRestoreFileToOriginalPlaceSuccess
@@ -125,8 +131,7 @@ class TrashedFileActionsBottomSheetDialog : BottomSheetDialogFragment() {
             showSnackbar(resources.getQuantityString(title, 1, *args.toTypedArray()))
             dismissAndRemoveFileFromList()
         } else {
-            val snackbarText = if (fileResult.errorCode == ApiErrorCode.AN_ERROR_HAS_OCCURRED) R.string.errorRestore
-            else fileResult.errorResId
+            val snackbarText = getErrorMessage(fileResult)
 
             snackbarText?.let { text -> showSnackbar(text) }
             findNavController().popBackStack()