Merge pull request #1316 from RocketChat/fix/offline-message-not-working-properly

[FIX] Offline messaging not working properly

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

@@ -181,11 +181,9 @@ class ChatRoomPresenter @Inject constructor(
             }
 
             subscribeTypingStatus()
-            if (offset == 0L) {
             subscribeState()
         }
     }
-    }
 
     private suspend fun loadAndShowMessages(chatRoomId: String, chatRoomType: String, offset: Long = 0) {
         val messages =
@@ -229,10 +227,9 @@ class ChatRoomPresenter @Inject constructor(
                     )
                     try {
                         messagesRepository.save(newMessage)
-                        val message = client.sendMessage(id, chatRoomId, text)
                         view.showNewMessage(mapper.map(newMessage, RoomViewModel(
                             roles = chatRoles, isBroadcast = chatIsBroadcast)))
-                        message
+                        client.sendMessage(id, chatRoomId, text)
                     } catch (ex: Exception) {
                         // Ok, not very beautiful, but the backend sends us a not valid response
                         // When someone sends a message on a read-only channel, so we just ignore it
@@ -324,7 +321,7 @@ class ChatRoomPresenter @Inject constructor(
         }
     }
 
-    private fun subscribeState() {
+    private suspend fun subscribeState() {
         Timber.d("Subscribing to Status changes")
         lastState = manager.state
         manager.addStatusChannel(stateChannel)
@@ -790,6 +787,7 @@ class ChatRoomPresenter @Inject constructor(
     }
 
     private suspend fun subscribeTypingStatus() {
+        launch(CommonPool + strategy.jobs) {
             client.subscribeTypingStatus(chatRoomId.toString()) { _, id ->
                 typingStatusSubscriptionId = id
             }
@@ -798,6 +796,7 @@ class ChatRoomPresenter @Inject constructor(
                 processTypingStatus(typingStatus)
             }
         }
+    }
 
     private fun processTypingStatus(typingStatus: Pair<String, Boolean>) {
         if (!typingStatusList.any { username -> username == typingStatus.first }) {
@@ -837,6 +836,7 @@ class ChatRoomPresenter @Inject constructor(
         launchUI(strategy) {
             val viewModelStreamedMessage = mapper.map(streamedMessage, RoomViewModel(
                 roles = chatRoles, isBroadcast = chatIsBroadcast))
+
             val roomMessages = messagesRepository.getByRoomId(streamedMessage.roomId)
             val index = roomMessages.indexOfFirst { msg -> msg.id == streamedMessage.id }
             if (index > -1) {

app/src/main/java/chat/rocket/android/chatroom/service/MessageService.kt

@@ -64,7 +64,7 @@ class MessageService : JobService() {
                     Timber.e(ex)
                     // TODO - remove the generic message when we implement :userId:/message subscription
                     if (ex is IllegalStateException) {
-                        Timber.d(ex, "Probably a read-only problem...")
+                        Timber.e(ex, "Probably a read-only problem...")
                         // TODO: For now we are only going to reschedule when api is fixed.
                         messageRepository.removeById(message.id)
                         jobFinished(params, false)

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

@@ -3,16 +3,16 @@ package chat.rocket.android.server.infraestructure
 import chat.rocket.common.model.BaseRoom
 import chat.rocket.common.model.User
 import chat.rocket.core.RocketChatClient
-import chat.rocket.core.internal.realtime.subscribeSubscriptions
-import chat.rocket.core.internal.realtime.subscribeRooms
-import chat.rocket.core.internal.realtime.subscribeUserData
-import chat.rocket.core.internal.realtime.subscribeActiveUsers
-import chat.rocket.core.internal.realtime.subscribeRoomMessages
-import chat.rocket.core.internal.realtime.unsubscribe
 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
 import chat.rocket.core.internal.realtime.socket.model.StreamMessage
+import chat.rocket.core.internal.realtime.subscribeActiveUsers
+import chat.rocket.core.internal.realtime.subscribeRoomMessages
+import chat.rocket.core.internal.realtime.subscribeRooms
+import chat.rocket.core.internal.realtime.subscribeSubscriptions
+import chat.rocket.core.internal.realtime.subscribeUserData
+import chat.rocket.core.internal.realtime.unsubscribe
 import chat.rocket.core.internal.rest.chatRooms
 import chat.rocket.core.model.Message
 import chat.rocket.core.model.Myself