Merge branch 'develop-2.x' into redesignOnboarding

# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties

app/build.gradle

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

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

+{
+  "formatVersion": 1,
+  "database": {
+    "version": 4,
+    "identityHash": "e389d26bfb975f00c75dc6fc5d06d012",
+    "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`)"
+          }
+        ],
+        "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, \"e389d26bfb975f00c75dc6fc5d06d012\")"
+    ]
+  }
+}
\ No newline at end of file

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/AndroidManifest.xml

@@ -76,7 +76,12 @@
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
 
-        <!-- TODO: Change to fragment -->
+        <activity
+            android:name=".chatinformation.ui.MessageInfoActivity"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
+
+        <!-- TODO: Change to fragment-->
         <activity
             android:name=".settings.password.ui.PasswordActivity"
             android:theme="@style/AppTheme" />

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 {
         }
     }
 
-    /**
-     * Returns a time from a [LocalDateTime].
-     *
-     * @param localDateTime The [LocalDateTime].
-     * @return The time from a [LocalDateTime].
-     */
-    fun getTime(localDateTime: LocalDateTime): String {
-        val formatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
-        return localDateTime.toLocalTime().format(formatter).toString()
+    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 date time from a [LocalDateTime].
-     *
-     * @param localDateTime The [LocalDateTime].
-     * @return The time from a [LocalDateTime].
-     */
-    fun getDateTime(localDateTime: LocalDateTime): String {
-        return formatLocalDateTime(localDateTime)
-    }
+/**
+ * Returns a time from a [LocalDateTime].
+ *
+ * @param localDateTime The [LocalDateTime].
+ * @return The time from a [LocalDateTime].
+ */
+fun getTime(localDateTime: LocalDateTime): String {
+    val formatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
+    return localDateTime.toLocalTime().format(formatter).toString()
+}
 
-    private fun formatLocalDateTime(localDateTime: LocalDateTime): String {
-        val formatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT)
-        return localDateTime.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 {
+    return formatLocalDateTime(localDateTime)
+}
 
-    private fun formatLocalDate(localDate: LocalDate): String {
-        val formatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)
-        return localDate.format(formatter).toString()
-    }
+private fun formatLocalDateTime(localDateTime: LocalDateTime): String {
+    val formatter = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT)
+    return localDateTime.format(formatter).toString()
+}
 
-    private fun formatLocalTime(localTime: LocalTime): String {
-        val formatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
-        return localTime.format(formatter).toString()
-    }
+private fun formatLocalDate(localDate: LocalDate): String {
+    val formatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT)
+    return localDate.format(formatter).toString()
+}
+
+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/login/presentation/LoginPresenter.kt

@@ -5,19 +5,58 @@ import chat.rocket.android.authentication.presentation.AuthenticationNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.helper.OauthHelper
 import chat.rocket.android.infrastructure.LocalRepository
-import chat.rocket.android.server.domain.*
+import chat.rocket.android.server.domain.GetAccountsInteractor
+import chat.rocket.android.server.domain.GetConnectingServerInteractor
+import chat.rocket.android.server.domain.GetSettingsInteractor
+import chat.rocket.android.server.domain.PublicSettings
+import chat.rocket.android.server.domain.SaveAccountInteractor
+import chat.rocket.android.server.domain.SaveCurrentServerInteractor
+import chat.rocket.android.server.domain.TokenRepository
+import chat.rocket.android.server.domain.casLoginUrl
+import chat.rocket.android.server.domain.favicon
+import chat.rocket.android.server.domain.gitlabUrl
+import chat.rocket.android.server.domain.isCasAuthenticationEnabled
+import chat.rocket.android.server.domain.isFacebookAuthenticationEnabled
+import chat.rocket.android.server.domain.isGithubAuthenticationEnabled
+import chat.rocket.android.server.domain.isGitlabAuthenticationEnabled
+import chat.rocket.android.server.domain.isGoogleAuthenticationEnabled
+import chat.rocket.android.server.domain.isLdapAuthenticationEnabled
+import chat.rocket.android.server.domain.isLinkedinAuthenticationEnabled
+import chat.rocket.android.server.domain.isLoginFormEnabled
+import chat.rocket.android.server.domain.isMeteorAuthenticationEnabled
+import chat.rocket.android.server.domain.isPasswordResetEnabled
+import chat.rocket.android.server.domain.isRegistrationEnabledForNewUsers
+import chat.rocket.android.server.domain.isTwitterAuthenticationEnabled
 import chat.rocket.android.server.domain.model.Account
+import chat.rocket.android.server.domain.wideTile
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
-import chat.rocket.android.util.extensions.*
+import chat.rocket.android.util.extensions.avatarUrl
+import chat.rocket.android.util.extensions.casUrl
+import chat.rocket.android.util.extensions.encodeToBase64
+import chat.rocket.android.util.extensions.generateRandomString
+import chat.rocket.android.util.extensions.isEmail
+import chat.rocket.android.util.extensions.parseColor
+import chat.rocket.android.util.extensions.registerPushToken
+import chat.rocket.android.util.extensions.samlUrl
+import chat.rocket.android.util.extensions.serverLogoUrl
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatAuthException
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.RocketChatTwoFactorException
+import chat.rocket.common.model.Email
 import chat.rocket.common.model.Token
+import chat.rocket.common.model.User
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
-import chat.rocket.core.internal.rest.*
+import chat.rocket.core.internal.rest.login
+import chat.rocket.core.internal.rest.loginWithCas
+import chat.rocket.core.internal.rest.loginWithEmail
+import chat.rocket.core.internal.rest.loginWithLdap
+import chat.rocket.core.internal.rest.loginWithOauth
+import chat.rocket.core.internal.rest.loginWithSaml
+import chat.rocket.core.internal.rest.me
+import chat.rocket.core.internal.rest.settingsOauth
 import kotlinx.coroutines.experimental.delay
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
@@ -351,11 +390,20 @@ class LoginPresenter @Inject constructor(
                         }
                     }
                 }
