From 4e90724d66003c4c304a14fcca4045d7789752d1 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 1 Oct 2017 20:59:18 -0400 Subject: [PATCH] Move MarkSeen implementation to Interactors --- .../QKSMS/data/repository/MessageRepository.kt | 2 -- .../moez/QKSMS/domain/interactor/MarkAllSeen.kt | 14 ++++++++++++++ .../com/moez/QKSMS/domain/interactor/MarkSeen.kt | 14 ++++++++++++++ .../moez/QKSMS/domain/interactor/ReceiveMessage.kt | 8 ++++---- .../moez/QKSMS/domain/interactor/SendMessage.kt | 1 + .../conversations/ConversationListViewModel.kt | 4 +++- .../com/moez/QKSMS/receiver/MarkSeenReceiver.kt | 6 +++--- .../java/com/moez/QKSMS/receiver/SmsReceiver.kt | 3 ++- 8 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index 7359cc36..e054cc2f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -61,12 +61,10 @@ class MessageRepository @Inject constructor( } fun markAllSeen() { - nativeMessageTransaction.markSeen() realmMessageTransaction.markSeen() } fun markSeen(threadId: Long) { - nativeMessageTransaction.markSeen(threadId) realmMessageTransaction.markSeen(threadId) } diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.kt new file mode 100644 index 00000000..61628226 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkAllSeen.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 MarkAllSeen @Inject constructor(val messageRepo: MessageRepository) : Interactor() { + + override fun buildUseCaseObservable(params: Unit): Flowable { + return Flowable.just(Unit) + .doOnNext { messageRepo.markAllSeen() } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.kt new file mode 100644 index 00000000..f16d7b2e --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/MarkSeen.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 MarkSeen @Inject constructor(val messageRepo: MessageRepository) : Interactor() { + + override fun buildUseCaseObservable(params: Long): Flowable { + return Flowable.just(Unit) + .doOnNext { messageRepo.markSeen(params) } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt index 7f56019b..d625e05e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/ReceiveMessage.kt @@ -20,14 +20,14 @@ class ReceiveMessage @Inject constructor( values.put(Telephony.Sms.ADDRESS, params.address) values.put(Telephony.Sms.BODY, params.body) values.put(Telephony.Sms.DATE_SENT, params.sentTime) + values.put(Telephony.Sms.READ, false) + values.put(Telephony.Sms.SEEN, false) val contentResolver = context.contentResolver return Flowable.just(values) .map { contentResolver.insert(Telephony.Sms.Inbox.CONTENT_URI, values) } - .doOnNext { uri -> - messageRepo.addMessageFromUri(uri) - notificationManager.update(messageRepo) - } + .doOnNext { uri -> messageRepo.addMessageFromUri(uri) } + .doOnNext { notificationManager.update(messageRepo) } .map { Unit } } 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 index ce610b9e..0da51e9f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/SendMessage.kt @@ -25,6 +25,7 @@ class SendMessage @Inject constructor( values.put(Telephony.Sms.BODY, params.body) values.put(Telephony.Sms.DATE, System.currentTimeMillis()) values.put(Telephony.Sms.READ, true) + values.put(Telephony.Sms.SEEN, true) values.put(Telephony.Sms.TYPE, Telephony.Sms.MESSAGE_TYPE_OUTBOX) values.put(Telephony.Sms.THREAD_ID, params.threadId) 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 41654fe6..34f40e6f 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 @@ -6,6 +6,7 @@ import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.data.sync.SyncManager +import com.moez.QKSMS.domain.interactor.MarkAllSeen import io.reactivex.subjects.PublishSubject import io.realm.RealmResults import javax.inject.Inject @@ -14,6 +15,7 @@ class ConversationListViewModel : ViewModel() { @Inject lateinit var syncManager: SyncManager @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var markAllSeen: MarkAllSeen val state: MutableLiveData = MutableLiveData() @@ -30,7 +32,7 @@ class ConversationListViewModel : ViewModel() { conversations = messageRepo.getConversationMessagesAsync() partialStates.onNext(PartialState.ConversationsLoaded(conversations)) - messageRepo.markAllSeen() + markAllSeen.execute({}, Unit) } fun onRefresh() { diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt index 0715cbaa..5a39b68b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MarkSeenReceiver.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.MarkSeen import javax.inject.Inject class MarkSeenReceiver : BroadcastReceiver() { - @Inject lateinit var messageRepo: MessageRepository + @Inject lateinit var markSeen: MarkSeen override fun onReceive(context: Context, intent: Intent) { AppComponentManager.appComponent.inject(this) val threadId = intent.getLongExtra("threadId", 0) - messageRepo.markSeen(threadId) + markSeen.execute({}, threadId) } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt index 24e58abd..c0870912 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt @@ -25,7 +25,8 @@ class SmsReceiver : BroadcastReceiver() { .map { message -> message.displayMessageBody } .reduce { body, new -> body + new } - receiveMessage.execute({}, ReceiveMessage.Params(address, body, time)) + val pendingResult = goAsync() + receiveMessage.execute({ pendingResult.finish() }, ReceiveMessage.Params(address, body, time)) } }