Only mark conversation as read if it's in the foreground

This commit is contained in:
Moez Bhatti
2018-01-05 00:53:56 -05:00
parent 613e3096a2
commit d8e8577991
3 changed files with 32 additions and 16 deletions
@@ -37,7 +37,6 @@ import common.util.extensions.setVisible
import common.util.extensions.showKeyboard
import data.model.Contact
import data.model.Message
import presentation.common.base.QkActivity
import io.reactivex.Observable
import io.reactivex.rxkotlin.Observables
import io.reactivex.rxkotlin.plusAssign
@@ -45,12 +44,14 @@ import io.reactivex.subjects.PublishSubject
import io.reactivex.subjects.Subject
import kotlinx.android.synthetic.main.compose_activity.*
import kotlinx.android.synthetic.main.toolbar_chips.*
import presentation.common.base.QkActivity
import javax.inject.Inject
class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
override val viewModelClass = ComposeViewModel::class
override val activityVisibleIntent: Subject<Boolean> = PublishSubject.create()
override val queryChangedIntent: Observable<CharSequence> by lazy { chipsAdapter.textChanges }
override val chipSelectedIntent: Subject<Contact> by lazy { contactsAdapter.contactSelected }
override val chipDeletedIntent: Subject<Contact> by lazy { chipsAdapter.chipDeleted }
@@ -151,6 +152,16 @@ class ComposeActivity : QkActivity<ComposeViewModel>(), ComposeView {
window.callback = ComposeWindowCallback(window.callback, this)
}
override fun onStart() {
super.onStart()
activityVisibleIntent.onNext(true)
}
override fun onPause() {
super.onPause()
activityVisibleIntent.onNext(false)
}
override fun render(state: ComposeState) {
if (state.hasError) {
finish()
@@ -20,12 +20,13 @@ package presentation.feature.compose
import data.model.Contact
import data.model.Message
import presentation.common.base.QkView
import io.reactivex.Observable
import io.reactivex.subjects.Subject
import presentation.common.base.QkView
interface ComposeView : QkView<ComposeState> {
val activityVisibleIntent: Observable<Boolean>
val queryChangedIntent: Observable<CharSequence>
val chipSelectedIntent: Subject<Contact>
val chipDeletedIntent: Subject<Contact>
@@ -28,6 +28,7 @@ import common.util.extensions.makeToast
import common.util.filter.ContactFilter
import data.model.Contact
import data.model.Conversation
import data.model.Message
import data.repository.ContactRepository
import data.repository.MessageRepository
import interactor.*
@@ -64,6 +65,7 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
private val contactsReducer: Subject<(List<Contact>) -> List<Contact>> = PublishSubject.create()
private val selectedContacts: Observable<List<Contact>>
private val conversation: Observable<Conversation>
private val messages: Observable<List<Message>>
init {
appComponent.inject(this)
@@ -131,26 +133,21 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
newState { it.copy(title = conversation.getTitle(), archived = conversation.archived) }
}
// When the conversation changes, update the messages for the adapter
messages = conversation
.distinctUntilChanged()
.observeOn(AndroidSchedulers.mainThread())
.map { conversation -> messageRepo.getMessages(conversation.id) }
.doOnNext { messages -> newState { it.copy(messages = messages) } }
.switchMap { messages -> messages.asObservable() }
disposables += sendMessage
disposables += markRead
disposables += markArchived
disposables += markUnarchived
disposables += deleteConversation
disposables += conversation.subscribe()
// When the conversation changes, update the messages for the adapter
// When the message list changes, make sure to mark them read
disposables += conversation
.distinctUntilChanged()
.observeOn(AndroidSchedulers.mainThread())
.map { conversation -> messageRepo.getMessages(conversation.id) }
.doOnNext { messages -> newState { it.copy(messages = messages) } }
.flatMap { messages -> messages.asObservable() }
.withLatestFrom(conversation, { messages, conversation ->
markRead.execute(conversation.id)
messages
})
.subscribe()
disposables += messages.subscribe()
if (threadId == 0L) {
syncContacts.execute(Unit)
@@ -228,6 +225,13 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
.withLatestFrom(conversation, { _, conversation -> conversation })
.subscribe { conversation -> deleteConversation.execute(conversation.id) }
// Mark the conversation read, if in foreground
intents += Observables.combineLatest(messages, view.activityVisibleIntent, { _, b -> b })
.withLatestFrom(conversation, { visible, conversation ->
if (visible) markRead.execute(conversation.id)
})
.subscribe()
// Add an attachment
intents += view.attachIntent
.subscribe { context.makeToast(R.string.compose_attach_unsupported) }