wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6610 from thundernest/fix_swipe_crash

Browse source 
Don't crash in swipe callbacks when a message list item no longer exists
This commit is contained in:
cketti 2023-01-27 11:54:24 +01:00 committed by GitHub
commit 55b15a613d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt
View file

@ -69,6 +69,8 @@ class MessageListSwipeCallback(
}
override fun onSwipeStarted(viewHolder: ViewHolder, direction: Int) {
val item = viewHolder.messageListItem ?: return
// Mark view to prevent MessageListItemAnimator from interfering with swipe animations
viewHolder.markAsSwiped(true)
@ -78,21 +80,23 @@ class MessageListSwipeCallback(
else -> error("Unsupported direction: $direction")
}
listener.onSwipeStarted(viewHolder.messageListItem, swipeAction)
listener.onSwipeStarted(item, swipeAction)
}
override fun onSwipeDirectionChanged(viewHolder: ViewHolder, direction: Int) {
val item = viewHolder.messageListItem ?: return
val swipeAction = when (direction) {
ItemTouchHelper.RIGHT -> swipeRightAction
ItemTouchHelper.LEFT -> swipeLeftAction
else -> error("Unsupported direction: $direction")
}
listener.onSwipeActionChanged(viewHolder.messageListItem, swipeAction)
listener.onSwipeActionChanged(item, swipeAction)
}
override fun onSwiped(viewHolder: ViewHolder, direction: Int) {
val item = viewHolder.messageListItem
val item = viewHolder.messageListItem ?: return
when (direction) {
ItemTouchHelper.RIGHT -> listener.onSwipeAction(item, swipeRightAction)
@ -102,7 +106,9 @@ class MessageListSwipeCallback(
}
override fun onSwipeEnded(viewHolder: ViewHolder) {
listener.onSwipeEnded(viewHolder.messageListItem)
val item = viewHolder.messageListItem ?: return
listener.onSwipeEnded(item)
}
override fun clearView(recyclerView: RecyclerView, viewHolder: ViewHolder) {
@ -230,9 +236,8 @@ class MessageListSwipeCallback(
return (super.getAnimationDuration(recyclerView, animationType, animateDx, animateDy) * percentage).toLong()
}
private val ViewHolder.messageListItem: MessageListItem
private val ViewHolder.messageListItem: MessageListItem?
get() = (this as? MessageViewHolder)?.uniqueId?.let { adapter.getItemById(it) }
?: error("Couldn't find MessageListItem")
}
fun interface SwipeActionSupportProvider {