empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix error message interaction on text-only bubbles.

Browse source
This commit is contained in:
Greyson Parrelli 2023-12-08 13:25:45 -05:00 • committed by Cody Henthorne
parent 3439861f74
commit f2a7824168
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt
View file

@ -136,10 +136,7 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
)
}
binding.root.setOnClickListener {
conversationContext.clickListener.onItemClick(getMultiselectPartForLatestTouch())
}
binding.root.setOnClickListener { onBubbleClicked() }
binding.root.setOnLongClickListener {
conversationContext.clickListener.onItemLongClick(binding.root, getMultiselectPartForLatestTouch())
@ -710,6 +707,28 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
}
}
private fun onBubbleClicked() {
val messageRecord = conversationMessage.messageRecord
when {
conversationContext.selectedItems.isNotEmpty() -> {
conversationContext.clickListener.onItemClick(getMultiselectPartForLatestTouch())
}
messageRecord.isFailed -> {
conversationContext.clickListener.onMessageWithErrorClicked(messageRecord)
}
messageRecord.isRateLimited && SignalStore.rateLimit().needsRecaptcha() -> {
conversationContext.clickListener.onMessageWithRecaptchaNeededClicked(messageRecord)
}
messageRecord.isOutgoing && messageRecord.isIdentityMismatchFailure -> {
conversationContext.clickListener.onIncomingIdentityMismatchClicked(messageRecord.fromRecipient.id)
}
else -> {
conversationContext.clickListener.onItemClick(getMultiselectPartForLatestTouch())
}
}
}
override fun disallowSwipe(latestDownX: Float, latestDownY: Float): Boolean {
return false
}