From abf1c76b04ab83c1ec52e5d08d8220bec763e51d Mon Sep 17 00:00:00 2001
From: Khushbu <khushbuk0711@gmail.com>
Date: Mon, 21 Apr 2025 03:53:20 +0530
Subject: [PATCH] Revert back changes

---
 .../customselector/ui/adapter/ImageAdapter.kt | 42 ++++++++-----------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt
index 8d48e063b..20a2fe70a 100644
--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt
@@ -230,13 +230,7 @@ class ImageAdapter(
             }
 
             holder.itemView.setOnClickListener {
-                     // pick the exact Image you displayed
-                     val clicked = if (showAlreadyActionedImages) {
-                             images[position]
-                        } else {
-                             ArrayList(actionableImagesMap.values)[position]
-                        }
-                     onThumbnailClicked(clicked, position, holder)
+                onThumbnailClicked(position, holder)
             }
 
             // launch media preview on long click.
@@ -300,7 +294,6 @@ class ImageAdapter(
      * Handles click on thumbnail
      */
     private fun onThumbnailClicked(
-        image: Image,
         position: Int,
         holder: ImageViewHolder,
     ) {
@@ -313,10 +306,10 @@ class ImageAdapter(
         // added inside map
         if (!switchState) {
             if (actionableImagesMap.size > position) {
-                selectOrRemoveImage(image,holder, position)
+                selectOrRemoveImage(holder, position)
             }
         } else {
-            selectOrRemoveImage(image,holder, position)
+            selectOrRemoveImage(holder, position)
         }
     }
 
@@ -324,7 +317,6 @@ class ImageAdapter(
      * Handle click event on an image, update counter on images.
      */
     private fun selectOrRemoveImage(
-        image:Image,
         holder: ImageViewHolder,
         position: Int,
     ) {
@@ -335,15 +327,15 @@ class ImageAdapter(
 
         // Getting clicked index from all images index when show_already_actioned_images
         // switch is on
-        val clickedIndex: Int =ImageHelper.getIndex(selectedImages, image)
-//            if (showAlreadyActionedImages) {
-//                ImageHelper.getIndex(selectedImages, images[position])
-//
-//                // Getting clicked index from actionable images when show_already_actioned_images
-//                // switch is off
-//            } else {
-//                ImageHelper.getIndex(selectedImages, ArrayList(actionableImagesMap.values)[position])
-//            }
+        val clickedIndex: Int =
+            if (showAlreadyActionedImages) {
+                ImageHelper.getIndex(selectedImages, images[position])
+
+                // Getting clicked index from actionable images when show_already_actioned_images
+                // switch is off
+            } else {
+                ImageHelper.getIndex(selectedImages, ArrayList(actionableImagesMap.values)[position])
+            }
 
         if (clickedIndex != -1) {
             selectedImages.removeAt(clickedIndex)
@@ -352,16 +344,16 @@ class ImageAdapter(
             }
             notifyItemChanged(position, ImageUnselected())
         } else {
-//            val image = images[position]
+            val image = images[position]
             scope.launch(ioDispatcher) {
                 val imageSHA1 = imageLoader.getSHA1(image, defaultDispatcher)
                 withContext(Dispatchers.Main) {
-            if (holder.isItemUploaded()) {
-                Toast.makeText(context, R.string.custom_selector_already_uploaded_image_text, Toast.LENGTH_SHORT).show()
+                    if (holder.isItemUploaded()) {
+                        Toast.makeText(context, R.string.custom_selector_already_uploaded_image_text, Toast.LENGTH_SHORT).show()
                         return@withContext
                     }
 
-                if (imageSHA1.isNotEmpty() && imageLoader.getFromUploaded(imageSHA1) != null) {
+                    if (imageSHA1.isNotEmpty() && imageLoader.getFromUploaded(imageSHA1) != null) {
                         holder.itemUploaded()
                         Toast.makeText(context, R.string.custom_selector_already_uploaded_image_text, Toast.LENGTH_SHORT).show()
                         return@withContext
@@ -377,7 +369,7 @@ class ImageAdapter(
                     selectedImages.add(image)
                     notifyItemChanged(position, ImageSelectedOrUpdated())
 
-        imageSelectListener.onSelectedImagesChanged(selectedImages, numberOfSelectedImagesMarkedAsNotForUpload)
+                    imageSelectListener.onSelectedImagesChanged(selectedImages, numberOfSelectedImagesMarkedAsNotForUpload)
                 }
             }
         }