-                val username = retryIO("me()") { client.me().username }
-                if (username != null) {
-                    localRepository.save(LocalRepository.CURRENT_USERNAME_KEY, username)
+                val myself = retryIO("me()") { client.me() }
+                if (myself.username != null) {
+                    val user = User(
+                        id = myself.id,
+                        roles = myself.roles,
+                        status = myself.status,
+                        name = myself.name,
+                        emails = myself.emails?.map { Email(it.address ?: "", it.verified) },
+                        username = myself.username,
+                        utcOffset = myself.utcOffset
+                    )
+                    localRepository.saveCurrentUser(url = currentServer, user = user)
                     saveCurrentServer.save(currentServer)
-                    saveAccount(username)
+                    saveAccount(myself.username!!)
                     saveToken(token)
                     registerPushToken()
                     if (loginType == TYPE_LOGIN_USER_EMAIL) {
@@ -391,7 +439,7 @@ class LoginPresenter @Inject constructor(
         }.toString()
     }
 
-    private fun getSamlServices(listMap: List<Map<String, Any>>): List<Map<String, Any>>  {
+    private fun getSamlServices(listMap: List<Map<String, Any>>): List<Map<String, Any>> {
         return listMap.filter { map -> map["service"] == "saml" }
     }
 

app/src/main/java/chat/rocket/android/chatinformation/adapter/ReadReceiptAdapter.kt

+package chat.rocket.android.chatinformation.adapter
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import chat.rocket.android.R
+import chat.rocket.android.chatinformation.adapter.ReadReceiptAdapter.ReadReceiptViewHolder
+import chat.rocket.android.chatinformation.viewmodel.ReadReceiptViewModel
+import chat.rocket.android.util.extensions.inflate
+import kotlinx.android.synthetic.main.avatar.view.*
+import kotlinx.android.synthetic.main.item_read_receipt.view.*
+
+class ReadReceiptAdapter : RecyclerView.Adapter<ReadReceiptViewHolder>() {
+    private val data = ArrayList<ReadReceiptViewModel>()
+
+    init {
+        setHasStableIds(true)
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ReadReceiptViewHolder {
+        return ReadReceiptViewHolder(parent.inflate(R.layout.item_read_receipt, false))
+    }
+
+    override fun getItemCount(): Int {
+        return data.size
+    }
+
+    override fun onBindViewHolder(holder: ReadReceiptViewHolder, position: Int) {
+        holder.bind(data[position])
+    }
+
+    fun addAll(items: List<ReadReceiptViewModel>) {
+        data.clear()
+        data.addAll(items)
+        notifyItemRangeInserted(0, items.size)
+    }
+
+    class ReadReceiptViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+        fun bind(readReceipt: ReadReceiptViewModel) {
+            with(itemView) {
+                image_avatar.setImageURI(readReceipt.avatar)
+                receipt_name.text = readReceipt.name
+                receipt_time.text = readReceipt.time
+            }
+        }
+    }
+}

app/src/main/java/chat/rocket/android/chatinformation/di/MessageInfoFragmentModule.kt

+package chat.rocket.android.chatinformation.di
+
+import androidx.lifecycle.LifecycleOwner
+import chat.rocket.android.chatinformation.presentation.MessageInfoView
+import chat.rocket.android.chatinformation.ui.MessageInfoFragment
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.dagger.scope.PerFragment
+import dagger.Module
+import dagger.Provides
+import kotlinx.coroutines.experimental.Job
+
+@Module
+class MessageInfoFragmentModule {
+
+    @Provides
+    @PerFragment
+    fun provideJob() = Job()
+
+    @Provides
+    @PerFragment
+    fun messageInfoView(frag: MessageInfoFragment): MessageInfoView {
+        return frag
+    }
+
+    @Provides
+    @PerFragment
+    fun provideLifecycleOwner(frag: MessageInfoFragment): LifecycleOwner {
+        return frag
+    }
+
+    @Provides
+    @PerFragment
+    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
+        return CancelStrategy(owner, jobs)
+    }
+}

app/src/main/java/chat/rocket/android/chatinformation/di/MessageInfoFragmentProvider.kt

+package chat.rocket.android.chatinformation.di
+
+import chat.rocket.android.chatinformation.ui.MessageInfoFragment
+import chat.rocket.android.dagger.scope.PerFragment
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class MessageInfoFragmentProvider {
+
+    @ContributesAndroidInjector(modules = [MessageInfoFragmentModule::class])
+    @PerFragment
+    abstract fun provideMessageInfoFragment(): MessageInfoFragment
+}

app/src/main/java/chat/rocket/android/chatinformation/presentation/MessageInfoPresenter.kt

+package chat.rocket.android.chatinformation.presentation
+
+import chat.rocket.android.chatroom.uimodel.UiModelMapper
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.util.extension.launchUI
+import chat.rocket.android.util.retryIO
+import chat.rocket.common.RocketChatException
+import chat.rocket.core.internal.rest.getMessageReadReceipts
+import timber.log.Timber
+import javax.inject.Inject
+
+class MessageInfoPresenter @Inject constructor(
+    private val view: MessageInfoView,
+    private val strategy: CancelStrategy,
+    private val mapper: UiModelMapper,
+    serverInteractor: GetCurrentServerInteractor,
+    factory: ConnectionManagerFactory
+) {
+
+    private val currentServer = serverInteractor.get()!!
+    private val manager = factory.create(currentServer)
+    private val client = manager.client
+
+    fun loadReadReceipts(messageId: String) {
+        launchUI(strategy) {
+            try {
+                view.showLoading()
+                val readReceipts = retryIO(description = "getMessageReadReceipts") {
+                    client.getMessageReadReceipts(messageId = messageId).result
+                }
+                view.showReadReceipts(mapper.map(readReceipts))
+            } catch (ex: RocketChatException) {
+                Timber.e(ex)
+                view.showGenericErrorMessage()
+            } finally {
+                view.hideLoading()
+            }
+        }
+    }
+}

app/src/main/java/chat/rocket/android/chatinformation/presentation/MessageInfoView.kt

+package chat.rocket.android.chatinformation.presentation
+
+import chat.rocket.android.chatinformation.viewmodel.ReadReceiptViewModel
+import chat.rocket.android.core.behaviours.LoadingView
+
+interface MessageInfoView : LoadingView {
+
+    fun showGenericErrorMessage()
+
+    fun showReadReceipts(messageReceipts: List<ReadReceiptViewModel>)
+}

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

+package chat.rocket.android.chatinformation.ui
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import chat.rocket.android.R
+import chat.rocket.android.chatinformation.ui.MessageInfoFragment.Companion.TAG_MESSAGE_INFO_FRAGMENT
+import chat.rocket.android.util.extensions.addFragment
+import chat.rocket.android.util.extensions.textContent
+import dagger.android.AndroidInjection
+import dagger.android.AndroidInjector
+import dagger.android.DispatchingAndroidInjector
+import dagger.android.support.HasSupportFragmentInjector
+import kotlinx.android.synthetic.main.app_bar_chat_room.*
+import javax.inject.Inject
+
+fun Context.messageInformationIntent(messageId: String): Intent {
+    return Intent(this, MessageInfoActivity::class.java).apply {
+        putExtra(INTENT_MESSAGE_ID, messageId)
+    }
+}
+
+private const val INTENT_MESSAGE_ID = "message_id"
+
+class MessageInfoActivity : AppCompatActivity(), HasSupportFragmentInjector {
+
+    @Inject
+    lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        AndroidInjection.inject(this)
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_chat_room)
+        setupToolbar()
+
+        val messageId = intent.getStringExtra(INTENT_MESSAGE_ID)
+        requireNotNull(messageId) { "no message_id provided in Intent extras" }
+
+        if (supportFragmentManager.findFragmentByTag(TAG_MESSAGE_INFO_FRAGMENT) == null) {
+            addFragment(TAG_MESSAGE_INFO_FRAGMENT, R.id.fragment_container) {
+                newInstance(messageId = messageId)
+            }
+        }
+    }
+
+    private fun setupToolbar() {
+        text_room_name.textContent = getString(R.string.message_information_title)
+        setSupportActionBar(toolbar)
+        supportActionBar?.setDisplayShowTitleEnabled(false)
+        toolbar.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+        toolbar.setNavigationOnClickListener { finishActivity() }
+    }
+
+    private fun finishActivity() {
+        super.onBackPressed()
+        overridePendingTransition(R.anim.close_enter, R.anim.close_exit)
+    }
+
+    override fun supportFragmentInjector(): AndroidInjector<Fragment> {
+        return fragmentDispatchingAndroidInjector
+    }
+}
\ No newline at end of file

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

