Merge pull request #1812 from RocketChat/release/3.0.1-hotfix

[NEW] Refactor attachments

app/build.gradle

@@ -16,8 +16,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2048
-        versionName "3.0.0"
+        versionCode 2049
+        versionName "3.1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

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

-package chat.rocket.android.chatroom.adapter
-
-import android.view.View
-import chat.rocket.android.chatroom.uimodel.ActionsAttachmentUiModel
-import chat.rocket.android.emoji.EmojiReactionListener
-import chat.rocket.core.model.attachment.actions.Action
-import chat.rocket.core.model.attachment.actions.ButtonAction
-import kotlinx.android.synthetic.main.item_actions_attachment.view.*
-import androidx.recyclerview.widget.LinearLayoutManager
-import timber.log.Timber
-
-class ActionsAttachmentViewHolder(
-        itemView: View,
-        listener: ActionsListener,
-        reactionListener: EmojiReactionListener? = null,
-        var actionAttachmentOnClickListener: ActionAttachmentOnClickListener
-) : BaseViewHolder<ActionsAttachmentUiModel>(itemView, listener, reactionListener) {
-
-    init {
-        with(itemView) {
-            setupActionMenu(actions_attachment_container)
-        }
-    }
-
-    override fun bindViews(data: ActionsAttachmentUiModel) {
-        val actions = data.actions
-        val alignment = data.buttonAlignment
-        Timber.d("no of actions : ${actions.size} : $actions")
-        with(itemView) {
-            title.text = data.title ?: ""
-            actions_list.layoutManager = LinearLayoutManager(itemView.context,
-                    when (alignment) {
-                        "horizontal" -> LinearLayoutManager.HORIZONTAL
-                        else -> LinearLayoutManager.VERTICAL //Default
-                    }, false)
-            actions_list.adapter = ActionsListAdapter(actions, actionAttachmentOnClickListener)
-        }
-    }
-}
-
-interface ActionAttachmentOnClickListener {
-    fun onActionClicked(view: View, action: Action)
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/adapter/MessageAttachmentViewHolder.kt → app/src/main/java/chat/rocket/android/chatroom/adapter/AttachmentViewHolder.kt

 package chat.rocket.android.chatroom.adapter
 
 import android.animation.ValueAnimator
-import android.text.method.LinkMovementMethod
+import android.content.Intent
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
+import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
+import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
+import androidx.recyclerview.widget.LinearLayoutManager
 import chat.rocket.android.R
-import chat.rocket.android.chatroom.uimodel.MessageAttachmentUiModel
+import chat.rocket.android.chatroom.uimodel.AttachmentUiModel
 import chat.rocket.android.emoji.EmojiReactionListener
+import chat.rocket.android.helper.ImageHelper
+import chat.rocket.android.player.PlayerActivity
+import chat.rocket.android.util.extensions.content
+import chat.rocket.android.util.extensions.isVisible
+import chat.rocket.android.util.extensions.openTabbedUrl
+import chat.rocket.android.util.extensions.setOnClickListener
+import chat.rocket.core.model.attachment.actions.Action
+import com.facebook.drawee.backends.pipeline.Fresco
 import kotlinx.android.synthetic.main.item_message_attachment.view.*
+import timber.log.Timber
 
-class MessageAttachmentViewHolder(
+class AttachmentViewHolder(
     itemView: View,
     listener: ActionsListener,
-    reactionListener: EmojiReactionListener? = null
-) : BaseViewHolder<MessageAttachmentUiModel>(itemView, listener, reactionListener) {
+    reactionListener: EmojiReactionListener? = null,
+    var actionAttachmentOnClickListener: ActionAttachmentOnClickListener
+) : BaseViewHolder<AttachmentUiModel>(itemView, listener, reactionListener) {
+
+    private val messageViews = listOf<View>(
+        itemView.text_sender,
+        itemView.text_message_time,
+        itemView.text_content,
+        itemView.text_view_more
+    )
+    private val audioVideoViews = listOf<View>(
+        itemView.audio_video_attachment,
+        itemView.play_button
+    )
+
+    private val quoteBarColor = ContextCompat.getColor(itemView.context, R.color.quoteBar)
 
     init {
         with(itemView) {
             setupActionMenu(attachment_container)
-            text_content.movementMethod = LinkMovementMethod()
+        }
+
+    }
+
+    override fun bindViews(data: AttachmentUiModel) {
+        with(itemView) {
+            file_name.isVisible = false
+            text_file_name.isVisible = false
+
+            // Media attachments
+            image_attachment.isVisible = data.hasImage
+            audio_video_attachment.isVisible = data.hasAudioOrVideo
+            when {
+                data.hasImage -> bindImage(data)
+                data.hasAudioOrVideo -> bindAudioOrVideo(data)
+                data.hasFile -> bindFile(data)
+            }
+
+            // File description - self describing
+            file_description.isVisible = data.hasDescription
+            file_description.text = data.description
+
+            // Message attachment
+            messageViews.isVisible = data.hasMessage
+            if (data.hasMessage) {
+                bindMessage(data)
+            }
+
+            // Author
+            author_icon.isInvisible = !(data.hasAuthorIcon && data.hasAuthorLink && data.hasAuthorName)
+            text_author_name.isVisible = data.hasAuthorLink && data.hasAuthorName
+            if (data.hasAuthorLink && data.hasAuthorName) {
+                bindAuthorLink(data)
+            }
+
+            // If not media or message, show the text with quote bar
+            attachment_text.isVisible = !data.hasMedia && !data.hasMessage && data.hasText
+            attachment_text.text = data.text
+
+            // If it has titleLink and is not "type = file" show the title/titleLink on this field.
+            file_name_not_file_type.isVisible = !data.hasFile && data.hasTitleLink
+            if (!data.hasFile && data.hasTitleLink) {
+                bindTitleLink(data)
+            }
+
+            // Fields
+            text_fields.isVisible = data.hasFields
+            if (data.hasFields) {
+                bindFields(data)
+            }
+
+            // Actions
+            actions_list.isVisible = data.hasActions
+            if (data.hasActions) {
+                bindActions(data)
+            }
+
+            // Quote bar
+            quote_bar.isVisible = shouldShowQuoteBar(data)
+            if (data.color != null) {
+                quote_bar.setColorFilter(data.color)
+            } else {
+                quote_bar.setColorFilter(quoteBarColor)
+            }
+        }
+    }
+
+    private fun shouldShowQuoteBar(data: AttachmentUiModel): Boolean {
+        return data.hasFields || data.hasActions || (data.hasAuthorLink && data.hasAuthorName)
+                || data.hasMessage || (!data.hasFile && data.hasTitleLink)
+                || (!data.hasMedia && !data.hasMessage && data.hasText)
+    }
+
+    private fun bindImage(data: AttachmentUiModel) {
+        with(itemView) {
+            val controller = Fresco.newDraweeControllerBuilder().apply {
+                setUri(data.imageUrl)
+                autoPlayAnimations = true
+                oldController = image_attachment.controller
+            }.build()
+            image_attachment.controller = controller
+            image_attachment.setOnClickListener {
+                ImageHelper.openImage(
+                        context,
+                        data.imageUrl!!,
+                        data.title?.toString()
+                )
+            }
+
+            file_name.isVisible = data.hasTitle
+            file_name.text = data.title
+
+            file_text.isVisible = data.hasText
+            file_text.text = data.text
+        }
+    }
+
+    private fun bindAudioOrVideo(data: AttachmentUiModel) {
+        with(itemView) {
+            text_file_name.content = data.title
+
+            file_text.isVisible = data.hasText
+            file_text.text = data.text
+
+            val url = if (data.hasVideo) data.videoUrl else data.audioUrl
+            audioVideoViews.setOnClickListener { view ->
+                url?.let {
+                    PlayerActivity.play(view.context, url)
+                }
+            }
+
+        }
+    }
+
+    private fun bindFile(data: AttachmentUiModel) {
+        with(itemView) {
+            text_file_name.isVisible = true
+            text_file_name.content = data.title
+
+            text_file_name.setOnClickListener {
+                it.context.startActivity(Intent(Intent.ACTION_VIEW, data.titleLink?.toUri()))
+            }
         }
     }
 
-    override fun bindViews(data: MessageAttachmentUiModel) {
+    private fun bindMessage(data: AttachmentUiModel) {
         with(itemView) {
             val collapsedHeight = context.resources.getDimensionPixelSize(R.dimen.quote_collapsed_height)
             val viewMore = context.getString(R.string.msg_view_more)
             val viewLess = context.getString(R.string.msg_view_less)
-            text_message_time.text = data.time
-            text_sender.text = data.senderName
-            text_content.text = data.content
+            text_message_time.text = data.timestamp
+            text_sender.text = data.authorName
+            text_content.text = data.text
             text_view_more.isVisible = true
-            text_view_more.text = if (isExpanded())viewLess else viewMore
+            text_view_more.text = if (isExpanded()) viewLess else viewMore
             val lp = text_content.layoutParams
             lp.height = ViewGroup.LayoutParams.WRAP_CONTENT
             text_content.layoutParams = lp
@@ -98,6 +246,50 @@ class MessageAttachmentViewHolder(
         }
     }
 
+    private fun bindAuthorLink(data: AttachmentUiModel) {
+        with(itemView) {
+            author_icon.setImageURI(data.authorIcon)
+            text_author_name.content = data.authorName
+
+            text_author_name.setOnClickListener {
+                openTabbedUrl(data.authorLink)
+            }
+        }
+    }
+
+    private fun bindTitleLink(data: AttachmentUiModel) {
+        with(itemView) {
+            val filename = data.title ?: data.titleLink
+            file_name_not_file_type.text = filename
+
+            file_name_not_file_type.setOnClickListener {
+                openTabbedUrl(data.titleLink)
+            }
+        }
+    }
+
+    private fun bindFields(data: AttachmentUiModel) {
+        with(itemView) {
+            text_fields.content = data.fields
+        }
+    }
+
+    private fun bindActions(data: AttachmentUiModel) {
+        val actions = data.actions
+        val alignment = data.buttonAlignment
+        Timber.d("no of actions : ${actions!!.size} : $actions")
+        with(itemView) {
+            attachment_text.isVisible = data.hasText
+            attachment_text.text = data.text
+            actions_list.layoutManager = LinearLayoutManager(itemView.context,
+                    when (alignment) {
+                        "horizontal" -> LinearLayoutManager.HORIZONTAL
+                        else -> LinearLayoutManager.VERTICAL //Default
+                    }, false)
+            actions_list.adapter = ActionsListAdapter(actions, actionAttachmentOnClickListener)
+        }
+    }
+
     private fun isExpanded(): Boolean {
         with(itemView) {
             val lp = text_content.layoutParams
@@ -105,3 +297,7 @@ class MessageAttachmentViewHolder(
         }
     }
 }
+
+interface ActionAttachmentOnClickListener {
+    fun onActionClicked(view: View, action: Action)
+}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.adapter
-
-import android.view.View
-import androidx.core.view.isVisible
-import chat.rocket.android.chatroom.uimodel.AudioAttachmentUiModel
-import chat.rocket.android.player.PlayerActivity
-import chat.rocket.android.emoji.EmojiReactionListener
-import kotlinx.android.synthetic.main.message_attachment.view.*
-
-class AudioAttachmentViewHolder(itemView: View,
-                                listener: ActionsListener,
-                                reactionListener: EmojiReactionListener? = null)
-    : BaseViewHolder<AudioAttachmentUiModel>(itemView, listener, reactionListener) {
-
-    init {
-        with(itemView) {
-            setupActionMenu(attachment_container)
-            image_attachment.isVisible = false
-            audio_video_attachment.isVisible = true
-        }
-    }
-
-    override fun bindViews(data: AudioAttachmentUiModel) {
-        with(itemView) {
-            file_name.text = data.attachmentTitle
-            audio_video_attachment.setOnClickListener { view ->
-                data.attachmentUrl.let { url ->
-                    PlayerActivity.play(view.context, url)
-                }
-            }
-        }
-    }
-}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.adapter
-
-import android.content.Intent
-import android.net.Uri
-import android.view.View
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import chat.rocket.android.chatroom.uimodel.AuthorAttachmentUiModel
-import chat.rocket.android.emoji.EmojiReactionListener
-import chat.rocket.android.util.extensions.content
-import chat.rocket.common.util.ifNull
-import kotlinx.android.synthetic.main.item_author_attachment.view.*
-
-class AuthorAttachmentViewHolder(itemView: View,
-                                 listener: ActionsListener,
-                                 reactionListener: EmojiReactionListener? = null)
-    : BaseViewHolder<AuthorAttachmentUiModel>(itemView, listener, reactionListener) {
-
-    init {
-        with(itemView) {
-            setupActionMenu(author_attachment_container)
-        }
-    }
-
-    override fun bindViews(data: AuthorAttachmentUiModel) {
-        with(itemView) {
-            data.icon?.let { icon ->
-                author_icon.isVisible = true
-                author_icon.setImageURI(icon)
-            }.ifNull {
-                author_icon.isGone = true
-            }
-
-            author_icon.setImageURI(data.icon)
-            text_author_name.content = data.name
-
-            data.fields?.let { fields ->
-                text_fields.content = fields
-                text_fields.isVisible = true
-            }.ifNull {
-                text_fields.isGone = true
-            }
-
-            text_author_name.setOnClickListener {
-                it.context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(data.attachmentUrl)))
-            }
-        }
-    }
-}
\ No newline at end of file

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

@@ -36,37 +36,13 @@ class ChatRoomAdapter(
                 val view = parent.inflate(R.layout.item_message)
                 MessageViewHolder(view, actionsListener, reactionListener)
             }
-            BaseUiModel.ViewType.IMAGE_ATTACHMENT -> {
-                val view = parent.inflate(R.layout.message_attachment)
-                ImageAttachmentViewHolder(view, actionsListener, reactionListener)
-            }
-            BaseUiModel.ViewType.AUDIO_ATTACHMENT -> {
-                val view = parent.inflate(R.layout.message_attachment)
-                AudioAttachmentViewHolder(view, actionsListener, reactionListener)
-            }
-            BaseUiModel.ViewType.VIDEO_ATTACHMENT -> {
-                val view = parent.inflate(R.layout.message_attachment)
-                VideoAttachmentViewHolder(view, actionsListener, reactionListener)
-            }
             BaseUiModel.ViewType.URL_PREVIEW -> {
                 val view = parent.inflate(R.layout.message_url_preview)
                 UrlPreviewViewHolder(view, actionsListener, reactionListener)
             }
-            BaseUiModel.ViewType.MESSAGE_ATTACHMENT -> {
+            BaseUiModel.ViewType.ATTACHMENT -> {
                 val view = parent.inflate(R.layout.item_message_attachment)
-                MessageAttachmentViewHolder(view, actionsListener, reactionListener)
-            }
-            BaseUiModel.ViewType.AUTHOR_ATTACHMENT -> {
-                val view = parent.inflate(R.layout.item_author_attachment)
-                AuthorAttachmentViewHolder(view, actionsListener, reactionListener)
-            }
-            BaseUiModel.ViewType.COLOR_ATTACHMENT -> {
-                val view = parent.inflate(R.layout.item_color_attachment)
-                ColorAttachmentViewHolder(view, actionsListener, reactionListener)
-            }
-            BaseUiModel.ViewType.GENERIC_FILE_ATTACHMENT -> {
-                val view = parent.inflate(R.layout.item_file_attachment)
-                GenericFileAttachmentViewHolder(view, actionsListener, reactionListener)
+                AttachmentViewHolder(view, actionsListener, reactionListener, actionAttachmentOnClickListener)
             }
             BaseUiModel.ViewType.MESSAGE_REPLY -> {
                 val view = parent.inflate(R.layout.item_message_reply)
@@ -74,10 +50,6 @@ class ChatRoomAdapter(
                     actionSelectListener?.openDirectMessage(roomName, permalink)
                 }
             }
-            BaseUiModel.ViewType.ACTIONS_ATTACHMENT -> {
-                val view = parent.inflate(R.layout.item_actions_attachment)
-                ActionsAttachmentViewHolder(view, actionsListener, reactionListener, actionAttachmentOnClickListener)
-            }
             else -> {
                 throw InvalidParameterException("TODO - implement for ${viewType.toViewType()}")
             }
@@ -113,26 +85,12 @@ class ChatRoomAdapter(
         when (holder) {
             is MessageViewHolder ->
                 holder.bind(dataSet[position] as MessageUiModel)
-            is ImageAttachmentViewHolder ->
-                holder.bind(dataSet[position] as ImageAttachmentUiModel)
-            is AudioAttachmentViewHolder ->
-                holder.bind(dataSet[position] as AudioAttachmentUiModel)
-            is VideoAttachmentViewHolder ->
-                holder.bind(dataSet[position] as VideoAttachmentUiModel)
             is UrlPreviewViewHolder ->
                 holder.bind(dataSet[position] as UrlPreviewUiModel)
-            is MessageAttachmentViewHolder ->
-                holder.bind(dataSet[position] as MessageAttachmentUiModel)
-            is AuthorAttachmentViewHolder ->
-                holder.bind(dataSet[position] as AuthorAttachmentUiModel)
-            is ColorAttachmentViewHolder ->
-                holder.bind(dataSet[position] as ColorAttachmentUiModel)
-            is GenericFileAttachmentViewHolder ->
-                holder.bind(dataSet[position] as GenericFileAttachmentUiModel)
             is MessageReplyViewHolder ->
                 holder.bind(dataSet[position] as MessageReplyUiModel)
-            is ActionsAttachmentViewHolder ->
-                holder.bind(dataSet[position] as ActionsAttachmentUiModel)
+            is AttachmentViewHolder ->
+                holder.bind(dataSet[position] as AttachmentUiModel)
         }
     }
 
@@ -140,8 +98,7 @@ class ChatRoomAdapter(
         val model = dataSet[position]
         return when (model) {
             is MessageUiModel -> model.messageId.hashCode().toLong()
-            is BaseFileAttachmentUiModel -> model.id
-            is AuthorAttachmentUiModel -> model.id
+            is AttachmentUiModel -> model.id
             else -> return position.toLong()
         }
     }

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

-package chat.rocket.android.chatroom.adapter
-
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.Drawable
-import androidx.core.content.ContextCompat
-import android.text.method.LinkMovementMethod
-import android.view.View
-import androidx.core.view.isVisible
-import androidx.core.widget.ImageViewCompat
-import chat.rocket.android.R
-import chat.rocket.android.chatroom.uimodel.ColorAttachmentUiModel
-import chat.rocket.android.emoji.EmojiReactionListener
-import kotlinx.android.synthetic.main.item_color_attachment.view.*
-
-
-class ColorAttachmentViewHolder(itemView: View,
-                                listener: BaseViewHolder.ActionsListener,
-                                reactionListener: EmojiReactionListener? = null)
-    : BaseViewHolder<ColorAttachmentUiModel>(itemView, listener, reactionListener) {
-
-    val drawable: Drawable = ColorDrawable(ContextCompat.getColor(itemView.context, R.color.quoteBar))
-
-    init {
-        with(itemView) {
-            setupActionMenu(color_attachment_container)
-            attachment_text.movementMethod = LinkMovementMethod()
-        }
-    }
-
-    override fun bindViews(data: ColorAttachmentUiModel) {
-        with(itemView) {
-                quote_bar.setColorFilter(data.color)
-                if (data.text.isNotEmpty()) {
-                    attachment_text.isVisible = true
-                    attachment_text.text = data.text
-                } else {
-                    attachment_text.isVisible = false
-                }
-
-                if (data.fields.isNullOrEmpty()) {
-                    text_fields.isVisible = false
-                } else {
-                    text_fields.isVisible = true
-                    text_fields.text = data.fields
-                }
-        }
-    }
-
-}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.adapter
-
-import android.content.Intent
-import android.view.View
-import androidx.core.net.toUri
-import chat.rocket.android.chatroom.uimodel.GenericFileAttachmentUiModel
-import chat.rocket.android.emoji.EmojiReactionListener
-import chat.rocket.android.util.extensions.content
-import kotlinx.android.synthetic.main.item_file_attachment.view.*
-
-class GenericFileAttachmentViewHolder(itemView: View,
-                                      listener: ActionsListener,
-                                      reactionListener: EmojiReactionListener? = null)
-    : BaseViewHolder<GenericFileAttachmentUiModel>(itemView, listener, reactionListener) {
-
-    init {
-        with(itemView) {
-            setupActionMenu(file_attachment_container)
-        }
-    }
-
-    override fun bindViews(data: GenericFileAttachmentUiModel) {
-        with(itemView) {
-            text_file_name.content = data.attachmentTitle
-
-            text_file_name.setOnClickListener {
-                it.context.startActivity(Intent(Intent.ACTION_VIEW, data.attachmentUrl.toUri()))
-            }
-        }
-    }
-}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.adapter
-
-import android.view.View
-import chat.rocket.android.chatroom.uimodel.ImageAttachmentUiModel
-import chat.rocket.android.helper.ImageHelper
-import chat.rocket.android.emoji.EmojiReactionListener
-import com.facebook.drawee.backends.pipeline.Fresco
-import kotlinx.android.synthetic.main.message_attachment.view.*
-
-class ImageAttachmentViewHolder(
-    itemView: View,
-    listener: ActionsListener,
-    reactionListener: EmojiReactionListener? = null
-) : BaseViewHolder<ImageAttachmentUiModel>(itemView, listener, reactionListener) {
-
-    init {
-        with(itemView) {
-            setupActionMenu(attachment_container)
-        }
-    }
-
-    override fun bindViews(data: ImageAttachmentUiModel) {
-        with(itemView) {
-            val controller = Fresco.newDraweeControllerBuilder().apply {
-                setUri(data.attachmentUrl)
-                autoPlayAnimations = true
-                oldController = image_attachment.controller
-            }.build()
-            image_attachment.controller = controller
-            file_name.text = data.attachmentTitle
-            file_description.text = data.attachmentDescription
-            file_text.text = data.attachmentText
-            image_attachment.setOnClickListener {
-                ImageHelper.openImage(
-                    context,
-                    data.attachmentUrl,
-                    data.attachmentTitle.toString()
-                )
-            }
-        }
-    }
-}
\ No newline at end of file

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

-package chat.rocket.android.chatroom.adapter
-
-import android.view.View
-import androidx.core.view.isVisible
-import chat.rocket.android.chatroom.uimodel.VideoAttachmentUiModel
-import chat.rocket.android.player.PlayerActivity
-import chat.rocket.android.emoji.EmojiReactionListener
-import kotlinx.android.synthetic.main.message_attachment.view.*
-
-class VideoAttachmentViewHolder(itemView: View,
-                                listener: ActionsListener,
-                                reactionListener: EmojiReactionListener? = null)
-    : BaseViewHolder<VideoAttachmentUiModel>(itemView, listener, reactionListener) {
-
-    init {
-        with(itemView) {
-            setupActionMenu(attachment_container)
-            image_attachment.isVisible = false
-            audio_video_attachment.isVisible = true
-        }
-    }
-
-    override fun bindViews(data: VideoAttachmentUiModel) {
-        with(itemView) {
-            file_name.text = data.attachmentTitle
-            audio_video_attachment.setOnClickListener { view ->
-                data.attachmentUrl.let { url ->
-                    PlayerActivity.play(view.context, url)
-                }
-            }
-        }
-    }
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt

@@ -176,7 +176,9 @@ class ChatRoomPresenter @Inject constructor(
             view.showLoading()
             try {
                 if (offset == 0L) {
-                    val localMessages = messagesRepository.getByRoomId(chatRoomId)
+                    // FIXME - load just 50 messages from DB to speed up. We will reload from Network after that
+                    // FIXME - We need to handle the pagination, first fetch from DB, then from network
+                    val localMessages = messagesRepository.getRecentMessages(chatRoomId, 50)
                     val oldMessages = mapper.map(
                         localMessages, RoomUiModel(
                         roles = chatRoles,

app/src/main/java/chat/rocket/android/chatroom/uimodel/ActionsAttachmentUiModel.kt

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.attachment.actions.Action
-import chat.rocket.core.model.attachment.actions.ActionsAttachment
-
-data class ActionsAttachmentUiModel(
-	override val attachmentUrl: String,
-	val title: String?,
-	val actions: List<Action>,
-	val buttonAlignment: String,
-	override val message: Message,
-	override val rawData: ActionsAttachment,
-	override val messageId: String,
-	override var reactions: List<ReactionUiModel>,
-	override var nextDownStreamMessage: BaseUiModel<*>? = null,
-	override var preview: Message? = null,
-	override var isTemporary: Boolean = false,
-	override var unread: Boolean? = null,
-	override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-	override var currentDayMarkerText: String,
-	override var showDayMarker: Boolean,
-	override var permalink: String
-) : BaseAttachmentUiModel<ActionsAttachment> {
-	override val viewType: Int
-		get() = BaseUiModel.ViewType.ACTIONS_ATTACHMENT.viewType
-	override val layoutId: Int
-		get() = R.layout.item_actions_attachment
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/uimodel/AttachmentUiModel.kt

+package chat.rocket.android.chatroom.uimodel
+
+import chat.rocket.android.R
+import chat.rocket.core.model.Message
+import chat.rocket.core.model.attachment.Attachment
+import chat.rocket.core.model.attachment.actions.Action
+
+data class AttachmentUiModel(
+        override val message: Message,
+        override val rawData: Attachment,
+        override val messageId: String,
+        override var reactions: List<ReactionUiModel>,
+        override var nextDownStreamMessage: BaseUiModel<*>? = null,
+        override var preview: Message?,
+        override var isTemporary: Boolean,
+        override var unread: Boolean?,
+        override var currentDayMarkerText: String,
+        override var showDayMarker: Boolean,
+        override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+        override var permalink: String,
+        val id: Long,
+        val title: CharSequence?,
+        val description: CharSequence?,
+        val authorName: CharSequence?,
+        val text: CharSequence?,
+        val color: Int?,
+        val imageUrl: String?,
+        val videoUrl: String?,
+        val audioUrl: String?,
+        val titleLink: String?,
+        val messageLink: String?,
+        val type: String?,
+        // TODO - attachments
+        val timestamp: CharSequence?,
+        val authorIcon: String?,
+        val authorLink: String?,
+        val fields: CharSequence?,
+        val buttonAlignment: String?,
+        val actions: List<Action>?
+) : BaseUiModel<Attachment> {
+    override val viewType: Int
+        get() = BaseUiModel.ViewType.ATTACHMENT.viewType
+    override val layoutId: Int
+        get() = R.layout.item_message_attachment
+
+    val hasTitle: Boolean
+        get() = !title.isNullOrEmpty()
+    val hasDescription: Boolean
+        get() = !description.isNullOrEmpty()
+    val hasText: Boolean
+        get() = !text.isNullOrEmpty()
+    val hasImage: Boolean
+        get() = imageUrl.orEmpty().isNotEmpty()
+    val hasVideo: Boolean
+        get() = videoUrl.orEmpty().isNotEmpty()
+    val hasAudio: Boolean
+        get() = audioUrl.orEmpty().isNotEmpty()
+    val hasAudioOrVideo: Boolean
+        get() = hasAudio || hasVideo
+    val hasFile: Boolean
+        get() = type.orEmpty().contentEquals("file") && titleLink.orEmpty().isNotEmpty()
+    val hasTitleLink: Boolean
+        get() = titleLink.orEmpty().isNotEmpty()
+    val hasMedia: Boolean
+        get() = hasImage || hasAudioOrVideo || hasFile
+    val hasMessage: Boolean
+        get() = messageLink.orEmpty().isNotEmpty()
+    val hasAuthorName: Boolean
+        get() = !authorName.isNullOrEmpty()
+    val hasAuthorLink: Boolean
+        get() = authorLink.orEmpty().isNotEmpty()
+    val hasAuthorIcon: Boolean
+        get() = authorIcon.orEmpty().isNotEmpty()
+    val hasFields: Boolean
+        get() = !fields.isNullOrEmpty()
+    val hasActions: Boolean
+        get() = actions != null && actions.isNotEmpty()
+}

app/src/main/java/chat/rocket/android/chatroom/uimodel/AudioAttachmentUiModel.kt

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.attachment.AudioAttachment
-
-data class AudioAttachmentUiModel(
-    override val message: Message,
-    override val rawData: AudioAttachment,
-    override val messageId: String,
-    override val attachmentUrl: String,
-    override val attachmentTitle: CharSequence,
-    override val id: Long,
-    override var reactions: List<ReactionUiModel>,
-    override var nextDownStreamMessage: BaseUiModel<*>? = null,
-    override var preview: Message? = null,
-    override var isTemporary: Boolean = false,
-    override var unread: Boolean? = null,
-    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-    override var currentDayMarkerText: String,
-    override var showDayMarker: Boolean,
-    override var permalink: String
-) : BaseFileAttachmentUiModel<AudioAttachment> {
-    override val viewType: Int
-        get() = BaseUiModel.ViewType.AUDIO_ATTACHMENT.viewType
-    override val layoutId: Int
-        get() = R.layout.message_attachment
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/uimodel/AuthorAttachmentUiModel.kt

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.attachment.AuthorAttachment
-
-data class AuthorAttachmentUiModel(
-    override val attachmentUrl: String,
-    val id: Long,
-    val name: CharSequence?,
-    val icon: String?,
-    val fields: CharSequence?,
-    override val message: Message,
-    override val rawData: AuthorAttachment,
-    override val messageId: String,
-    override var reactions: List<ReactionUiModel>,
-    override var nextDownStreamMessage: BaseUiModel<*>? = null,
-    override var preview: Message? = null,
-    override var isTemporary: Boolean = false,
-    override var unread: Boolean? = null,
-    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-    override var currentDayMarkerText: String,
-    override var showDayMarker: Boolean, override var permalink: String
-) : BaseAttachmentUiModel<AuthorAttachment> {
-    override val viewType: Int
-        get() = BaseUiModel.ViewType.AUTHOR_ATTACHMENT.viewType
-    override val layoutId: Int
-        get() = R.layout.item_author_attachment
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/uimodel/BaseFileAttachmentUiModel.kt

-package chat.rocket.android.chatroom.uimodel
-
-interface BaseFileAttachmentUiModel<out T> : BaseAttachmentUiModel<T> {
-    val attachmentTitle: CharSequence
-    val id: Long
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/uimodel/BaseUiModel.kt

@@ -23,15 +23,8 @@ interface BaseUiModel<out T> {
         MESSAGE(0),
         SYSTEM_MESSAGE(1),
         URL_PREVIEW(2),
-        IMAGE_ATTACHMENT(3),
-        VIDEO_ATTACHMENT(4),
-        AUDIO_ATTACHMENT(5),
-        MESSAGE_ATTACHMENT(6),
-        AUTHOR_ATTACHMENT(7),
-        COLOR_ATTACHMENT(8),
-        GENERIC_FILE_ATTACHMENT(9),
-        MESSAGE_REPLY(10),
-        ACTIONS_ATTACHMENT(11)
+        ATTACHMENT(3),
+        MESSAGE_REPLY(4)
     }
 }
 

app/src/main/java/chat/rocket/android/chatroom/uimodel/ColorAttachmentUiModel.kt

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.attachment.ColorAttachment
-
-data class ColorAttachmentUiModel(
-    override val attachmentUrl: String,
-    val id: Long,
-    val color: Int,
-    val text: CharSequence,
-    val fields: CharSequence? = null,
-    override val message: Message,
-    override val rawData: ColorAttachment,
-    override val messageId: String,
-    override var reactions: List<ReactionUiModel>,
-    override var nextDownStreamMessage: BaseUiModel<*>? = null,
-    override var preview: Message? = null,
-    override var isTemporary: Boolean = false,
-    override var unread: Boolean?,
-    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-    override var currentDayMarkerText: String,
-    override var showDayMarker: Boolean,
-    override var permalink: String
-) : BaseAttachmentUiModel<ColorAttachment> {
-    override val viewType: Int
-        get() = BaseUiModel.ViewType.COLOR_ATTACHMENT.viewType
-    override val layoutId: Int
-        get() = R.layout.item_color_attachment
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/uimodel/GenericFileAttachmentUiModel.kt

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.attachment.GenericFileAttachment
-
-data class GenericFileAttachmentUiModel(
-    override val message: Message,
-    override val rawData: GenericFileAttachment,
-    override val messageId: String,
-    override val attachmentUrl: String,
-    override val attachmentTitle: CharSequence,
-    override val id: Long,
-    override var reactions: List<ReactionUiModel>,
-    override var nextDownStreamMessage: BaseUiModel<*>? = null,
-    override var preview: Message? = null,
-    override var isTemporary: Boolean = false,
-    override var unread: Boolean? = null,
-    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-    override var currentDayMarkerText: String,
-    override var showDayMarker: Boolean,
-    override var permalink: String
-) : BaseFileAttachmentUiModel<GenericFileAttachment> {
-    override val viewType: Int
-        get() = BaseUiModel.ViewType.GENERIC_FILE_ATTACHMENT.viewType
-    override val layoutId: Int
-        get() = R.layout.item_file_attachment
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/uimodel/ImageAttachmentUiModel.kt

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.attachment.ImageAttachment
-
-data class ImageAttachmentUiModel(
-    override val message: Message,
-    override val rawData: ImageAttachment,
-    override val messageId: String,
-    override val attachmentUrl: String,
-    override val attachmentTitle: CharSequence,
-    val attachmentText: String?,
-    val attachmentDescription: String?,
-    override val id: Long,
-    override var reactions: List<ReactionUiModel>,
-    override var nextDownStreamMessage: BaseUiModel<*>? = null,
-    override var preview: Message? = null,
-    override var isTemporary: Boolean = false,
-    override var unread: Boolean? = null,
-    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-    override var currentDayMarkerText: String,
-    override var showDayMarker: Boolean,
-    override var permalink: String
-) : BaseFileAttachmentUiModel<ImageAttachment> {
-    override val viewType: Int
-        get() = BaseUiModel.ViewType.IMAGE_ATTACHMENT.viewType
-    override val layoutId: Int
-        get() = R.layout.message_attachment
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/uimodel/MessageAttachmentUiModel.kt

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-
-data class MessageAttachmentUiModel(
-    override val message: Message,
-    override val rawData: Message,
-    override val messageId: String,
-    var senderName: String?,
-    val time: CharSequence?,
-    val content: CharSequence,
-    val isPinned: Boolean,
-    override var reactions: List<ReactionUiModel>,
-    override var nextDownStreamMessage: BaseUiModel<*>? = null,
-    var messageLink: String? = null,
-    override var preview: Message? = null,
-    override var isTemporary: Boolean = false,
-    override var unread: Boolean? = null,
-    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-    override var currentDayMarkerText: String,
-    override var showDayMarker: Boolean,
-    override var permalink: String
-) : BaseUiModel<Message> {
-    override val viewType: Int
-        get() = BaseUiModel.ViewType.MESSAGE_ATTACHMENT.viewType
-
-    override val layoutId: Int
-        get() = R.layout.item_message_attachment
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/uimodel/VideoAttachmentUiModel.kt

-package chat.rocket.android.chatroom.uimodel
-
-import chat.rocket.android.R
-import chat.rocket.core.model.Message
-import chat.rocket.core.model.attachment.VideoAttachment
-
-data class VideoAttachmentUiModel(
-    override val message: Message,
-    override val rawData: VideoAttachment,
-    override val messageId: String,
-    override val attachmentUrl: String,
-    override val attachmentTitle: CharSequence,
-    override val id: Long,
-    override var reactions: List<ReactionUiModel>,
-    override var nextDownStreamMessage: BaseUiModel<*>? = null,
-    override var preview: Message? = null,
-    override var isTemporary: Boolean = false,
-    override var unread: Boolean? = null,
-    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
-    override var currentDayMarkerText: String,
-    override var showDayMarker: Boolean,
-    override var permalink: String
-) : BaseFileAttachmentUiModel<VideoAttachment> {
-    override val viewType: Int
-        get() = BaseUiModel.ViewType.VIDEO_ATTACHMENT.viewType
-    override val layoutId: Int
-        get() = R.layout.message_attachment
-}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt

@@ -24,6 +24,7 @@ import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.model.userStatusOf
 import chat.rocket.core.model.Room
 import chat.rocket.core.model.SpotlightResult
+import ru.noties.markwon.Markwon
 
 class RoomUiModelMapper(
     private val context: Application,
@@ -119,6 +120,8 @@ class RoomUiModelMapper(
                     type is RoomType.DirectMessage) } else { null }
             val open = open
 
+            val lastMessageMarkdown = lastMessage?.let { Markwon.markdown(context, it.toString()).toString() }
+
             RoomUiModel(
                 id = id,
                 name = roomName,
@@ -128,7 +131,7 @@ class RoomUiModelMapper(
                 date = timestamp,
                 unread = unread,
                 alert = isUnread,
-                lastMessage = lastMessage,
+                lastMessage = lastMessageMarkdown,
                 status = status,
                 username = if (type is RoomType.DirectMessage) name else null
             )

app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt

@@ -33,7 +33,7 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
 
             if (room.lastMessage != null) {
                 text_last_message.isVisible = true
-                text_last_message.text = Markwon.markdown(context, room.lastMessage.toString()).toString()
+                text_last_message.text = room.lastMessage
             } else {
                 text_last_message.isGone = true
             }

app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomsAdapter.kt

@@ -19,17 +19,21 @@ class RoomsAdapter(private val listener: (RoomUiModel) -> Unit) : RecyclerView.A
         }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder<*> {
-        if (viewType == VIEW_TYPE_ROOM) {
+        return when (viewType) {
+            VIEW_TYPE_ROOM -> {
                 val view = parent.inflate(R.layout.item_chat)
-            return RoomViewHolder(view, listener)
-        } else if (viewType == VIEW_TYPE_HEADER) {
+                RoomViewHolder(view, listener)
+            }
+            VIEW_TYPE_HEADER -> {
                 val view = parent.inflate(R.layout.item_chatroom_header)
-            return HeaderViewHolder(view)
-        } else if (viewType == VIEW_TYPE_LOADING) {
+                HeaderViewHolder(view)
+            }
+            VIEW_TYPE_LOADING -> {
                 val view = parent.inflate(R.layout.item_loading)
-            return LoadingViewHolder(view)
+                LoadingViewHolder(view)
+            }
+            else -> throw IllegalStateException("View type must be either Room, Header or Loading")
         }
-        throw IllegalStateException("View type must be either Room, Header or Loading")
     }
 
     override fun getItemCount() = values.size

app/src/main/java/chat/rocket/android/db/RCDatabase.kt

@@ -23,7 +23,7 @@ import chat.rocket.android.db.model.UserEntity
         AttachmentFieldEntity::class, AttachmentActionEntity::class, UrlEntity::class,
         ReactionEntity::class, MessagesSync::class
     ],
-    version = 9,
+    version = 10,
     exportSchema = true
 )
 abstract class RCDatabase : RoomDatabase() {

app/src/main/java/chat/rocket/android/db/model/Attachments.kt

 package chat.rocket.android.db.model
 
+import android.content.Context
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.Index
 import androidx.room.PrimaryKey
+import chat.rocket.android.R
 import chat.rocket.android.util.extension.orFalse
+import chat.rocket.android.util.extensions.isNotNullNorEmpty
 import chat.rocket.core.model.attachment.Attachment
-import chat.rocket.core.model.attachment.AudioAttachment
-import chat.rocket.core.model.attachment.AuthorAttachment
-import chat.rocket.core.model.attachment.ColorAttachment
-import chat.rocket.core.model.attachment.GenericFileAttachment
-import chat.rocket.core.model.attachment.ImageAttachment
-import chat.rocket.core.model.attachment.MessageAttachment
-import chat.rocket.core.model.attachment.VideoAttachment
-import chat.rocket.core.model.attachment.actions.ActionsAttachment
 import chat.rocket.core.model.attachment.actions.ButtonAction
-import timber.log.Timber
 
 @Entity(tableName = "attachments",
         foreignKeys = [
@@ -115,150 +109,54 @@ data class AttachmentActionEntity(
     var id: Long? = null
 }
 
-fun Attachment.asEntity(msgId: String): List<BaseMessageEntity> {
-    return when(this) {
-        is ImageAttachment -> listOf(asEntity(msgId))
-        is VideoAttachment -> listOf(asEntity(msgId))
-        is AudioAttachment -> listOf(asEntity(msgId))
-        is AuthorAttachment -> asEntity(msgId)
-        is ColorAttachment -> asEntity(msgId)
-        is MessageAttachment -> listOf(asEntity(msgId))
-        is GenericFileAttachment -> listOf(asEntity(msgId))
-        is ActionsAttachment -> asEntity(msgId)
-        else -> {
-            Timber.d("Missing conversion for: ${javaClass.canonicalName}")
-            emptyList()
-        }
-    }
-}
-
-fun ImageAttachment.asEntity(msgId: String): AttachmentEntity =
-    AttachmentEntity(
-        _id = "${msgId}_${hashCode()}",
-        messageId = msgId,
-        title = title,
-        description =  description,
-        text = text,
-        titleLink = titleLink,
-        titleLinkDownload = titleLinkDownload.orFalse(),
-        imageUrl = url,
-        imageType = type,
-        imageSize = size
-    )
+fun Attachment.asEntity(msgId: String, context: Context): List<BaseMessageEntity> {
+    val attachmentId = "${msgId}_${hashCode()}"
+    val list = mutableListOf<BaseMessageEntity>()
 
-fun VideoAttachment.asEntity(msgId: String): AttachmentEntity =
-    AttachmentEntity(
-        _id = "${msgId}_${hashCode()}",
-        messageId = msgId,
-        title = title,
-        description =  description,
-        text = text,
-        titleLink = titleLink,
-        titleLinkDownload = titleLinkDownload.orFalse(),
-        videoUrl = url,
-        videoType = type,
-        videoSize = size
-    )
+    val text = mapAttachmentText(text, attachments?.firstOrNull(), context)
 
-fun AudioAttachment.asEntity(msgId: String): AttachmentEntity =
-    AttachmentEntity(
-        _id = "${msgId}_${hashCode()}",
+    val entity = AttachmentEntity(
+            _id = attachmentId,
             messageId = msgId,
             title = title,
+            type = type,
             description =  description,
             text = text,
             titleLink = titleLink,
             titleLinkDownload = titleLinkDownload.orFalse(),
-        audioUrl = url,
-        audioType = type,
-        audioSize = size
-    )
-
-fun AuthorAttachment.asEntity(msgId: String): List<BaseMessageEntity> {
-    val list = mutableListOf<BaseMessageEntity>()
-    val attachment = AttachmentEntity(
-        _id = "${msgId}_${hashCode()}",
-        messageId = msgId,
-        authorLink = url,
+            imageUrl = imageUrl,
+            imageType = imageType,
+            imageSize = imageSize,
+            videoUrl = videoUrl,
+            videoType = videoType,
+            videoSize = videoSize,
+            audioUrl = audioUrl,
+            audioType = audioType,
+            audioSize = audioSize,
+            authorLink = authorLink,
             authorIcon = authorIcon,
             authorName = authorName,
-        hasFields = fields?.isNotEmpty() == true
-    )
-    list.add(attachment)
-
-    fields?.forEach { field ->
-        val entity = AttachmentFieldEntity(
-            attachmentId = attachment._id,
-            title = field.title,
-            value = field.value
-        )
-        list.add(entity)
-    }
-
-    return list
-}
-
-fun ColorAttachment.asEntity(msgId: String): List<BaseMessageEntity> {
-    val list = mutableListOf<BaseMessageEntity>()
-    val attachment = AttachmentEntity(
-        _id = "${msgId}_${hashCode()}",
-        messageId = msgId,
-        color = color.rawColor,
+            color = color?.rawColor,
             fallback = fallback,
+            thumbUrl = thumbUrl,
+            messageLink = messageLink,
+            timestamp = timestamp,
+            buttonAlignment = buttonAlignment,
+            hasActions = actions?.isNotEmpty() == true,
             hasFields = fields?.isNotEmpty() == true
     )
-    list.add(attachment)
+    list.add(entity)
 
     fields?.forEach { field ->
         val entity = AttachmentFieldEntity(
-            attachmentId = attachment._id,
+                attachmentId = attachmentId,
                 title = field.title,
                 value = field.value
         )
         list.add(entity)
     }
 
-    return list
-}
-
-// TODO - how to model An message attachment with attachments???
-fun MessageAttachment.asEntity(msgId: String): AttachmentEntity =
-    AttachmentEntity(
-        _id = "${msgId}_${hashCode()}",
-        messageId = msgId,
-        authorName = author,
-        authorIcon = icon,
-        text = text,
-        thumbUrl = thumbUrl,
-        color = color?.rawColor,
-        messageLink = url,
-        timestamp = timestamp
-    )
-
-fun GenericFileAttachment.asEntity(msgId: String): AttachmentEntity =
-    AttachmentEntity(
-        _id = "${msgId}_${hashCode()}",
-        messageId = msgId,
-        title = title,
-        description = description,
-        text = text,
-        titleLink = titleLink,
-        titleLinkDownload = titleLinkDownload ?: false
-    )
-
-fun ActionsAttachment.asEntity(msgId: String): List<BaseMessageEntity> {
-    val list = mutableListOf<BaseMessageEntity>()
-    val attachmentId = "${msgId}_${hashCode()}"
-    val attachment = AttachmentEntity(
-            _id = attachmentId,
-            messageId = msgId,
-            title = title,
-            hasActions = true,
-            buttonAlignment = buttonAlignment
-    )
-    list.add(attachment)
-
-    actions.forEach { action ->
+    actions?.forEach { action ->
         when (action) {
             is ButtonAction -> AttachmentActionEntity(
                 attachmentId = attachmentId,
@@ -276,3 +174,19 @@ fun ActionsAttachment.asEntity(msgId: String): List<BaseMessageEntity> {
     }
     return list
 }
+
+fun mapAttachmentText(text: String?, attachment: Attachment?, context: Context): String? {
+    return if (attachment != null) {
+        when {
+            attachment.imageUrl.isNotNullNorEmpty() -> context.getString(R.string.msg_preview_photo)
+            attachment.videoUrl.isNotNullNorEmpty() -> context.getString(R.string.msg_preview_video)
+            attachment.audioUrl.isNotNullNorEmpty() -> context.getString(R.string.msg_preview_audio)
+            attachment.titleLink.isNotNullNorEmpty() &&
+                    attachment.type?.contentEquals("file") == true ->
+                context.getString(R.string.msg_preview_file)
+            else -> text
+        }
+    } else {
+        text
+    }
+}

app/src/main/java/chat/rocket/android/helper/ImageHelper.kt

@@ -35,7 +35,7 @@ object ImageHelper {
 
     // TODO - implement a proper image viewer with a proper Transition
     // TODO - We should definitely write our own ImageViewer
-    fun openImage(context: Context, imageUrl: String, imageName: String) {
+    fun openImage(context: Context, imageUrl: String, imageName: String? = "") {
         var imageViewer: ImageViewer? = null
         val request =
             ImageRequestBuilder.newBuilderWithSource(imageUrl.toUri())

app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessageMapper.kt

@@ -12,18 +12,10 @@ import chat.rocket.common.model.SimpleUser
 import chat.rocket.core.model.Message
 import chat.rocket.core.model.Reactions
 import chat.rocket.core.model.attachment.Attachment
-import chat.rocket.core.model.attachment.AudioAttachment
-import chat.rocket.core.model.attachment.AuthorAttachment
 import chat.rocket.core.model.attachment.Color
-import chat.rocket.core.model.attachment.ColorAttachment
 import chat.rocket.core.model.attachment.DEFAULT_COLOR_STR
 import chat.rocket.core.model.attachment.Field
-import chat.rocket.core.model.attachment.GenericFileAttachment
-import chat.rocket.core.model.attachment.ImageAttachment
-import chat.rocket.core.model.attachment.MessageAttachment
-import chat.rocket.core.model.attachment.VideoAttachment
 import chat.rocket.core.model.attachment.actions.Action
-import chat.rocket.core.model.attachment.actions.ActionsAttachment
 import chat.rocket.core.model.attachment.actions.ButtonAction
 import chat.rocket.core.model.messageTypeOf
 import chat.rocket.core.model.url.Meta
@@ -141,44 +133,57 @@ class DatabaseMessageMapper(private val dbManager: DatabaseManager) {
         val list = mutableListOf<Attachment>()
         attachments.forEach { attachment ->
             with(attachment) {
-                when {
-                    imageUrl != null -> {
-                        ImageAttachment(title, description, text, titleLink, titleLinkDownload, imageUrl, type, imageSize)
-                    }
-                    videoUrl != null -> {
-                        VideoAttachment(title, description, text, titleLink, titleLinkDownload, videoUrl, type, videoSize)
-                    }
-                    audioUrl != null -> {
-                        AudioAttachment(title, description, text, titleLink, titleLinkDownload, audioUrl, type, audioSize)
-                    }
-                    titleLink != null -> {
-                        GenericFileAttachment(title, description, text, titleLink, titleLink, titleLinkDownload)
-                    }
-                    text != null && color != null && fallback != null -> {
-                        ColorAttachment(Color.Custom(color), text, fallback)
-                    }
-                    text != null -> {
-                        // TODO how to model message with attachments
-                        MessageAttachment(authorName, authorIcon, text, thumbUrl,
-                                color?.let { Color.Custom(it) }, messageLink, null, timestamp)
-                    }
-                    authorLink != null -> {
-                        mapAuthorAttachment(this)
-                    }
-                    hasFields -> {
-                        mapColorAttachmentWithFields(this)
-                    }
-                    hasActions -> {
-                        mapActionAttachment(this)
+                val fields = if (hasFields) {
+                    withContext(CommonPool) {
+                        dbManager.messageDao().getAttachmentFields(attachment._id)
+                    }.map { Field(it.title, it.value) }
+                } else {
+                    null
                 }
-                    else -> null
-                }?.let { list.add(it) }
+                val actions = if (hasActions) {
+                    withContext(CommonPool) {
+                        dbManager.messageDao().getAttachmentActions(attachment._id)
+                    }.mapNotNull { mapAction(it) }
+                } else {
+                    null
+                }
+
+                val attachment = Attachment(
+                        title = title,
+                        type = type,
+                        description = description,
+                        authorName = authorName,
+                        text = text,
+                        thumbUrl = thumbUrl,
+                        color = color?.let { Color.Custom(color) },
+                        titleLink = titleLink,
+                        titleLinkDownload = titleLinkDownload,
+                        imageUrl = imageUrl,
+                        imageType = imageType,
+                        imageSize = imageSize,
+                        videoUrl = videoUrl,
+                        videoType = videoType,
+                        videoSize = videoSize,
+                        audioUrl = audioUrl,
+                        audioType = audioType,
+                        audioSize = audioSize,
+                        messageLink = messageLink,
+                        attachments = null, // HOW TO MAP THIS
+                        timestamp = timestamp,
+                        authorIcon = authorIcon,
+                        authorLink = authorLink,
+                        fields = fields,
+                        fallback = fallback,
+                        buttonAlignment = if (actions != null && actions.isNotEmpty()) buttonAlignment ?: "vertical" else null,
+                        actions = actions
+                )
+                list.add(attachment)
             }
         }
         return list
     }
 
-    private suspend fun mapColorAttachmentWithFields(entity: AttachmentEntity): ColorAttachment {
+    /*private suspend fun mapColorAttachmentWithFields(entity: AttachmentEntity): ColorAttachment {
         val fields = withContext(CommonPool) {
             dbManager.messageDao().getAttachmentFields(entity._id)
         }.map { Field(it.title, it.value) }
@@ -199,7 +204,7 @@ class DatabaseMessageMapper(private val dbManager: DatabaseManager) {
             // TODO - remove the default "vertical" value from here...
             ActionsAttachment(title, actions, buttonAlignment ?: "vertical")
         }
-    }
+    }*/
 
     private fun mapAction(action: AttachmentActionEntity): Action? {
         return when (action.type) {
@@ -210,12 +215,12 @@ class DatabaseMessageMapper(private val dbManager: DatabaseManager) {
         }
     }
 
-    private suspend fun mapAuthorAttachment(attachment: AttachmentEntity): AuthorAttachment {
+    /*private suspend fun mapAuthorAttachment(attachment: AttachmentEntity): AuthorAttachment {
         val fields = withContext(CommonPool) {
             dbManager.messageDao().getAttachmentFields(attachment._id)
         }.map { Field(it.title, it.value) }
         return with(attachment) {
             AuthorAttachment(authorLink!!, authorIcon, authorName, fields)
         }
-    }
+    }*/
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessagesRepository.kt

 package chat.rocket.android.server.infraestructure
 
 import chat.rocket.android.db.DatabaseManager
+import chat.rocket.android.db.Operation
 import chat.rocket.android.db.model.MessagesSync
 import chat.rocket.android.server.domain.MessagesRepository
 import chat.rocket.core.model.Message
@@ -61,9 +62,7 @@ class DatabaseMessagesRepository(
     }
 
     override suspend fun saveLastSyncDate(roomId: String, timeMillis: Long) {
-        withContext(dbManager.dbContext) {
-            dbManager.messageDao().saveLastSync(MessagesSync(roomId, timeMillis))
-        }
+        dbManager.sendOperation(Operation.SaveLastSync(MessagesSync(roomId, timeMillis)))
     }
 
     override suspend fun getLastSyncDate(roomId: String): Long? = withContext(CommonPool) {

app/src/main/java/chat/rocket/android/util/extensions/CharSequence.kt

 package chat.rocket.android.util.extensions
 
 
-inline fun CharSequence?.isNotNullNorEmpty(block: (CharSequence) -> Unit) {
+inline fun CharSequence?.ifNotNullNorEmpty(block: (CharSequence) -> Unit) {
     if (this != null && this.isNotEmpty()) {
         block(this)
     }
 }
+
+fun CharSequence?.isNotNullNorEmpty(): Boolean = this != null && this.isNotEmpty()
\ No newline at end of file

app/src/main/java/chat/rocket/android/util/extensions/String.kt

@@ -75,3 +75,5 @@ fun String.lowercaseUrl(): String? {
 
     return httpUrl?.newBuilder()?.scheme(newScheme)?.build()?.toString()
 }
+
+fun String?.isNotNullNorEmpty(): Boolean = this != null && this.isNotEmpty()
\ No newline at end of file

app/src/main/java/chat/rocket/android/util/extensions/T.kt

+package chat.rocket.android.util.extensions
+
+val <T> T.exhaustive: T
+    get() = this
\ No newline at end of file

app/src/main/java/chat/rocket/android/util/extensions/View.kt

@@ -4,10 +4,12 @@ import android.net.Uri
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.res.ResourcesCompat
 import android.view.View
+import androidx.core.view.isVisible
 import chat.rocket.android.R
 import timber.log.Timber
 
-fun View.openTabbedUrl(url: String) {
+fun View.openTabbedUrl(url: String?) {
+    if (url == null) return
     with(this) {
         val uri = url.ensureScheme()
         val tabsbuilder = CustomTabsIntent.Builder()
@@ -31,3 +33,26 @@ private fun String.ensureScheme(): Uri? {
 
     return Uri.parse(url.lowercaseUrl())
 }
+
+inline var List<View>.isVisible: Boolean
+    get() {
+        var visible = true
+        forEach { view ->
+            if (!view.isVisible) {
+                visible = false
+            }
+        }
+        return visible
+    }
+
+    set(value) {
+        forEach { view ->
+            view.isVisible = value
+        }
+    }
+
+fun List<View>.setOnClickListener(listener: (v: View) -> Unit) {
+    forEach { view ->
+        view.setOnClickListener(listener)
+    }
+}
\ No newline at end of file

app/src/main/res/layout/item_message_attachment_old.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/attachment_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:animateLayoutChanges="true"
+    android:background="?android:attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:paddingStart="@dimen/screen_edge_left_and_right_padding"
+    android:paddingTop="@dimen/message_item_top_and_bottom_padding"
+    android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
+    android:paddingBottom="@dimen/message_item_top_and_bottom_padding">
+
+    <View
+        android:id="@+id/quote_bar"
+        android:layout_width="4dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="56dp"
+        android:background="@drawable/quote_vertical_gray_bar"
+        app:layout_constraintBottom_toTopOf="@+id/text_view_more"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/text_sender"
+        style="@style/Sender.Name.TextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:textColor="@color/colorPrimary"
+        app:layout_constraintStart_toEndOf="@+id/quote_bar"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Ronald Perkins" />
+
+    <TextView
+        android:id="@+id/text_message_time"
+        style="@style/Timestamp.TextView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        app:layout_constraintBottom_toBottomOf="@+id/text_sender"
+        app:layout_constraintStart_toEndOf="@+id/text_sender"
+        app:layout_constraintTop_toTopOf="@+id/text_sender"
+        tools:text="11:45 PM" />
+
+    <TextView
+        android:id="@+id/text_content"
+        style="@style/Message.Quote.TextView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/text_view_more"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/text_sender"
+        app:layout_constraintTop_toBottomOf="@+id/text_sender"
+        tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
+
+    <TextView
+        android:id="@+id/text_view_more"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="end"
+        android:textColor="@color/darkGray"
+        android:textSize="14sp"
+        app:layout_constraintEnd_toEndOf="@+id/text_content"
+        app:layout_constraintStart_toStartOf="@+id/quote_bar"
+        app:layout_constraintTop_toBottomOf="@+id/text_content"
+        tools:text="Visualizar mais" />
+
+    <include
+        layout="@layout/layout_reactions"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="@+id/quote_bar"
+        app:layout_constraintTop_toBottomOf="@+id/text_view_more" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>