Skip to content

Commit fd51d7e

Browse files
committed
Properly handling selected emoji from sheet - making sure it is saved as last used
1 parent 75344b1 commit fd51d7e

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1729,18 +1729,13 @@ class ConversationActivityV2 : ScreenLockActionBarActivity(), InputBarDelegate,
17291729
override fun onReactWithAnyEmojiDialogDismissed() = reactionDelegate.hide()
17301730

17311731
override fun onReactWithAnyEmojiSelected(emoji: String, messageId: MessageId) {
1732-
reactionDelegate.hide()
17331732
val message = if (messageId.mms) {
17341733
mmsDb.getMessageRecord(messageId.id)
17351734
} else {
17361735
smsDb.getMessageRecord(messageId.id)
17371736
}
1738-
val oldRecord = reactionDb.getReactions(messageId).find { it.author == textSecurePreferences.getLocalNumber() }
1739-
if (oldRecord?.emoji == emoji) {
1740-
sendEmojiRemoval(emoji, message)
1741-
} else {
1742-
sendEmojiReaction(emoji, message)
1743-
}
1737+
1738+
onReactionSelected(message, emoji)
17441739
}
17451740

17461741
override fun onRemoveReaction(emoji: String, messageId: MessageId) {

0 commit comments

Comments
 (0)