Skip to content

Fix #6409: Add listener call in ImageAdapter to update UI and upload #6420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 15, 2025
Merged

Fix #6409: Add listener call in ImageAdapter to update UI and upload #6420

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd09c81
Fix #6409: Add listener call in ImageAdapter to update UI and upload …
Kota-Jagadeesh Sep 7, 2025
b2341c8
Merge branch 'main' into Fix/custom-selector-maximum-limit
nicolas-raoul Sep 10, 2025
633210d
Fix image deselection issue in ImageAdapter to update UI correctly (#…
Kota-Jagadeesh Sep 13, 2025
a91d728
Merge branch 'main' into Fix/custom-selector-maximum-limit
nicolas-raoul Sep 13, 2025
a1d37e1
Prevent duplicate image selections on multiple taps in ImageAdapter w…
Kota-Jagadeesh Sep 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,7 @@ class ImageAdapter(

// Getting selected index when switch is off
} else if (actionableImagesMap.size > position) {
ImageHelper
.getIndex(selectedImages, ArrayList(actionableImagesMap.values)[position])
ImageHelper.getIndex(selectedImages, ArrayList(actionableImagesMap.values)[position])

// For any other case return -1
} else {
Expand Down Expand Up @@ -348,8 +347,14 @@ class ImageAdapter(
numberOfSelectedImagesMarkedAsNotForUpload--
}
notifyItemChanged(position, ImageUnselected())
// Notify listener of deselection to update UI
imageSelectListener.onSelectedImagesChanged(selectedImages, numberOfSelectedImagesMarkedAsNotForUpload)
} else {
val image = images[position]
// Prevent adding the same image multiple times
val image = if (showAlreadyActionedImages) images[position] else ArrayList(actionableImagesMap.values)[position]
if (selectedImages.contains(image)) {
return // Image already selected, ignore additional clicks
}
scope.launch(ioDispatcher) {
val imageSHA1 = imageLoader.getSHA1(image, defaultDispatcher)
withContext(Dispatchers.Main) {
Expand All @@ -373,7 +378,6 @@ class ImageAdapter(
}
selectedImages.add(image)
notifyItemChanged(position, ImageSelectedOrUpdated())

imageSelectListener.onSelectedImagesChanged(selectedImages, numberOfSelectedImagesMarkedAsNotForUpload)
}
}
Expand Down Expand Up @@ -632,4 +636,4 @@ class ImageAdapter(
fun setSingleSelection(single: Boolean) {
singleSelection = single
}
}
}