Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-26 04:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect quick react emojis for story replies.

Browse Source
This commit is contained in:
Cody Henthorne
2023-02-15 10:07:32 -05:00
committed by Greyson Parrelli
parent f26b2c0b2a
commit a88410faaf
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/stories/viewer/reply/composer/StoryReplyComposer.kt
View File

@@ -178,14 +178,15 @@ class StoryReplyComposer @JvmOverloads constructor(
}
private fun getReactionEmojis(): List<MappingModel<*>> {
val reactionEmoji = SignalStore.emojiValues().reactions
val recentEmoji = RecentEmojiPageModel(context, ReactWithAnyEmojiBottomSheetDialogFragment.REACTION_STORAGE_KEY).emoji
val emoji = (reactionEmoji + recentEmoji).distinct()
val displayEmoji: List<Emoji> = emoji
val reactionDisplayEmoji: List<Emoji> = SignalStore.emojiValues().reactions.map { Emoji(it) }
val canonicalReactionEmoji: List<String> = reactionDisplayEmoji.map { EmojiSource.latest.variationsToCanonical[it.value] ?: it.value }
val canonicalRecentReactionEmoji: Set<String> = LinkedHashSet(RecentEmojiPageModel(context, ReactWithAnyEmojiBottomSheetDialogFragment.REACTION_STORAGE_KEY).emoji) - canonicalReactionEmoji.toSet()
val recentDisplayEmoji: List<Emoji> = canonicalRecentReactionEmoji
.mapNotNull { canonical -> EmojiSource.latest.canonicalToVariations[canonical] }
.map { Emoji(it) }
return EmojiReactionsPageModel(emoji, displayEmoji).toMappingModels()
return EmojiReactionsPageModel(canonicalReactionEmoji + canonicalRecentReactionEmoji, reactionDisplayEmoji + recentDisplayEmoji).toMappingModels()
}
private fun onEmojiToggleClicked() {