Merge pull request #1209 from RocketChat/fix/honor-real-name-on-chat-list

[FIX] Show real name instead of username on chat list

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

@@ -289,8 +289,9 @@ class ChatRoomsPresenter @Inject constructor(
 
     private suspend fun getChatRoomsWithPreviews(chatRooms: List<ChatRoom>): List<ChatRoom> {
         return chatRooms.map {
-            if (it.lastMessage != null) {
-                it.copy(lastMessage = viewModelMapper.map(it.lastMessage!!).last().preview)
+            val lastMessage = it.lastMessage
+            if (lastMessage != null) {
+                it.copy(lastMessage = viewModelMapper.map(lastMessage).last().preview)
             } else {
                 it
             }

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt

@@ -112,7 +112,15 @@ class ChatRoomsAdapter(private val context: Context,
         }
 
         private fun bindName(chatRoom: ChatRoom, textView: TextView) {
-            textView.textContent = chatRoom.name
+            textView.textContent = chatRoomName(chatRoom)
+        }
+
+        private fun chatRoomName(chatRoom: ChatRoom): String {
+            return if (settings.useRealName()) {
+                chatRoom.fullName ?: chatRoom.name
+            } else {
+                chatRoom.name
+            }
         }
 
         private fun bindLastMessageDateTime(chatRoom: ChatRoom, textView: TextView) {