+package chat.rocket.android.chatinformation.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import chat.rocket.android.R
+import chat.rocket.android.chatinformation.adapter.ReadReceiptAdapter
+import chat.rocket.android.chatinformation.presentation.MessageInfoPresenter
+import chat.rocket.android.chatinformation.presentation.MessageInfoView
+import chat.rocket.android.chatinformation.viewmodel.ReadReceiptViewModel
+import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
+import chat.rocket.android.util.extensions.setVisible
+import chat.rocket.android.util.extensions.showToast
+import chat.rocket.core.model.ReadReceipt
+import dagger.android.support.AndroidSupportInjection
+import kotlinx.android.synthetic.main.fragment_message_info.*
+import javax.inject.Inject
+
+fun newInstance(messageId: String): Fragment {
+    return MessageInfoFragment().apply {
+        arguments = Bundle(1).apply {
+            putString(BUNDLE_MESSAGE_ID, messageId)
+        }
+    }
+}
+
+private const val BUNDLE_MESSAGE_ID = "message_id"
+
+class MessageInfoFragment : Fragment(), MessageInfoView {
+
+    @Inject
+    lateinit var presenter: MessageInfoPresenter
+
+    private lateinit var adapter: ReadReceiptAdapter
+    private lateinit var messageId: String
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
+        setHasOptionsMenu(true)
+
+        val bundle = arguments
+        if (bundle != null) {
+            messageId = bundle.getString(BUNDLE_MESSAGE_ID)
+        } else {
+            requireNotNull(bundle) { "no arguments supplied when the fragment was instantiated" }
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        return inflater.inflate(R.layout.fragment_message_info, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupRecyclerView()
+        presenter.loadReadReceipts(messageId = messageId)
+    }
+
+    private fun setupRecyclerView() {
+        // Initialize the endlessRecyclerViewScrollListener so we don't NPE at onDestroyView
+        val linearLayoutManager = LinearLayoutManager(context, RecyclerView.VERTICAL, true)
+        adapter = ReadReceiptAdapter()
+        linearLayoutManager.stackFromEnd = true
+        receipt_list.layoutManager = linearLayoutManager
+        receipt_list.itemAnimator = DefaultItemAnimator()
+        receipt_list.adapter = adapter
+    }
+
+    override fun showGenericErrorMessage() {
+        showToast(R.string.msg_generic_error)
+    }
+
+    override fun showLoading() {
+        view_loading.setVisible(true)
+        view_loading.show()
+    }
+
+    override fun hideLoading() {
+        view_loading.hide()
+        view_loading.setVisible(false)
+    }
+
+    override fun showReadReceipts(messageReceipts: List<ReadReceiptViewModel>) {
+        adapter.addAll(messageReceipts)
+    }
+
+    companion object {
+        const val TAG_MESSAGE_INFO_FRAGMENT = "MessageInfoFragment"
+    }
+}

app/src/main/java/chat/rocket/android/chatinformation/viewmodel/ReadReceiptViewModel.kt

+package chat.rocket.android.chatinformation.viewmodel
+
+data class ReadReceiptViewModel(
+    val avatar: String,
+    val name: String,
+    val time: String
+)
\ No newline at end of file

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

@@ -78,24 +78,26 @@ abstract class BaseViewHolder<T : BaseUiModel<*>>(
 
     private val onClickListener = { view: View ->
         if (data?.message?.isSystemMessage() == false) {
-            data?.message?.let {
-                val menuItems = view.context.inflate(R.menu.message_actions).toList()
-                menuItems.find { it.itemId == R.id.action_message_unpin }?.apply {
-                    setTitle(if (it.pinned) R.string.action_msg_unpin else R.string.action_msg_pin)
-                    isChecked = it.pinned
-                }
+            data?.let { vm ->
+                vm.message.let {
+                    val menuItems = view.context.inflate(R.menu.message_actions).toList()
+                    menuItems.find { it.itemId == R.id.action_message_unpin }?.apply {
+                        setTitle(if (it.pinned) R.string.action_msg_unpin else R.string.action_msg_pin)
+                        isChecked = it.pinned
+                    }
 
-                menuItems.find { it.itemId == R.id.action_message_star }?.apply {
-                    val isStarred = it.starred?.isNotEmpty() ?: false
-                    setTitle(if (isStarred) R.string.action_msg_unstar else R.string.action_msg_star)
-                    isChecked = isStarred
-                }
-                view.context?.let {
-                    if (it is ContextThemeWrapper && it.baseContext is AppCompatActivity) {
-                        with(it.baseContext as AppCompatActivity) {
-                            val actionsBottomSheet = MessageActionsBottomSheet()
-                            actionsBottomSheet.addItems(menuItems, this@BaseViewHolder)
-                            actionsBottomSheet.show(supportFragmentManager, null)
+                    menuItems.find { it.itemId == R.id.action_message_star }?.apply {
+                        val isStarred = it.starred?.isNotEmpty() ?: false
+                        setTitle(if (isStarred) R.string.action_msg_unstar else R.string.action_msg_star)
+                        isChecked = isStarred
+                    }
+                    view.context?.let {
+                        if (it is ContextThemeWrapper && it.baseContext is AppCompatActivity) {
+                            with(it.baseContext as AppCompatActivity) {
+                                val actionsBottomSheet = MessageActionsBottomSheet()
+                                actionsBottomSheet.addItems(menuItems, this@BaseViewHolder)
+                                actionsBottomSheet.show(supportFragmentManager, null)
+                            }
                         }
                     }
                 }

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

@@ -211,6 +211,9 @@ class ChatRoomAdapter(
         override fun onActionSelected(item: MenuItem, message: Message) {
             message.apply {
                 when (item.itemId) {
+                    R.id.action_message_info -> {
+                        presenter?.messageInfo(id)
+                    }
                     R.id.action_message_reply -> {
                         if (roomName != null && roomType != null) {
                             presenter?.citeMessage(roomName, roomType, id, true)

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

@@ -4,6 +4,7 @@ import android.graphics.Color
 import android.text.method.LinkMovementMethod
 import android.view.View
 import androidx.core.view.isVisible
+import chat.rocket.android.R
 import chat.rocket.android.chatroom.uimodel.MessageUiModel
 import chat.rocket.android.emoji.EmojiReactionListener
 import chat.rocket.core.model.isSystemMessage
@@ -25,20 +26,42 @@ 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
             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
                 image_star_indicator.isVisible = it.starred?.isNotEmpty() ?: false
             }
+
+            if (data.unread == null) {
+                read_receipt_view.isVisible = false
+            } else {
+                read_receipt_view.setImageResource(
+                    if (data.unread == true) {
+                        R.drawable.ic_check_unread_24dp
+                    } else {
+                        R.drawable.ic_check_read_24dp
+                    }
+                )
+                read_receipt_view.isVisible = true
+            }
         }
     }
-}
\ No newline at end of file
+}

app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt

@@ -33,4 +33,4 @@ class ChatRoomFragmentModule {
     fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
         return CancelStrategy(owner, jobs)
     }
-}
\ No newline at end of file
+}

app/src/main/java/chat/rocket/android/chatroom/domain/MessageReply.kt

 package chat.rocket.android.chatroom.domain
 
-data class MessageReply(
-    val roomName: String,
-    val permalink: String
-)
\ No newline at end of file
+data class MessageReply(val roomName: String, val permalink: String)
\ No newline at end of file

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

 package chat.rocket.android.chatroom.presentation
 
 import chat.rocket.android.R
+import chat.rocket.android.chatinformation.ui.messageInformationIntent
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatroom.ui.chatRoomIntent
 import chat.rocket.android.server.ui.changeServerIntent
@@ -69,4 +70,9 @@ class ChatRoomNavigator(internal val activity: ChatRoomActivity) {
         )
         activity.overridePendingTransition(R.anim.open_enter, R.anim.open_exit)
     }
+
+    fun toMessageInformation(messageId: String) {
+        activity.startActivity(activity.messageInformationIntent(messageId = messageId))
+        activity.overridePendingTransition(R.anim.open_enter, R.anim.open_exit)
+    }
 }
\ No newline at end of file

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

@@ -153,4 +153,4 @@ interface ChatRoomView : LoadingView, MessageView {
      * to reply.
      */
     fun openDirectMessage(chatRoom: ChatRoom, permalink: String)
-}
\ No newline at end of file
+}

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

@@ -15,11 +15,11 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import android.widget.Button
 import android.widget.EditText
-import android.widget.TextView
 import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.TextView
 import androidx.annotation.DrawableRes
 import androidx.core.text.bold
 import androidx.core.view.isVisible
@@ -52,9 +52,9 @@ import chat.rocket.android.emoji.EmojiParser
 import chat.rocket.android.emoji.EmojiPickerPopup
 import chat.rocket.android.emoji.EmojiReactionListener
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
+import chat.rocket.android.helper.ImageHelper
 import chat.rocket.android.helper.KeyboardHelper
 import chat.rocket.android.helper.MessageParser
-import chat.rocket.android.helper.ImageHelper
 import chat.rocket.android.util.extension.asObservable
 import chat.rocket.android.util.extensions.circularRevealOrUnreveal
 import chat.rocket.android.util.extensions.fadeIn
@@ -147,6 +147,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     private lateinit var actionSnackbar: ActionSnackbar
     internal var citation: String? = null
     private var editingMessageId: String? = null
+    internal var disableMenu: Boolean = false
 
     private val compositeDisposable = CompositeDisposable()
     private var playComposeMessageButtonsAnimation = true
@@ -249,7 +250,16 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     override fun onPause() {
         super.onPause()
         setReactionButtonIcon(R.drawable.ic_reaction_24dp)
-        emojiKeyboardPopup.dismiss()
+        dismissEmojiKeyboard()
+        activity?.invalidateOptionsMenu()
+    }
+
+    private fun dismissEmojiKeyboard() {
+        // Check if the keyboard was ever initialized.
+        // It may be the case when you are looking a not joined room
+        if (::emojiKeyboardPopup.isInitialized) {
+            emojiKeyboardPopup.dismiss()
+        }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
@@ -285,24 +295,42 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                 adapter.clearData()
             }
 
-            // track the message sent immediately after the current message
-            var prevMessageUiModel: MessageUiModel? = null
+            if (dataSet.isNotEmpty()) {
+                var prevMsgModel = dataSet[0]
 
-            // Loop over received messages to determine first unread
-            for (i in dataSet.indices) {
-                val msgModel = dataSet[i]
+                // track the message sent immediately after the current message
+                var prevMessageUiModel: MessageUiModel? = null
 
-                if (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.
-                        // if there is a message after (below) this, mark it firstUnread.
-                        if (prevMessageUiModel != null) {
-                            prevMessageUiModel.isFirstUnread = true
+                // 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 (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.
+                            // if there is a message after (below) this, mark it firstUnread.
+                            if (prevMessageUiModel != null) {
+                                prevMessageUiModel.isFirstUnread = true
+                            }
+                            // Found first unread message.
+                            firstUnread = true
                         }
-                        break
+                        prevMessageUiModel = msgModel
                     }
-                    prevMessageUiModel = msgModel
                 }
             }
 
@@ -320,6 +348,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                 }
                 recycler_view.addOnLayoutChangeListener(layoutChangeListener)
                 recycler_view.addOnScrollListener(onScrollListener)
+
+                // Load just once, on the first page...
+                presenter.loadActiveMembers(chatRoomId, chatRoomType, filterSelfOut = true)
             }
 
             val oldMessagesCount = adapter.itemCount
@@ -350,7 +381,10 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         ui {
             setupMessageComposer(userCanPost)
             isBroadcastChannel = channelIsBroadcast
-            if (isBroadcastChannel && !userCanMod) activity?.invalidateOptionsMenu()
+            if (isBroadcastChannel && !userCanMod) {
+                disableMenu = true
+                activity?.invalidateOptionsMenu()
+            }
         }
     }
 
@@ -411,7 +445,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             } else {
                 if (dy < 0 && !button_fab.isVisible) {
                     button_fab.show()
-                    if (newMessageCount !=0) text_count.isVisible = true
+                    if (newMessageCount != 0) text_count.isVisible = true
                 }
             }
         }
