Do schedule resend of failed messages whenever connection state is set to...

Do schedule resend of failed messages whenever connection state is set to connected; also fix some typos

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

@@ -220,6 +220,7 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
                     }
 
                     if (state is State.Connected) {
+                        jobSchedulerInteractor.scheduleSendingMessages()
                         loadMissingMessages()
                     }
                 }

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

@@ -59,6 +59,7 @@ class MessageService : JobService() {
                         alias = message.senderAlias
                     )
                     messageRepository.save(message.copy(isTemporary = false))
+                    Timber.d("Sent scheduled message given by id: ${message.id}")
                 } catch (ex: RocketChatException) {
                     Timber.e(ex)
                     if (ex.message?.contains("E11000", true) == true) {
@@ -72,7 +73,6 @@ class MessageService : JobService() {
     }
 
     companion object {
-        const val EXTRA_MESSAGE_ID = "extra_message_id"
         const val RETRY_SEND_MESSAGE_ID = 1
     }
 }
\ No newline at end of file

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

@@ -40,6 +40,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
                                              private val saveChatRoomsInteractor: SaveChatRoomsInteractor,
                                              private val refreshSettingsInteractor: RefreshSettingsInteractor,
                                              private val viewModelMapper: ViewModelMapper,
+                                             private val jobSchedulerInteractor: JobSchedulerInteractor,
                                              settingsRepository: SettingsRepository,
                                              factory: ConnectionManagerFactory) {
     private val manager: ConnectionManager = factory.create(serverInteractor.get()!!)
@@ -258,6 +259,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
                     }
 
                     if (state is State.Connected) {
+                        jobSchedulerInteractor.scheduleSendingMessages()
                         reloadRooms()
                         updateRooms()
                     }

app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt

@@ -23,9 +23,7 @@ import chat.rocket.core.internal.rest.logout
 import chat.rocket.core.internal.rest.me
 import chat.rocket.core.internal.rest.unregisterPushToken
 import chat.rocket.core.model.Myself
-import kotlinx.coroutines.experimental.CommonPool
 import kotlinx.coroutines.experimental.channels.Channel
-import kotlinx.coroutines.experimental.launch
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -39,7 +37,7 @@ class MainPresenter @Inject constructor(
     private val navHeaderMapper: NavHeaderViewModelMapper,
     private val saveAccountInteractor: SaveAccountInteractor,
     private val getAccountsInteractor: GetAccountsInteractor,
-        private val removeAccountInterector: RemoveAccountInterector,
+    private val removeAccountInteractor: RemoveAccountInteractor,
     private val factory: RocketChatClientFactory,
     getSettingsInteractor: GetSettingsInteractor,
     managerFactory: ConnectionManagerFactory
@@ -105,7 +103,7 @@ class MainPresenter @Inject constructor(
 
             try {
                 disconnect()
-                removeAccountInterector.remove(currentServer)
+                removeAccountInteractor.remove(currentServer)
                 tokenRepository.remove(currentServer)
                 navigator.toNewServer()
             } catch (ex: Exception) {

app/src/main/java/chat/rocket/android/server/domain/RemoveAccountInterector.kt → app/src/main/java/chat/rocket/android/server/domain/RemoveAccountInteractor.kt

@@ -2,7 +2,7 @@ package chat.rocket.android.server.domain
 
 import javax.inject.Inject
 
-class RemoveAccountInterector @Inject constructor(val repository: AccountsRepository) {
+class RemoveAccountInteractor @Inject constructor(val repository: AccountsRepository) {
     suspend fun remove(serverUrl: String) {
         repository.remove(serverUrl)
     }

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

@@ -3,6 +3,7 @@ package chat.rocket.android.server.infraestructure
 import android.app.job.JobInfo
 import android.app.job.JobScheduler
 import chat.rocket.android.server.domain.JobSchedulerInteractor
+import timber.log.Timber
 import javax.inject.Inject
 
 /**
@@ -14,6 +15,7 @@ class JobSchedulerInteractorImpl @Inject constructor(
 ) : JobSchedulerInteractor {
 
     override fun scheduleSendingMessages() {
+        Timber.d("Scheduling unsent messages to send...")
         jobScheduler.schedule(jobInfo)
     }
 }
\ No newline at end of file