From 2cab83433e0d771c60d7c70cd90507606f6ea203 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 1 Oct 2017 17:19:15 -0400 Subject: [PATCH] Create interactor for sending messages --- .../QKSMS/domain/interactor/Interactor.kt | 23 +++++++++++++++++++ .../QKSMS/domain/interactor/SendMessage.kt | 16 +++++++++++++ .../messages/MessageListViewModel.kt | 5 +++- .../QKSMS/receiver/RemoteMessagingReceiver.kt | 4 +++- 4 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt new file mode 100644 index 00000000..0bebd4c8 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/Interactor.kt @@ -0,0 +1,23 @@ +package com.moez.QKSMS.domain.interactor + +import io.reactivex.Flowable +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.disposables.CompositeDisposable +import io.reactivex.schedulers.Schedulers + +abstract class Interactor { + + private val disposables: CompositeDisposable = CompositeDisposable() + + abstract fun buildUseCaseObservable(params: Params): Flowable + + fun execute(observer: ((T) -> Unit), params: Params) { + disposables.add(buildUseCaseObservable(params) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe(observer)) + } + + fun dispose() = disposables.dispose() + +} diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt new file mode 100644 index 00000000..68f2ea38 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt @@ -0,0 +1,16 @@ +package com.moez.QKSMS.domain.interactor + +import com.moez.QKSMS.data.repository.MessageRepository +import io.reactivex.Flowable +import javax.inject.Inject + +class SendMessage @Inject constructor(val messageRepo: MessageRepository) : Interactor() { + + data class Params(val threadId: Long, val address: String, val body: String) + + override fun buildUseCaseObservable(params: Params): Flowable { + return Flowable.just(Unit) + .doOnNext { messageRepo.sendMessage(params.threadId, params.address, params.body) } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt index c27e7c3e..12d43d43 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/messages/MessageListViewModel.kt @@ -5,12 +5,14 @@ import android.arch.lifecycle.ViewModel import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.repository.MessageRepository +import com.moez.QKSMS.domain.interactor.SendMessage import io.reactivex.subjects.PublishSubject import javax.inject.Inject class MessageListViewModel : ViewModel() { @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var sendMessage: SendMessage val state: MutableLiveData = MutableLiveData() var threadId: Long = 0 @@ -48,7 +50,7 @@ class MessageListViewModel : ViewModel() { fun sendMessage(body: String) { conversation?.takeIf { conversation -> conversation.isValid }?.let { conversation -> - messageRepo.sendMessage(threadId, conversation.contacts[0].address, body) + sendMessage.execute({}, SendMessage.Params(threadId, conversation.contacts[0].address, body)) partialStates.onNext(PartialState.TextChanged("")) } } @@ -63,6 +65,7 @@ class MessageListViewModel : ViewModel() { override fun onCleared() { super.onCleared() + sendMessage.dispose() conversation?.removeAllChangeListeners() } diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt index 2c6f10d9..8c82bead 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt @@ -6,11 +6,13 @@ import android.content.Intent import android.support.v4.app.RemoteInput import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.repository.MessageRepository +import com.moez.QKSMS.domain.interactor.SendMessage import javax.inject.Inject class RemoteMessagingReceiver : BroadcastReceiver() { @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var sendMessage: SendMessage override fun onReceive(context: Context, intent: Intent) { AppComponentManager.appComponent.inject(this) @@ -22,7 +24,7 @@ class RemoteMessagingReceiver : BroadcastReceiver() { val threadId = bundle.getLong("threadId") val body = remoteInput.getCharSequence("body").toString() messageRepo.markRead(threadId) - messageRepo.sendMessage(threadId, address, body) + sendMessage.execute({}, SendMessage.Params(threadId, address, body)) } } }