@@ -470,14 +504,13 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             if (isMessageReceived && button_fab.isVisible) {
                 newMessageCount++
 
-            if (newMessageCount <= 99)
-                text_count.text = newMessageCount.toString()
-            else
-                text_count.text = "99+"
+                if (newMessageCount <= 99)
+                    text_count.text = newMessageCount.toString()
+                else
+                    text_count.text = "99+"
 
                 text_count.isVisible = true
-            }
-            else if (!button_fab.isVisible)
+            } else if (!button_fab.isVisible)
                 recycler_view.scrollToPosition(0)
             verticalScrollOffset.set(0)
             empty_chat_view.isVisible = adapter.itemCount == 0
@@ -866,7 +899,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             clearMessageComposition(false)
             if (text_message.textContent.isEmpty()) {
                 KeyboardHelper.showSoftKeyboard(text_message)
-            }    
+            }
         }
     }
 
@@ -934,4 +967,4 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     private fun setupToolbar(toolbarTitle: String) {
         (activity as ChatRoomActivity).showToolbarTitle(toolbarTitle)
     }
-}
\ No newline at end of file
+}

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

@@ -14,7 +14,21 @@ internal fun ChatRoomFragment.setupMenu(menu: Menu) {
     setupSearchMessageMenuItem(menu, requireContext())
     setupFavoriteMenuItem(menu)
 
-    if (chatRoomType != RoomType.DIRECT_MESSAGE) {
+    menu.add(
+        Menu.NONE,
+        MENU_ACTION_PINNED_MESSAGES,
+        Menu.NONE,
+        R.string.title_pinned_messages
+    )
+
+    menu.add(
+        Menu.NONE,
+        MENU_ACTION_FAVORITE_MESSAGES,
+        Menu.NONE,
+        R.string.title_favorite_messages
+    )
+
+    if (chatRoomType != RoomType.DIRECT_MESSAGE && !disableMenu) {
         menu.add(
             Menu.NONE,
             MENU_ACTION_MEMBER,
@@ -30,26 +44,14 @@ internal fun ChatRoomFragment.setupMenu(menu: Menu) {
         )
     }
 
-    menu.add(
-        Menu.NONE,
-        MENU_ACTION_PINNED_MESSAGES,
-        Menu.NONE,
-        R.string.title_pinned_messages
-    )
-
-    menu.add(
-        Menu.NONE,
-        MENU_ACTION_FAVORITE_MESSAGES,
-        Menu.NONE,
-        R.string.title_favorite_messages
-    )
-
-    menu.add(
-        Menu.NONE,
-        MENU_ACTION_FILES,
-        Menu.NONE,
-        R.string.title_files
-    )
+    if (!disableMenu) {
+        menu.add(
+            Menu.NONE,
+            MENU_ACTION_FILES,
+            Menu.NONE,
+            R.string.title_files
+        )
+    }
 }
 
 internal fun ChatRoomFragment.setOnMenuItemClickListener(item: MenuItem) {
@@ -101,7 +103,7 @@ private fun ChatRoomFragment.setupSearchViewTextListener(searchView: SearchView)
         // TODO: We use isSearchTermQueried to avoid querying when the search view is expanded but the user doesn't start typing. Check for a native solution.
         if (it.isEmpty() && isSearchTermQueried) {
             presenter.loadMessages(chatRoomId, chatRoomType, clearDataSet = true)
-        } else if (it.isNotEmpty()){
+        } else if (it.isNotEmpty()) {
             presenter.searchMessages(chatRoomId, it)
             isSearchTermQueried = true
         }

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

@@ -14,7 +14,11 @@ data class AudioAttachmentUiModel(
         override var reactions: List<ReactionUiModel>,
         override var nextDownStreamMessage: BaseUiModel<*>? = null,
         override var preview: Message? = null,
-        override var isTemporary: Boolean = false
+        override var isTemporary: Boolean = false,
+        override var unread: Boolean? = null,
+        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

@@ -5,18 +5,22 @@ import chat.rocket.core.model.Message
 import chat.rocket.core.model.attachment.AuthorAttachment
 
 data class AuthorAttachmentUiModel(
-        override val attachmentUrl: String,
-        val id: Long,
-        val name: CharSequence?,
-        val icon: String?,
-        val fields: CharSequence?,
-        override val message: Message,
-        override val rawData: AuthorAttachment,
-        override val messageId: String,
-        override var reactions: List<ReactionUiModel>,
-        override var nextDownStreamMessage: BaseUiModel<*>? = null,
-        override var preview: Message? = null,
-        override var isTemporary: Boolean = false
+    override val attachmentUrl: String,
+    val id: Long,
+    val name: CharSequence?,
+    val icon: String?,
+    val fields: CharSequence?,
+    override val message: Message,
+    override val rawData: AuthorAttachment,
+    override val messageId: String,
+    override var reactions: List<ReactionUiModel>,
+    override var nextDownStreamMessage: BaseUiModel<*>? = null,
+    override var preview: Message? = null,
+    override var isTemporary: Boolean = false,
+    override var unread: Boolean? = null,
+    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+    override var currentDayMarkerText: String,
+    override var showDayMarker: Boolean
 ) : BaseAttachmentUiModel<AuthorAttachment> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.AUTHOR_ATTACHMENT.viewType

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

@@ -13,6 +13,10 @@ interface BaseUiModel<out T> {
     var nextDownStreamMessage: BaseUiModel<*>?
     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) {
         MESSAGE(0),

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

@@ -5,17 +5,21 @@ import chat.rocket.core.model.Message
 import chat.rocket.core.model.attachment.ColorAttachment
 
 data class ColorAttachmentUiModel(
-        override val attachmentUrl: String,
-        val id: Long,
-        val color: Int,
-        val text: CharSequence,
-        override val message: Message,
-        override val rawData: ColorAttachment,
-        override val messageId: String,
-        override var reactions: List<ReactionUiModel>,
-        override var nextDownStreamMessage: BaseUiModel<*>? = null,
-        override var preview: Message? = null,
-        override var isTemporary: Boolean = false
+    override val attachmentUrl: String,
+    val id: Long,
+    val color: Int,
+    val text: CharSequence,
+    override val message: Message,
+    override val rawData: ColorAttachment,
+    override val messageId: String,
+    override var reactions: List<ReactionUiModel>,
+    override var nextDownStreamMessage: BaseUiModel<*>? = null,
+    override var preview: Message? = null,
+    override var isTemporary: Boolean = false,
+    override var unread: Boolean?,
+    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+    override var currentDayMarkerText: String,
+    override var showDayMarker: Boolean
 ) : BaseAttachmentUiModel<ColorAttachment> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.COLOR_ATTACHMENT.viewType

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

@@ -5,16 +5,20 @@ import chat.rocket.core.model.Message
 import chat.rocket.core.model.attachment.GenericFileAttachment
 
 data class GenericFileAttachmentUiModel(
-        override val message: Message,
-        override val rawData: GenericFileAttachment,
-        override val messageId: String,
-        override val attachmentUrl: String,
-        override val attachmentTitle: CharSequence,
-        override val id: Long,
-        override var reactions: List<ReactionUiModel>,
-        override var nextDownStreamMessage: BaseUiModel<*>? = null,
-        override var preview: Message? = null,
-        override var isTemporary: Boolean = false
+    override val message: Message,
+    override val rawData: GenericFileAttachment,
+    override val messageId: String,
+    override val attachmentUrl: String,
+    override val attachmentTitle: CharSequence,
+    override val id: Long,
+    override var reactions: List<ReactionUiModel>,
+    override var nextDownStreamMessage: BaseUiModel<*>? = null,
+    override var preview: Message? = null,
+    override var isTemporary: Boolean = false,
+    override var unread: Boolean? = null,
+    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+    override var currentDayMarkerText: String,
+    override var showDayMarker: Boolean
 ) : BaseFileAttachmentUiModel<GenericFileAttachment> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.GENERIC_FILE_ATTACHMENT.viewType

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

@@ -5,18 +5,22 @@ import chat.rocket.core.model.Message
 import chat.rocket.core.model.attachment.ImageAttachment
 
 data class ImageAttachmentUiModel(
-        override val message: Message,
-        override val rawData: ImageAttachment,
-        override val messageId: String,
-        override val attachmentUrl: String,
-        override val attachmentTitle: CharSequence,
-        val attachmentText: String?,
-        val attachmentDescription: String?,
-        override val id: Long,
-        override var reactions: List<ReactionUiModel>,
-        override var nextDownStreamMessage: BaseUiModel<*>? = null,
-        override var preview: Message? = null,
-        override var isTemporary: Boolean = false
+    override val message: Message,
+    override val rawData: ImageAttachment,
+    override val messageId: String,
+    override val attachmentUrl: String,
+    override val attachmentTitle: CharSequence,
+    val attachmentText: String?,
+    val attachmentDescription: String?,
+    override val id: Long,
+    override var reactions: List<ReactionUiModel>,
+    override var nextDownStreamMessage: BaseUiModel<*>? = null,
+    override var preview: Message? = null,
+    override var isTemporary: Boolean = false,
+    override var unread: Boolean? = null,
+    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+    override var currentDayMarkerText: String,
+    override var showDayMarker: Boolean
 ) : BaseFileAttachmentUiModel<ImageAttachment> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.IMAGE_ATTACHMENT.viewType

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

@@ -4,18 +4,22 @@ import chat.rocket.android.R
 import chat.rocket.core.model.Message
 
 data class MessageAttachmentUiModel(
-        override val message: Message,
-        override val rawData: Message,
-        override val messageId: String,
-        var senderName: String?,
-        val time: CharSequence?,
-        val content: CharSequence,
-        val isPinned: Boolean,
-        override var reactions: List<ReactionUiModel>,
-        override var nextDownStreamMessage: BaseUiModel<*>? = null,
-        var messageLink: String? = null,
-        override var preview: Message? = null,
-        override var isTemporary: Boolean = false
+    override val message: Message,
+    override val rawData: Message,
+    override val messageId: String,
+    var senderName: String?,
+    val time: CharSequence?,
+    val content: CharSequence,
+    val isPinned: Boolean,
+    override var reactions: List<ReactionUiModel>,
+    override var nextDownStreamMessage: BaseUiModel<*>? = null,
+    var messageLink: String? = null,
+    override var preview: Message? = null,
+    override var isTemporary: Boolean = false,
+    override var unread: Boolean? = null,
+    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+    override var currentDayMarkerText: String,
+    override var showDayMarker: Boolean
 ) : BaseUiModel<Message> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.MESSAGE_ATTACHMENT.viewType

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

@@ -5,13 +5,17 @@ import chat.rocket.android.chatroom.domain.MessageReply
 import chat.rocket.core.model.Message
 
 data class MessageReplyUiModel(
-        override val rawData: MessageReply,
-        override val messageId: String,
-        override var reactions: List<ReactionUiModel>,
-        override var nextDownStreamMessage: BaseUiModel<*>?,
-        override var preview: Message?,
-        override var isTemporary: Boolean = false,
-        override val message: Message
+    override val rawData: MessageReply,
+    override val messageId: String,
+    override var reactions: List<ReactionUiModel>,
+    override var nextDownStreamMessage: BaseUiModel<*>?,
+    override var preview: Message?,
+    override var isTemporary: Boolean = false,
+    override val message: Message,
+    override var unread: Boolean? = null,
+    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

@@ -4,19 +4,23 @@ import chat.rocket.android.R
 import chat.rocket.core.model.Message
 
 data class MessageUiModel(
-        override val message: Message,
-        override val rawData: Message,
-        override val messageId: String,
-        override val avatar: String,
-        override val time: CharSequence,
-        override val senderName: CharSequence,
-        override val content: CharSequence,
-        override val isPinned: Boolean,
-        override var reactions: List<ReactionUiModel>,
-        override var nextDownStreamMessage: BaseUiModel<*>? = null,
-        override var preview: Message? = null,
-        var isFirstUnread: Boolean,
-        override var isTemporary: Boolean = false
+    override val message: Message,
+    override val rawData: Message,
+    override val messageId: String,
+    override val avatar: String,
+    override val time: CharSequence,
+    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,
+    override var unread: Boolean? = null,
+    var isFirstUnread: Boolean,
+    override var isTemporary: Boolean = false,
+    override var menuItemsToHide: MutableList<Int> = mutableListOf()
 ) : BaseMessageUiModel<Message> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.MESSAGE.viewType

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

@@ -5,17 +5,21 @@ import chat.rocket.core.model.Message
 import chat.rocket.core.model.url.Url
 
 data class UrlPreviewUiModel(
-        override val message: Message,
-        override val rawData: Url,
-        override val messageId: String,
-        val title: CharSequence?,
-        val hostname: String,
-        val description: CharSequence?,
-        val thumbUrl: String?,
-        override var reactions: List<ReactionUiModel>,
-        override var nextDownStreamMessage: BaseUiModel<*>? = null,
-        override var preview: Message? = null,
-        override var isTemporary: Boolean = false
+    override val message: Message,
+    override val rawData: Url,
+    override val messageId: String,
+    val title: CharSequence?,
+    val hostname: String,
+    val description: CharSequence?,
+    val thumbUrl: String?,
+    override var reactions: List<ReactionUiModel>,
+    override var nextDownStreamMessage: BaseUiModel<*>? = null,
+    override var preview: Message? = null,
+    override var isTemporary: Boolean = false,
+    override var unread: Boolean? = null,
+    override var menuItemsToHide: MutableList<Int> = mutableListOf(),
+    override var currentDayMarkerText: String,
+    override var showDayMarker: Boolean
 ) : BaseUiModel<Url> {
     override val viewType: Int
         get() = BaseUiModel.ViewType.URL_PREVIEW.viewType

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

@@ -14,7 +14,11 @@ data class VideoAttachmentUiModel(
         override var reactions: List<ReactionUiModel>,
         override var nextDownStreamMessage: BaseUiModel<*>? = null,
         override var preview: Message? = null,
-        override var isTemporary: Boolean = false
+        override var isTemporary: Boolean = false,
+        override var unread: Boolean? = null,
+        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
@@ -68,13 +73,15 @@ class RoomUiModelMapper(
             val name = mapName(user.username!!, user.name, false)
             val status = user.status
             val avatar = serverUrl.avatarUrl(user.username!!)
+            val username = user.username!!
 
             RoomUiModel(
                 id = user.id,
                 name = name,
                 type = roomTypeOf(RoomType.DIRECT_MESSAGE),
                 avatar = avatar,
-                status = status
+                status = status,
+                username = username
             )
         }
     }
@@ -86,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)
             )
         }
     }
@@ -97,7 +105,7 @@ class RoomUiModelMapper(
             val isUnread = alert || unread > 0
             val type = roomTypeOf(type)
             val status = chatRoom.status?.let { userStatusOf(it) }
-            val roomName = mapName(name, chatRoom.userFullname, isUnread)
+            val roomName = mapName(name, fullname, isUnread)
             val timestamp = mapDate(lastMessageTimestamp ?: updatedAt, isUnread)
             val avatar = if (type is RoomType.DirectMessage) {
                 serverUrl.avatarUrl(name)
@@ -105,19 +113,23 @@ 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,
                 lastMessage = lastMessage,
-                status = status
+                status = status,
+                username = if (type is RoomType.DirectMessage) name else null
             )
         }
     }
@@ -133,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,9 +8,11 @@ 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,
     val lastMessage: CharSequence? = null,
-    val status: UserStatus? = null
+    val status: UserStatus? = null,
+    val username: String? = null
 )
\ No newline at end of file

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

@@ -9,11 +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.DatabaseManagerFactory
+import chat.rocket.android.db.UserDao
 import chat.rocket.android.infrastructure.LocalRepository
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
+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
@@ -37,13 +38,6 @@ class ChatRoomsFragmentModule {
         return frag
     }
 
-    @Provides
-    @PerFragment
-    @Named("currentServer")
-    fun provideCurrentServer(currentServerInteractor: GetCurrentServerInteractor): String {
-        return currentServerInteractor.get()!!
-    }
-
     @Provides
     @PerFragment
     fun provideRocketChatClient(
@@ -55,16 +49,11 @@ class ChatRoomsFragmentModule {
 
     @Provides
     @PerFragment
-    fun provideDatabaseManager(
-        factory: DatabaseManagerFactory,
-        @Named("currentServer") currentServer: String
-    ): DatabaseManager {
-        return factory.create(currentServer)
-    }
+    fun provideChatRoomDao(manager: DatabaseManager): ChatRoomDao = manager.chatRoomDao()
 
     @Provides
     @PerFragment
-    fun provideChatRoomDao(manager: DatabaseManager): ChatRoomDao = manager.chatRoomDao()
+    fun provideUserDao(manager: DatabaseManager): UserDao = manager.userDao()
 
     @Provides
     @PerFragment
@@ -98,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
@@ -18,60 +17,11 @@ class FetchChatRoomsInteractor(
 
     suspend fun refreshChatRooms() {
         val rooms = retryIO("fetch chatRooms", times = 10,
-                initialDelay = 200, maxDelay = 2000) {
-            client.chatRooms().update.map { room ->
-                mapChatRoom(room)
-            }
+            initialDelay = 200, maxDelay = 2000) {
+            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
-            )
-        }
+        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,52 +47,65 @@ 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(
                             id = id,
                             subscriptionId = "",
                             type = type.toString(),
-                            name = name.toString(),
-                            open = false
+                            name = username ?: name.toString(),
+                            fullname = name.toString(),
+                            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())) {
-                    fullname ?: name
-                } else {
-                    name
-                }
+                fullname ?: name
+            } else {
+                name
+            }
 
-            launchUI(strategy) {
-                val myself = getCurrentUser()
-                if (myself?.username == null) {
-                    view.showMessage(R.string.msg_generic_error)
-                } else {
-                    val id = if (isDirectMessage && !open) {
+            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)
+                            withTimeout(10000) {
+                                createDirectMessage(name)
+                            }
                         }
                         val fromTo = mutableListOf(myself.id, id).apply {
                             sort()
                         }
                         fromTo.joinToString("")
-                    } else {
-                        id
                     }
+                } else {
+                    id
+                }
 
-                    navigator.toChatRoom(
+                navigator.toChatRoom(
                         chatRoomId = id,
                         chatRoomName = roomName,
                         chatRoomType = type,
@@ -98,8 +114,7 @@ class ChatRoomsPresenter @Inject constructor(
                         isSubscribed = open,
                         isCreator = ownerId == myself.id || isDirectMessage,
                         isFavorite = favorite ?: false
-                    )
-                }
+                )
             }
         }
     }
