forked from upstream-mirrors/quik
Use withLatestFrom to get message text for sending, instead of relying on state
This commit is contained in:
@@ -18,10 +18,11 @@ import io.reactivex.BackpressureStrategy
|
|||||||
import io.reactivex.Observable
|
import io.reactivex.Observable
|
||||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||||
import io.reactivex.rxkotlin.plusAssign
|
import io.reactivex.rxkotlin.plusAssign
|
||||||
|
import io.reactivex.rxkotlin.withLatestFrom
|
||||||
import io.reactivex.schedulers.Schedulers
|
import io.reactivex.schedulers.Schedulers
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class ComposeViewModel(val threadId: Long) : QkViewModel<ComposeView, ComposeState>(ComposeState(editingMode = threadId == 0L)) {
|
class ComposeViewModel(threadId: Long) : QkViewModel<ComposeView, ComposeState>(ComposeState(editingMode = threadId == 0L)) {
|
||||||
|
|
||||||
@Inject lateinit var context: Context
|
@Inject lateinit var context: Context
|
||||||
@Inject lateinit var contactsRepo: ContactRepository
|
@Inject lateinit var contactsRepo: ContactRepository
|
||||||
@@ -80,19 +81,23 @@ class ComposeViewModel(val threadId: Long) : QkViewModel<ComposeView, ComposeSta
|
|||||||
view.chipSelectedIntent.map { contact ->
|
view.chipSelectedIntent.map { contact ->
|
||||||
{ contacts: List<Contact> -> contacts.toMutableList().apply { add(contact) } }
|
{ contacts: List<Contact> -> contacts.toMutableList().apply { add(contact) } }
|
||||||
})
|
})
|
||||||
.scan(listOf<Contact>(), { previousState, reducer -> reducer(previousState) })
|
.scan(state.value!!.contacts, { previousState, reducer -> reducer(previousState) })
|
||||||
.subscribe { contacts -> newState { it.copy(selectedContacts = contacts) } }
|
.doOnNext { contacts -> newState { it.copy(selectedContacts = contacts) } }
|
||||||
|
.subscribe()
|
||||||
|
|
||||||
intents += view.textChangedIntent.subscribe { text ->
|
intents += view.textChangedIntent.subscribe { text ->
|
||||||
newState { it.copy(draft = text.toString(), canSend = text.isNotEmpty()) }
|
newState { it.copy(draft = text.toString(), canSend = text.isNotEmpty()) }
|
||||||
}
|
}
|
||||||
|
|
||||||
intents += view.sendIntent.subscribe {
|
intents += view.sendIntent
|
||||||
val previousState = state.value!!
|
.withLatestFrom(view.textChangedIntent, { _, body -> body })
|
||||||
val address = conversation?.contacts?.first()?.address.orEmpty()
|
.map { body -> body.toString() }
|
||||||
sendMessage.execute(SendMessage.Params(threadId, address, previousState.draft))
|
.subscribe { body ->
|
||||||
newState { it.copy(draft = "", canSend = false) }
|
val threadId = conversation?.id ?: 0
|
||||||
}
|
val address = conversation?.contacts?.first()?.address.orEmpty()
|
||||||
|
sendMessage.execute(SendMessage.Params(threadId, address, body))
|
||||||
|
newState { it.copy(draft = "", canSend = false) }
|
||||||
|
}
|
||||||
|
|
||||||
intents += view.copyTextIntent.subscribe { message ->
|
intents += view.copyTextIntent.subscribe { message ->
|
||||||
ClipboardUtils.copy(context, message.body)
|
ClipboardUtils.copy(context, message.body)
|
||||||
@@ -105,7 +110,9 @@ class ComposeViewModel(val threadId: Long) : QkViewModel<ComposeView, ComposeSta
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun dataChanged() {
|
fun dataChanged() {
|
||||||
markRead.execute(threadId)
|
conversation?.id?.let { threadId ->
|
||||||
|
markRead.execute(threadId)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user