forked from upstream-mirrors/quik
Retry sending failed MMS
This commit is contained in:
@@ -18,29 +18,25 @@
|
||||
*/
|
||||
package com.moez.QKSMS.interactor
|
||||
|
||||
import com.moez.QKSMS.extensions.mapNotNull
|
||||
import com.moez.QKSMS.model.Message
|
||||
import com.moez.QKSMS.repository.MessageRepository
|
||||
import io.reactivex.Flowable
|
||||
import javax.inject.Inject
|
||||
|
||||
class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Message>() {
|
||||
class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
|
||||
|
||||
override fun buildObservable(params: Message): Flowable<Message> {
|
||||
override fun buildObservable(params: Long): Flowable<Message> {
|
||||
|
||||
// We don't want to touch the supplied message on another thread in case it's a live realm
|
||||
// object, so copy the required fields into a new object that is safe to pass around threads
|
||||
val message = Message().apply {
|
||||
id = params.id
|
||||
type = params.type
|
||||
address = params.address
|
||||
body = params.body
|
||||
subId = params.subId
|
||||
}
|
||||
|
||||
return Flowable.just(message)
|
||||
.filter { message.isSms() } // TODO support resending failed MMS
|
||||
.doOnNext { messageRepo.markSending(message.id) }
|
||||
.doOnNext { messageRepo.sendSms(message) }
|
||||
return Flowable.just(params)
|
||||
.mapNotNull(messageRepo::getMessage)
|
||||
.doOnNext { message -> messageRepo.markSending(message.id) }
|
||||
.doOnNext { message ->
|
||||
when (message.isSms()) {
|
||||
true -> messageRepo.sendSms(message)
|
||||
false -> messageRepo.resendMms(message)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -74,6 +74,8 @@ interface MessageRepository {
|
||||
*/
|
||||
fun sendSms(message: Message)
|
||||
|
||||
fun resendMms(message: Message)
|
||||
|
||||
/**
|
||||
* Attempts to cancel sending the message with the given id
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user