forked from upstream-mirrors/quik
Move MarkSeen implementation to Interactors
This commit is contained in:
@@ -61,12 +61,10 @@ class MessageRepository @Inject constructor(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun markAllSeen() {
|
fun markAllSeen() {
|
||||||
nativeMessageTransaction.markSeen()
|
|
||||||
realmMessageTransaction.markSeen()
|
realmMessageTransaction.markSeen()
|
||||||
}
|
}
|
||||||
|
|
||||||
fun markSeen(threadId: Long) {
|
fun markSeen(threadId: Long) {
|
||||||
nativeMessageTransaction.markSeen(threadId)
|
|
||||||
realmMessageTransaction.markSeen(threadId)
|
realmMessageTransaction.markSeen(threadId)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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<Unit, Unit>() {
|
||||||
|
|
||||||
|
override fun buildUseCaseObservable(params: Unit): Flowable<Unit> {
|
||||||
|
return Flowable.just(Unit)
|
||||||
|
.doOnNext { messageRepo.markAllSeen() }
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -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<Unit, Long>() {
|
||||||
|
|
||||||
|
override fun buildUseCaseObservable(params: Long): Flowable<Unit> {
|
||||||
|
return Flowable.just(Unit)
|
||||||
|
.doOnNext { messageRepo.markSeen(params) }
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -20,14 +20,14 @@ class ReceiveMessage @Inject constructor(
|
|||||||
values.put(Telephony.Sms.ADDRESS, params.address)
|
values.put(Telephony.Sms.ADDRESS, params.address)
|
||||||
values.put(Telephony.Sms.BODY, params.body)
|
values.put(Telephony.Sms.BODY, params.body)
|
||||||
values.put(Telephony.Sms.DATE_SENT, params.sentTime)
|
values.put(Telephony.Sms.DATE_SENT, params.sentTime)
|
||||||
|
values.put(Telephony.Sms.READ, false)
|
||||||
|
values.put(Telephony.Sms.SEEN, false)
|
||||||
|
|
||||||
val contentResolver = context.contentResolver
|
val contentResolver = context.contentResolver
|
||||||
return Flowable.just(values)
|
return Flowable.just(values)
|
||||||
.map { contentResolver.insert(Telephony.Sms.Inbox.CONTENT_URI, values) }
|
.map { contentResolver.insert(Telephony.Sms.Inbox.CONTENT_URI, values) }
|
||||||
.doOnNext { uri ->
|
.doOnNext { uri -> messageRepo.addMessageFromUri(uri) }
|
||||||
messageRepo.addMessageFromUri(uri)
|
.doOnNext { notificationManager.update(messageRepo) }
|
||||||
notificationManager.update(messageRepo)
|
|
||||||
}
|
|
||||||
.map { Unit }
|
.map { Unit }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ class SendMessage @Inject constructor(
|
|||||||
values.put(Telephony.Sms.BODY, params.body)
|
values.put(Telephony.Sms.BODY, params.body)
|
||||||
values.put(Telephony.Sms.DATE, System.currentTimeMillis())
|
values.put(Telephony.Sms.DATE, System.currentTimeMillis())
|
||||||
values.put(Telephony.Sms.READ, true)
|
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.TYPE, Telephony.Sms.MESSAGE_TYPE_OUTBOX)
|
||||||
values.put(Telephony.Sms.THREAD_ID, params.threadId)
|
values.put(Telephony.Sms.THREAD_ID, params.threadId)
|
||||||
|
|
||||||
|
|||||||
+3
-1
@@ -6,6 +6,7 @@ import com.moez.QKSMS.common.di.AppComponentManager
|
|||||||
import com.moez.QKSMS.data.model.Message
|
import com.moez.QKSMS.data.model.Message
|
||||||
import com.moez.QKSMS.data.repository.MessageRepository
|
import com.moez.QKSMS.data.repository.MessageRepository
|
||||||
import com.moez.QKSMS.data.sync.SyncManager
|
import com.moez.QKSMS.data.sync.SyncManager
|
||||||
|
import com.moez.QKSMS.domain.interactor.MarkAllSeen
|
||||||
import io.reactivex.subjects.PublishSubject
|
import io.reactivex.subjects.PublishSubject
|
||||||
import io.realm.RealmResults
|
import io.realm.RealmResults
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
@@ -14,6 +15,7 @@ class ConversationListViewModel : ViewModel() {
|
|||||||
|
|
||||||
@Inject lateinit var syncManager: SyncManager
|
@Inject lateinit var syncManager: SyncManager
|
||||||
@Inject lateinit var messageRepo: MessageRepository
|
@Inject lateinit var messageRepo: MessageRepository
|
||||||
|
@Inject lateinit var markAllSeen: MarkAllSeen
|
||||||
|
|
||||||
val state: MutableLiveData<ConversationListViewState> = MutableLiveData()
|
val state: MutableLiveData<ConversationListViewState> = MutableLiveData()
|
||||||
|
|
||||||
@@ -30,7 +32,7 @@ class ConversationListViewModel : ViewModel() {
|
|||||||
conversations = messageRepo.getConversationMessagesAsync()
|
conversations = messageRepo.getConversationMessagesAsync()
|
||||||
partialStates.onNext(PartialState.ConversationsLoaded(conversations))
|
partialStates.onNext(PartialState.ConversationsLoaded(conversations))
|
||||||
|
|
||||||
messageRepo.markAllSeen()
|
markAllSeen.execute({}, Unit)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun onRefresh() {
|
fun onRefresh() {
|
||||||
|
|||||||
@@ -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.MarkSeen
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class MarkSeenReceiver : BroadcastReceiver() {
|
class MarkSeenReceiver : BroadcastReceiver() {
|
||||||
|
|
||||||
@Inject lateinit var messageRepo: MessageRepository
|
@Inject lateinit var markSeen: MarkSeen
|
||||||
|
|
||||||
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.markSeen(threadId)
|
markSeen.execute({}, threadId)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -25,7 +25,8 @@ class SmsReceiver : BroadcastReceiver() {
|
|||||||
.map { message -> message.displayMessageBody }
|
.map { message -> message.displayMessageBody }
|
||||||
.reduce { body, new -> body + new }
|
.reduce { body, new -> body + new }
|
||||||
|
|
||||||
receiveMessage.execute({}, ReceiveMessage.Params(address, body, time))
|
val pendingResult = goAsync()
|
||||||
|
receiveMessage.execute({ pendingResult.finish() }, ReceiveMessage.Params(address, body, time))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user