mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 03:28:52 +01:00
Refresh realm instead of waiting on async query when changing message box and close realm instance when finished
This commit is contained in:
@@ -20,15 +20,13 @@ package interactor
|
||||
|
||||
import data.repository.MessageRepository
|
||||
import io.reactivex.Flowable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import javax.inject.Inject
|
||||
|
||||
class MarkDelivered @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long, Any>() {
|
||||
class MarkDelivered @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long, Unit>() {
|
||||
|
||||
override fun buildObservable(params: Long): Flowable<Any> {
|
||||
override fun buildObservable(params: Long): Flowable<Unit> {
|
||||
return Flowable.just(Unit)
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.flatMap { messageRepo.markDelivered(params) }
|
||||
.doOnNext { messageRepo.markDelivered(params) }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -20,19 +20,17 @@ package interactor
|
||||
|
||||
import data.repository.MessageRepository
|
||||
import io.reactivex.Flowable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import javax.inject.Inject
|
||||
|
||||
class MarkDeliveryFailed @Inject constructor(
|
||||
private val messageRepo: MessageRepository)
|
||||
: Interactor<MarkDeliveryFailed.Params, Any>() {
|
||||
: Interactor<MarkDeliveryFailed.Params, Unit>() {
|
||||
|
||||
data class Params(val id: Long, val resultCode: Int)
|
||||
|
||||
override fun buildObservable(params: Params): Flowable<Any> {
|
||||
override fun buildObservable(params: Params): Flowable<Unit> {
|
||||
return Flowable.just(Unit)
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.flatMap { messageRepo.markDeliveryFailed(params.id, params.resultCode) }
|
||||
.doOnNext { messageRepo.markDeliveryFailed(params.id, params.resultCode) }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -21,20 +21,18 @@ package interactor
|
||||
import common.util.NotificationManager
|
||||
import data.repository.MessageRepository
|
||||
import io.reactivex.Flowable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import javax.inject.Inject
|
||||
|
||||
class MarkFailed @Inject constructor(
|
||||
private val messageRepo: MessageRepository,
|
||||
private val notificationManager: NotificationManager
|
||||
) : Interactor<MarkFailed.Params, Any>() {
|
||||
) : Interactor<MarkFailed.Params, Unit>() {
|
||||
|
||||
data class Params(val id: Long, val resultCode: Int)
|
||||
|
||||
override fun buildObservable(params: Params): Flowable<Any> {
|
||||
override fun buildObservable(params: Params): Flowable<Unit> {
|
||||
return Flowable.just(Unit)
|
||||
.observeOn(AndroidSchedulers.mainThread())
|
||||
.flatMap { messageRepo.markFailed(params.id, params.resultCode) }
|
||||
.doOnNext { messageRepo.markFailed(params.id, params.resultCode) }
|
||||
.doOnNext { notificationManager.notifyFailed(params.id) }
|
||||
}
|
||||
|
||||
|
||||
@@ -22,10 +22,10 @@ import data.repository.MessageRepository
|
||||
import io.reactivex.Flowable
|
||||
import javax.inject.Inject
|
||||
|
||||
class MarkSent @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long, Long>() {
|
||||
class MarkSent @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long, Unit>() {
|
||||
|
||||
override fun buildObservable(params: Long): Flowable<Long> {
|
||||
return Flowable.just(params)
|
||||
override fun buildObservable(params: Long): Flowable<Unit> {
|
||||
return Flowable.just(Unit)
|
||||
.doOnNext { messageRepo.markSent(params) }
|
||||
}
|
||||
|
||||
|
||||
@@ -21,8 +21,6 @@ package interactor
|
||||
import data.model.Message
|
||||
import data.repository.MessageRepository
|
||||
import io.reactivex.Flowable
|
||||
import io.reactivex.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.schedulers.Schedulers
|
||||
import javax.inject.Inject
|
||||
|
||||
class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Message, Message>() {
|
||||
@@ -42,8 +40,6 @@ class RetrySending @Inject constructor(private val messageRepo: MessageRepositor
|
||||
return Flowable.just(message)
|
||||
.filter { message.isSms() } // TODO support resending failed MMS
|
||||
.doOnNext { messageRepo.markSending(message.id) }
|
||||
.subscribeOn(AndroidSchedulers.mainThread())
|
||||
.observeOn(Schedulers.io())
|
||||
.doOnNext { messageRepo.sendSms(message) }
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user