This commit is contained in:
Ben Iofel
2026-01-12 10:45:41 -05:00
parent 45a1426319
commit 625b08d5f8
3 changed files with 11 additions and 21 deletions
@@ -758,14 +758,10 @@ class ComposeActivity : QkThemedActivity(), ComposeView {
.show() .show()
} }
override fun showReactionsDialog(reactions: List<Pair<String, List<String>>>) { override fun showReactionsDialog(reactions: List<String>) {
val message = reactions.flatMap { (emoji, contacts) ->
contacts.map { "$emoji $it" }
}.joinToString("\n")
AlertDialog.Builder(this) AlertDialog.Builder(this)
.setTitle(R.string.compose_reactions_title) .setTitle(R.string.compose_reactions_title)
.setMessage(message) .setMessage(reactions.joinToString("\n"))
.setPositiveButton(R.string.button_ok, null) .setPositiveButton(R.string.button_ok, null)
.show() .show()
} }
@@ -112,7 +112,7 @@ interface ComposeView : QkView<ComposeState> {
fun showQksmsPlusSnackbar(@StringRes message: Int) fun showQksmsPlusSnackbar(@StringRes message: Int)
fun showDeleteDialog( messages: List<Long>) fun showDeleteDialog( messages: List<Long>)
fun showClearCurrentMessageDialog() fun showClearCurrentMessageDialog()
fun showReactionsDialog(reactions: List<Pair<String, List<String>>>) fun showReactionsDialog(reactions: List<String>)
fun startSpeechRecognition() fun startSpeechRecognition()
fun focusMessage() fun focusMessage()
} }
@@ -763,21 +763,15 @@ class ComposeViewModel @Inject constructor(
view.reactionClickIntent view.reactionClickIntent
.mapNotNull { messageId -> messageRepo.getMessage(messageId) } .mapNotNull { messageId -> messageRepo.getMessage(messageId) }
.withLatestFrom(conversation) { message, conv -> .withLatestFrom(conversation) { message, conv ->
val reactions = message.emojiReactions message.emojiReactions.map { reaction ->
.groupBy { it.emoji } val contactName = conv.recipients
.map { (emoji, emojiReactions) -> .firstOrNull { recipient ->
val contactNames = emojiReactions.map { reaction -> phoneNumberUtils.compare(recipient.address, reaction.senderAddress)
conv.recipients
.firstOrNull { recipient ->
phoneNumberUtils.compare(recipient.address, reaction.senderAddress)
}
?.getDisplayName()
?: reaction.senderAddress
} }
emoji to contactNames ?.getDisplayName()
} ?: reaction.senderAddress
.sortedByDescending { it.second.size } "${reaction.emoji} $contactName"
reactions }
} }
.autoDisposable(view.scope()) .autoDisposable(view.scope())
.subscribe { reactions -> view.showReactionsDialog(reactions) } .subscribe { reactions -> view.showReactionsDialog(reactions) }