Create interactor for marking conversation read

This commit is contained in:
Moez Bhatti
2017-10-01 21:14:23 -04:00
parent 9ce6f8bc53
commit bc15464ba5
6 changed files with 29 additions and 25 deletions
@@ -2,12 +2,8 @@ package com.moez.QKSMS.common.di
import android.app.Application import android.app.Application
import android.content.Context import android.content.Context
import com.moez.QKSMS.data.datasource.MessageTransaction
import com.moez.QKSMS.data.datasource.native.NativeMessageTransaction
import com.moez.QKSMS.data.datasource.realm.RealmMessageTransaction
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import javax.inject.Named
import javax.inject.Singleton import javax.inject.Singleton
@Module @Module
@@ -19,18 +15,4 @@ class AppModule(private var application: Application) {
return application return application
} }
@Provides
@Singleton
@Named("Realm")
fun provideRealmMessageTransaction() : MessageTransaction {
return RealmMessageTransaction()
}
@Provides
@Singleton
@Named("Native")
fun provideNativeMessageTransaction(context: Context) : MessageTransaction {
return NativeMessageTransaction(context)
}
} }
@@ -0,0 +1,14 @@
package com.moez.QKSMS.domain.interactor
import com.moez.QKSMS.data.repository.MessageRepository
import io.reactivex.Flowable
import javax.inject.Inject
class MarkRead @Inject constructor(val messageRepo: MessageRepository): Interactor<Unit, Long>() {
override fun buildUseCaseObservable(params: Long): Flowable<Unit> {
return Flowable.just(Unit)
.doOnNext { messageRepo.markRead(params) }
}
}
@@ -40,4 +40,9 @@ class ConversationListViewModel : ViewModel() {
syncManager.copyToRealm { partialStates.onNext(PartialState.Refreshing(false)) } syncManager.copyToRealm { partialStates.onNext(PartialState.Refreshing(false)) }
} }
override fun onCleared() {
super.onCleared()
markAllSeen.dispose()
}
} }
@@ -5,6 +5,7 @@ import android.arch.lifecycle.ViewModel
import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.model.Conversation
import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.data.repository.MessageRepository
import com.moez.QKSMS.domain.interactor.MarkRead
import com.moez.QKSMS.domain.interactor.SendMessage import com.moez.QKSMS.domain.interactor.SendMessage
import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.PublishSubject
import javax.inject.Inject import javax.inject.Inject
@@ -13,6 +14,7 @@ class MessageListViewModel : ViewModel() {
@Inject lateinit var messageRepo: MessageRepository @Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var sendMessage: SendMessage @Inject lateinit var sendMessage: SendMessage
@Inject lateinit var markRead: MarkRead
val state: MutableLiveData<MessageListViewState> = MutableLiveData() val state: MutableLiveData<MessageListViewState> = MutableLiveData()
var threadId: Long = 0 var threadId: Long = 0
@@ -56,7 +58,7 @@ class MessageListViewModel : ViewModel() {
} }
fun dataChanged() { fun dataChanged() {
messageRepo.markRead(threadId) markRead.execute({}, threadId)
} }
fun textChanged(text: String) { fun textChanged(text: String) {
@@ -66,6 +68,7 @@ class MessageListViewModel : ViewModel() {
override fun onCleared() { override fun onCleared() {
super.onCleared() super.onCleared()
sendMessage.dispose() sendMessage.dispose()
markRead.dispose()
conversation?.removeAllChangeListeners() conversation?.removeAllChangeListeners()
} }
@@ -4,18 +4,18 @@ import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.domain.interactor.MarkRead
import javax.inject.Inject import javax.inject.Inject
class MarkReadReceiver : BroadcastReceiver() { class MarkReadReceiver : BroadcastReceiver() {
@Inject lateinit var messageRepo: MessageRepository @Inject lateinit var markRead: MarkRead
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
val threadId = intent.getLongExtra("threadId", 0) val threadId = intent.getLongExtra("threadId", 0)
messageRepo.markRead(threadId) markRead.execute({}, threadId)
} }
} }
@@ -5,14 +5,14 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.support.v4.app.RemoteInput import android.support.v4.app.RemoteInput
import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.common.di.AppComponentManager
import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.domain.interactor.MarkRead
import com.moez.QKSMS.domain.interactor.SendMessage import com.moez.QKSMS.domain.interactor.SendMessage
import javax.inject.Inject import javax.inject.Inject
class RemoteMessagingReceiver : BroadcastReceiver() { class RemoteMessagingReceiver : BroadcastReceiver() {
@Inject lateinit var messageRepo: MessageRepository
@Inject lateinit var sendMessage: SendMessage @Inject lateinit var sendMessage: SendMessage
@Inject lateinit var markRead: MarkRead
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
@@ -23,7 +23,7 @@ class RemoteMessagingReceiver : BroadcastReceiver() {
val address = bundle.getString("address") val address = bundle.getString("address")
val threadId = bundle.getLong("threadId") val threadId = bundle.getLong("threadId")
val body = remoteInput.getCharSequence("body").toString() val body = remoteInput.getCharSequence("body").toString()
messageRepo.markRead(threadId) markRead.execute({}, threadId)
sendMessage.execute({}, SendMessage.Params(threadId, address, body)) sendMessage.execute({}, SendMessage.Params(threadId, address, body))
} }
} }