Fix again mistaken refactoring.

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

@@ -432,24 +432,11 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
         }
     }
 
-<<<<<<< 61f4135f2fbe9097b2d53bf96aa9e55d47ec62d8
     fun toMembersList(chatRoomId: String, chatRoomType: String) = navigator.toMembersList(chatRoomId, chatRoomType)
-=======
+
     fun loadChatRooms() {
         launchUI(strategy) {
             try {
-<<<<<<< 436e7d600706834b3573b0043507343d77f39652
-                val chatRooms = getChatRoomsInteractor.get(currentServer).map { chatRoom ->
-                    val name = chatRoom.name
-                    val fullName = chatRoom.fullName ?: ""
-                    ChatRoomViewModel(
-                            text = name,
-                            name = name,
-                            fullName = fullName,
-                            searchList = listOf(name, fullName)
-                    )
-                }
-=======
                 val chatRooms = getChatRoomsInteractor.get(currentServer)
                         .filterNot {
                             it.type is RoomType.DirectMessage || it.type is RoomType.Livechat
@@ -464,14 +451,12 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
                                     searchList = listOf(name, fullName)
                             )
                         }
->>>>>>> Revert erroneous refactoring
                 view.populateRooms(chatRooms)
             } catch (e: RocketChatException) {
                 Timber.e(e)
             }
         }
     }
->>>>>>> Load rooms from subscriptions
 
     private fun updateMessage(streamedMessage: Message) {
         launchUI(strategy) {

app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt

@@ -30,8 +30,8 @@ class ProfilePresenter @Inject constructor (private val view: ProfileView,
                 val avatarUrl = UrlHelper.getAvatarUrl(serverUrl, myself.username!!)
                 view.showProfile(
                     avatarUrl,
-                    myself.name!!,
-                    myself.username!!,
+                    myself.name ?: "",
+                    myself.username ?: "",
                     myself.emails?.get(0)?.address!!
                 )
             } catch (exception: RocketChatException) {