Don't save draft until necessary

This commit is contained in:
Moez Bhatti
2018-04-14 18:22:12 -04:00
parent cb8b428691
commit ad9c9ace8e
@@ -290,12 +290,24 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
.autoDisposable(view.scope())
.subscribe { conversation -> navigator.showConversationInfo(conversation.id) }
// Retry sending
view.messageClickIntent
.filter { message -> message.isFailedMessage() }
.doOnNext { message -> retrySending.execute(message) }
.autoDisposable(view.scope())
.subscribe()
// Save draft when the activity goes into the background
view.activityVisibleIntent
.filter { visible -> !visible }
.withLatestFrom(conversation, { _, conversation -> conversation.id })
.observeOn(Schedulers.io())
.withLatestFrom(view.textChangedIntent, { threadId, draft ->
messageRepo.saveDraft(threadId, draft.toString())
})
.autoDisposable(view.scope())
.subscribe()
// Mark the conversation read, if in foreground
Observables.combineLatest(messages, view.activityVisibleIntent, { _, visible -> visible })
.filter { visible -> visible }
@@ -362,17 +374,6 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
.autoDisposable(view.scope())
.subscribe { remaining -> newState { it.copy(remaining = remaining) } }
// Update the draft whenever the text is changed
view.textChangedIntent
.debounce(100, TimeUnit.MILLISECONDS)
.map { draft -> draft.toString() }
.observeOn(Schedulers.io())
.withLatestFrom(conversation.map { it.id }, { draft, threadId ->
messageRepo.saveDraft(threadId, draft)
})
.autoDisposable(view.scope())
.subscribe()
// Send a message when the send button is clicked, and disable editing mode if it's enabled
view.sendIntent
.withLatestFrom(view.textChangedIntent, { _, body -> body })