fix: Files persist in the gallery when deleted in the preview

Infomaniak · Nov 11, 2024 · e8e80e0 · e8e80e0
1 parent c7a31e8
commit e8e80e0
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/app/src/main/java/com/infomaniak/drive/ui/MainViewModel.kt b/app/src/main/java/com/infomaniak/drive/ui/MainViewModel.kt
@@ -124,6 +124,8 @@ class MainViewModel(
     private var syncOfflineFilesJob = Job()
     private var setCurrentFolderJob = Job()
 
+    val deleteFilesFromGallery = SingleLiveEvent<List<Int>>()
+
     private fun getContext() = getApplication<MainApplication>()
 
     fun setCurrentFolder(folder: File?) {

diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/preview/PreviewSliderFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/preview/PreviewSliderFragment.kt
@@ -277,6 +277,9 @@ class PreviewSliderFragment : BasePreviewSliderFragment(), FileInfoActionsView.O
                 removeFileInSlider()
                 showSnackbar(getString(R.string.snackbarMoveTrashConfirmation, currentFile.name))
                 mainViewModel.deleteFileFromHome.value = true
+                mainViewModel.deleteFilesFromGallery.postValue(
+                    mainViewModel.deleteFilesFromGallery.value?.plus(currentFile.id) ?: listOf(currentFile.id)
+                )
             } else {
                 showSnackbar(R.string.errorDelete)
             }

diff --git a/app/src/main/java/com/infomaniak/drive/ui/menu/GalleryFragment.kt b/app/src/main/java/com/infomaniak/drive/ui/menu/GalleryFragment.kt
@@ -46,6 +46,7 @@ import com.infomaniak.drive.utils.getAdjustedColumnNumber
 import com.infomaniak.drive.utils.observeAndDisplayNetworkAvailability
 import com.infomaniak.drive.views.NoItemsLayoutView
 import com.infomaniak.lib.core.utils.Utils.createRefreshTimer
+import com.infomaniak.lib.core.utils.getBackNavigationResult
 import com.infomaniak.lib.core.utils.setPagination
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -85,6 +86,10 @@ class GalleryFragment : MultiSelectFragment(MATOMO_CATEGORY), NoItemsLayoutView.
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        getBackNavigationResult<Int>(DELETE_FILE_KEY) { fileId ->
+            galleryAdapter.deleteByFileId(fileId)
+        }
+
         setupPagination()
 
         val isCurrentlyInGallery = menuGalleryBinding != null
@@ -148,6 +153,10 @@ class GalleryFragment : MultiSelectFragment(MATOMO_CATEGORY), NoItemsLayoutView.
         }
 
         observeApiResultPagination()
+
+        mainViewModel.deleteFilesFromGallery.observe(viewLifecycleOwner) { filesId ->
+            filesId.forEach { fileId -> galleryAdapter.deleteByFileId(fileId) }
+        }
     }
 
     private fun observeApiResultPagination() {
@@ -338,5 +347,7 @@ class GalleryFragment : MultiSelectFragment(MATOMO_CATEGORY), NoItemsLayoutView.
         const val TAG = "GalleryFragment"
         const val MATOMO_CATEGORY = "picturesFileAction"
         private const val NUMBER_ITEMS_LOADER = 13
+
+        const val DELETE_FILE_KEY = "sort_type_option"
     }
 }