@@ -125,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/dagger/module/ActivityBuilder.kt

@@ -8,6 +8,8 @@ import chat.rocket.android.authentication.server.di.ServerFragmentProvider
 import chat.rocket.android.authentication.signup.di.SignupFragmentProvider
 import chat.rocket.android.authentication.twofactor.di.TwoFAFragmentProvider
 import chat.rocket.android.authentication.ui.AuthenticationActivity
+import chat.rocket.android.chatinformation.di.MessageInfoFragmentProvider
+import chat.rocket.android.chatinformation.ui.MessageInfoActivity
 import chat.rocket.android.chatroom.di.ChatRoomFragmentProvider
 import chat.rocket.android.chatroom.di.ChatRoomModule
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
@@ -82,6 +84,8 @@ abstract class ActivityBuilder {
     abstract fun bindChangeServerActivity(): ChangeServerActivity
 
     @PerActivity
+    @ContributesAndroidInjector(modules = [MessageInfoFragmentProvider::class])
+    abstract fun bindMessageInfoActiviy(): MessageInfoActivity
     @ContributesAndroidInjector(modules = [DrawModule::class])
     abstract fun bindDrawingActivity(): DrawingActivity
-}
\ No newline at end of file
+}

app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt

@@ -14,6 +14,8 @@ import chat.rocket.android.authentication.infraestructure.SharedPreferencesToken
 import chat.rocket.android.chatroom.service.MessageService
 import chat.rocket.android.dagger.qualifier.ForAuthentication
 import chat.rocket.android.dagger.qualifier.ForMessages
