diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index bc274b0a..a6c69100 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -758,14 +758,10 @@ class ComposeActivity : QkThemedActivity(), ComposeView { .show() } - override fun showReactionsDialog(reactions: List>>) { - val message = reactions.flatMap { (emoji, contacts) -> - contacts.map { "$emoji $it" } - }.joinToString("\n") - + override fun showReactionsDialog(reactions: List) { AlertDialog.Builder(this) .setTitle(R.string.compose_reactions_title) - .setMessage(message) + .setMessage(reactions.joinToString("\n")) .setPositiveButton(R.string.button_ok, null) .show() } diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt index 5e0b8641..3f661878 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeView.kt @@ -112,7 +112,7 @@ interface ComposeView : QkView { fun showQksmsPlusSnackbar(@StringRes message: Int) fun showDeleteDialog( messages: List) fun showClearCurrentMessageDialog() - fun showReactionsDialog(reactions: List>>) + fun showReactionsDialog(reactions: List) fun startSpeechRecognition() fun focusMessage() } \ No newline at end of file diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index f8c191d1..440a975e 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -763,21 +763,15 @@ class ComposeViewModel @Inject constructor( view.reactionClickIntent .mapNotNull { messageId -> messageRepo.getMessage(messageId) } .withLatestFrom(conversation) { message, conv -> - val reactions = message.emojiReactions - .groupBy { it.emoji } - .map { (emoji, emojiReactions) -> - val contactNames = emojiReactions.map { reaction -> - conv.recipients - .firstOrNull { recipient -> - phoneNumberUtils.compare(recipient.address, reaction.senderAddress) - } - ?.getDisplayName() - ?: reaction.senderAddress + message.emojiReactions.map { reaction -> + val contactName = conv.recipients + .firstOrNull { recipient -> + phoneNumberUtils.compare(recipient.address, reaction.senderAddress) } - emoji to contactNames - } - .sortedByDescending { it.second.size } - reactions + ?.getDisplayName() + ?: reaction.senderAddress + "${reaction.emoji} $contactName" + } } .autoDisposable(view.scope()) .subscribe { reactions -> view.showReactionsDialog(reactions) }