mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 11:38:51 +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:
@@ -33,7 +33,10 @@ import com.klinker.android.send_message.StripAccents
|
||||
import common.util.Keys
|
||||
import common.util.MessageUtils
|
||||
import common.util.Preferences
|
||||
import common.util.extensions.*
|
||||
import common.util.extensions.asFlowable
|
||||
import common.util.extensions.asMaybe
|
||||
import common.util.extensions.insertOrUpdate
|
||||
import common.util.extensions.map
|
||||
import data.mapper.CursorToConversation
|
||||
import data.mapper.CursorToRecipient
|
||||
import data.model.*
|
||||
@@ -384,29 +387,23 @@ class MessageRepository @Inject constructor(
|
||||
/**
|
||||
* Marks the message as sending, in case we need to retry sending it
|
||||
*/
|
||||
fun markSending(id: Long): Flowable<*> {
|
||||
val realm = Realm.getDefaultInstance()
|
||||
return realm.where(Message::class.java).equalTo("id", id)
|
||||
.findAllAsync()
|
||||
.asFlowable()
|
||||
.filter { it.isLoaded }
|
||||
.filter { it.isValid }
|
||||
.mapNotNull { it[0] }
|
||||
.take(1)
|
||||
.doOnNext { message ->
|
||||
// Update the message in realm
|
||||
realm.executeTransaction {
|
||||
message.boxId = Sms.MESSAGE_TYPE_OUTBOX
|
||||
}
|
||||
}
|
||||
.map { message -> message.getUri() }
|
||||
.observeOn(Schedulers.computation())
|
||||
.doOnNext { uri ->
|
||||
// Update the message in the native ContentProvider
|
||||
val values = ContentValues()
|
||||
values.put(Sms.TYPE, Sms.MESSAGE_TYPE_OUTBOX)
|
||||
context.contentResolver.update(uri, values, null, null)
|
||||
fun markSending(id: Long) {
|
||||
Realm.getDefaultInstance().use { realm ->
|
||||
realm.refresh()
|
||||
|
||||
val message = realm.where(Message::class.java).equalTo("id", id).findFirst()
|
||||
message?.let {
|
||||
// Update the message in realm
|
||||
realm.executeTransaction {
|
||||
message.boxId = Sms.MESSAGE_TYPE_OUTBOX
|
||||
}
|
||||
|
||||
// Update the message in the native ContentProvider
|
||||
val values = ContentValues()
|
||||
values.put(Sms.TYPE, Sms.MESSAGE_TYPE_OUTBOX)
|
||||
context.contentResolver.update(message.getUri(), values, null, null)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun markSent(id: Long) {
|
||||
@@ -428,91 +425,73 @@ class MessageRepository @Inject constructor(
|
||||
}
|
||||
}
|
||||
|
||||
fun markFailed(id: Long, resultCode: Int): Flowable<*> {
|
||||
val realm = Realm.getDefaultInstance()
|
||||
return realm.where(Message::class.java).equalTo("id", id)
|
||||
.findAllAsync()
|
||||
.asFlowable()
|
||||
.filter { it.isLoaded }
|
||||
.filter { it.isValid }
|
||||
.mapNotNull { it[0] }
|
||||
.take(1)
|
||||
.doOnNext { message ->
|
||||
// Update the message in realm
|
||||
realm.executeTransaction {
|
||||
message.boxId = Sms.MESSAGE_TYPE_FAILED
|
||||
message.errorCode = resultCode
|
||||
}
|
||||
}
|
||||
.map { message -> message.getUri() }
|
||||
.observeOn(Schedulers.computation())
|
||||
.doOnNext { uri ->
|
||||
// Update the message in the native ContentProvider
|
||||
val values = ContentValues()
|
||||
values.put(Sms.TYPE, Sms.MESSAGE_TYPE_FAILED)
|
||||
values.put(Sms.ERROR_CODE, resultCode)
|
||||
context.contentResolver.update(uri, values, null, null)
|
||||
fun markFailed(id: Long, resultCode: Int) {
|
||||
Realm.getDefaultInstance().use { realm ->
|
||||
realm.refresh()
|
||||
|
||||
val message = realm.where(Message::class.java).equalTo("id", id).findFirst()
|
||||
message?.let {
|
||||
// Update the message in realm
|
||||
realm.executeTransaction {
|
||||
message.boxId = Sms.MESSAGE_TYPE_FAILED
|
||||
message.errorCode = resultCode
|
||||
}
|
||||
|
||||
// Update the message in the native ContentProvider
|
||||
val values = ContentValues()
|
||||
values.put(Sms.TYPE, Sms.MESSAGE_TYPE_FAILED)
|
||||
values.put(Sms.ERROR_CODE, resultCode)
|
||||
context.contentResolver.update(message.getUri(), values, null, null)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun markDelivered(id: Long): Flowable<*> {
|
||||
val realm = Realm.getDefaultInstance()
|
||||
return realm.where(Message::class.java).equalTo("id", id)
|
||||
.findAllAsync()
|
||||
.asFlowable()
|
||||
.filter { it.isLoaded }
|
||||
.filter { it.isValid }
|
||||
.mapNotNull { it[0] }
|
||||
.take(1)
|
||||
.doOnNext { message ->
|
||||
// Update the message in realm
|
||||
realm.executeTransaction {
|
||||
message.deliveryStatus = Sms.STATUS_COMPLETE
|
||||
message.dateSent = System.currentTimeMillis()
|
||||
message.read = true
|
||||
}
|
||||
}
|
||||
.map { message -> message.getUri() }
|
||||
.observeOn(Schedulers.computation())
|
||||
.doOnNext { uri ->
|
||||
// Update the message in the native ContentProvider
|
||||
val values = ContentValues()
|
||||
values.put(Sms.STATUS, Sms.STATUS_COMPLETE)
|
||||
values.put(Sms.DATE_SENT, System.currentTimeMillis())
|
||||
values.put(Sms.READ, true)
|
||||
context.contentResolver.update(uri, values, null, null)
|
||||
fun markDelivered(id: Long) {
|
||||
Realm.getDefaultInstance().use { realm ->
|
||||
realm.refresh()
|
||||
|
||||
val message = realm.where(Message::class.java).equalTo("id", id).findFirst()
|
||||
message?.let {
|
||||
// Update the message in realm
|
||||
realm.executeTransaction {
|
||||
message.deliveryStatus = Sms.STATUS_COMPLETE
|
||||
message.dateSent = System.currentTimeMillis()
|
||||
message.read = true
|
||||
}
|
||||
|
||||
// Update the message in the native ContentProvider
|
||||
val values = ContentValues()
|
||||
values.put(Sms.STATUS, Sms.STATUS_COMPLETE)
|
||||
values.put(Sms.DATE_SENT, System.currentTimeMillis())
|
||||
values.put(Sms.READ, true)
|
||||
context.contentResolver.update(message.getUri(), values, null, null)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun markDeliveryFailed(id: Long, resultCode: Int): Flowable<*> {
|
||||
val realm = Realm.getDefaultInstance()
|
||||
return realm.where(Message::class.java).equalTo("id", id)
|
||||
.findAllAsync()
|
||||
.asFlowable()
|
||||
.filter { it.isLoaded }
|
||||
.filter { it.isValid }
|
||||
.mapNotNull { it[0] }
|
||||
.take(1)
|
||||
.doOnNext { message ->
|
||||
// Update the message in realm
|
||||
realm.executeTransaction {
|
||||
message.deliveryStatus = Sms.STATUS_FAILED
|
||||
message.dateSent = System.currentTimeMillis()
|
||||
message.read = true
|
||||
message.errorCode = resultCode
|
||||
}
|
||||
}
|
||||
.map { message -> message.getUri() }
|
||||
.observeOn(Schedulers.computation())
|
||||
.doOnNext { uri ->
|
||||
// Update the message in the native ContentProvider
|
||||
val values = ContentValues()
|
||||
values.put(Sms.STATUS, Sms.STATUS_FAILED)
|
||||
values.put(Sms.DATE_SENT, System.currentTimeMillis())
|
||||
values.put(Sms.READ, true)
|
||||
values.put(Sms.ERROR_CODE, resultCode)
|
||||
context.contentResolver.update(uri, values, null, null)
|
||||
fun markDeliveryFailed(id: Long, resultCode: Int) {
|
||||
Realm.getDefaultInstance().use { realm ->
|
||||
realm.refresh()
|
||||
|
||||
val message = realm.where(Message::class.java).equalTo("id", id).findFirst()
|
||||
message?.let {
|
||||
// Update the message in realm
|
||||
realm.executeTransaction {
|
||||
message.deliveryStatus = Sms.STATUS_FAILED
|
||||
message.dateSent = System.currentTimeMillis()
|
||||
message.read = true
|
||||
message.errorCode = resultCode
|
||||
}
|
||||
|
||||
// Update the message in the native ContentProvider
|
||||
val values = ContentValues()
|
||||
values.put(Sms.STATUS, Sms.STATUS_FAILED)
|
||||
values.put(Sms.DATE_SENT, System.currentTimeMillis())
|
||||
values.put(Sms.READ, true)
|
||||
values.put(Sms.ERROR_CODE, resultCode)
|
||||
context.contentResolver.update(message.getUri(), values, null, null)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun deleteMessage(messageId: Long) {
|
||||
|
||||
@@ -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