+import chat.rocket.android.db.DatabaseManager
+import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.helper.MessageParser
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.infrastructure.SharedPreferencesLocalRepository
@@ -68,6 +70,7 @@ import ru.noties.markwon.SpannableConfiguration
 import ru.noties.markwon.spans.SpannableTheme
 import timber.log.Timber
 import java.util.concurrent.TimeUnit
+import javax.inject.Named
 import javax.inject.Singleton
 
 @Module
@@ -82,7 +85,7 @@ class AppModule {
     @Provides
     @Singleton
     fun provideHttpLoggingInterceptor(): HttpLoggingInterceptor {
-        val interceptor = HttpLoggingInterceptor(object  : HttpLoggingInterceptor.Logger {
+        val interceptor = HttpLoggingInterceptor(object : HttpLoggingInterceptor.Logger {
             override fun log(message: String) {
                 Timber.d(message)
             }
@@ -254,7 +257,12 @@ class AppModule {
     }
 
     @Provides
-    fun provideMessageParser(context: Application, configuration: SpannableConfiguration, serverInteractor: GetCurrentServerInteractor, settingsInteractor: GetSettingsInteractor): MessageParser {
+    fun provideMessageParser(
+        context: Application,
+        configuration: SpannableConfiguration,
+        serverInteractor: GetCurrentServerInteractor,
+        settingsInteractor: GetSettingsInteractor
+    ): MessageParser {
         val url = serverInteractor.get()!!
         return MessageParser(context, configuration, settingsInteractor.get(url))
     }
@@ -301,4 +309,18 @@ class AppModule {
     fun provideJobSchedulerInteractor(jobScheduler: JobScheduler, jobInfo: JobInfo): JobSchedulerInteractor {
         return JobSchedulerInteractorImpl(jobScheduler, jobInfo)
     }
-}
\ No newline at end of file
+
+    @Provides
+    @Named("currentServer")
+    fun provideCurrentServer(currentServerInteractor: GetCurrentServerInteractor): String {
+        return currentServerInteractor.get()!!
+    }
+
+    @Provides
+    fun provideDatabaseManager(
+        factory: DatabaseManagerFactory,
+        @Named("currentServer") currentServer: String
+    ): DatabaseManager {
+        return factory.create(currentServer)
+    }
+}

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,12 +120,16 @@ 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 = '${RoomType.CHANNEL}' THEN 1
-		        WHEN type = '${RoomType.PRIVATE_GROUP}' THEN 2
-		        WHEN type = '${RoomType.DIRECT_MESSAGE}' THEN 3
-		        WHEN type = '${RoomType.LIVECHAT}' THEN 4
+		        WHEN type = 'c' THEN 1
+		        WHEN type = 'p' THEN 2
+		        WHEN type = 'd' THEN 3
+		        WHEN type = 'l' THEN 4
 		        ELSE 5
 	        END
         """

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 = 3,
+    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"]),
@@ -40,7 +41,8 @@ data class ChatRoomEntity(
     var lastSeen: Long? = -1,
     var lastMessageText: String? = null,
     var lastMessageUserId: String? = null,
-    var lastMessageTimestamp: Long? = null
+    var lastMessageTimestamp: Long? = null,
+    var broadcast: Boolean? = false
 )
 
 data class ChatRoom(

app/src/main/java/chat/rocket/android/favoritemessages/di/FavoriteMessagesFragmentModule.kt

@@ -22,22 +22,6 @@ class FavoriteMessagesFragmentModule {
         return frag
     }
 
-    @Provides
-    @PerFragment
-    @Named("currentServer")
-    fun provideCurrentServer(currentServerInteractor: GetCurrentServerInteractor): String {
-        return currentServerInteractor.get()!!
-    }
-
-    @Provides
-    @PerFragment
-    fun provideDatabaseManager(
-        factory: DatabaseManagerFactory,
-        @Named("currentServer") currentServer: String
-    ): DatabaseManager {
-        return factory.create(currentServer)
-    }
-
     @Provides
     @PerFragment
     fun provideJob() = Job()

app/src/main/java/chat/rocket/android/files/di/FilesFragmentModule.kt

@@ -3,15 +3,11 @@ package chat.rocket.android.files.di
 import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
-import chat.rocket.android.db.DatabaseManager
-import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.files.presentation.FilesView
 import chat.rocket.android.files.ui.FilesFragment
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import dagger.Module
 import dagger.Provides
 import kotlinx.coroutines.experimental.Job
-import javax.inject.Named
 
 @Module
 class FilesFragmentModule {
@@ -22,22 +18,6 @@ class FilesFragmentModule {
         return frag
     }
 
-    @Provides
-    @PerFragment
-    @Named("currentServer")
-    fun provideCurrentServer(currentServerInteractor: GetCurrentServerInteractor): String {
-        return currentServerInteractor.get()!!
-    }
-
-    @Provides
-    @PerFragment
-    fun provideDatabaseManager(
-        factory: DatabaseManagerFactory,
-        @Named("currentServer") currentServer: String
-    ): DatabaseManager {
-        return factory.create(currentServer)
-    }
-
     @Provides
     @PerFragment
     fun provideJob() = Job()

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

@@ -5,6 +5,7 @@ import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.PublicSettings
 import chat.rocket.android.server.domain.SettingsRepository
 import chat.rocket.android.server.domain.useRealName
+import chat.rocket.common.model.SimpleUser
 import chat.rocket.common.model.User
 import javax.inject.Inject
 
@@ -26,6 +27,10 @@ class UserHelper @Inject constructor(
         return if (settings.useRealName()) user.name ?: user.username else user.username
     }
 
+    fun displayName(user: SimpleUser): String {
+        return if (settings.useRealName()) user.name ?: user.username ?: "" else user.username ?: ""
+    }
+
     /**
      * Return current logged user's display name.
      *

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/infrastructure/SharedPreferencesLocalRepository.kt

@@ -52,9 +52,10 @@ class SharedPreferencesLocalRepository(
     override fun clear(key: String) = preferences.edit { remove(key) }
 
     override fun clearAllFromServer(server: String) {
-        clear(LocalRepository.KEY_PUSH_TOKEN)
-        clear(LocalRepository.TOKEN_KEY + server)
-        clear(LocalRepository.SETTINGS_KEY + server)
-        clear(LocalRepository.CURRENT_USERNAME_KEY)
+        preferences.all.keys.forEach { key ->
+            if (key.startsWith(server, ignoreCase = true)) {
+                clear(key)
+            }
+        }
     }
-}
\ No newline at end of file
+}

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

@@ -9,6 +9,7 @@ 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
@@ -33,6 +34,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
@@ -43,6 +45,7 @@ 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,
@@ -149,6 +152,7 @@ class MainPresenter @Inject constructor(
     }
 
     fun connect() {
+        refreshSettingsInteractor.refreshAsync(currentServer)
         manager.connect()
     }
 
@@ -172,7 +176,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 {

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

@@ -169,7 +169,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)
         }
@@ -218,19 +218,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/members/di/MembersFragmentModule.kt

@@ -4,16 +4,12 @@ import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
-import chat.rocket.android.db.DatabaseManager
-import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.members.presentation.MembersNavigator
 import chat.rocket.android.members.presentation.MembersView
 import chat.rocket.android.members.ui.MembersFragment
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import dagger.Module
 import dagger.Provides
 import kotlinx.coroutines.experimental.Job
-import javax.inject.Named
 
 @Module
 class MembersFragmentModule {
@@ -28,22 +24,6 @@ class MembersFragmentModule {
     @PerFragment
     fun provideChatRoomNavigator(activity: ChatRoomActivity) = MembersNavigator(activity)
 
-    @Provides
-    @PerFragment
-    @Named("currentServer")
-    fun provideCurrentServer(currentServerInteractor: GetCurrentServerInteractor): String {
-        return currentServerInteractor.get()!!
-    }
-
-    @Provides
-    @PerFragment
-    fun provideDatabaseManager(
-        factory: DatabaseManagerFactory,
-        @Named("currentServer") currentServer: String
-    ): DatabaseManager {
-        return factory.create(currentServer)
-    }
-
     @Provides
     @PerFragment
     fun provideJob() = Job()

app/src/main/java/chat/rocket/android/mentions/di/MentionsFragmentModule.kt

@@ -5,11 +5,9 @@ import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.mentions.presentention.MentionsView
 import chat.rocket.android.mentions.ui.MentionsFragment
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import dagger.Module
 import dagger.Provides
 import kotlinx.coroutines.experimental.Job
-import javax.inject.Named
 
 @Module
 class MentionsFragmentModule {
@@ -20,13 +18,6 @@ class MentionsFragmentModule {
         return frag
     }
 
-    @Provides
-    @PerFragment
-    @Named("currentServer")
-    fun provideCurrentServer(currentServerInteractor: GetCurrentServerInteractor): String {
-        return currentServerInteractor.get()!!
-    }
-
     @Provides
     @PerFragment
     fun provideJob() = Job()

app/src/main/java/chat/rocket/android/pinnedmessages/di/PinnedMessagesFragmentModule.kt

@@ -3,15 +3,11 @@ package chat.rocket.android.pinnedmessages.di
 import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
-import chat.rocket.android.db.DatabaseManager
-import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.pinnedmessages.presentation.PinnedMessagesView
 import chat.rocket.android.pinnedmessages.ui.PinnedMessagesFragment
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import dagger.Module
 import dagger.Provides
 import kotlinx.coroutines.experimental.Job
-import javax.inject.Named
 
 @Module
 class PinnedMessagesFragmentModule {
@@ -22,22 +18,6 @@ class PinnedMessagesFragmentModule {
         return frag
     }
 
-    @Provides
-    @PerFragment
-    @Named("currentServer")
-    fun provideCurrentServer(currentServerInteractor: GetCurrentServerInteractor): String {
-        return currentServerInteractor.get()!!
-    }
-
-    @Provides
-    @PerFragment
-    fun provideDatabaseManager(
-        factory: DatabaseManagerFactory,
-        @Named("currentServer") currentServer: String
-    ): DatabaseManager {
-        return factory.create(currentServer)
-    }
-
     @Provides
     @PerFragment
     fun provideJob() = Job()

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/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

@@ -5,7 +5,9 @@ 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(
@@ -25,12 +27,13 @@ class RefreshSettingsInteractor @Inject constructor(
         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)
+        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 +42,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

@@ -46,6 +46,8 @@ const val SHOW_EDITED_STATUS = "Message_ShowEditedStatus"
 const val ALLOW_MESSAGE_PINNING = "Message_AllowPinning"
 const val ALLOW_MESSAGE_STARRING = "Message_AllowStarring"
 const val STORE_LAST_MESSAGE = "Store_Last_Message"
+const val MESSAGE_READ_RECEIPT_ENABLED = "Message_Read_Receipt_Enabled"
+const val MESSAGE_READ_RECEIPT_STORE_USERS = "Message_Read_Receipt_Store_Users"
 
 /*
  * Extension functions for Public Settings.
@@ -87,6 +89,9 @@ fun PublicSettings.allowedMessageDeleting(): Boolean = this[ALLOW_MESSAGE_DELETI
 fun PublicSettings.hasShowLastMessage(): Boolean = this[STORE_LAST_MESSAGE] != null
 fun PublicSettings.showLastMessage(): Boolean = this[STORE_LAST_MESSAGE]?.value == true
 
+fun PublicSettings.messageReadReceiptEnabled(): Boolean = this[MESSAGE_READ_RECEIPT_ENABLED]?.value == true
+fun PublicSettings.messageReadReceiptStoreUsers(): Boolean = this[MESSAGE_READ_RECEIPT_STORE_USERS]?.value == true
+
 fun PublicSettings.uploadMimeTypeFilter(): Array<String>? {
     val values = this[UPLOAD_WHITELIST_MIMETYPES]?.value as String?
     if (!values.isNullOrBlank()) {

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

@@ -5,7 +5,10 @@ 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 +52,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 +75,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 +94,10 @@ class ConnectionManager(
                         }
 
                         resubscribeRooms()
+
+                        temporaryStatus?.let { status ->
+                            client.setTemporaryStatus(status)
+                        }
                     }
                     is State.Waiting -> {
                         Timber.d("Connection in: ${status.seconds}")
@@ -149,7 +158,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 +184,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 +208,7 @@ class ConnectionManager(
         client.removeStateChannel(statusChannel)
         client.disconnect()
         connectJob?.cancel()
+        temporaryStatus = null
     }
 
     fun addStatusChannel(channel: Channel<State>) = statusChannelList.add(channel)
@@ -260,10 +280,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

@@ -6,11 +6,11 @@ import chat.rocket.common.model.Token
 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 {

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

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/actionMenuColor"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="@color/actionMenuColor"
+        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z" />
+</vector>

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

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#1D74F5"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="#FF1D74F5"
+        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
+</vector>

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

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#999999"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="#FF999999"
+        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
+</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>
\ No newline at end of file
+    </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"
@@ -242,7 +242,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_message_info.xml

+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".chatinformation.ui.MessageInfoActivity">
+
+    <com.wang.avi.AVLoadingIndicatorView
+        android:id="@+id/view_loading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:indicatorColor="@color/colorBlack"
+        app:indicatorName="BallPulseIndicator"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:visibility="visible" />
+
+    <TextView
+        android:id="@+id/text_read_by"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:textSize="18sp"
+        android:text="@string/read_by"
+        app:layout_constraintBottom_toTopOf="@+id/receipt_list"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/receipt_list"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:scrollbars="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_read_by" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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
@@ -98,12 +140,24 @@
         android:layout_gravity="center_vertical"
         android:layout_marginStart="4dp"
         android:layout_marginTop="2dp"
-        android:src="@drawable/ic_action_message_star_24dp"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/text_sender"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/text_edit_indicator"
         app:layout_constraintTop_toTopOf="@+id/text_sender"
+        app:srcCompat="@drawable/ic_action_message_star_24dp"
+        tools:visibility="visible" />
+
+    <ImageView
+        android:id="@+id/read_receipt_view"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/text_sender"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/image_star_indicator"
+        app:layout_constraintTop_toTopOf="@+id/text_sender"
+        app:srcCompat="@drawable/ic_check_unread_24dp"
         tools:visibility="visible" />
 
     <TextView
@@ -112,9 +166,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
+        android:layout_marginEnd="4dp"
         android:layout_marginBottom="2dp"
         app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginEnd="4dp"
         app:layout_constraintStart_toStartOf="@+id/text_sender"
         app:layout_constraintTop_toBottomOf="@+id/text_sender"
         tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
@@ -127,4 +181,4 @@
         app:layout_constraintStart_toStartOf="@+id/text_content"
         app:layout_constraintTop_toBottomOf="@+id/text_content" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>

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"?>
+<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"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="8dp">
+
+    <TextView
+        android:id="@+id/receipt_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/receipt_time"
+        app:layout_constraintStart_toEndOf="@+id/avatar_layout"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="John Doe" />
+
+    <include
+        android:id="@+id/avatar_layout"
+        layout="@layout/avatar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/receipt_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginTop="8dp"
+        android:gravity="center"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="04/06/2018 14:18:36" />
+</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>
\ No newline at end of file
+</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/menu/message_actions.xml

@@ -2,6 +2,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/action_message_info"
+        android:icon="@drawable/ic_action_message_info_outline_24dp"
+        android:title="@string/action_msg_info" />
+
     <item
         android:id="@+id/action_message_reply"
         android:icon="@drawable/ic_action_message_reply_24dp"

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>
@@ -172,19 +173,19 @@
 
     <!-- Message actions -->
     <string name="action_msg_reply">Répondre</string>
+    <string name="action_msg_info">Informations sur le message</string>
     <string name="action_msg_edit">Modifier</string>
     <string name="action_msg_copy">Copier</string>
     <string name="action_msg_quote">Citation</string>
     <string name="action_msg_delete">Effacer</string>
     <string name="action_msg_pin">Épingle message</string>
     <string name="action_msg_unpin">Enlever message</string>
-    // TODO: Add proper translation.
-    <string name="action_msg_star">Star message</string>
-    // TODO: Add proper translation.
-    <string name="action_msg_unstar">Unstar Message</string>
+    <string name="action_msg_star">Ajouter aux Favoris</string>
+    <string name="action_msg_unstar">Retirer des favoris</string>
     <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>
@@ -288,9 +289,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>
-    <!-- TODO Add proper translation-->
-    <string name="msg_log_out">Logging out…</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>
@@ -123,6 +125,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>
 
@@ -156,6 +159,7 @@
 
     <!-- Message actions -->
     <string name="action_msg_reply">जवाब दें</string>
+    <string name="action_msg_info">संदेश जानकारी</string>
     <string name="action_msg_edit">संपादन करें</string>
     <string name="action_msg_copy">कॉपी</string>
     <string name="action_msg_quote">उद्धरण</string>
@@ -265,9 +269,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>
-    <!-- TODO Add proper translation-->
-    <string name="msg_log_out">Logging out…</string>
-</resources>
\ No newline at end of file
+    <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>