From bc15464ba5342ec3dfb375bed548274c3759c4ce Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 1 Oct 2017 21:14:23 -0400 Subject: [PATCH] Create interactor for marking conversation read --- .../java/com/moez/QKSMS/common/di/AppModule.kt | 18 ------------------ .../moez/QKSMS/domain/interactor/MarkRead.kt | 14 ++++++++++++++ .../conversations/ConversationListViewModel.kt | 5 +++++ .../messages/MessageListViewModel.kt | 5 ++++- .../moez/QKSMS/receiver/MarkReadReceiver.kt | 6 +++--- .../QKSMS/receiver/RemoteMessagingReceiver.kt | 6 +++--- 6 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt b/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt index a30faaa1..b8f89149 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/di/AppModule.kt @@ -2,12 +2,8 @@ package com.moez.QKSMS.common.di import android.app.Application 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.Provides -import javax.inject.Named import javax.inject.Singleton @Module @@ -19,18 +15,4 @@ class AppModule(private var application: Application) { return application } - @Provides - @Singleton - @Named("Realm") - fun provideRealmMessageTransaction() : MessageTransaction { - return RealmMessageTransaction() - } - - @Provides - @Singleton - @Named("Native") - fun provideNativeMessageTransaction(context: Context) : MessageTransaction { - return NativeMessageTransaction(context) - } - } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt new file mode 100644 index 00000000..a5a8b5c2 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkRead.kt @@ -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() { + + override fun buildUseCaseObservable(params: Long): Flowable { + return Flowable.just(Unit) + .doOnNext { messageRepo.markRead(params) } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt index 34f40e6f..b5bfe625 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/conversations/ConversationListViewModel.kt @@ -40,4 +40,9 @@ class ConversationListViewModel : ViewModel() { syncManager.copyToRealm { partialStates.onNext(PartialState.Refreshing(false)) } } + override fun onCleared() { + super.onCleared() + markAllSeen.dispose() + } + } \ 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 12d43d43..372e6fcf 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,6 +5,7 @@ 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.MarkRead import com.moez.QKSMS.domain.interactor.SendMessage import io.reactivex.subjects.PublishSubject import javax.inject.Inject @@ -13,6 +14,7 @@ class MessageListViewModel : ViewModel() { @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var sendMessage: SendMessage + @Inject lateinit var markRead: MarkRead val state: MutableLiveData = MutableLiveData() var threadId: Long = 0 @@ -56,7 +58,7 @@ class MessageListViewModel : ViewModel() { } fun dataChanged() { - messageRepo.markRead(threadId) + markRead.execute({}, threadId) } fun textChanged(text: String) { @@ -66,6 +68,7 @@ class MessageListViewModel : ViewModel() { override fun onCleared() { super.onCleared() sendMessage.dispose() + markRead.dispose() conversation?.removeAllChangeListeners() } diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt index 0669819d..5f7ad4e8 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkReadReceiver.kt @@ -4,18 +4,18 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent 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 class MarkReadReceiver : BroadcastReceiver() { - @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var markRead: MarkRead override fun onReceive(context: Context, intent: Intent) { AppComponentManager.appComponent.inject(this) val threadId = intent.getLongExtra("threadId", 0) - messageRepo.markRead(threadId) + markRead.execute({}, threadId) } } \ No newline at end of file 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 8c82bead..dd762c09 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/RemoteMessagingReceiver.kt @@ -5,14 +5,14 @@ import android.content.Context 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.MarkRead import com.moez.QKSMS.domain.interactor.SendMessage import javax.inject.Inject class RemoteMessagingReceiver : BroadcastReceiver() { - @Inject lateinit var messageRepo: MessageRepository @Inject lateinit var sendMessage: SendMessage + @Inject lateinit var markRead: MarkRead override fun onReceive(context: Context, intent: Intent) { AppComponentManager.appComponent.inject(this) @@ -23,7 +23,7 @@ class RemoteMessagingReceiver : BroadcastReceiver() { val address = bundle.getString("address") val threadId = bundle.getLong("threadId") val body = remoteInput.getCharSequence("body").toString() - messageRepo.markRead(threadId) + markRead.execute({}, threadId) sendMessage.execute({}, SendMessage.Params(threadId, address, body)) } }