Merge pull request #2459 from RocketChat/fix/unable-to-start-dm

[FIX] Unable to start a chat.

Author: philipbrito

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

@@ -22,15 +22,13 @@ import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.RoomType
 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.createDirectMessage
 import chat.rocket.core.internal.rest.me
 import chat.rocket.core.internal.rest.show
 import kotlinx.coroutines.withTimeout
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Named
-import kotlin.coroutines.resume
-import kotlin.coroutines.suspendCoroutine
 
 class ChatRoomsPresenter @Inject constructor(
     private val view: ChatRoomsView,
@@ -140,8 +138,11 @@ class ChatRoomsPresenter @Inject constructor(
                     } else {
                         retryIO("createDirectMessage($name)") {
                             withTimeout(10000) {
-                                createDirectMessage(name)
-                                FetchChatRoomsInteractor(client, dbManager).refreshChatRooms()
+                                try {
+                                    client.createDirectMessage(name)
+                                } catch (ex: Exception) {
+                                    Timber.e(ex)
+                                }
                             }
                         }
                         val fromTo = mutableListOf(myself.id, id).apply {
@@ -153,6 +154,8 @@ class ChatRoomsPresenter @Inject constructor(
                     id
                 }
 
+                FetchChatRoomsInteractor(client, dbManager).refreshChatRooms()
+
                 navigator.toChatRoom(
                     chatRoomId = id,
                     chatRoomName = roomName,
@@ -190,10 +193,4 @@ class ChatRoomsPresenter @Inject constructor(
         }
         return null
     }
-
-    private suspend fun createDirectMessage(name: String): Boolean = suspendCoroutine { cont ->
-        client.createDirectMessage(name) { success, _ ->
-            cont.resume(success)
-        }
-    }
 }