Add list of message action items to hide for a specific message. First check...

Add list of message action items to hide for a specific message. First check for Message_Read_Receipt_Store_Users setting

app/src/main/java/chat/rocket/android/chatroom/adapter/BaseViewHolder.kt

@@ -77,20 +77,24 @@ abstract class BaseViewHolder<T : BaseViewModel<*>>(
 
     private val onClickListener = { view: View ->
         if (data?.message?.isSystemMessage() == false) {
-            data?.message?.let {
-                val menuItems = view.context.inflate(R.menu.message_actions).toList()
-                menuItems.find { it.itemId == R.id.action_message_unpin }?.apply {
-                    setTitle(if (it.pinned) R.string.action_msg_unpin else R.string.action_msg_pin)
-                    isChecked = it.pinned
-                }
+            data?.let { vm ->
+                vm.message.let {
+                    val menuItems = view.context.inflate(R.menu.message_actions).toList()
+                    menuItems.find { it.itemId == R.id.action_message_unpin }?.apply {
+                        setTitle(if (it.pinned) R.string.action_msg_unpin else R.string.action_msg_pin)
+                        isChecked = it.pinned
+                    }
 
-                menuItems.find { it.itemId == R.id.action_message_star }?.apply {
-                    val isStarred = it.starred?.isNotEmpty() ?: false
-                    setTitle(if (isStarred) R.string.action_msg_unstar else R.string.action_msg_star)
-                    isChecked = isStarred
+                    menuItems.find { it.itemId == R.id.action_message_star }?.apply {
+                        val isStarred = it.starred?.isNotEmpty() ?: false
+                        setTitle(if (isStarred) R.string.action_msg_unstar else R.string.action_msg_star)
+                        isChecked = isStarred
+                    }
+                    val adapter = ActionListAdapter(menuItems = menuItems.filterNot {
+                        vm.menuItemsToHide.contains(it.itemId)
+                    }, callback = this@BaseViewHolder)
+                    BottomSheetMenu(adapter).show(view.context)
                 }
-                val adapter = ActionListAdapter(menuItems, this@BaseViewHolder)
-                BottomSheetMenu(adapter).show(view.context)
             }
         }
     }

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt

@@ -188,6 +188,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         super.onDestroyView()
     }
 
+    override fun onResume() {
+        super.onResume()
+        activity?.invalidateOptionsMenu()
+    }
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
         if (requestCode == REQUEST_CODE_FOR_PERFORM_SAF && resultCode == Activity.RESULT_OK) {
             if (resultData != null) {
@@ -199,6 +204,10 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
         inflater.inflate(R.menu.chatroom_actions, menu)
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu) {
+        super.onPrepareOptionsMenu(menu)
         menu.findItem(R.id.action_members_list)?.isVisible = !isBroadcastChannel
     }
 

app/src/main/java/chat/rocket/android/chatroom/viewmodel/AudioAttachmentViewModel.kt

@@ -15,7 +15,8 @@ data class AudioAttachmentViewModel(
         override var nextDownStreamMessage: BaseViewModel<*>? = null,
         override var preview: Message? = null,
         override var isTemporary: Boolean = false,
-        override var unread: Boolean? = null
+        override var unread: Boolean? = null,
+        override var menuItemsToHide: MutableList<Int> = mutableListOf()
 ) : BaseFileAttachmentViewModel<AudioAttachment> {
     override val viewType: Int
         get() = BaseViewModel.ViewType.AUDIO_ATTACHMENT.viewType

app/src/main/java/chat/rocket/android/chatroom/viewmodel/AuthorAttachmentViewModel.kt

@@ -17,7 +17,8 @@ data class AuthorAttachmentViewModel(
         override var nextDownStreamMessage: BaseViewModel<*>? = null,
         override var preview: Message? = null,
         override var isTemporary: Boolean = false,
-        override var unread: Boolean? = null
+        override var unread: Boolean? = null,
+        override var menuItemsToHide: MutableList<Int> = mutableListOf()
 ) : BaseAttachmentViewModel<AuthorAttachment> {
     override val viewType: Int
         get() = BaseViewModel.ViewType.AUTHOR_ATTACHMENT.viewType

app/src/main/java/chat/rocket/android/chatroom/viewmodel/BaseViewModel.kt

@@ -14,6 +14,7 @@ interface BaseViewModel<out T> {
     var preview: Message?
     var isTemporary: Boolean
     var unread: Boolean?
+    var menuItemsToHide: MutableList<Int>
 
     enum class ViewType(val viewType: Int) {
         MESSAGE(0),

app/src/main/java/chat/rocket/android/chatroom/viewmodel/ColorAttachmentViewModel.kt

@@ -16,7 +16,8 @@ data class ColorAttachmentViewModel(
     override var nextDownStreamMessage: BaseViewModel<*>? = null,
     override var preview: Message? = null,
     override var isTemporary: Boolean = false,
-    override var unread: Boolean? = null
+    override var unread: Boolean? = null,
+    override var menuItemsToHide: MutableList<Int> = mutableListOf()
 ) : BaseAttachmentViewModel<ColorAttachment> {
     override val viewType: Int
         get() = BaseViewModel.ViewType.COLOR_ATTACHMENT.viewType

app/src/main/java/chat/rocket/android/chatroom/viewmodel/GenericFileAttachmentViewModel.kt

@@ -16,7 +16,8 @@ data class GenericFileAttachmentViewModel(
         override var nextDownStreamMessage: BaseViewModel<*>? = null,
         override var preview: Message? = null,
         override var isTemporary: Boolean = false,
-        override var unread: Boolean? = null
+        override var unread: Boolean? = null,
+        override var menuItemsToHide: MutableList<Int> = mutableListOf()
 ) : BaseFileAttachmentViewModel<GenericFileAttachment> {
     override val viewType: Int
         get() = BaseViewModel.ViewType.GENERIC_FILE_ATTACHMENT.viewType

app/src/main/java/chat/rocket/android/chatroom/viewmodel/ImageAttachmentViewModel.kt

@@ -15,7 +15,8 @@ data class ImageAttachmentViewModel(
         override var nextDownStreamMessage: BaseViewModel<*>? = null,
         override var preview: Message? = null,
         override var isTemporary: Boolean = false,
-        override var unread: Boolean? = null
+        override var unread: Boolean? = null,
+        override var menuItemsToHide: MutableList<Int> = mutableListOf()
 ) : BaseFileAttachmentViewModel<ImageAttachment> {
     override val viewType: Int
         get() = BaseViewModel.ViewType.IMAGE_ATTACHMENT.viewType

app/src/main/java/chat/rocket/android/chatroom/viewmodel/MessageAttachmentViewModel.kt

@@ -16,7 +16,8 @@ data class MessageAttachmentViewModel(
         var messageLink: String? = null,
         override var preview: Message? = null,
         override var isTemporary: Boolean = false,
-        override var unread: Boolean? = null
+        override var unread: Boolean? = null,
+        override var menuItemsToHide: MutableList<Int> = mutableListOf()
 ) : BaseViewModel<Message> {
     override val viewType: Int
         get() = BaseViewModel.ViewType.MESSAGE_ATTACHMENT.viewType

app/src/main/java/chat/rocket/android/chatroom/viewmodel/MessageReplyViewModel.kt

@@ -12,7 +12,8 @@ data class MessageReplyViewModel(
     override var preview: Message?,
     override var isTemporary: Boolean = false,
     override val message: Message,
-    override var unread: Boolean? = null
+    override var unread: Boolean? = null,
+    override var menuItemsToHide: MutableList<Int> = mutableListOf()
 ) : BaseViewModel<MessageReply> {
     override val viewType: Int
         get() = BaseViewModel.ViewType.MESSAGE_REPLY.viewType

app/src/main/java/chat/rocket/android/chatroom/viewmodel/MessageViewModel.kt

@@ -17,7 +17,8 @@ data class MessageViewModel(
     override var preview: Message? = null,
     var isFirstUnread: Boolean,
     override var isTemporary: Boolean = false,
-    override var unread: Boolean? = null
+    override var unread: Boolean? = null,
+    override var menuItemsToHide: MutableList<Int> = mutableListOf()
 ) : BaseMessageViewModel<Message> {
     override val viewType: Int
         get() = BaseViewModel.ViewType.MESSAGE.viewType

app/src/main/java/chat/rocket/android/chatroom/viewmodel/UrlPreviewViewModel.kt

@@ -16,7 +16,8 @@ data class UrlPreviewViewModel(
         override var nextDownStreamMessage: BaseViewModel<*>? = null,
         override var preview: Message? = null,
         override var isTemporary: Boolean = false,
-        override var unread: Boolean? = null
+        override var unread: Boolean? = null,
+        override var menuItemsToHide: MutableList<Int> = mutableListOf()
 ) : BaseViewModel<Url> {
     override val viewType: Int
         get() = BaseViewModel.ViewType.URL_PREVIEW.viewType

app/src/main/java/chat/rocket/android/chatroom/viewmodel/VideoAttachmentViewModel.kt

@@ -15,7 +15,8 @@ data class VideoAttachmentViewModel(
         override var nextDownStreamMessage: BaseViewModel<*>? = null,
         override var preview: Message? = null,
         override var isTemporary: Boolean = false,
-        override var unread: Boolean? = null
+        override var unread: Boolean? = null,
+        override var menuItemsToHide: MutableList<Int> = mutableListOf()
 ) : BaseFileAttachmentViewModel<VideoAttachment> {
     override val viewType: Int
         get() = BaseViewModel.ViewType.VIDEO_ATTACHMENT.viewType

app/src/main/java/chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt

@@ -20,13 +20,13 @@ import chat.rocket.android.helper.MessageParser
 import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.ChatRoomsInteractor
-import chat.rocket.android.server.domain.GetActiveUsersInteractor
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.UsersRepository
 import chat.rocket.android.server.domain.baseUrl
 import chat.rocket.android.server.domain.messageReadReceiptEnabled
+import chat.rocket.android.server.domain.messageReadReceiptStoreUsers
 import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.isNotNullNorEmpty
@@ -141,6 +141,7 @@ class ViewModelMapper @Inject constructor(
             for (i in list.size - 1 downTo 0) {
                 val next = if (i - 1 < 0) null else list[i - 1]
                 list[i].nextDownStreamMessage = next
+                mapVisibleActions(list[i])
             }
 
             if (isBroadcastReplyAvailable(roomViewModel, message)) {
@@ -154,6 +155,12 @@ class ViewModelMapper @Inject constructor(
             return@withContext list
         }
 
+    private fun mapVisibleActions(viewModel: BaseViewModel<*>) {
+        if (!settings.messageReadReceiptStoreUsers()) {
+            viewModel.menuItemsToHide.add(R.id.action_message_info)
+        }
+    }
+
     private suspend fun translateAsNotReversed(
         message: Message,
         roomViewModel: RoomViewModel