Merge branch 'beta' into emoji-custom-support

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2031
-        versionName "2.5.0"
+        versionCode 2036
+        versionName "2.5.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 

app/schemas/chat.rocket.android.db.RCDatabase/5.json

+{
+  "formatVersion": 1,
+  "database": {
+    "version": 5,
+    "identityHash": "47a0c30e2696ae09bc86df16cc37279d",
+    "entities": [
+      {
+        "tableName": "users",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "username",
+            "columnName": "username",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "status",
+            "columnName": "status",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "utcOffset",
+            "columnName": "utcOffset",
+            "affinity": "REAL",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_users_username",
+            "unique": false,
+            "columnNames": [
+              "username"
+            ],
+            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "chatrooms",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subscriptionId",
+            "columnName": "subscriptionId",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "fullname",
+            "columnName": "fullname",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "userId",
+            "columnName": "userId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "ownerId",
+            "columnName": "ownerId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "readonly",
+            "columnName": "readonly",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isDefault",
+            "columnName": "isDefault",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "favorite",
+            "columnName": "favorite",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "open",
+            "columnName": "open",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "alert",
+            "columnName": "alert",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "unread",
+            "columnName": "unread",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "userMentions",
+            "columnName": "userMentions",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "groupMentions",
+            "columnName": "groupMentions",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "updatedAt",
+            "columnName": "updatedAt",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastSeen",
+            "columnName": "lastSeen",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastMessageText",
+            "columnName": "lastMessageText",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastMessageUserId",
+            "columnName": "lastMessageUserId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "lastMessageTimestamp",
+            "columnName": "lastMessageTimestamp",
+            "affinity": "INTEGER",
+            "notNull": false
+          },
+          {
+            "fieldPath": "broadcast",
+            "columnName": "broadcast",
+            "affinity": "INTEGER",
+            "notNull": false
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "id"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_chatrooms_userId",
+            "unique": false,
+            "columnNames": [
+              "userId"
+            ],
+            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
+          },
+          {
+            "name": "index_chatrooms_ownerId",
+            "unique": false,
+            "columnNames": [
+              "ownerId"
+            ],
+            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
+          },
+          {
+            "name": "index_chatrooms_subscriptionId",
+            "unique": true,
+            "columnNames": [
+              "subscriptionId"
+            ],
+            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
+          },
+          {
+            "name": "index_chatrooms_updatedAt",
+            "unique": false,
+            "columnNames": [
+              "updatedAt"
+            ],
+            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
+          },
+          {
+            "name": "index_chatrooms_lastMessageUserId",
+            "unique": false,
+            "columnNames": [
+              "lastMessageUserId"
+            ],
+            "createSql": "CREATE  INDEX `index_chatrooms_lastMessageUserId` ON `${TABLE_NAME}` (`lastMessageUserId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "ownerId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "userId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "users",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "lastMessageUserId"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          }
+        ]
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"47a0c30e2696ae09bc86df16cc37279d\")"
+    ]
+  }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/app/AppLifecycleObserver.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import chat.rocket.android.server.domain.GetAccountInteractor
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.UserStatus
@@ -15,8 +16,7 @@ import javax.inject.Inject
 
 class AppLifecycleObserver @Inject constructor(
     private val serverInteractor: GetCurrentServerInteractor,
-    private val factory: RocketChatClientFactory,
-    private val getAccountInteractor: GetAccountInteractor
+    private val factory: ConnectionManagerFactory
 ) : LifecycleObserver {
 
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
@@ -31,14 +31,8 @@ class AppLifecycleObserver @Inject constructor(
 
     private fun changeTemporaryStatus(userStatus: UserStatus) {
         launch {
-            val currentServer = serverInteractor.get()
-            val account = currentServer?.let { getAccountInteractor.get(currentServer) }
-            val client = account?.let { factory.create(currentServer) }
-
-            try {
-                client?.setTemporaryStatus(userStatus)
-            } catch (exception: RocketChatException) {
-                Timber.e(exception)
+            serverInteractor.get()?.let { currentServer ->
+                factory.create(currentServer).setTemporaryStatus(userStatus)
             }
         }
     }

app/src/main/java/chat/rocket/android/app/DateTimeHelper.kt

@@ -44,39 +44,48 @@ object DateTimeHelper {
         }
     }
 
-    /**
+    fun getFormattedDateForMessages(localDateTime: LocalDateTime, context: Context): String {
+        val localDate = localDateTime.toLocalDate()
+        return when (localDate) {
+            today -> context.getString(R.string.msg_today)
+            yesterday -> context.getString(R.string.msg_yesterday)
+            else -> formatLocalDate(localDate)
+        }
+    }
+
+/**
  * Returns a time from a [LocalDateTime].
  *
  * @param localDateTime The [LocalDateTime].
  * @return The time from a [LocalDateTime].
  */
-    fun getTime(localDateTime: LocalDateTime): String {
+fun getTime(localDateTime: LocalDateTime): String {
     val formatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
     return localDateTime.toLocalTime().format(formatter).toString()
-    }
+}
 
-    /**
+/**
  * Returns a date time from a [LocalDateTime].
  *
  * @param localDateTime The [LocalDateTime].
  * @return The time from a [LocalDateTime].
  */
-    fun getDateTime(localDateTime: LocalDateTime): String {
+fun getDateTime(localDateTime: LocalDateTime): String {
     return formatLocalDateTime(localDateTime)
-    }
+}
 
-    private fun formatLocalDateTime(localDateTime: LocalDateTime): String {
+private fun formatLocalDateTime(localDateTime: LocalDateTime): String {
     val formatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT)
     return localDateTime.format(formatter).toString()
-    }
+}
 
-    private fun formatLocalDate(localDate: LocalDate): String {
+private fun formatLocalDate(localDate: LocalDate): String {
     val formatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)
     return localDate.format(formatter).toString()
-    }
+}
 
-    private fun formatLocalTime(localTime: LocalTime): String {
+private fun formatLocalTime(localTime: LocalTime): String {
     val formatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
     return localTime.format(formatter).toString()
-    }
+}
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/domain/model/LoginDeepLinkInfo.kt

@@ -11,8 +11,8 @@ import timber.log.Timber
 @Parcelize
 data class LoginDeepLinkInfo(
     val url: String,
-    val userId: String,
-    val token: String
+    val userId: String?,
+    val token: String?
 ) : Parcelable
 
 fun Intent.getLoginDeepLinkInfo(): LoginDeepLinkInfo? {

app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginView.kt

@@ -190,6 +190,21 @@ interface LoginView : LoadingView, MessageView {
      */
     fun setupGitlabButtonListener(gitlabUrl: String, state: String)
 
+    /**
+     * Shows the "login by WordPress" view if it is enable by the server settings.
+     *
+     * REMARK: We must set up the Gitlab button listener before enabling it [setupWordpressButtonListener].
+     */
+    fun enableLoginByWordpress()
+
+    /**
+     * Setups the WordPress button when tapped.
+     *
+     * @param wordpressUrl The WordPress OAuth URL to authenticate with.
+     * @param state A random string generated by the app, which you'll verify later (to protect against forgery attacks).
+     */
+    fun setupWordpressButtonListener(wordpressUrl: String, state: String)
+
     /**
      * Adds a custom OAuth button in the oauth view.
      *

app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt

@@ -443,6 +443,24 @@ class LoginFragment : Fragment(), LoginView {
         }
     }
 
+    override fun enableLoginByWordpress() {
+        ui {
+            button_wordpress.isClickable = true
+        }
+    }
+
+    override fun setupWordpressButtonListener(wordpressUrl: String, state: String) {
+        ui { activity ->
+            button_wordpress.setOnClickListener {
+                startActivityForResult(
+                    activity.oauthWebViewIntent(wordpressUrl, state),
+                    REQUEST_CODE_FOR_OAUTH
+                )
+                activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)
+            }
+        }
+    }
+
     override fun addCustomOauthServiceButton(
         customOauthUrl: String,
         state: String,
@@ -488,11 +506,11 @@ class LoginFragment : Fragment(), LoginView {
     override fun setupFabListener() {
         ui {
             button_fab.isVisible = true
-            button_fab.setOnClickListener({
+            button_fab.setOnClickListener {
                 button_fab.hide()
                 showRemainingSocialAccountsView()
                 scrollToBottom()
-            })
+            }
         }
     }
 

app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt

@@ -104,6 +104,8 @@ class ServerFragment : Fragment(), ServerView {
 
     override fun onDestroyView() {
         super.onDestroyView()
+        // reset deep link info, so user can come back and log to another server...
+        deepLinkInfo = null
         relative_layout.viewTreeObserver.removeOnGlobalLayoutListener(layoutListener)
     }
 
@@ -144,9 +146,9 @@ class ServerFragment : Fragment(), ServerView {
             hideLoading()
             AlertDialog.Builder(it)
                 .setMessage(getString(R.string.msg_ver_not_recommended, BuildConfig.RECOMMENDED_SERVER_VERSION))
-                .setPositiveButton(R.string.msg_ok, { _, _ ->
+                .setPositiveButton(R.string.msg_ok) { _, _ ->
                     performConnect()
-                })
+                }
                 .create()
                 .show()
         }

app/src/main/java/chat/rocket/android/authentication/ui/AuthenticationActivity.kt

@@ -56,9 +56,7 @@ class AuthenticationActivity : AppCompatActivity(), HasSupportFragmentInjector {
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         val currentFragment = supportFragmentManager.findFragmentById(R.id.fragment_container)
-        if (currentFragment != null) {
-            currentFragment.onActivityResult(requestCode, resultCode, data)
-        }
+        currentFragment?.onActivityResult(requestCode, resultCode, data)
     }
 
     override fun supportFragmentInjector(): AndroidInjector<Fragment> {

app/src/main/java/chat/rocket/android/chatinformation/ui/MessageInfoFragment.kt

@@ -68,7 +68,7 @@ class MessageInfoFragment : Fragment(), MessageInfoView {
 
     private fun setupRecyclerView() {
         // Initialize the endlessRecyclerViewScrollListener so we don't NPE at onDestroyView
-        val linearLayoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, true)
+        val linearLayoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, true)
         adapter = ReadReceiptAdapter()
         linearLayoutManager.stackFromEnd = true
         receipt_list.layoutManager = linearLayoutManager

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

@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.children
+import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.ui.bottomsheet.MessageActionsBottomSheet
@@ -94,6 +95,7 @@ abstract class BaseViewHolder<T : BaseUiModel<*>>(
                     view.context?.let {
                         if (it is ContextThemeWrapper && it.baseContext is AppCompatActivity) {
                             with(it.baseContext as AppCompatActivity) {
+                                if (this.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {
                                     val actionsBottomSheet = MessageActionsBottomSheet()
                                     actionsBottomSheet.addItems(menuItems, this@BaseViewHolder)
                                     actionsBottomSheet.show(supportFragmentManager, null)
@@ -104,6 +106,7 @@ abstract class BaseViewHolder<T : BaseUiModel<*>>(
                 }
             }
         }
+    }
 
     internal fun setupActionMenu(view: View) {
         if (listener.isActionsEnabled()) {

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

@@ -18,10 +18,9 @@ import java.security.InvalidParameterException
 class ChatRoomAdapter(
     private val roomType: String? = null,
     private val roomName: String? = null,
-    private val presenter: ChatRoomPresenter? = null,
+    private val actionSelectListener: OnActionSelected? = null,
     private val enableActions: Boolean = true,
-    private val reactionListener: EmojiReactionListener? = null,
-    private val context: Context? = null
+    private val reactionListener: EmojiReactionListener? = null
 ) : RecyclerView.Adapter<BaseViewHolder<*>>() {
     private val dataSet = ArrayList<BaseUiModel<*>>()
 
@@ -70,7 +69,7 @@ class ChatRoomAdapter(
             BaseUiModel.ViewType.MESSAGE_REPLY -> {
                 val view = parent.inflate(R.layout.item_message_reply)
                 MessageReplyViewHolder(view, actionsListener, reactionListener) { roomName, permalink ->
-                    presenter?.openDirectMessage(roomName, permalink)
+                    actionSelectListener?.openDirectMessage(roomName, permalink)
                 }
             }
             else -> {
@@ -212,52 +211,53 @@ class ChatRoomAdapter(
             message.apply {
                 when (item.itemId) {
                     R.id.action_message_info -> {
-                        presenter?.messageInfo(id)
+                        actionSelectListener?.showMessageInfo(id)
                     }
                     R.id.action_message_reply -> {
                         if (roomName != null && roomType != null) {
-                            presenter?.citeMessage(roomName, roomType, id, true)
+                            actionSelectListener?.citeMessage(roomName, roomType, id, true)
                         }
                     }
                     R.id.action_message_quote -> {
                         if (roomName != null && roomType != null) {
-                            presenter?.citeMessage(roomName, roomType, id, false)
+                            actionSelectListener?.citeMessage(roomName, roomType, id, false)
                         }
                     }
                     R.id.action_message_copy -> {
-                        presenter?.copyMessage(id)
+                        actionSelectListener?.copyMessage(id)
                     }
                     R.id.action_message_edit -> {
-                        presenter?.editMessage(roomId, id, message.message)
+                        actionSelectListener?.editMessage(roomId, id, message.message)
                     }
                     R.id.action_message_star -> {
-                        if (!item.isChecked) {
-                            presenter?.starMessage(id)
-                        } else {
-                            presenter?.unstarMessage(id)
-                        }
+                        actionSelectListener?.toogleStar(id, !item.isChecked)
                     }
                     R.id.action_message_unpin -> {
-                        if (!item.isChecked) {
-                            presenter?.pinMessage(id)
-                        } else {
-                            presenter?.unpinMessage(id)
-                        }
+                        actionSelectListener?.tooglePin(id, !item.isChecked)
                     }
                     R.id.action_message_delete -> {
-                        context?.let {
-                            val builder = AlertDialog.Builder(it)
-                            builder.setTitle(it.getString(R.string.msg_delete_message))
-                                    .setMessage(it.getString(R.string.msg_delete_description))
-                                    .setPositiveButton(it.getString(R.string.msg_ok)) { _, _ -> presenter?.deleteMessage(roomId, id) }
-                                    .setNegativeButton(it.getString(R.string.msg_cancel)) { _, _ ->  }
-                                    .show()
+                        actionSelectListener?.deleteMessage(roomId, id)
                     }
+                    R.id.action_menu_msg_react -> {
+                        actionSelectListener?.showReactions(id)
+                    }
+                    else -> {
+                        TODO("Not implemented")
                     }
-                    R.id.action_menu_msg_react -> presenter?.showReactions(id)
-                    else -> TODO("Not implemented")
                 }
             }
         }
     }
+
+    interface OnActionSelected {
+        fun showMessageInfo(id: String)
+        fun citeMessage(roomName: String, roomType: String, messageId: String, mentionAuthor: Boolean)
+        fun copyMessage(id: String)
+        fun editMessage(roomId: String, messageId: String, text: String)
+        fun toogleStar(id: String, star: Boolean)
+        fun tooglePin(id: String, pin: Boolean)
+        fun deleteMessage(roomId: String, id: String)
+        fun showReactions(id: String)
+        fun openDirectMessage(roomName: String, message: String)
+    }
 }
\ No newline at end of file

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

@@ -49,8 +49,18 @@ class MessageViewHolder(
 
     override fun bindViews(data: MessageUiModel) {
         with(itemView) {
-            if (data.isFirstUnread) new_messages_notif.visibility = View.VISIBLE
-            else new_messages_notif.visibility = View.GONE
+            day_marker_layout.visibility = if (data.showDayMarker) {
+                day.text = data.currentDayMarkerText
+                View.VISIBLE
+            } else {
+                View.GONE
+            }
+
+            if (data.isFirstUnread) {
+                new_messages_notif.visibility = View.VISIBLE
+            } else {
+                new_messages_notif.visibility = View.GONE
+            }
 
             text_message_time.text = data.time
             text_sender.text = data.senderName
@@ -69,9 +79,7 @@ class MessageViewHolder(
             text_content.text_content.text = data.content
 
             image_avatar.setImageURI(data.avatar)
-            text_content.setTextColor(
-                if (data.isTemporary) Color.GRAY else Color.BLACK
-            )
+            text_content.setTextColor(if (data.isTemporary) Color.GRAY else Color.BLACK)
 
             data.message.let {
                 text_edit_indicator.isVisible = !it.isSystemMessage() && it.editedBy != null

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

 package chat.rocket.android.chatroom.adapter
 
-import android.net.Uri
 import android.view.View
 import androidx.core.view.isVisible
 import chat.rocket.android.chatroom.uimodel.UrlPreviewUiModel
-import chat.rocket.android.util.extensions.openTabbedUrl
 import chat.rocket.android.emoji.EmojiReactionListener
 import chat.rocket.android.util.extensions.content
+import chat.rocket.android.util.extensions.openTabbedUrl
 import kotlinx.android.synthetic.main.message_url_preview.view.*
 
 class UrlPreviewViewHolder(itemView: View,
@@ -42,7 +41,7 @@ class UrlPreviewViewHolder(itemView: View,
 
     private val onClickListener = { view: View ->
         if (data != null) {
-            view.openTabbedUrl(Uri.parse(data!!.rawData.url))
+            view.openTabbedUrl(data!!.rawData.url)
         }
     }
 }
\ No newline at end of file

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

@@ -1006,7 +1006,7 @@ class ChatRoomPresenter @Inject constructor(
         }
     }
 
-    private suspend fun subscribeTypingStatus() {
+    private fun subscribeTypingStatus() {
         launch(CommonPool + strategy.jobs) {
             client.subscribeTypingStatus(chatRoomId.toString()) { _, id ->
                 typingStatusSubscriptionId = id
@@ -1019,6 +1019,7 @@ class ChatRoomPresenter @Inject constructor(
     }
 
     private fun processTypingStatus(typingStatus: Pair<String, Boolean>) {
+        if (typingStatus.first != currentLoggedUsername) {
             if (!typingStatusList.any { username -> username == typingStatus.first }) {
                 if (typingStatus.second) {
                     typingStatusList.add(typingStatus.first)
@@ -1031,12 +1032,14 @@ class ChatRoomPresenter @Inject constructor(
                     }
                 }
             }
+
             if (typingStatusList.isNotEmpty()) {
-            view.showTypingStatus(typingStatusList.toList()) // copy typingStatusList
+                view.showTypingStatus(typingStatusList.toList())
             } else {
                 view.hideTypingStatusView()
             }
         }
+    }
 
     private fun unsubscribeTypingStatus() {
         typingStatusSubscriptionId?.let {

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

@@ -135,7 +135,7 @@ internal const val MENU_ACTION_FAVORITE_MESSAGES = 5
 internal const val MENU_ACTION_FILES = 6
 
 class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiReactionListener,
-    Drawable.Callback {
+    ChatRoomAdapter.OnActionSelected, Drawable.Callback {
 
     @Inject
     lateinit var presenter: ChatRoomPresenter
@@ -210,6 +210,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         } else {
             requireNotNull(bundle) { "no arguments supplied when the fragment was instantiated" }
         }
+
+        adapter = ChatRoomAdapter(chatRoomType, chatRoomName, this,
+                reactionListener = this)
     }
 
     override fun onCreateView(
@@ -305,14 +308,30 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                 adapter.clearData()
             }
 
+            if (dataSet.isNotEmpty()) {
+                var prevMsgModel = dataSet[0]
+
                 // track the message sent immediately after the current message
                 var prevMessageUiModel: MessageUiModel? = null
 
+                // Checking for all messages to assign true to the required showDayMaker
                 // Loop over received messages to determine first unread
+                var firstUnread = false
                 for (i in dataSet.indices) {
                     val msgModel = dataSet[i]
 
-                if (msgModel is MessageUiModel) {
+                    if (i > 0) {
+                        prevMsgModel = dataSet[i - 1]
+                    }
+
+                    val currentDayMarkerText = msgModel.currentDayMarkerText
+                    val previousDayMarkerText = prevMsgModel.currentDayMarkerText
+                    println("$previousDayMarkerText then $currentDayMarkerText")
+                    if (previousDayMarkerText != currentDayMarkerText) {
+                        prevMsgModel.showDayMarker = true
+                    }
+
+                    if (!firstUnread && msgModel is MessageUiModel) {
                         val msg = msgModel.rawData
                         if (msg.timestamp < chatRoomLastSeen) {
                             // This message was sent before the last seen of the room. Hence, it was seen.
@@ -320,20 +339,15 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                             if (prevMessageUiModel != null) {
                                 prevMessageUiModel.isFirstUnread = true
                             }
-                        break
+                            // Found first unread message.
+                            firstUnread = true
                         }
                         prevMessageUiModel = msgModel
                     }
                 }
+            }
 
             if (recycler_view.adapter == null) {
-                adapter = ChatRoomAdapter(
-                    chatRoomType,
-                    chatRoomName,
-                    presenter,
-                    reactionListener = this@ChatRoomFragment,
-                    context = context
-                )
                 recycler_view.adapter = adapter
                 if (dataSet.size >= 30) {
                     recycler_view.addOnScrollListener(endlessRecyclerViewScrollListener)
@@ -973,4 +987,55 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     override fun scheduleDrawable(who: Drawable?, what: Runnable?, w: Long) {
         text_message?.postDelayed(what, w)
     }
+
+    override fun showMessageInfo(id: String) {
+        presenter.messageInfo(id)
+    }
+
+    override fun citeMessage(roomName: String, roomType: String, messageId: String, mentionAuthor: Boolean) {
+        presenter.citeMessage(roomName, roomType, messageId, mentionAuthor)
+    }
+
+    override fun copyMessage(id: String) {
+        presenter.copyMessage(id)
+    }
+
+    override fun editMessage(roomId: String, messageId: String, text: String) {
+        presenter.editMessage(roomId, messageId, text)
+    }
+
+    override fun toogleStar(id: String, star: Boolean) {
+        if (star) {
+            presenter.starMessage(id)
+        } else {
+            presenter.unstarMessage(id)
+        }
+    }
+
+    override fun tooglePin(id: String, pin: Boolean) {
+        if (pin) {
+            presenter.pinMessage(id)
+        } else {
+            presenter.unpinMessage(id)
+        }
+    }
+
+    override fun deleteMessage(roomId: String, id: String) {
+        ui {
+            val builder = AlertDialog.Builder(it)
+            builder.setTitle(it.getString(R.string.msg_delete_message))
+                    .setMessage(it.getString(R.string.msg_delete_description))
+                    .setPositiveButton(it.getString(R.string.msg_ok)) { _, _ -> presenter.deleteMessage(roomId, id) }
+                    .setNegativeButton(it.getString(R.string.msg_cancel)) { _, _ ->  }
+                    .show()
+        }
+    }
+
+    override fun showReactions(id: String) {
+        presenter.showReactions(id)
+    }
+
+    override fun openDirectMessage(roomName: String, message: String) {
+        presenter.openDirectMessage(roomName, message)
+    }
 }

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

@@ -14,20 +14,18 @@ import kotlinx.android.synthetic.main.message_bottomsheet.*
 
 class MessageActionsBottomSheet : BottomSheetDialogFragment() {
 
-    private lateinit var adapter: MessageActionAdapter
+    private val adapter = MessageActionAdapter()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return inflater.inflate(R.layout.message_bottomsheet, container, false)
     }
 
     fun addItems(items: List<MenuItem>, itemClickListener: MenuItem.OnMenuItemClickListener) {
-        adapter = MessageActionAdapter()
         adapter.addItems(items, ActionItemClickListener(dismissAction = { dismiss() },
             itemClickListener = itemClickListener))
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
         bottomsheet_recycler_view.layoutManager = LinearLayoutManager(context)
         bottomsheet_recycler_view.adapter = adapter
     }
@@ -58,6 +56,7 @@ class MessageActionsBottomSheet : BottomSheetDialogFragment() {
             this.itemClickListener = itemClickListener
             menuItems.clear()
             menuItems.addAll(items)
+            notifyDataSetChanged()
         }
     }
 

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

@@ -16,7 +16,9 @@ data class AudioAttachmentUiModel(
         override var preview: Message? = null,
         override var isTemporary: Boolean = false,
         override var unread: Boolean? = null,
-        override var menuItemsToHide: MutableList<Int> = mutableListOf()
+        override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+        override var currentDayMarkerText: String,
+        override var showDayMarker: Boolean
 ) : BaseFileAttachmentUiModel<AudioAttachment> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.AUDIO_ATTACHMENT.viewType

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

@@ -18,7 +18,9 @@ data class AuthorAttachmentUiModel(
     override var preview: Message? = null,
     override var isTemporary: Boolean = false,
     override var unread: Boolean? = null,
-        override var menuItemsToHide: MutableList<Int> = mutableListOf()
+    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+    override var currentDayMarkerText: String,
+    override var showDayMarker: Boolean
 ) : BaseAttachmentUiModel<AuthorAttachment> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.AUTHOR_ATTACHMENT.viewType

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

@@ -14,6 +14,8 @@ interface BaseUiModel<out T> {
     var preview: Message?
     var isTemporary: Boolean
     var unread: Boolean?
+    var currentDayMarkerText: String
+    var showDayMarker: Boolean
     var menuItemsToHide: MutableList<Int>
 
     enum class ViewType(val viewType: Int) {

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

@@ -17,7 +17,9 @@ data class ColorAttachmentUiModel(
     override var preview: Message? = null,
     override var isTemporary: Boolean = false,
     override var unread: Boolean?,
-        override var menuItemsToHide: MutableList<Int> = mutableListOf()
+    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+    override var currentDayMarkerText: String,
+    override var showDayMarker: Boolean
 ) : BaseAttachmentUiModel<ColorAttachment> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.COLOR_ATTACHMENT.viewType

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

@@ -16,7 +16,9 @@ data class GenericFileAttachmentUiModel(
     override var preview: Message? = null,
     override var isTemporary: Boolean = false,
     override var unread: Boolean? = null,
-        override var menuItemsToHide: MutableList<Int> = mutableListOf()
+    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+    override var currentDayMarkerText: String,
+    override var showDayMarker: Boolean
 ) : BaseFileAttachmentUiModel<GenericFileAttachment> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.GENERIC_FILE_ATTACHMENT.viewType

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

@@ -18,7 +18,9 @@ data class ImageAttachmentUiModel(
     override var preview: Message? = null,
     override var isTemporary: Boolean = false,
     override var unread: Boolean? = null,
-        override var menuItemsToHide: MutableList<Int> = mutableListOf()
+    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+    override var currentDayMarkerText: String,
+    override var showDayMarker: Boolean
 ) : BaseFileAttachmentUiModel<ImageAttachment> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.IMAGE_ATTACHMENT.viewType

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

@@ -17,7 +17,9 @@ data class MessageAttachmentUiModel(
     override var preview: Message? = null,
     override var isTemporary: Boolean = false,
     override var unread: Boolean? = null,
-        override var menuItemsToHide: MutableList<Int> = mutableListOf()
+    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+    override var currentDayMarkerText: String,
+    override var showDayMarker: Boolean
 ) : BaseUiModel<Message> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.MESSAGE_ATTACHMENT.viewType

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

@@ -13,7 +13,9 @@ data class MessageReplyUiModel(
     override var isTemporary: Boolean = false,
     override val message: Message,
     override var unread: Boolean? = null,
-    override var menuItemsToHide: MutableList<Int> = mutableListOf()
+    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+    override var currentDayMarkerText: String,
+    override var showDayMarker: Boolean
 ) : BaseUiModel<MessageReply> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.MESSAGE_REPLY.viewType

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

@@ -12,6 +12,8 @@ data class MessageUiModel(
     override val senderName: CharSequence,
     override val content: CharSequence,
     override val isPinned: Boolean,
+    override var currentDayMarkerText: String,
+    override var showDayMarker: Boolean,
     override var reactions: List<ReactionUiModel>,
     override var nextDownStreamMessage: BaseUiModel<*>? = null,
     override var preview: Message? = null,

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

@@ -265,6 +265,10 @@ class UiModelMapper @Inject constructor(
         val roomName =
             if (settings.useRealName() && name != null) name else message.sender?.username ?: ""
         val permalink = messageHelper.createPermalink(message, chatRoom)
+
+        val localDateTime = DateTimeHelper.getLocalDateTime(message.timestamp)
+        val dayMarkerText = DateTimeHelper.getFormattedDateForMessages(localDateTime, context)
+
         return MessageReplyUiModel(
             messageId = message.id,
             isTemporary = false,
@@ -273,7 +277,9 @@ class UiModelMapper @Inject constructor(
             preview = mapMessagePreview(message),
             rawData = MessageReply(roomName = roomName, permalink = permalink),
             nextDownStreamMessage = null,
-            unread = message.unread
+            unread = message.unread,
+            currentDayMarkerText = dayMarkerText,
+            showDayMarker = false
         )
     }
 
@@ -285,8 +291,12 @@ class UiModelMapper @Inject constructor(
         val title = url.meta?.title
         val description = url.meta?.description
 
+        val localDateTime = DateTimeHelper.getLocalDateTime(message.timestamp)
+        val dayMarkerText = DateTimeHelper.getFormattedDateForMessages(localDateTime, context)
+
         return UrlPreviewUiModel(message, url, message.id, title, hostname, description, thumb,
-            getReactions(message), preview = message.copy(message = url.url), unread = message.unread)
+            getReactions(message), preview = message.copy(message = url.url), unread = message.unread,
+            showDayMarker = false, currentDayMarkerText = dayMarkerText)
     }
 
     private fun mapAttachment(message: Message, attachment: Attachment): BaseUiModel<*>? {
@@ -304,10 +314,14 @@ class UiModelMapper @Inject constructor(
             val content = stripMessageQuotes(message)
             val id = attachmentId(message, attachment)
 
+            val localDateTime = DateTimeHelper.getLocalDateTime(message.timestamp)
+            val dayMarkerText = DateTimeHelper.getFormattedDateForMessages(localDateTime, context)
+
             ColorAttachmentUiModel(attachmentUrl = url, id = id, color = color.color,
                 text = text, message = message, rawData = attachment,
                 messageId = message.id, reactions = getReactions(message),
-                preview = message.copy(message = content.message), unread = message.unread)
+                preview = message.copy(message = content.message), unread = message.unread,
+                showDayMarker = false, currentDayMarkerText = dayMarkerText)
         }
     }
 
@@ -332,10 +346,14 @@ class UiModelMapper @Inject constructor(
             }
             val id = attachmentId(message, attachment)
 
+            val localDateTime = DateTimeHelper.getLocalDateTime(message.timestamp)
+            val dayMarkerText = DateTimeHelper.getFormattedDateForMessages(localDateTime, context)
+
             AuthorAttachmentUiModel(attachmentUrl = url, id = id, name = authorName,
                 icon = authorIcon, fields = fieldsText, message = message, rawData = attachment,
                 messageId = message.id, reactions = getReactions(message),
-                preview = message.copy(message = content.message), unread = message.unread)
+                preview = message.copy(message = content.message), unread = message.unread,
+                showDayMarker = false, currentDayMarkerText = dayMarkerText)
         }
     }
 
@@ -349,11 +367,17 @@ class UiModelMapper @Inject constructor(
             is GenericFileAttachment -> context.getString(R.string.msg_preview_file)
             else -> attachment.text ?: ""
         }
+
+        val localDateTime = DateTimeHelper.getLocalDateTime(message.timestamp)
+        val dayMarkerText = DateTimeHelper.getFormattedDateForMessages(localDateTime, context)
+
         val content = stripMessageQuotes(message)
+
         return MessageAttachmentUiModel(message = content, rawData = message,
             messageId = message.id, time = time, senderName = attachmentAuthor,
             content = attachmentText, isPinned = message.pinned, reactions = getReactions(message),
-            preview = message.copy(message = content.message), unread = message.unread)
+            preview = message.copy(message = content.message), unread = message.unread,
+            currentDayMarkerText = dayMarkerText, showDayMarker = false)
     }
 
     private fun mapFileAttachment(message: Message, attachment: FileAttachment): BaseUiModel<*>? {
@@ -362,19 +386,27 @@ class UiModelMapper @Inject constructor(
         val attachmentText = attachmentText(attachment)
         val attachmentDescription = attachmentDescription(attachment)
         val id = attachmentId(message, attachment)
+
+        val localDateTime = DateTimeHelper.getLocalDateTime(message.timestamp)
+        val dayMarkerText = DateTimeHelper.getFormattedDateForMessages(localDateTime, context)
+
         return when (attachment) {
             is ImageAttachment -> ImageAttachmentUiModel(message, attachment, message.id,
                 attachmentUrl, attachmentTitle, attachmentText, attachmentDescription, id, getReactions(message),
-                preview = message.copy(message = context.getString(R.string.msg_preview_photo)), unread = message.unread)
+                preview = message.copy(message = context.getString(R.string.msg_preview_photo)), unread = message.unread,
+                showDayMarker = false, currentDayMarkerText = dayMarkerText)
             is VideoAttachment -> VideoAttachmentUiModel(message, attachment, message.id,
                 attachmentUrl, attachmentTitle, id, getReactions(message),
-                preview = message.copy(message = context.getString(R.string.msg_preview_video)), unread = message.unread)
+                preview = message.copy(message = context.getString(R.string.msg_preview_video)), unread = message.unread,
+                showDayMarker = false, currentDayMarkerText = dayMarkerText)
             is AudioAttachment -> AudioAttachmentUiModel(message, attachment, message.id,
                 attachmentUrl, attachmentTitle, id, getReactions(message),
-                preview = message.copy(message = context.getString(R.string.msg_preview_audio)), unread = message.unread)
+                preview = message.copy(message = context.getString(R.string.msg_preview_audio)), unread = message.unread,
+                showDayMarker = false, currentDayMarkerText = dayMarkerText)
             is GenericFileAttachment -> GenericFileAttachmentUiModel(message, attachment,
                 message.id, attachmentUrl, attachmentTitle, id, getReactions(message),
-                preview = message.copy(message = context.getString(R.string.msg_preview_file)), unread = message.unread)
+                preview = message.copy(message = context.getString(R.string.msg_preview_file)), unread = message.unread,
+                showDayMarker = false, currentDayMarkerText = dayMarkerText)
             else -> null
         }
     }
@@ -434,11 +466,15 @@ class UiModelMapper @Inject constructor(
             null
         }
 
+        val localDateTime = DateTimeHelper.getLocalDateTime(message.timestamp)
+        val dayMarkerText = DateTimeHelper.getFormattedDateForMessages(localDateTime, context)
+
         val content = getContent(stripMessageQuotes(message))
         MessageUiModel(message = stripMessageQuotes(message), rawData = message,
             messageId = message.id, avatar = avatar!!, time = time, senderName = sender,
-            content = content, isPinned = message.pinned, reactions = getReactions(message),
-            isFirstUnread = false, preview = preview, isTemporary = isTemp, unread = unread)
+            content = content, isPinned = message.pinned, currentDayMarkerText = dayMarkerText,
+            showDayMarker = false, reactions = getReactions(message), isFirstUnread = false,
+            preview = preview, isTemporary = isTemp, unread = unread)
     }
 
     private fun mapMessagePreview(message: Message): Message {

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

@@ -17,7 +17,9 @@ data class UrlPreviewUiModel(
     override var preview: Message? = null,
     override var isTemporary: Boolean = false,
     override var unread: Boolean? = null,
-        override var menuItemsToHide: MutableList<Int> = mutableListOf()
+    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+    override var currentDayMarkerText: String,
+    override var showDayMarker: Boolean
 ) : BaseUiModel<Url> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.URL_PREVIEW.viewType

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

@@ -16,7 +16,9 @@ data class VideoAttachmentUiModel(
         override var preview: Message? = null,
         override var isTemporary: Boolean = false,
         override var unread: Boolean? = null,
-        override var menuItemsToHide: MutableList<Int> = mutableListOf()
+        override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+        override var currentDayMarkerText: String,
+        override var showDayMarker: Boolean
 ) : BaseFileAttachmentUiModel<VideoAttachment> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.VIDEO_ATTACHMENT.viewType

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

@@ -10,6 +10,7 @@ import chat.rocket.android.chatrooms.adapter.model.RoomUiModel
 import chat.rocket.android.db.model.ChatRoom
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.infrastructure.checkIfMyself
+import chat.rocket.android.server.domain.GetCurrentUserInteractor
 import chat.rocket.android.server.domain.PublicSettings
 import chat.rocket.android.server.domain.showLastMessage
 import chat.rocket.android.server.domain.useRealName
@@ -27,7 +28,7 @@ import chat.rocket.core.model.SpotlightResult
 class RoomUiModelMapper(
     private val context: Application,
     private val settings: PublicSettings,
-    private val localRepository: LocalRepository,
+    private val userInteractor: GetCurrentUserInteractor,
     private val serverUrl: String
 ) {
     private val nameUnreadColor = ContextCompat.getColor(context, R.color.colorPrimaryText)
@@ -37,6 +38,10 @@ class RoomUiModelMapper(
     private val messageUnreadColor = ContextCompat.getColor(context, android.R.color.primary_text_light)
     private val messageColor = ContextCompat.getColor(context, R.color.colorSecondaryText)
 
+    private val currentUser by lazy {
+        userInteractor.get()
+    }
+
     fun map(rooms: List<ChatRoom>, grouped: Boolean = false): List<ItemHolder<*>> {
         val list = ArrayList<ItemHolder<*>>(rooms.size + 4)
         var lastType: String? = null
@@ -88,8 +93,9 @@ class RoomUiModelMapper(
                 name = name!!,
                 type = type,
                 avatar = serverUrl.avatarUrl(name!!, isGroupOrChannel = true),
-                lastMessage = mapLastMessage(lastMessage?.sender?.username,
-                        lastMessage?.sender?.name, lastMessage?.message)
+                lastMessage = mapLastMessage(lastMessage?.sender?.id, lastMessage?.sender?.username,
+                        lastMessage?.sender?.name, lastMessage?.message,
+                        isDirectMessage = type is RoomType.DirectMessage)
             )
         }
     }
@@ -107,14 +113,17 @@ class RoomUiModelMapper(
                 serverUrl.avatarUrl(name, isGroupOrChannel = true)
             }
             val unread = mapUnread(unread)
-            val lastMessage = mapLastMessage(chatRoom.lastMessageUserName,
-                    chatRoom.lastMessageUserFullName, lastMessageText, isUnread)
+            val lastMessage = mapLastMessage(lastMessageUserId, chatRoom.lastMessageUserName,
+                    chatRoom.lastMessageUserFullName, lastMessageText, isUnread,
+                    type is RoomType.DirectMessage)
+            val open = open
 
             RoomUiModel(
                 id = id,
                 name = roomName,
                 type = type,
                 avatar = avatar,
+                open = open,
                 date = timestamp,
                 unread = unread,
                 alert = isUnread,
@@ -136,14 +145,16 @@ class RoomUiModelMapper(
         }
     }
 
-    private fun mapLastMessage(name: String?, fullName: String?, text: String?, unread: Boolean = false): CharSequence? {
+    private fun mapLastMessage(userId: String?, name: String?, fullName: String?, text: String?,
+                               unread: Boolean = false,
+                               isDirectMessage: Boolean = false): CharSequence? {
         return if (!settings.showLastMessage()) {
             null
         } else if (name != null && text != null) {
-            val user = if (localRepository.checkIfMyself(name)) {
+            val user = if (currentUser != null && currentUser!!.id == userId) {
                 "${context.getString(R.string.msg_you)}: "
             } else {
-                "${mapName(name, fullName, unread)}: "
+                if (isDirectMessage) "" else "${mapName(name, fullName, unread)}: "
             }
 
             val color = if (unread) messageUnreadColor else messageColor

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

@@ -8,6 +8,7 @@ data class RoomUiModel(
     val type: RoomType,
     val name: CharSequence,
     val avatar: String,
+    val open: Boolean = false,
     val date: CharSequence? = null,
     val unread: String? = null,
     val alert: Boolean = false,

app/src/main/java/chat/rocket/android/chatrooms/di/ChatRoomsFragmentModule.kt

@@ -9,9 +9,12 @@ import chat.rocket.android.chatrooms.ui.ChatRoomsFragment
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.db.ChatRoomDao
 import chat.rocket.android.db.DatabaseManager
+import chat.rocket.android.db.UserDao
 import chat.rocket.android.infrastructure.LocalRepository
+import chat.rocket.android.server.domain.GetCurrentUserInteractor
 import chat.rocket.android.server.domain.PublicSettings
 import chat.rocket.android.server.domain.SettingsRepository
+import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.infraestructure.ConnectionManager
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
@@ -48,6 +51,10 @@ class ChatRoomsFragmentModule {
     @PerFragment
     fun provideChatRoomDao(manager: DatabaseManager): ChatRoomDao = manager.chatRoomDao()
 
+    @Provides
+    @PerFragment
+    fun provideUserDao(manager: DatabaseManager): UserDao = manager.userDao()
+
     @Provides
     @PerFragment
     fun provideConnectionManager(
@@ -80,9 +87,19 @@ class ChatRoomsFragmentModule {
     fun provideRoomMapper(
         context: Application,
         repository: SettingsRepository,
-        localRepository: LocalRepository,
+        userInteractor: GetCurrentUserInteractor,
         @Named("currentServer") serverUrl: String
     ): RoomUiModelMapper {
-        return RoomUiModelMapper(context, repository.get(serverUrl), localRepository, serverUrl)
+        return RoomUiModelMapper(context, repository.get(serverUrl), userInteractor, serverUrl)
+    }
+
+    @Provides
+    @PerFragment
+    fun provideGetCurrentUserInteractor(
+        tokenRepository: TokenRepository,
+        @Named("currentServer") serverUrl: String,
+        userDao: UserDao
+    ): GetCurrentUserInteractor {
+        return GetCurrentUserInteractor(tokenRepository, serverUrl, userDao)
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatrooms/domain/FetchChatRoomsInteractor.kt

@@ -3,7 +3,6 @@ package chat.rocket.android.chatrooms.domain
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.db.model.ChatRoomEntity
 import chat.rocket.android.db.model.UserEntity
-import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.util.retryIO
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.chatRooms
@@ -19,60 +18,10 @@ class FetchChatRoomsInteractor(
     suspend fun refreshChatRooms() {
         val rooms = retryIO("fetch chatRooms", times = 10,
             initialDelay = 200, maxDelay = 2000) {
-            client.chatRooms().update.map { room ->
-                mapChatRoom(room)
-            }
+            client.chatRooms().update
         }
 
         Timber.d("Refreshing rooms: $rooms")
-        dbManager.insert(rooms)
-    }
-
-    private suspend fun mapChatRoom(room: ChatRoom): ChatRoomEntity {
-        with(room) {
-            val userId = userId()
-            if (userId != null && dbManager.findUser(userId) == null) {
-                Timber.d("Missing user, inserting: $userId")
-                dbManager.insert(UserEntity(userId))
-            }
-            lastMessage?.sender?.let { user ->
-                user.id?.let { id ->
-                    if (dbManager.findUser(id) == null) {
-                        Timber.d("Missing last message user, inserting: $id")
-                        dbManager.insert(UserEntity(id, user.username, user.name))
-                    }
-                }
-            }
-            user?.id?.let { id ->
-                if (dbManager.findUser(id) == null) {
-                    Timber.d("Missing owner user, inserting: $id")
-                    dbManager.insert(UserEntity(id, user?.username, user?.name))
-                }
-            }
-            return ChatRoomEntity(
-                id = id,
-                subscriptionId = subscriptionId,
-                type = type.toString(),
-                name = name,
-                fullname = fullName,
-                userId = userId,
-                ownerId = user?.id,
-                readonly = readonly,
-                isDefault = default,
-                favorite = favorite,
-                open = open,
-                alert = alert,
-                unread = unread,
-                userMentions = userMentions,
-                groupMentions = groupMentions,
-                updatedAt = updatedAt,
-                timestamp = timestamp,
-                lastSeen = lastSeen,
-                lastMessageText = lastMessage?.message,
-                lastMessageUserId = lastMessage?.sender?.id,
-                lastMessageTimestamp = lastMessage?.timestamp,
-                broadcast = broadcast
-            )
-        }
+        dbManager.processRooms(rooms)
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt

@@ -9,8 +9,8 @@ import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.main.presentation.MainNavigator
 import chat.rocket.android.server.domain.SettingsRepository
-import chat.rocket.android.server.domain.useSpecialCharsOnRoom
 import chat.rocket.android.server.domain.useRealName
+import chat.rocket.android.server.domain.useSpecialCharsOnRoom
 import chat.rocket.android.server.infraestructure.ConnectionManager
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
@@ -20,9 +20,12 @@ import chat.rocket.common.model.User
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.core.internal.realtime.createDirectMessage
 import chat.rocket.core.internal.rest.me
+import chat.rocket.core.internal.rest.show
+import kotlinx.coroutines.experimental.withTimeout
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Named
+import kotlin.coroutines.experimental.suspendCoroutine
 
 class ChatRoomsPresenter @Inject constructor(
     private val view: ChatRoomsView,
@@ -44,7 +47,7 @@ class ChatRoomsPresenter @Inject constructor(
             try {
                 val room = dbManager.getRoom(chatRoom.id)
                 if (room != null) {
-                    loadChatRoom(room.chatRoom)
+                    loadChatRoom(room.chatRoom, true)
                 } else {
                     with(chatRoom) {
                         val entity = ChatRoomEntity(
@@ -53,18 +56,21 @@ class ChatRoomsPresenter @Inject constructor(
                             type = type.toString(),
                             name = username ?: name.toString(),
                             fullname = name.toString(),
-                            open = false
+                            open = open
                         )
-                        loadChatRoom(entity)
+                        loadChatRoom(entity, false)
                     }
                 }
+            } catch (ex: Exception) {
+                Timber.d(ex, "Error loading channel")
+                view.showGenericErrorMessage()
             } finally {
                 view.hideLoadingRoom()
             }
         }
     }
 
-    fun loadChatRoom(chatRoom: ChatRoomEntity) {
+    suspend fun loadChatRoom(chatRoom: ChatRoomEntity, local: Boolean = false) {
         with(chatRoom) {
             val isDirectMessage = roomTypeOf(type) is RoomType.DirectMessage
             val roomName = if (settings.useSpecialCharsOnRoom() || (isDirectMessage && settings.useRealName())) {
@@ -73,21 +79,28 @@ class ChatRoomsPresenter @Inject constructor(
                 name
             }
 
-            launchUI(strategy) {
             val myself = getCurrentUser()
             if (myself?.username == null) {
                 view.showMessage(R.string.msg_generic_error)
             } else {
                 val id = if (isDirectMessage && !open) {
+                    // If from local database, we already have the roomId, no need to concatenate
+                    if (local) {
+                        retryIO {
+                            client.show(id, roomTypeOf(RoomType.DIRECT_MESSAGE))
+                        }
+                        id
+                    } else {
                         retryIO("createDirectMessage($name)") {
-                            client.createDirectMessage(name, callback = { b, s ->
-
-                            })
+                            withTimeout(10000) {
+                                createDirectMessage(name)
+                            }
                         }
                         val fromTo = mutableListOf(myself.id, id).apply {
                             sort()
                         }
                         fromTo.joinToString("")
+                    }
                 } else {
                     id
                 }
@@ -105,7 +118,6 @@ class ChatRoomsPresenter @Inject constructor(
             }
         }
     }
-    }
 
     private suspend fun getCurrentUser(): User? {
         userHelper.user()?.let {
@@ -128,4 +140,10 @@ class ChatRoomsPresenter @Inject constructor(
         }
         return null
     }
+
+    private suspend fun createDirectMessage(name: String): Boolean = suspendCoroutine { cont ->
+        client.createDirectMessage(name) { success, _ ->
+            cont.resume(success)
+        }
+    }
 }
\ No newline at end of file

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

@@ -21,19 +21,23 @@ abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
     abstract fun get(id: String): ChatRoom?
 
     @Transaction
-    @Query("$BASE_QUERY")
+    @Query("$BASE_QUERY $FILTER_NOT_OPENED")
     abstract fun getAllSync(): List<ChatRoom>
 
     @Transaction
-    @Query("""$BASE_QUERY WHERE chatrooms.name LIKE '%' || :query || '%' OR  users.name LIKE '%' || :query || '%'""")
+    @Query("""$BASE_QUERY
+            WHERE chatrooms.name LIKE '%' || :query || '%'
+            OR  users.name LIKE '%' || :query || '%'
+            """)
     abstract fun searchSync(query: String): List<ChatRoom>
 
-    @Query("SELECT COUNT(id) FROM chatrooms")
+    @Query("SELECT COUNT(id) FROM chatrooms WHERE open = 1")
     abstract fun count(): Long
 
     @Transaction
     @Query("""
         $BASE_QUERY
+        $FILTER_NOT_OPENED
         ORDER BY
 	        CASE
 		        WHEN lastMessageTimeStamp IS NOT NULL THEN lastMessageTimeStamp
@@ -45,6 +49,7 @@ abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
     @Transaction
     @Query("""
         $BASE_QUERY
+        $FILTER_NOT_OPENED
         ORDER BY
             $TYPE_ORDER,
 	        CASE
@@ -57,6 +62,7 @@ abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
     @Transaction
     @Query("""
         $BASE_QUERY
+        $FILTER_NOT_OPENED
         ORDER BY name
         """)
     abstract fun getAllAlphabetically(): LiveData<List<ChatRoom>>
@@ -64,6 +70,7 @@ abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
     @Transaction
     @Query("""
         $BASE_QUERY
+        $FILTER_NOT_OPENED
         ORDER BY
             $TYPE_ORDER,
             name
@@ -113,6 +120,10 @@ abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
             LEFT JOIN users AS lmUsers ON chatrooms.lastMessageUserId = lmUsers.id
         """
 
+        const val FILTER_NOT_OPENED = """
+            WHERE chatrooms.open = 1
+        """
+
         const val TYPE_ORDER = """
             CASE
 		        WHEN type = 'c' THEN 1

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

@@ -2,16 +2,29 @@ package chat.rocket.android.db
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
 import chat.rocket.android.db.model.ChatRoomEntity
 import chat.rocket.android.db.model.UserEntity
 
 @Database(
     entities = [UserEntity::class, ChatRoomEntity::class],
-    version = 4,
+    version = 5,
     exportSchema = true
 )
 abstract class RCDatabase : RoomDatabase() {
     abstract fun userDao(): UserDao
 
     abstract fun chatRoomDao(): ChatRoomDao
+
+    companion object {
+        @JvmField
+        val MIGRATION_4_5 = Migration4to5()
+    }
+}
+
+class Migration4to5 : Migration(4, 5) {
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("CREATE INDEX `index_chatrooms_lastMessageUserId` ON `chatrooms` (`lastMessageUserId`)")
+    }
 }
\ No newline at end of file

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

@@ -13,6 +13,12 @@ import timber.log.Timber
 
 @Dao
 abstract class UserDao : BaseDao<UserEntity> {
+
+    @Query("""
+        UPDATE users set STATUS = "offline"
+        """)
+    abstract fun clearStatus()
+
     @Update(onConflict = OnConflictStrategy.IGNORE)
     abstract fun update(user: UserEntity): Int
 
@@ -22,6 +28,9 @@ abstract class UserDao : BaseDao<UserEntity> {
     @Query("SELECT id FROM users WHERE ID = :id")
     abstract fun findUser(id: String): String?
 
+    @Query("SELECT * FROM users WHERE ID = :id")
+    abstract fun getUser(id:String): UserEntity?
+
     @Transaction
     open fun upsert(user: BaseUserEntity) {
         internalUpsert(user)

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

@@ -11,7 +11,8 @@ import androidx.room.PrimaryKey
             Index(value = ["userId"]),
             Index(value = ["ownerId"]),
             Index(value = ["subscriptionId"], unique = true),
-            Index(value = ["updatedAt"])
+            Index(value = ["updatedAt"]),
+            Index(value = ["lastMessageUserId"])
         ],
         foreignKeys = [
             ForeignKey(entity = UserEntity::class, parentColumns = ["id"], childColumns = ["ownerId"]),
@@ -19,7 +20,6 @@ import androidx.room.PrimaryKey
             ForeignKey(entity = UserEntity::class, parentColumns = ["id"], childColumns = ["lastMessageUserId"])
         ]
 )
-
 data class ChatRoomEntity(
     @PrimaryKey var id: String,
     var subscriptionId: String,

app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt

@@ -35,7 +35,7 @@ private const val INTENT_CHAT_ROOM_ID = "chat_room_id"
 
 class FavoriteMessagesFragment : Fragment(), FavoriteMessagesView {
     private lateinit var chatRoomId: String
-    private lateinit var adapter: ChatRoomAdapter
+    private val adapter = ChatRoomAdapter(enableActions = false)
     @Inject
     lateinit var presenter: FavoriteMessagesPresenter
 
@@ -66,7 +66,6 @@ class FavoriteMessagesFragment : Fragment(), FavoriteMessagesView {
     override fun showFavoriteMessages(favoriteMessages: List<BaseUiModel<*>>) {
         ui {
             if (recycler_view.adapter == null) {
-                adapter = ChatRoomAdapter(enableActions = false)
                 recycler_view.adapter = adapter
                 val linearLayoutManager = LinearLayoutManager(context)
                 recycler_view.layoutManager = linearLayoutManager

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

@@ -5,21 +5,20 @@ import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.RectF
-import android.net.Uri
-import androidx.core.content.res.ResourcesCompat
 import android.text.Spanned
 import android.text.style.ClickableSpan
 import android.text.style.ImageSpan
 import android.text.style.ReplacementSpan
 import android.util.Patterns
 import android.view.View
+import androidx.core.content.res.ResourcesCompat
 import chat.rocket.android.R
-import chat.rocket.android.server.domain.PublicSettings
-import chat.rocket.android.server.domain.useRealName
-import chat.rocket.android.util.extensions.openTabbedUrl
 import chat.rocket.android.emoji.EmojiParser
 import chat.rocket.android.emoji.EmojiRepository
 import chat.rocket.android.emoji.EmojiTypefaceSpan
+import chat.rocket.android.server.domain.PublicSettings
+import chat.rocket.android.server.domain.useRealName
+import chat.rocket.android.util.extensions.openTabbedUrl
 import chat.rocket.common.model.SimpleUser
 import chat.rocket.core.model.Message
 import org.commonmark.node.AbstractVisitor
@@ -197,7 +196,7 @@ class MessageParser @Inject constructor(
                 if (!link.startsWith("@") && link !in consumed) {
                     builder.setSpan(object : ClickableSpan() {
                         override fun onClick(view: View) {
-                            view.openTabbedUrl(getUri(link))
+                            view.openTabbedUrl(link)
                         }
                     }, matcher.start(0), matcher.end(0))
                     consumed.add(link)
@@ -205,14 +204,6 @@ class MessageParser @Inject constructor(
             }
             visitChildren(text)
         }
-
-        private fun getUri(link: String): Uri {
-            val uri = Uri.parse(link)
-            if (uri.scheme == null) {
-                return Uri.parse("http://$link")
-            }
-            return uri
-        }
     }
 
     class MentionSpan(

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

@@ -92,6 +92,59 @@ object OauthHelper {
                 "&scope=email"
     }
 
+    /**
+     * Returns the WordPress-Com Oauth URL.
+     *
+     * @param clientId The WordPress-Com client ID.
+     * @param serverUrl The server URL.
+     * @param state An unguessable random string used to protect against forgery attacks.
+     * @return The WordPress-Com Oauth URL.
+     */
+    fun getWordpressComOauthUrl(clientId: String, serverUrl: String, state: String): String {
+        return "https://public-api.wordpress.com/oauth2/authorize" +
+                "?client_id=$clientId" +
+                "&redirect_uri=${serverUrl.removeTrailingSlash()}/_oauth/wordpress?close" +
+                "&state=$state" +
+                "&response_type=code" +
+                "&scope=auth"
+    }
+
+    /**
+     * Returns the WordPress custom Oauth URL.
+     *
+     * @param host The WordPress custom OAuth host.
+     * @param authorizePath The WordPress custom OAuth authorization path.
+     * @param clientId The WordPress custom OAuth client ID.
+     * @param serverUrl The server URL.
+     * @param serviceName The service name.
+     * @param state An unguessable random string used to protect against forgery attacks.
+     * @param scope The WordPress custom OAuth scope.
+     * @return The WordPress custom Oauth URL.
+     */
+    fun getWordpressCustomOauthUrl(
+        host: String,
+        authorizePath: String,
+        clientId: String,
+        serverUrl: String,
+        serviceName: String,
+        state: String,
+        scope: String
+    ): String {
+        (authorizePath +
+                "?client_id=$clientId" +
+                "&redirect_uri=${serverUrl.removeTrailingSlash()}/_oauth/$serviceName?close" +
+                "&state=$state" +
+                "&scope=$scope" +
+                "&response_type=code"
+                ).let {
+            return if (it.contains(host)) {
+                it
+            } else {
+                host + it
+            }
+        }
+    }
+
     /**
      * Returns the Custom Oauth URL.
      *

app/src/main/java/chat/rocket/android/infrastructure/LocalRepository.kt

@@ -32,5 +32,6 @@ interface LocalRepository {
     }
 }
 
+// FIXME - we are saving the user full name here when the server is UI_Use_Real_Name true
 fun LocalRepository.checkIfMyself(username: String) = username() == username
 fun LocalRepository.username() = get(LocalRepository.CURRENT_USERNAME_KEY)
\ No newline at end of file

app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt

@@ -10,10 +10,12 @@ import chat.rocket.android.emoji.internal.EmojiCategory
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.main.uimodel.NavHeaderUiModel
 import chat.rocket.android.main.uimodel.NavHeaderUiModelMapper
+import chat.rocket.android.push.GroupedPush
 import chat.rocket.android.server.domain.GetAccountsInteractor
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.PublicSettings
+import chat.rocket.android.server.domain.RefreshSettingsInteractor
 import chat.rocket.android.server.domain.RemoveAccountInteractor
 import chat.rocket.android.server.domain.SaveAccountInteractor
 import chat.rocket.android.server.domain.TokenRepository
@@ -39,6 +41,7 @@ import chat.rocket.core.internal.rest.unregisterPushToken
 import chat.rocket.core.model.Myself
 import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.channels.Channel
+import kotlinx.coroutines.experimental.launch
 import kotlinx.coroutines.experimental.withContext
 import timber.log.Timber
 import javax.inject.Inject
@@ -49,12 +52,14 @@ class MainPresenter @Inject constructor(
     private val navigator: MainNavigator,
     private val tokenRepository: TokenRepository,
     private val serverInteractor: GetCurrentServerInteractor,
+    private val refreshSettingsInteractor: RefreshSettingsInteractor,
     private val localRepository: LocalRepository,
     private val navHeaderMapper: NavHeaderUiModelMapper,
     private val saveAccountInteractor: SaveAccountInteractor,
     private val getAccountsInteractor: GetAccountsInteractor,
     private val removeAccountInteractor: RemoveAccountInteractor,
     private val factory: RocketChatClientFactory,
+    private val groupedPush: GroupedPush,
     dbManagerFactory: DatabaseManagerFactory,
     getSettingsInteractor: GetSettingsInteractor,
     managerFactory: ConnectionManagerFactory
@@ -181,6 +186,7 @@ class MainPresenter @Inject constructor(
     }
 
     fun connect() {
+        refreshSettingsInteractor.refreshAsync(currentServer)
         manager.connect()
     }
 
@@ -204,7 +210,7 @@ class MainPresenter @Inject constructor(
     fun changeDefaultStatus(userStatus: UserStatus) {
         launchUI(strategy) {
             try {
-                client.setDefaultStatus(userStatus)
+                manager.setDefaultStatus(userStatus)
                 view.showUserStatus(userStatus)
             } catch (ex: RocketChatException) {
                 ex.message?.let {
@@ -260,4 +266,12 @@ class MainPresenter @Inject constructor(
 
     private fun updateMyself(myself: Myself) =
         view.setupUserAccountInfo(navHeaderMapper.mapToUiModel(myself))
+
+    fun clearNotificationsForChatroom(chatRoomId: String?) {
+        if (chatRoomId == null) return
+
+        groupedPush.hostToPushMessageList[currentServer]?.let { list ->
+            list.removeAll { it.info.roomId == chatRoomId }
+        }
+    }
 }

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

@@ -5,13 +5,13 @@ import android.app.Activity
 import android.app.AlertDialog
 import android.app.ProgressDialog
 import android.os.Bundle
-import androidx.fragment.app.Fragment
-import androidx.appcompat.app.AppCompatActivity
-import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.Gravity
 import android.view.MenuItem
 import androidx.annotation.IdRes
+import androidx.appcompat.app.AppCompatActivity
 import androidx.drawerlayout.widget.DrawerLayout
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
 import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
 import chat.rocket.android.main.adapter.AccountsAdapter
@@ -55,7 +55,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
     private var expanded = false
     private val headerLayout by lazy { view_navigation.getHeaderView(0) }
     private var chatRoomId: String? = null
-    private var progressDialog : ProgressDialog? = null
+    private var progressDialog: ProgressDialog? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
@@ -74,6 +74,9 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
 
         chatRoomId = intent.getStringExtra(INTENT_CHAT_ROOM_ID)
 
+        println("ChatRoomId: $chatRoomId")
+        presenter.clearNotificationsForChatroom(chatRoomId)
+
         presenter.connect()
         presenter.loadServerAccounts()
         presenter.loadCurrentInfo()
@@ -170,7 +173,7 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         }
 
         headerLayout.image_avatar.setOnClickListener {
-            view_navigation.menu.findItem(R.id.action_update_profile).isChecked = true
+            view_navigation.menu.findItem(R.id.action_profile).isChecked = true
             presenter.toUserProfile()
             drawer_layout.closeDrawer(Gravity.START)
         }
@@ -219,19 +222,20 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
 
     private fun setupToolbar() {
         setSupportActionBar(toolbar)
-        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp)
-        toolbar.setNavigationOnClickListener {
-            openDrawer()
-        }
     }
 
-    private fun setupNavigationView() {
+    fun setupNavigationView() {
         view_navigation.setNavigationItemSelectedListener { menuItem ->
             menuItem.isChecked = true
             closeDrawer()
             onNavDrawerItemSelected(menuItem)
             true
         }
+
+        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp)
+        toolbar.setNavigationOnClickListener {
+            openDrawer()
+        }
     }
 
     private fun onNavDrawerItemSelected(menuItem: MenuItem) {

app/src/main/java/chat/rocket/android/mentions/ui/MentionsFragment.kt

@@ -36,7 +36,7 @@ private const val BUNDLE_CHAT_ROOM_ID = "chat_room_id"
 class MentionsFragment : Fragment(), MentionsView {
 
     private lateinit var chatRoomId: String
-    private lateinit var adapter: ChatRoomAdapter
+    private val adapter = ChatRoomAdapter(enableActions = false)
     @Inject
     lateinit var presenter: MentionsPresenter
 
@@ -68,7 +68,6 @@ class MentionsFragment : Fragment(), MentionsView {
     override fun showMentions(mentions: List<BaseUiModel<*>>) {
         ui {
             if (recycler_view.adapter == null) {
-                adapter = ChatRoomAdapter(enableActions = false)
                 recycler_view.adapter = adapter
 
                 val linearLayoutManager = LinearLayoutManager(context)

app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt

@@ -36,7 +36,7 @@ private const val BUNDLE_CHAT_ROOM_ID = "chat_room_id"
 class PinnedMessagesFragment : Fragment(), PinnedMessagesView {
 
     private lateinit var chatRoomId: String
-    private lateinit var adapter: ChatRoomAdapter
+    private val adapter = ChatRoomAdapter(enableActions = false)
     @Inject
     lateinit var presenter: PinnedMessagesPresenter
 
@@ -68,7 +68,6 @@ class PinnedMessagesFragment : Fragment(), PinnedMessagesView {
     override fun showPinnedMessages(pinnedMessages: List<BaseUiModel<*>>) {
         ui {
             if (recycler_view_pinned.adapter == null) {
-                adapter = ChatRoomAdapter(enableActions = false)
                 recycler_view_pinned.adapter = adapter
 
                 val linearLayoutManager = LinearLayoutManager(context)

app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt

@@ -14,6 +14,7 @@ import chat.rocket.android.profile.presentation.ProfileView
 import chat.rocket.android.util.extension.asObservable
 import chat.rocket.android.util.extensions.*
 import dagger.android.support.AndroidSupportInjection
+import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
 import io.reactivex.rxkotlin.Observables
 import kotlinx.android.synthetic.main.avatar_profile.*
@@ -28,7 +29,7 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
     private lateinit var currentEmail: String
     private lateinit var currentAvatar: String
     private var actionMode: ActionMode? = null
-    private lateinit var editTextsDisposable: Disposable
+    private val editTextsDisposable = CompositeDisposable()
 
     companion object {
         fun newInstance() = ProfileFragment()
@@ -170,7 +171,7 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
     }
 
     private fun subscribeEditTexts() {
-        editTextsDisposable = Observables.combineLatest(
+        editTextsDisposable.add(Observables.combineLatest(
             text_name.asObservable(),
             text_username.asObservable(),
             text_email.asObservable(),
@@ -186,11 +187,11 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
             } else {
                 finishActionMode()
             }
-        }
+        })
     }
 
     private fun unsubscribeEditTexts() {
-        editTextsDisposable.dispose()
+        editTextsDisposable.clear()
     }
 
     private fun startActionMode() {

app/src/main/java/chat/rocket/android/push/PushManager.kt

@@ -18,6 +18,7 @@ import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.RemoteInput
 import android.text.Html
 import android.text.Spanned
+import androidx.core.content.ContextCompat
 import chat.rocket.android.R
 import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.server.domain.GetAccountInteractor
@@ -36,10 +37,6 @@ import java.util.*
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
 
-/**
- * Refer to: https://github.com/RocketChat/Rocket.Chat.Android/blob/9e846b7fde8fe0c74b9e0117c37ce49293308db5/app/src/main/java/chat/rocket/android/push/PushManager.kt
- * for old source code.
- */
 class PushManager @Inject constructor(
     private val groupedPushes: GroupedPush,
     private val manager: NotificationManager,
@@ -80,7 +77,7 @@ class PushManager @Inject constructor(
 
             showNotification(pushMessage)
         } catch (ex: Exception) {
-            Timber.d(ex, "Error parsing PUSH message: $data")
+            Timber.e(ex, "Error parsing PUSH message: $data")
             ex.printStackTrace()
         }
     }
@@ -101,7 +98,7 @@ class PushManager @Inject constructor(
         val groupTuple = getGroupForHost(host)
 
         groupTuple.second.incrementAndGet()
-        val notIdListForHostname: MutableList<PushMessage>? = groupedPushes.hostToPushMessageList.get(host)
+        val notIdListForHostname: MutableList<PushMessage>? = groupedPushes.hostToPushMessageList[host]
         if (notIdListForHostname == null) {
             groupedPushes.hostToPushMessageList[host] = arrayListOf(pushMessage)
         } else {
@@ -365,14 +362,14 @@ class PushManager @Inject constructor(
         val res = context.resources
         val smallIcon = res.getIdentifier(
             "rocket_chat_notification", "drawable", context.packageName)
-        with(this, {
+        with(this) {
             setAutoCancel(true)
             setShowWhen(true)
-            color = context.resources.getColor(R.color.colorPrimary)
+            color = ContextCompat.getColor(context, R.color.colorPrimary)
             setDefaults(Notification.DEFAULT_ALL)
             setSmallIcon(smallIcon)
             setSound(alarmSound)
-        })
+        }
         return this
     }
 }

app/src/main/java/chat/rocket/android/server/domain/GetCurrentUserInteractor.kt

+package chat.rocket.android.server.domain
+
+import chat.rocket.android.db.UserDao
+import chat.rocket.android.db.model.UserEntity
+
+class GetCurrentUserInteractor(
+    private val tokenRepository: TokenRepository,
+    private val currentServer: String,
+    private val userDao: UserDao
+) {
+    fun get(): UserEntity? {
+        return tokenRepository.get(currentServer)?.let {
+            userDao.getUser(it.userId)
+        }
+    }
+
+}

app/src/main/java/chat/rocket/android/server/domain/RefreshSettingsInteractor.kt

@@ -4,8 +4,9 @@ import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.retryIO
 import chat.rocket.core.internal.rest.settings
 import kotlinx.coroutines.experimental.CommonPool
-import kotlinx.coroutines.experimental.async
+import kotlinx.coroutines.experimental.launch
 import kotlinx.coroutines.experimental.withContext
+import timber.log.Timber
 import javax.inject.Inject
 
 class RefreshSettingsInteractor @Inject constructor(
@@ -14,23 +15,61 @@ class RefreshSettingsInteractor @Inject constructor(
 ) {
 
     private var settingsFilter = arrayOf(
-        LDAP_ENABLE, CAS_ENABLE, CAS_LOGIN_URL,
+        LDAP_ENABLE,
+        CAS_ENABLE,
+        CAS_LOGIN_URL,
 
-        ACCOUNT_REGISTRATION, ACCOUNT_LOGIN_FORM, ACCOUNT_PASSWORD_RESET, ACCOUNT_CUSTOM_FIELDS,
-        ACCOUNT_GOOGLE, ACCOUNT_FACEBOOK, ACCOUNT_GITHUB, ACCOUNT_LINKEDIN, ACCOUNT_METEOR,
-        ACCOUNT_TWITTER, ACCOUNT_WORDPRESS, ACCOUNT_GITLAB, ACCOUNT_GITLAB_URL,
+        ACCOUNT_REGISTRATION,
+        ACCOUNT_LOGIN_FORM,
+        ACCOUNT_PASSWORD_RESET,
+        ACCOUNT_CUSTOM_FIELDS,
+        ACCOUNT_GOOGLE,
+        ACCOUNT_FACEBOOK,
+        ACCOUNT_GITHUB,
+        ACCOUNT_LINKEDIN,
+        ACCOUNT_METEOR,
+        ACCOUNT_TWITTER,
+        ACCOUNT_GITLAB,
+        ACCOUNT_GITLAB_URL,
+        ACCOUNT_WORDPRESS,
+        ACCOUNT_WORDPRESS_URL,
 
-        SITE_URL, SITE_NAME, FAVICON_512, FAVICON_196, USE_REALNAME, ALLOW_ROOM_NAME_SPECIAL_CHARS,
-        FAVORITE_ROOMS, UPLOAD_STORAGE_TYPE, UPLOAD_MAX_FILE_SIZE, UPLOAD_WHITELIST_MIMETYPES,
-        HIDE_USER_JOIN, HIDE_USER_LEAVE,
-        HIDE_TYPE_AU, HIDE_MUTE_UNMUTE, HIDE_TYPE_RU, ALLOW_MESSAGE_DELETING,
-        ALLOW_MESSAGE_EDITING, ALLOW_MESSAGE_PINNING, ALLOW_MESSAGE_STARRING, SHOW_DELETED_STATUS, SHOW_EDITED_STATUS,
-        WIDE_TILE_310, STORE_LAST_MESSAGE, MESSAGE_READ_RECEIPT_ENABLED, MESSAGE_READ_RECEIPT_STORE_USERS)
+        SITE_URL,
+        SITE_NAME,
+        FAVICON_512,
+        FAVICON_196,
+        USE_REALNAME,
+        ALLOW_ROOM_NAME_SPECIAL_CHARS,
+        FAVORITE_ROOMS,
+        UPLOAD_STORAGE_TYPE,
+        UPLOAD_MAX_FILE_SIZE,
+        UPLOAD_WHITELIST_MIMETYPES,
+        HIDE_USER_JOIN,
+        HIDE_USER_LEAVE,
+        HIDE_TYPE_AU,
+        HIDE_MUTE_UNMUTE,
+        HIDE_TYPE_RU,
+        ALLOW_MESSAGE_DELETING,
+        ALLOW_MESSAGE_EDITING,
+        ALLOW_MESSAGE_PINNING,
+        ALLOW_MESSAGE_STARRING,
+        SHOW_DELETED_STATUS,
+        SHOW_EDITED_STATUS,
+        WIDE_TILE_310,
+        STORE_LAST_MESSAGE,
+        MESSAGE_READ_RECEIPT_ENABLED,
+        MESSAGE_READ_RECEIPT_STORE_USERS
+    )
 
     suspend fun refresh(server: String) {
         withContext(CommonPool) {
             factory.create(server).let { client ->
-                val settings = retryIO(description = "settings", times = 5) {
+                val settings = retryIO(
+                    description = "settings",
+                    times = 5,
+                    maxDelay = 5000,
+                    initialDelay = 300
+                ) {
                     client.settings(*settingsFilter)
                 }
                 repository.save(server, settings)
@@ -39,11 +78,11 @@ class RefreshSettingsInteractor @Inject constructor(
     }
 
     fun refreshAsync(server: String) {
-        async {
+        launch(CommonPool) {
             try {
                 refresh(server)
             } catch (ex: Exception) {
-                ex.printStackTrace()
+                Timber.e(ex, "Error refreshing settings for: $server")
             }
         }
     }

app/src/main/java/chat/rocket/android/server/domain/SettingsRepository.kt

@@ -19,9 +19,10 @@ const val ACCOUNT_GITHUB = "Accounts_OAuth_Github"
 const val ACCOUNT_LINKEDIN = "Accounts_OAuth_Linkedin"
 const val ACCOUNT_METEOR = "Accounts_OAuth_Meteor"
 const val ACCOUNT_TWITTER = "Accounts_OAuth_Twitter"
-const val ACCOUNT_WORDPRESS = "Accounts_OAuth_Wordpress"
 const val ACCOUNT_GITLAB = "Accounts_OAuth_Gitlab"
 const val ACCOUNT_GITLAB_URL = "API_Gitlab_URL"
+const val ACCOUNT_WORDPRESS = "Accounts_OAuth_Wordpress"
+const val ACCOUNT_WORDPRESS_URL = "API_Wordpress_URL"
 
 const val SITE_URL = "Site_Url"
 const val SITE_NAME = "Site_Name"
@@ -71,6 +72,7 @@ fun PublicSettings.isTwitterAuthenticationEnabled(): Boolean = this[ACCOUNT_TWIT
 fun PublicSettings.isGitlabAuthenticationEnabled(): Boolean = this[ACCOUNT_GITLAB]?.value == true
 fun PublicSettings.gitlabUrl(): String? = this[ACCOUNT_GITLAB_URL]?.value as String?
 fun PublicSettings.isWordpressAuthenticationEnabled(): Boolean = this[ACCOUNT_WORDPRESS]?.value == true
+fun PublicSettings.wordpressUrl(): String? = this[ACCOUNT_WORDPRESS_URL]?.value as String?
 
 fun PublicSettings.useRealName(): Boolean = this[USE_REALNAME]?.value == true
 fun PublicSettings.useSpecialCharsOnRoom(): Boolean = this[ALLOW_ROOM_NAME_SPECIAL_CHARS]?.value == true

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

@@ -2,10 +2,12 @@ package chat.rocket.android.server.infraestructure
 
 import androidx.lifecycle.MutableLiveData
 import chat.rocket.android.db.DatabaseManager
-import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.common.model.BaseRoom
 import chat.rocket.common.model.User
+import chat.rocket.common.model.UserStatus
 import chat.rocket.core.RocketChatClient
+import chat.rocket.core.internal.realtime.setDefaultStatus
+import chat.rocket.core.internal.realtime.setTemporaryStatus
 import chat.rocket.core.internal.realtime.socket.connect
 import chat.rocket.core.internal.realtime.socket.disconnect
 import chat.rocket.core.internal.realtime.socket.model.State
@@ -49,6 +51,7 @@ class ConnectionManager(
     private var roomsId: String? = null
     private var userDataId: String? = null
     private var activeUserId: String? = null
+    private var temporaryStatus: UserStatus? = null
 
     private val activeUsersContext = newSingleThreadContext("activeUsersContext")
     private val roomsContext = newSingleThreadContext("roomsContext")
@@ -71,6 +74,7 @@ class ConnectionManager(
                 Timber.d("Changing status to: $status")
                 when (status) {
                     is State.Connected -> {
+                        dbManager.clearUsersStatus()
                         client.subscribeSubscriptions { _, id ->
                             Timber.d("Subscribed to subscriptions: $id")
                             subscriptionId = id
@@ -89,6 +93,10 @@ class ConnectionManager(
                         }
 
                         resubscribeRooms()
+
+                        temporaryStatus?.let { status ->
+                            client.setTemporaryStatus(status)
+                        }
                     }
                     is State.Waiting -> {
                         Timber.d("Connection in: ${status.seconds}")
@@ -149,7 +157,7 @@ class ConnectionManager(
         launch(parent = connectJob) {
             for (myself in client.userDataChannel) {
                 Timber.d("Got userData")
-                userActor.send(myself.asUser())
+                dbManager.updateSelfUser(myself)
                 for (channel in userDataChannels) {
                     channel.send(myself)
                 }
@@ -175,6 +183,16 @@ class ConnectionManager(
         }
     }
 
+    fun setDefaultStatus(userStatus: UserStatus) {
+        temporaryStatus = null
+        client.setDefaultStatus(userStatus)
+    }
+
+    fun setTemporaryStatus(userStatus: UserStatus) {
+        temporaryStatus = userStatus
+        client.setTemporaryStatus(userStatus)
+    }
+
     private fun resubscribeRooms() {
         roomMessagesChannels.toList().map { (roomId, channel) ->
             client.subscribeRoomMessages(roomId) { _, id ->
@@ -189,6 +207,7 @@ class ConnectionManager(
         client.removeStateChannel(statusChannel)
         client.disconnect()
         connectJob?.cancel()
+        temporaryStatus = null
     }
 
     fun addStatusChannel(channel: Channel<State>) = statusChannelList.add(channel)
@@ -260,10 +279,6 @@ class ConnectionManager(
     }
 }
 
-private fun Myself.asUser(): User {
-    return User(id, name, username, status, utcOffset, null, roles)
-}
-
 private fun Long.orZero(): Long {
     return if (this < 0) 0 else this
 }

app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt

@@ -10,6 +10,7 @@ import android.view.ViewGroup
 import android.widget.AdapterView
 import chat.rocket.android.R
 import chat.rocket.android.about.ui.AboutFragment
+import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.settings.password.ui.PasswordActivity
 import chat.rocket.android.settings.presentation.SettingsView
 import chat.rocket.android.util.extensions.addFragmentBackStack
@@ -34,6 +35,14 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
         setupListView()
     }
 
+    override fun onResume() {
+        // FIXME - gambiarra ahead. will fix when moving to new androidx Navigation
+        (activity as? MainActivity)?.let {
+            it.setupNavigationView()
+        }
+        super.onResume()
+    }
+
     override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
         when (parent?.getItemAtPosition(position).toString()) {
             resources.getString(R.string.title_password) -> {

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

@@ -3,14 +3,15 @@ package chat.rocket.android.util.extensions
 import android.graphics.Color
 import android.util.Patterns
 import chat.rocket.common.model.Token
+import okhttp3.HttpUrl
 import timber.log.Timber
 
 fun String.removeTrailingSlash(): String {
-    return if (isNotEmpty() && this[length - 1] == '/') {
-        this.substring(0, length - 1)
-    } else {
-        this
+    var removed = this
+    while (removed.isNotEmpty() && removed[removed.length - 1] == '/') {
+        removed = removed.substring(0, removed.length - 1)
     }
+    return removed
 }
 
 fun String.sanitize(): String {
@@ -65,3 +66,10 @@ fun String.parseColor(): Int {
 fun String.userId(userId: String?): String? {
     return userId?.let { this.replace(it, "") }
 }
+
+fun String.lowercaseUrl(): String? {
+    val httpUrl = HttpUrl.parse(this)
+    val newScheme = httpUrl?.scheme()?.toLowerCase()
+
+    return httpUrl?.newBuilder()?.scheme(newScheme)?.build()?.toString()
+}
\ No newline at end of file

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

@@ -7,15 +7,27 @@ import android.view.View
 import chat.rocket.android.R
 import timber.log.Timber
 
-fun View.openTabbedUrl(url: Uri) {
+fun View.openTabbedUrl(url: String) {
     with(this) {
+        val uri = url.ensureScheme()
         val tabsbuilder = CustomTabsIntent.Builder()
         tabsbuilder.setToolbarColor(ResourcesCompat.getColor(context.resources, R.color.colorPrimary, context.theme))
         val customTabsIntent = tabsbuilder.build()
         try {
-            customTabsIntent.launchUrl(context, url)
+            customTabsIntent.launchUrl(context, uri)
         } catch (ex: Exception) {
             Timber.d(ex, "Unable to launch URL")
         }
     }
 }
+
+private fun String.ensureScheme(): Uri? {
+    // check if the URL starts with a http(s) scheme
+    val url = if (!this.matches(Regex("^([h|H][t|T][t|T][p|P]).*"))) {
+        "http://$this"
+    } else {
+        this
+    }
+
+    return Uri.parse(url.lowercaseUrl())
+}
\ No newline at end of file

app/src/main/res/drawable/ic_wordpress.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="290dp"
+    android:height="40dp"
+    android:viewportWidth="290"
+    android:viewportHeight="40">
+
+    <path
+        android:fillColor="#428BBA"
+        android:fillType="evenOdd"
+        android:pathData="M2,0L288,0A2,2 0,0 1,290 2L290,38A2,2 0,0 1,288 40L2,40A2,2 0,0 1,0 38L0,2A2,2 0,0 1,2 0z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M134.878,23.188L136.628,14.625L138.589,14.625L135.964,26L134.073,26L131.909,17.695L129.698,26L127.8,26L125.175,14.625L127.136,14.625L128.901,23.172L131.073,14.625L132.729,14.625L134.878,23.188ZM139.824,21.695C139.824,20.867 139.988,20.121 140.316,19.457C140.645,18.793 141.105,18.283 141.699,17.926C142.293,17.569 142.975,17.391 143.746,17.391C144.887,17.391 145.813,17.758 146.523,18.492C147.234,19.227 147.618,20.201 147.676,21.414L147.684,21.859C147.684,22.693 147.523,23.437 147.203,24.094C146.883,24.75 146.424,25.258 145.828,25.617C145.232,25.977 144.543,26.156 143.762,26.156C142.569,26.156 141.615,25.759 140.898,24.965C140.182,24.171 139.824,23.112 139.824,21.789L139.824,21.695ZM141.723,21.859C141.723,22.729 141.902,23.41 142.262,23.902C142.621,24.395 143.121,24.641 143.762,24.641C144.402,24.641 144.901,24.391 145.258,23.891C145.615,23.391 145.793,22.659 145.793,21.695C145.793,20.841 145.609,20.164 145.242,19.664C144.875,19.164 144.376,18.914 143.746,18.914C143.126,18.914 142.634,19.16 142.27,19.652C141.905,20.145 141.723,20.88 141.723,21.859ZM154.286,19.281C154.036,19.24 153.778,19.219 153.513,19.219C152.643,19.219 152.057,19.552 151.755,20.219L151.755,26L149.857,26L149.857,17.547L151.669,17.547L151.716,18.492C152.174,17.758 152.81,17.391 153.622,17.391C153.893,17.391 154.117,17.427 154.294,17.5L154.286,19.281ZM155.553,21.711C155.553,20.409 155.855,19.363 156.459,18.574C157.063,17.785 157.873,17.391 158.889,17.391C159.785,17.391 160.509,17.703 161.061,18.328L161.061,14L162.959,14L162.959,26L161.241,26L161.147,25.125C160.579,25.813 159.821,26.156 158.873,26.156C157.884,26.156 157.083,25.758 156.471,24.961C155.859,24.164 155.553,23.081 155.553,21.711ZM157.451,21.875C157.451,22.734 157.617,23.405 157.948,23.887C158.278,24.368 158.748,24.609 159.358,24.609C160.134,24.609 160.701,24.263 161.061,23.57L161.061,19.961C160.712,19.284 160.149,18.945 159.373,18.945C158.759,18.945 158.285,19.189 157.951,19.676C157.618,20.163 157.451,20.896 157.451,21.875ZM167.671,21.773L167.671,26L165.695,26L165.695,14.625L170.046,14.625C171.317,14.625 172.326,14.956 173.074,15.617C173.821,16.279 174.195,17.154 174.195,18.242C174.195,19.357 173.829,20.224 173.097,20.844C172.365,21.464 171.341,21.773 170.023,21.773L167.671,21.773ZM167.671,20.188L170.046,20.188C170.749,20.188 171.286,20.022 171.656,19.691C172.025,19.361 172.21,18.883 172.21,18.258C172.21,17.643 172.023,17.152 171.648,16.785C171.273,16.418 170.757,16.229 170.101,16.219L167.671,16.219L167.671,20.188ZM180.735,19.281C180.485,19.24 180.227,19.219 179.962,19.219C179.092,19.219 178.506,19.552 178.204,20.219L178.204,26L176.305,26L176.305,17.547L178.118,17.547L178.165,18.492C178.623,17.758 179.258,17.391 180.071,17.391C180.342,17.391 180.566,17.427 180.743,17.5L180.735,19.281ZM186.08,26.156C184.877,26.156 183.901,25.777 183.154,25.02C182.407,24.262 182.033,23.253 182.033,21.992L182.033,21.758C182.033,20.914 182.196,20.16 182.521,19.496C182.847,18.832 183.304,18.315 183.892,17.945C184.481,17.576 185.137,17.391 185.861,17.391C187.012,17.391 187.901,17.758 188.529,18.492C189.157,19.227 189.47,20.266 189.47,21.609L189.47,22.375L183.947,22.375C184.004,23.073 184.237,23.625 184.646,24.031C185.055,24.438 185.569,24.641 186.189,24.641C187.059,24.641 187.767,24.289 188.314,23.586L189.338,24.563C188.999,25.068 188.547,25.46 187.982,25.738C187.417,26.017 186.783,26.156 186.08,26.156ZM185.853,18.914C185.332,18.914 184.912,19.096 184.592,19.461C184.271,19.826 184.067,20.333 183.978,20.984L187.595,20.984L187.595,20.844C187.554,20.208 187.384,19.728 187.088,19.402C186.791,19.077 186.379,18.914 185.853,18.914ZM196.253,23.703C196.253,23.365 196.113,23.107 195.835,22.93C195.556,22.753 195.094,22.596 194.448,22.461C193.802,22.326 193.263,22.154 192.831,21.945C191.883,21.487 191.409,20.823 191.409,19.953C191.409,19.224 191.716,18.615 192.331,18.125C192.945,17.635 193.727,17.391 194.675,17.391C195.685,17.391 196.501,17.641 197.124,18.141C197.746,18.641 198.057,19.289 198.057,20.086L196.159,20.086C196.159,19.721 196.024,19.418 195.753,19.176C195.482,18.934 195.123,18.813 194.675,18.813C194.258,18.813 193.918,18.909 193.655,19.102C193.392,19.294 193.261,19.552 193.261,19.875C193.261,20.167 193.383,20.393 193.628,20.555C193.873,20.716 194.367,20.879 195.112,21.043C195.857,21.207 196.442,21.402 196.866,21.629C197.291,21.855 197.606,22.128 197.811,22.445C198.017,22.763 198.12,23.148 198.12,23.602C198.12,24.362 197.805,24.978 197.175,25.449C196.544,25.921 195.719,26.156 194.698,26.156C194.005,26.156 193.388,26.031 192.847,25.781C192.305,25.531 191.883,25.188 191.581,24.75C191.279,24.312 191.128,23.841 191.128,23.336L192.972,23.336C192.998,23.784 193.167,24.129 193.479,24.371C193.792,24.613 194.206,24.734 194.722,24.734C195.222,24.734 195.602,24.639 195.862,24.449C196.123,24.259 196.253,24.01 196.253,23.703ZM205.082,23.703C205.082,23.365 204.943,23.107 204.664,22.93C204.385,22.753 203.923,22.596 203.277,22.461C202.632,22.326 202.092,22.154 201.66,21.945C200.712,21.487 200.238,20.823 200.238,19.953C200.238,19.224 200.546,18.615 201.16,18.125C201.775,17.635 202.556,17.391 203.504,17.391C204.514,17.391 205.331,17.641 205.953,18.141C206.576,18.641 206.887,19.289 206.887,20.086L204.988,20.086C204.988,19.721 204.853,19.418 204.582,19.176C204.311,18.934 203.952,18.813 203.504,18.813C203.087,18.813 202.747,18.909 202.484,19.102C202.221,19.294 202.09,19.552 202.09,19.875C202.09,20.167 202.212,20.393 202.457,20.555C202.702,20.716 203.197,20.879 203.941,21.043C204.686,21.207 205.271,21.402 205.695,21.629C206.12,21.855 206.435,22.128 206.641,22.445C206.846,22.763 206.949,23.148 206.949,23.602C206.949,24.362 206.634,24.978 206.004,25.449C205.374,25.921 204.548,26.156 203.527,26.156C202.835,26.156 202.217,26.031 201.676,25.781C201.134,25.531 200.712,25.188 200.41,24.75C200.108,24.312 199.957,23.841 199.957,23.336L201.801,23.336C201.827,23.784 201.996,24.129 202.309,24.371C202.621,24.613 203.035,24.734 203.551,24.734C204.051,24.734 204.431,24.639 204.691,24.449C204.952,24.259 205.082,24.01 205.082,23.703Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M104.26,11C99.146,11 95,15.146 95,20.26C95,25.375 99.146,29.521 104.26,29.521C109.375,29.521 113.521,25.375 113.521,20.26C113.521,15.146 109.375,11 104.26,11M104.26,11.556C105.995,11.552 107.69,12.07 109.127,13.042C110.054,13.669 110.852,14.467 111.479,15.394C112.451,16.83 112.969,18.526 112.965,20.26C112.969,21.995 112.451,23.69 111.479,25.127C110.852,26.054 110.054,26.852 109.127,27.479C107.69,28.451 105.995,28.969 104.26,28.965C102.526,28.969 100.83,28.451 99.394,27.479C98.467,26.852 97.669,26.054 97.042,25.127C96.07,23.69 95.552,21.995 95.556,20.26C95.552,18.526 96.07,16.83 97.042,15.394C97.669,14.467 98.467,13.669 99.393,13.042C100.83,12.07 102.526,11.552 104.26,11.556"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M111.032,16.558C111.066,16.804 111.084,17.068 111.084,17.351C111.084,18.134 110.937,19.014 110.497,20.115L108.14,26.93C110.516,25.549 111.978,23.008 111.977,20.26C111.979,18.966 111.654,17.693 111.032,16.559L111.032,16.558ZM104.396,20.935L102.08,27.663C103.635,28.121 105.294,28.078 106.823,27.54C106.802,27.506 106.783,27.471 106.768,27.434L104.396,20.935ZM109.47,19.871C109.47,18.917 109.128,18.257 108.834,17.743C108.443,17.106 108.076,16.569 108.076,15.933C108.076,15.223 108.613,14.563 109.372,14.563C109.406,14.563 109.438,14.567 109.472,14.569C108.05,13.264 106.19,12.541 104.26,12.544C101.662,12.543 99.238,13.851 97.813,16.022C97.994,16.028 98.165,16.032 98.309,16.032C99.116,16.032 100.366,15.934 100.366,15.934C100.782,15.909 100.831,16.52 100.415,16.57C100.415,16.57 99.997,16.618 99.532,16.643L102.343,25.002L104.031,19.937L102.829,16.643C102.414,16.618 102.02,16.57 102.02,16.57C101.604,16.545 101.652,15.909 102.068,15.934C102.068,15.934 103.342,16.032 104.101,16.032C104.908,16.032 106.158,15.934 106.158,15.934C106.574,15.909 106.623,16.52 106.207,16.57C106.207,16.57 105.788,16.618 105.324,16.643L108.113,24.938L108.908,22.415C109.263,21.313 109.47,20.531 109.47,19.872L109.47,19.871ZM96.544,20.26C96.544,23.217 98.233,25.915 100.893,27.205L97.211,17.12C96.77,18.108 96.543,19.178 96.544,20.26Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>

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

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -9,9 +9,11 @@
         layout="@layout/layout_toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/layout_container"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -20,7 +22,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/toolbar_layout">
 
-        <android.support.design.chip.ChipGroup
+        <com.google.android.material.chip.ChipGroup
             android:id="@+id/members_chips"
             style="@style/Widget.MaterialComponents.Chip.Entry"
             android:layout_width="match_parent"
@@ -31,7 +33,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-        </android.support.design.chip.ChipGroup>
+        </com.google.android.material.chip.ChipGroup>
 
         <com.wang.avi.AVLoadingIndicatorView
             android:id="@+id/view_loading"
@@ -51,9 +53,11 @@
             android:layout_height="wrap_content"
             android:backgroundTint="@android:color/transparent"
             android:hint="@string/msg_search"
-            android:paddingBottom="8dp"
-            android:paddingEnd="8dp"
             android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:paddingBottom="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/members_chips" />
 
         <View
@@ -61,14 +65,18 @@
             android:layout_width="match_parent"
             android:layout_height="0.2dp"
             android:background="@color/colorDividerMessageComposer"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/text_search_member" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:scrollbars="vertical"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/separator_1" />
-    </android.support.constraint.ConstraintLayout>
-</android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -10,8 +10,10 @@
         android:layout_width="120dp"
         android:layout_height="120dp"
         android:layout_centerHorizontal="true"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:roundedCornerRadius="2dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -59,9 +59,9 @@
         <Button
             android:id="@+id/button_cas"
             style="@style/Authentication.Button"
-            android:layout_marginEnd="@dimen/screen_edge_left_and_right_margins"
             android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
             android:layout_marginTop="16dp"
+            android:layout_marginEnd="@dimen/screen_edge_left_and_right_margins"
             android:text="@string/action_login_or_sign_up"
             android:visibility="gone"
             app:layout_constraintLeft_toLeftOf="parent"
@@ -73,9 +73,9 @@
             android:id="@+id/text_new_to_rocket_chat"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/screen_edge_left_and_right_margins"
             android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
             android:layout_marginTop="16dp"
+            android:layout_marginEnd="@dimen/screen_edge_left_and_right_margins"
             android:gravity="center"
             android:textColorLink="@color/colorAccent"
             android:visibility="gone"
@@ -88,9 +88,9 @@
             android:id="@+id/text_forgot_your_password"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/screen_edge_left_and_right_margins"
             android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
             android:layout_marginTop="8dp"
+            android:layout_marginEnd="@dimen/screen_edge_left_and_right_margins"
             android:gravity="center"
             android:textColorLink="@color/colorAccent"
             android:visibility="gone"
@@ -115,14 +115,14 @@
             android:id="@+id/social_accounts_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/screen_edge_left_and_right_margins"
             android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
             android:layout_marginTop="20dp"
+            android:layout_marginEnd="@dimen/screen_edge_left_and_right_margins"
             android:background="@color/colorPrimaryDark"
             android:gravity="center"
             android:orientation="vertical"
-            android:paddingBottom="32dp"
             android:paddingTop="@dimen/screen_edge_left_and_right_margins"
+            android:paddingBottom="32dp"
             android:visibility="gone"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
@@ -218,6 +218,18 @@
                 android:src="@drawable/ic_gitlab"
                 android:visibility="gone"
                 tools:visibility="gone" />
+
+            <ImageButton
+                android:id="@+id/button_wordpress"
+                android:layout_width="290dp"
+                android:layout_height="40dp"
+                android:layout_marginTop="16dp"
+                android:clickable="false"
+                android:contentDescription="@string/msg_content_description_log_in_using_gitlab"
+                android:foreground="?android:attr/selectableItemBackgroundBorderless"
+                android:src="@drawable/ic_wordpress"
+                android:visibility="gone"
+                tools:visibility="gone" />
         </LinearLayout>
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -242,7 +254,9 @@
             style="@style/Authentication.Button"
             android:text="@string/title_log_in"
             android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </ScrollView>
\ No newline at end of file

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

@@ -12,9 +12,9 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:layout_constraintBottom_toTopOf="@id/text_typing_status"
-        app:layout_constraintTop_toBottomOf="@+id/text_connection_status"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_connection_status">
 
         <include
             android:id="@+id/layout_message_list"
@@ -68,25 +68,29 @@
         android:id="@+id/empty_chat_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:constraint_referenced_ids="image_chat_icon, text_chat_title, text_chat_description"
         android:visibility="gone"
+        app:constraint_referenced_ids="image_chat_icon, text_chat_title, text_chat_description"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible" />
 
     <chat.rocket.android.widget.autocompletion.ui.SuggestionsView
         android:id="@+id/suggestions_view"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:background="@color/suggestion_background_color"
-        app:layout_constraintBottom_toTopOf="@id/layout_message_composer" />
+        app:layout_constraintBottom_toTopOf="@id/layout_message_composer"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
         android:id="@+id/text_typing_status"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="5dp"
-        android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="5dp"
         android:maxLines="2"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@id/layout_message_composer"
@@ -95,30 +99,37 @@
     <include
         android:id="@+id/layout_message_composer"
         layout="@layout/message_composer"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <View
         android:id="@+id/view_dim"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
         android:background="@color/colorDim"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@id/layout_message_composer" />
+        app:layout_constraintBottom_toTopOf="@id/layout_message_composer"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <include
         android:id="@+id/layout_message_attachment_options"
         layout="@layout/message_attachment_options"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@id/layout_message_composer" />
+        app:layout_constraintBottom_toTopOf="@id/layout_message_composer"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
         android:id="@+id/text_connection_status"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="32dp"
         android:alpha="0"
         android:background="@color/colorPrimary"
@@ -127,6 +138,8 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Body2"
         android:textColor="@color/colorWhite"
         android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:alpha="1"
         tools:text="connected"

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

@@ -95,8 +95,8 @@
         android:hint="@string/msg_channel_name"
         android:inputType="text"
         android:maxLines="1"
-        android:paddingEnd="10dp"
         android:paddingStart="24dp"
+        android:paddingEnd="10dp"
         android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="@+id/image_channel_icon"
         app:layout_constraintEnd_toEndOf="parent"
@@ -120,8 +120,8 @@
         android:hint="@string/msg_invite_members"
         android:inputType="text"
         android:maxLines="1"
-        android:paddingEnd="10dp"
         android:paddingStart="24dp"
+        android:paddingEnd="10dp"
         android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="@+id/image_invite_member"
         app:layout_constraintEnd_toEndOf="parent"
@@ -130,21 +130,27 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/view_member_suggestion"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="100dp"
-        android:layout_marginEnd="12dp"
         android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
         android:background="@color/colorWhite"
         android:elevation="2dp"
         android:orientation="vertical"
         android:visibility="gone"
-        app:layout_constraintBottom_toTopOf="@+id/text_invite_members">
+        app:layout_constraintBottom_toTopOf="@+id/text_invite_members"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone" />
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.wang.avi.AVLoadingIndicatorView
             android:id="@+id/view_member_suggestion_loading"
@@ -173,11 +179,13 @@
     <com.google.android.material.chip.ChipGroup
         android:id="@+id/chip_group_member"
         style="@style/Widget.MaterialComponents.Chip.Entry"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:visibility="gone"
         app:chipSpacing="3dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/text_invite_members" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -8,9 +8,13 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbars="vertical" />
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:scrollbars="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.wang.avi.AVLoadingIndicatorView
         android:id="@+id/view_loading"
@@ -72,6 +76,8 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         app:constraint_referenced_ids="text_no_favorite_messages_description,image_star,text_no_favorite_messages"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -9,9 +9,13 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbars="vertical" />
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:scrollbars="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.wang.avi.AVLoadingIndicatorView
         android:id="@+id/view_loading"
@@ -68,6 +72,10 @@
         android:id="@+id/group_no_file"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         android:visibility="gone"
         app:constraint_referenced_ids="image_file,text_no_file,text_all_files_appear_here"
         tools:visibility="visible" />

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

@@ -10,8 +10,11 @@
 
     <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/image_bottom_sheet_avatar"
-        android:layout_width="match_parent"
-        android:layout_height="200dp" />
+        android:layout_width="0dp"
+        android:layout_height="200dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <LinearLayout
         android:id="@+id/name_and_username_container"
@@ -19,9 +22,9 @@
         android:layout_height="wrap_content"
         android:background="@color/colorBackgroundMemberContainer"
         android:orientation="vertical"
-        android:paddingBottom="10dp"
         android:paddingStart="16dp"
         android:paddingTop="10dp"
+        android:paddingBottom="10dp"
         app:layout_constraintBottom_toBottomOf="@+id/image_bottom_sheet_avatar"
         app:layout_constraintLeft_toLeftOf="parent">
 

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

@@ -8,9 +8,13 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbars="vertical" />
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:scrollbars="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.wang.avi.AVLoadingIndicatorView
         android:id="@+id/view_loading"
@@ -70,6 +74,10 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         app:constraint_referenced_ids="image_mention,text_no_mention,text_all_mentions_appear_here"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -8,17 +8,21 @@
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view_pinned"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scrollbars="vertical" />
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:scrollbars="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.wang.avi.AVLoadingIndicatorView
         android:id="@+id/view_loading"
         android:layout_width="48dp"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:layout_marginBottom="8dp"
         android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
         android:visibility="gone"
         app:indicatorColor="@color/colorBlack"
         app:indicatorName="BallPulseIndicator"
@@ -74,6 +78,8 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         app:constraint_referenced_ids="tv_pin_description,iv_pin_icon,tv_pin_title"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -8,10 +8,10 @@
     android:background="?android:attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
-    android:paddingBottom="@dimen/message_item_top_and_bottom_padding"
-    android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
     android:paddingStart="@dimen/screen_edge_left_and_right_padding"
-    android:paddingTop="@dimen/message_item_top_and_bottom_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"
@@ -19,19 +19,20 @@
         android:layout_height="0dp"
         android:layout_marginStart="56dp"
         android:background="@drawable/quote_vertical_gray_bar"
+        app:layout_constraintBottom_toTopOf="@id/recycler_view_reactions"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/recycler_view_reactions"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/attachment_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
         android:autoLink="web"
-        app:layout_constraintStart_toEndOf="@id/quote_bar"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/quote_bar"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="#5571 - User profile from SSO must not have password change option" />
 
     <include

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

@@ -13,6 +13,47 @@
     android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
     android:paddingBottom="@dimen/message_item_top_and_bottom_padding">
 
+    <LinearLayout
+        android:id="@+id/day_marker_layout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingBottom="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/new_messages_notif">
+
+        <View
+            android:layout_width="0px"
+            android:layout_height="1dp"
+            android:layout_weight="1"
+            android:background="@color/colorDivider" />
+
+        <TextView
+            android:id="@+id/day"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:textAppearance="@style/Message.DayMarker"
+            tools:text="Wednesday" />
+
+        <View
+            android:layout_width="0dp"
+            android:layout_height="1dp"
+            android:layout_weight="1"
+            android:background="@color/colorDivider" />
+    </LinearLayout>
+
+    <include
+        android:id="@+id/layout_avatar"
+        layout="@layout/avatar"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/text_sender" />
+
     <LinearLayout
         android:id="@+id/new_messages_notif"
         android:layout_width="match_parent"
@@ -50,7 +91,7 @@
     <include
         android:id="@+id/layout_avatar"
         layout="@layout/avatar"
-        android:layout_width="40dp"
+        android:layout_width="38dp"
         android:layout_height="40dp"
         android:layout_marginTop="5dp"
         app:layout_constraintStart_toStartOf="parent"
@@ -63,8 +104,9 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintLeft_toRightOf="@+id/layout_avatar"
         app:layout_constraintStart_toEndOf="@+id/layout_avatar"
-        app:layout_constraintTop_toBottomOf="@+id/new_messages_notif"
+        app:layout_constraintTop_toBottomOf="@+id/day_marker_layout"
         tools:text="Ronald Perkins" />
 
     <TextView

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

@@ -7,24 +7,25 @@
     android:background="?android:attr/selectableItemBackground"
     android:clickable="true"
     android:focusable="true"
-    android:paddingBottom="@dimen/message_item_top_and_bottom_padding"
-    android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
     android:paddingStart="@dimen/screen_edge_left_and_right_padding"
-    android:paddingTop="@dimen/message_item_top_and_bottom_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">
 
     <Button
         android:id="@+id/button_message_reply"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="2dp"
-        android:layout_marginTop="5dp"
         android:layout_marginStart="56dp"
+        android:layout_marginTop="5dp"
+        android:layout_marginBottom="2dp"
         android:background="@drawable/message_reply_button_bg"
         android:text="@string/action_msg_reply"
         android:textAllCaps="false"
         android:textColor="#1D74F5"
         android:textSize="14sp"
-        app:layout_constraintLeft_toLeftOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <include
         layout="@layout/layout_reactions"

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

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_width="match_parent"
@@ -41,4 +41,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="04/06/2018 14:18:36" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/toolbar_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="@dimen/toolbar_height"
         android:background="@color/colorPrimary"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_scrollFlags="scroll|enterAlways"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
@@ -29,6 +32,6 @@
             android:gravity="end"
             android:textSize="14sp" />
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -3,8 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@color/default_background">
+    android:background="@color/default_background"
+    android:orientation="vertical">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/composer"
@@ -13,19 +13,24 @@
 
         <View
             android:id="@+id/divider"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="1dp"
-            android:background="@color/colorDividerMessageComposer" />
+            android:background="@color/colorDividerMessageComposer"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/text_room_is_read_only"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="45dp"
             android:background="@color/colorWhite"
             android:gravity="center"
             android:text="@string/msg_this_room_is_read_only"
             android:textColor="@color/colorBlack"
             android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/divider" />
 
         <Button
@@ -42,13 +47,15 @@
 
         <LinearLayout
             android:id="@+id/input_container"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
             android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:orientation="horizontal"
-            android:paddingBottom="10dp"
             android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/divider">
 
             <ImageButton
@@ -70,12 +77,12 @@
                 android:layout_weight="1"
                 android:background="@android:color/transparent"
                 android:hint="@string/msg_message"
+                android:imeOptions="flagNoExtractUi"
                 android:inputType="textCapSentences|textMultiLine"
                 android:lineSpacingExtra="4dp"
                 android:maxLines="4"
                 android:minHeight="24dp"
-                android:scrollbars="vertical"
-                android:imeOptions="flagNoExtractUi" />
+                android:scrollbars="vertical" />
 
             <ImageButton
                 android:id="@+id/button_show_attachment_options"

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

@@ -6,16 +6,16 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:attr/selectableItemBackground"
-    android:paddingEnd="24dp"
-    android:paddingStart="72dp">
+    android:paddingStart="72dp"
+    android:paddingEnd="24dp">
 
     <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/image_preview"
         android:layout_width="70dp"
         android:layout_height="50dp"
+        app:actualImageScaleType="centerCrop"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:actualImageScaleType="centerCrop" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/text_host"
@@ -23,9 +23,10 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:textColor="@color/colorSecondaryText"
+        android:textDirection="locale"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image_preview"
-        android:textDirection="locale"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="www.uol.com.br" />
 
     <TextView
@@ -33,20 +34,20 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:textColor="@color/colorAccent"
+        android:textDirection="locale"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/text_host"
         app:layout_constraintTop_toBottomOf="@id/text_host"
-        android:textDirection="locale"
         tools:text="Web page title" />
 
     <TextView
         android:id="@+id/text_description"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:textDirection="locale"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/text_host"
         app:layout_constraintTop_toBottomOf="@id/text_title"
-        android:textDirection="locale"
         tools:text="description" />
 
     <include

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

@@ -30,30 +30,35 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/account_container"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:background="?selectableItemBackground"
         android:elevation="2dp"
-        android:paddingBottom="4dp"
-        android:paddingEnd="12dp"
         android:paddingStart="12dp"
         android:paddingTop="4dp"
+        android:paddingEnd="12dp"
+        android:paddingBottom="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/image_avatar">
 
         <ImageView
             android:id="@+id/image_user_status"
             android:layout_width="12dp"
             android:layout_height="12dp"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintBottom_toTopOf="@+id/text_user_name"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/text_user_name"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/text_user_name"
             style="@style/Sender.Name.TextView"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
             android:layout_marginStart="10dp"
+            android:layout_marginEnd="10dp"
             android:textColor="@color/colorWhite"
             app:layout_constraintBottom_toBottomOf="@+id/image_user_status"
             app:layout_constraintEnd_toStartOf="@+id/image_account_expand"

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

@@ -15,6 +15,9 @@
         android:layout_width="24dp"
         android:layout_height="24dp"
         app:roundedCornerRadius="3dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         tools:src="@tools:sample/avatars" />
 
     <ImageView

app/src/main/res/menu/chatrooms.xml

 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="AppCompatResource">
 
     <item
         android:id="@+id/action_search"

app/src/main/res/menu/image_actions.xml

 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="AppCompatResource">
 
     <item
         android:id="@+id/action_save_image"

app/src/main/res/values-es/strings.xml

@@ -36,8 +36,8 @@
     <string name="action_away">Ausente</string>
     <string name="action_busy">Ocupado</string>
     <string name="action_invisible">Invisible</string>
+    <string name="action_drawing">dibujo</string>
     <string name="action_save_to_gallery">Guardar en la galería</string>
-    <string name="action_share">Compartir</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
@@ -64,6 +64,7 @@
     <string name="msg_new_user_agreement">Al continuar estás aceptando nuestra\n%1$s y %2$s</string>
     <string name="msg_2fa_code">Código 2FA</string>
     <string name="msg_yesterday">Ayer</string>
+    <string name="msg_today">Hoy</string>
     <string name="msg_message">Mensaje</string>
     <string name="msg_this_room_is_read_only">Esta sala es de solo lectura</string>
     <string name="msg_invalid_2fa_code">Código 2FA no válido</string>
@@ -76,6 +77,7 @@
     <string name="msg_content_description_log_in_using_meteor">Inicia sesión usando Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Inicia sesión usando Twitter</string>
     <string name="msg_content_description_log_in_using_gitlab">Inicia sesión usando Gitlab</string>
+    <string name="msg_content_description_log_in_using_wordprees">Login using WordPress</string> <!-- TODO Translate-->
     <string name="msg_content_description_send_message">Enviar mensaje</string>
     <string name="msg_content_description_show_attachment_options">Mostrar opciones de archivo adjunto</string>
     <string name="msg_you">Tú</string>
@@ -171,6 +173,9 @@
     // TODO: Add proper translation.
     <string name="permission_starring_not_allowed">Starring is not allowed</string>
 
+    <!-- Search message -->
+    <string name="title_search_message">Mensaje de búsqueda</string>
+
     <!-- Favorite/Unfavorite chat room -->
     <string name="title_favorite_chat">Chat favorito</string>
     <string name="title_unfavorite_chat">Deshacer chat favorito</string>
@@ -239,6 +244,7 @@
 
     <!-- Emoji message-->
     <string name="msg_no_recent_emoji">Sin emojis recientes</string>
+    <string name="alert_title_default_skin_tone">Tono de piel predeterminado</string>
 
     <!-- Sorting and grouping-->
     <string name="menu_chatroom_sort">Ordenar</string>
@@ -265,4 +271,9 @@
     <string name="read_by">Leído por</string>
     <string name="message_information_title">Información del mensaje</string>
     <string name="msg_log_out">Saliendo de tu cuenta…</string>
+    <string name="msg_upload_file">Subir archivo</string>
+    <string name="msg_file_description">Descripción del archivo</string>
+    <string name="msg_send">Enviar</string>
+    <string name="msg_sent_attachment">Envió un archivo</string>
+
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -72,6 +72,7 @@
     <string name="msg_new_user_agreement">En procédant, vous acceptez notre\n%1$s et %2$s</string>
     <string name="msg_2fa_code">Code 2FA</string>
     <string name="msg_yesterday">Hier</string>
+    <string name="msg_today">Aujourd\'hui</string>
     <string name="msg_message">Message</string>
     <string name="msg_this_room_is_read_only">Cette salle est seulement de lecture</string>
     <string name="msg_invalid_2fa_code">Code 2FA non valide</string>
@@ -84,6 +85,7 @@
     <string name="msg_content_description_log_in_using_meteor">Connectez-vous en utilisant Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Connectez-vous en utilisant Twitter</string>
     <string name="msg_content_description_log_in_using_gitlab">Connectez-vous en utilisant Gitlab</string>
+    <string name="msg_content_description_log_in_using_wordprees">Login using WordPress</string> <!-- TODO Translate-->
     <string name="msg_content_description_send_message">Envoyer message</string>
     <string name="msg_content_description_show_attachment_options">Afficher les options de fichiers</string>
     <string name="msg_you">Toi</string>
@@ -184,6 +186,7 @@
     <string name="action_msg_share">Partager</string>
     <string name="action_title_editing">Modification du message</string>
     <string name="action_msg_add_reaction">Ajouter une réaction</string>
+    <string name="action_share">Partager</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">L\'édition n\'est pas autorisée</string>
@@ -287,10 +290,12 @@
     <string name="header_unknown">Inconnu</string>
 
     <!--Notifications-->
+    <string name="share_label">Modifier le message partagé</string>
     <string name="notif_action_reply_hint">RÉPONDRE</string>
     <string name="notif_error_sending">La réponse a échoué. Veuillez réessayer.</string>
     <string name="notif_success_sending">Message envoyé à %1$s!</string>
     <string name="read_by">Lire par</string>
     <string name="message_information_title">Informations sur le message</string>
     <string name="msg_log_out">Déconnecter…</string>
+    <string name="msg_sent_attachment">Envoyé un fichier</string>
 </resources>

app/src/main/res/values-hi-rIN/strings.xml

@@ -39,6 +39,7 @@
     <string name="action_invisible">अदृश्य</string>
     <string name="action_save_to_gallery">गैलरी में सहेजें</string>
     <string name="action_drawing">चित्रकारी</string>
+    <string name="action_share">शेयर</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
@@ -65,6 +66,7 @@
     <string name="msg_new_user_agreement">आगे बढ़कर आप हमारे %1$s और %2$s से सहमत हो रहे हैं</string>
     <string name="msg_2fa_code">कोड 2FA</string>
     <string name="msg_yesterday">कल</string>
+    <string name="msg_today">आज</string>
     <string name="msg_message">संदेश</string>
     <string name="msg_this_room_is_read_only">यह रूम केवल पढ़ने के लिए है</string>
     <string name="msg_invalid_2fa_code">अमान्य 2FA कोड</string>
@@ -77,6 +79,7 @@
     <string name="msg_content_description_log_in_using_meteor">Meteor द्वारा लॉगिन करें</string>
     <string name="msg_content_description_log_in_using_twitter">Twitter द्वारा लॉगिन करें</string>
     <string name="msg_content_description_log_in_using_gitlab">Gitlab द्वारा लॉगिन करें</string>
+    <string name="msg_content_description_log_in_using_wordprees">Login using WordPress</string> <!-- TODO Translate-->
     <string name="msg_content_description_send_message">मेसेज भेजें</string>
     <string name="msg_content_description_show_attachment_options">अटैचमेंट विकल्प दिखाएं</string>
     <string name="msg_you">आप</string>
@@ -123,6 +126,7 @@
     <string name="msg_upload_file">फाइल अपलोड करें</string>
     <string name="msg_file_description">फाइल विवरण</string>
     <string name="msg_send">भेजें</string>
+    <string name="msg_sent_attachment">एक अनुलग्नक भेजा</string>
     <string name="msg_delete_message">संदेश को हटाएं</string>
     <string name="msg_delete_description">क्या आप निश्चित रूप से यह संदेश हटाना चाहते हैं</string>
 
@@ -266,6 +270,7 @@
     <string name="header_unknown">अज्ञात</string>
 
     <!--Notifications-->
+    <string name="share_label">साझा संदेश संपादित करें</string>
     <string name="notif_action_reply_hint">जवाब</string>
     <string name="notif_error_sending">उत्तर विफल हुआ है। कृपया फिर से प्रयास करें।</string>
     <string name="notif_success_sending">संदेश भेजा गया %1$s!</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -64,7 +64,8 @@
     <string name="msg_invalid_email">Por favor informe um e-mail válido</string>
     <string name="msg_new_user_agreement">Ao proceder você concorda com nossos %1$s e %2$s</string>
     <string name="msg_2fa_code">Código 2FA</string>
-    <string name="msg_yesterday">ontem</string>
+    <string name="msg_yesterday">Ontem</string>
+    <string name="msg_today">Hoje</string>
     <string name="msg_message">Mensagem</string>
     <string name="msg_this_room_is_read_only">Este chat é apenas de leitura</string>
     <string name="msg_invalid_2fa_code">Código 2FA inválido</string>
@@ -77,6 +78,7 @@
     <string name="msg_content_description_log_in_using_meteor">Fazer login através do Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Fazer login através do Twitter</string>
     <string name="msg_content_description_log_in_using_gitlab">Fazer login através do Gitlab</string>
+    <string name="msg_content_description_log_in_using_wordprees">Fazer login através do WordPress</string>
     <string name="msg_content_description_send_message">Enviar mensagem</string>
     <string name="msg_content_description_show_attachment_options">Mostrar opções de anexo</string>
     <string name="msg_you">Você</string>
@@ -266,10 +268,13 @@
     <string name="header_unknown">Desconhecido</string>
 
     <!--Notifications-->
+    <string name="share_label">Editar mensagem compartilhada</string>
     <string name="notif_action_reply_hint">RESPONDER</string>
     <string name="notif_error_sending">Falha ao enviar a mensagem.</string>
     <string name="notif_success_sending">Mensagem enviada para %1$s!</string>
+    <string name="action_share">Compartilhar</string>
     <string name="read_by">Lida por</string>
     <string name="message_information_title">Informações da mensagem</string>
     <string name="msg_log_out">Deslogando…</string>
+    <string name="msg_sent_attachment">Enviou um arquivo</string>
 </resources>

app/src/main/res/values-uk-rRU/strings.xml

@@ -37,6 +37,7 @@
     <string name="action_away">Отошел</string>
     <string name="action_busy">Занят</string>
     <string name="action_invisible">Невидимый</string>
+    <string name="action_drawing">малюнок</string>
     <string name="action_save_to_gallery">Сохранить в галерею</string>
 
     <!-- Settings List -->
@@ -64,6 +65,7 @@
     <string name="msg_new_user_agreement">Продолжая, вы соглашаетесь с нашими\n%1$s и %2$s</string>
     <string name="msg_2fa_code">Код 2FA</string>
     <string name="msg_yesterday">Вчера</string>
+    <string name="msg_today">Сьогодні</string>
     <string name="msg_message">Сообщение</string>
     <string name="msg_this_room_is_read_only">Этот канал только для чтения</string>
     <string name="msg_invalid_2fa_code">Неверный код 2FA</string>
@@ -76,6 +78,7 @@
     <string name="msg_content_description_log_in_using_meteor">Войти используя Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Войти используя Twitter</string>
     <string name="msg_content_description_log_in_using_gitlab">Войти используя Gitlab</string>
+    <string name="msg_content_description_log_in_using_wordprees">Login using WordPress</string> <!-- TODO Translate-->
     <string name="msg_content_description_send_message">Отправить сообщение</string>
     <string name="msg_content_description_show_attachment_options">Показать параметры вложения</string>
     <string name="msg_you">Вы</string>
@@ -119,6 +122,7 @@
     <string name="msg_upload_file">Загрузить файл</string>
     <string name="msg_file_description">Описание файла</string>
     <string name="msg_send">послать</string>
+    <string name="msg_sent_attachment">Надіслано вкладення</string>
     <string name="msg_delete_message">Удалить сообщение</string>
     <string name="msg_delete_description">Вы уверены, что хотите удалить это сообщение?</string>
     <string name="msg_channel_name">Название канала</string>
@@ -165,6 +169,7 @@
     <string name="action_msg_share">Поделиться</string>
     <string name="action_title_editing">Редактирование сообщения</string>
     <string name="action_msg_add_reaction">Добавить реакцию</string>
+    <string name="action_share">Поділитися</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Редактирование запрещено</string>
@@ -262,8 +267,11 @@
     <string name="header_unknown">Неизвестные</string>
 
     <!--Notifications-->
+    <string name="share_label">Редагування спільного повідомлення</string>
     <string name="notif_action_reply_hint">ОТВЕТИТЬ</string>
     <string name="notif_error_sending">Ошибка ответа. Пожалуйста, попробуйте еще раз.</string>
     <string name="notif_success_sending">Сообщение отправлено %1$s!</string>
+    <string name="read_by">Прочитано</string>
+    <string name="message_information_title">Інформація про повідомлення</string>
     <string name="msg_log_out">Выход…</string>
 </resources>

app/src/main/res/values/colors.xml

@@ -44,6 +44,8 @@
 
     <color name="quoteBar">#A0A0A0</color>
 
+    <color name="colorDivider">#1F000000</color>
+
     <!-- Suggestions -->
     <color name="suggestion_background_color">@color/colorWhite</color>
 

app/src/main/res/values/fonts.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="font_fontFamily_medium" translatable="false">sans-serif-medium</string>
+</resources>

app/src/main/res/values/strings.xml

@@ -67,6 +67,7 @@
     <string name="msg_2fa_code">2FA Code</string>
     <string name="msg_more_than_ninety_nine_unread_messages" translatable="false">99+</string>
     <string name="msg_yesterday">Yesterday</string>
+    <string name="msg_today">Today</string>
     <string name="msg_message">Message</string>
     <string name="msg_this_room_is_read_only">This room is read only</string>
     <string name="msg_invalid_2fa_code">Invalid 2FA Code</string>
@@ -79,6 +80,7 @@
     <string name="msg_content_description_log_in_using_meteor">Login using Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Login using Twitter</string>
     <string name="msg_content_description_log_in_using_gitlab">Login using Gitlab</string>
+    <string name="msg_content_description_log_in_using_wordprees">Login using WordPress</string>
     <string name="msg_content_description_send_message">Send message</string>
     <string name="msg_content_description_show_attachment_options">Show attachment options</string>
     <string name="msg_you">You</string>
@@ -124,6 +126,7 @@
     <string name="msg_upload_file">Upload file</string>
     <string name="msg_file_description">File description</string>
     <string name="msg_send">Send</string>
+    <string name="msg_sent_attachment">Sent an attachment</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Private</string>
@@ -169,6 +172,7 @@
     <string name="action_msg_share">Share</string>
     <string name="action_title_editing">Editing Message</string>
     <string name="action_msg_add_reaction">Add reaction</string>
+    <string name="action_share">Share</string>
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">Editing is not allowed</string>
@@ -266,6 +270,7 @@
     <string name="header_unknown">Unknown</string>
 
     <!--Notifications-->
+    <string name="share_label">Edit shared message</string>
     <string name="notif_action_reply_hint">REPLY</string>
     <string name="notif_error_sending">Reply has failed. Please try again.</string>
     <string name="notif_success_sending">Message sent to %1$s!</string>

app/src/main/res/values/styles.xml

@@ -101,6 +101,12 @@
         <item name="android:textColor">@color/colorPrimaryText</item>
     </style>
 
+    <style name="Message.DayMarker" parent="TextAppearance.AppCompat">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@color/colorPrimaryText</item>
+        <item name="android:fontFamily">@string/font_fontFamily_medium</item>
+    </style>
+
     <style name="Message.Quote.TextView" parent="Message.TextView">
         <item name="android:textColor">@color/colorPrimaryText</item>
     </style>

build.gradle

@@ -5,8 +5,8 @@ buildscript {
     repositories {
         google()
         jcenter()
-        mavenCentral()
         maven { url 'https://maven.fabric.io/public' }
+        mavenCentral()
     }
 
     dependencies {

core/build.gradle

@@ -18,6 +18,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    packagingOptions {
+        exclude 'META-INF/core.kotlin_module'
+        exclude 'META-INF/main.kotlin_module'
+    }
 }
 
 dependencies {

dependencies.gradle

@@ -24,9 +24,9 @@ ext {
             playServices          : '15.0.0',
             exoPlayer             : '2.6.0',
             flexbox               : '0.3.2',
-            material              : '1.0.0-alpha1',
+            material              : '1.0.0-beta01',
 
-            room                  : '2.0.0-alpha1',
+            room                  : '2.0.0-beta01',
             lifecycle             : '2.0.0-beta01',
 
             rxKotlin              : '2.2.0',

draw/src/main/res/layout/activity_drawing.xml

@@ -4,13 +4,17 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.DrawingActivity">
+    tools:context=".main.ui.DrawingActivity">
 
     <chat.rocket.android.draw.widget.CustomDrawView
         android:id="@+id/custom_draw_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/color_white" />
+        android:background="@color/color_white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <ImageView
         android:id="@+id/image_close_drawing"

emoji/src/main/res/layout/emoji_keyboard.xml

@@ -55,8 +55,10 @@
             android:padding="8dp"
             android:src="@drawable/ic_search_gray_24px"
             android:visibility="invisible"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/emoji_backspace"
-            app:layout_constraintStart_toEndOf="@+id/color_change_view" />
+            app:layout_constraintStart_toEndOf="@+id/color_change_view"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
             android:id="@+id/emoji_backspace"