Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-03-01 22:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix improper media selection after deletion.

Browse Source
This commit is contained in:
Alex Hart
2025-10-15 09:17:37 -03:00
committed by Cody Henthorne
parent 7b25cc399d
commit 6bde2fd20a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/mediasend/v2/MediaSelectionViewModel.kt
View File

@@ -275,10 +275,12 @@ class MediaSelectionViewModel(
fun removeMedia(media: Set<Media>) {
val snapshot = store.state
val newMediaList = snapshot.selectedMedia - media
val oldFocusIndex = snapshot.selectedMedia.indexOf(media.first())
val newFocus = when {
newMediaList.isEmpty() -> null
media == snapshot.focusedMedia -> newMediaList[Util.clamp(oldFocusIndex, 0, newMediaList.size - 1)]
snapshot.focusedMedia in media -> {
val oldFocusIndex = snapshot.selectedMedia.indexOf(snapshot.focusedMedia)
newMediaList[Util.clamp(oldFocusIndex, 0, newMediaList.size - 1)]
}
else -> snapshot.focusedMedia
}
@@ -287,7 +289,7 @@ class MediaSelectionViewModel(
selectedMedia = newMediaList,
focusedMedia = newFocus,
editorStateMap = it.editorStateMap - media.map { it.uri },
cameraFirstCapture = if (media == it.cameraFirstCapture) null else it.cameraFirstCapture
cameraFirstCapture = if (it.cameraFirstCapture in media) null else it.cameraFirstCapture
)
}