Merge pull request #1957 from nextcloud/bugfix/1956/hideReactionsForReadOnlyConversations

Hide reactions from menu if conversation is read-only
This commit is contained in:
Andy Scherzinger 2022-05-06 14:38:15 +02:00 committed by GitHub
commit fafbcbd1cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -89,8 +89,6 @@ class MessageActionsDialog(
ChatMessage.MessageType.SYSTEM_MESSAGE != message.getMessageType() && ChatMessage.MessageType.SYSTEM_MESSAGE != message.getMessageType() &&
BuildConfig.DEBUG BuildConfig.DEBUG
) )
initEmojiMore()
} }
override fun onStart() { override fun onStart() {
@ -153,7 +151,10 @@ class MessageActionsDialog(
} }
private fun initEmojiBar() { private fun initEmojiBar() {
if (CapabilitiesUtil.hasSpreedFeatureCapability(user, "reactions")) { if (CapabilitiesUtil.hasSpreedFeatureCapability(user, "reactions") &&
Conversation.ConversationReadOnlyState.CONVERSATION_READ_ONLY !=
currentConversation?.conversationReadOnlyState
) {
checkAndSetEmojiSelfReaction(dialogMessageActionsBinding.emojiThumbsUp) checkAndSetEmojiSelfReaction(dialogMessageActionsBinding.emojiThumbsUp)
dialogMessageActionsBinding.emojiThumbsUp.setOnClickListener { dialogMessageActionsBinding.emojiThumbsUp.setOnClickListener {
sendReaction(message, dialogMessageActionsBinding.emojiThumbsUp.text.toString()) sendReaction(message, dialogMessageActionsBinding.emojiThumbsUp.text.toString())
@ -182,6 +183,7 @@ class MessageActionsDialog(
dialogMessageActionsBinding.emojiMore.setOnClickListener { dialogMessageActionsBinding.emojiMore.setOnClickListener {
dismiss() dismiss()
} }
initEmojiMore()
dialogMessageActionsBinding.emojiBar.visibility = View.VISIBLE dialogMessageActionsBinding.emojiBar.visibility = View.VISIBLE
} else { } else {
dialogMessageActionsBinding.emojiBar.visibility = View.GONE dialogMessageActionsBinding.emojiBar.visibility = View.GONE