From 56d0beb22a2292f54aa7a72fda26d9b314fb3088 Mon Sep 17 00:00:00 2001
From: LachlanMajor <majorlachie@gmail.com>
Date: Sun, 20 Oct 2024 22:36:15 +1100
Subject: [PATCH] Fixes #5840 Custom select folder display breaks after exiting
 media preview (#5866)

* ImageFragment.kt: notifyDataSetChanged() added to update observers about init call in handleResult()

* ImageFragment.kt: unnecessary initialisation after exiting media preview was removed from passSelectedImages
---
 .../ui/selector/CustomSelectorActivity.kt            |  4 +---
 .../customselector/ui/selector/ImageFragment.kt      | 12 ++++--------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt
index d39b69f29..3bba6f05c 100644
--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/CustomSelectorActivity.kt
@@ -41,7 +41,6 @@ import fr.free.nrw.commons.R
 import fr.free.nrw.commons.customselector.database.NotForUploadStatus
 import fr.free.nrw.commons.customselector.database.NotForUploadStatusDao
 import fr.free.nrw.commons.customselector.helper.CustomSelectorConstants
-import fr.free.nrw.commons.customselector.helper.CustomSelectorConstants.SHOULD_REFRESH
 import fr.free.nrw.commons.customselector.listeners.FolderClickListener
 import fr.free.nrw.commons.customselector.listeners.ImageSelectListener
 import fr.free.nrw.commons.customselector.model.Image
@@ -237,8 +236,7 @@ class CustomSelectorActivity :
             val selectedImages: ArrayList<Image> =
                 data!!
                     .getParcelableArrayListExtra(CustomSelectorConstants.NEW_SELECTED_IMAGES)!!
-            val shouldRefresh = data.getBooleanExtra(SHOULD_REFRESH, false)
-            imageFragment?.passSelectedImages(selectedImages, shouldRefresh)
+            viewModel?.selectedImages?.value = selectedImages
         }
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt
index 7e522f681..efe640e82 100644
--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/selector/ImageFragment.kt
@@ -279,6 +279,10 @@ class ImageFragment :
                 filteredImages = ImageHelper.filterImages(images, bucketId)
                 allImages = ArrayList(filteredImages)
                 imageAdapter.init(filteredImages, allImages, TreeMap(), uploadingContributions)
+                viewModel?.selectedImages?.value?.let { selectedImages ->
+                    imageAdapter.setSelectedImages(selectedImages)
+                }
+                imageAdapter.notifyDataSetChanged()
                 selectorRV?.let {
                     it.visibility = View.VISIBLE
                     lastItemId?.let { pos ->
@@ -382,14 +386,6 @@ class ImageFragment :
         selectedImages: ArrayList<Image>,
         shouldRefresh: Boolean,
     ) {
-        imageAdapter.setSelectedImages(selectedImages)
-
-        val uploadingContributions = getUploadingContributions()
-
-        if (!showAlreadyActionedImages && shouldRefresh) {
-            imageAdapter.init(filteredImages, allImages, TreeMap(), uploadingContributions)
-            imageAdapter.setSelectedImages(selectedImages)
-        }
     }
 
     /**