Skip to content
This repository has been archived by the owner on Jun 7, 2020. It is now read-only.

Add fallback connect while sending message #2427

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Add fallback connect while sending message #2427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ import chat.rocket.common.model.UserStatus
import chat.rocket.common.model.roomTypeOf
import chat.rocket.common.util.ifNull
import chat.rocket.core.internal.realtime.setTypingStatus
import chat.rocket.core.internal.realtime.socket.connect
import chat.rocket.core.internal.realtime.socket.model.State
import chat.rocket.core.internal.realtime.subscribeRoomMessages
import chat.rocket.core.internal.realtime.subscribeTypingStatus
Expand Down Expand Up @@ -356,6 +357,9 @@ class ChatRoomPresenter @Inject constructor(
launchUI(strategy) {
try {
view.disableSendMessageButton()
if(client.state is State.Disconnected || client.state is State.Waiting){
client.connect()
}
// ignore message for now, will receive it on the stream
if (messageId == null) {
val id = UUID.randomUUID().toString()
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/java/chat/rocket/android/chatroom/service/MessageService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import chat.rocket.android.server.domain.GetAccountsInteractor
import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
import chat.rocket.android.server.infrastructure.DatabaseMessageMapper
import chat.rocket.android.server.infrastructure.DatabaseMessagesRepository
import chat.rocket.core.internal.realtime.socket.connect
import chat.rocket.core.internal.rest.sendMessage
import chat.rocket.core.model.Message
import dagger.android.AndroidInjection
Expand All @@ -15,6 +16,7 @@ import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import timber.log.Timber
import javax.inject.Inject
import chat.rocket.core.internal.realtime.socket.model.State

class MessageService : JobService() {
@Inject
Expand Down Expand Up @@ -53,6 +55,9 @@ class MessageService : JobService() {
val client = factory.create(serverUrl)?.client
temporaryMessages.forEach { message ->
try {
if(client?.state is State.Disconnected || client?.state is State.Waiting){
client?.connect()
}
client?.sendMessage(
message = message.message,
messageId = message.id,
Expand Down