From 2db4468b19b15af552f1e320a7889f3a5a48ab45 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 23 Feb 2018 22:46:14 -0500 Subject: [PATCH] Refresh realm instead of waiting on async query when changing message box and close realm instance when finished --- .../java/data/repository/MessageRepository.kt | 181 ++++++++---------- .../src/main/java/interactor/MarkDelivered.kt | 8 +- .../java/interactor/MarkDeliveryFailed.kt | 8 +- qksms/src/main/java/interactor/MarkFailed.kt | 8 +- qksms/src/main/java/interactor/MarkSent.kt | 6 +- .../src/main/java/interactor/RetrySending.kt | 4 - 6 files changed, 92 insertions(+), 123 deletions(-) diff --git a/qksms/src/main/java/data/repository/MessageRepository.kt b/qksms/src/main/java/data/repository/MessageRepository.kt index 647b5421..409f65eb 100644 --- a/qksms/src/main/java/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/data/repository/MessageRepository.kt @@ -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) { diff --git a/qksms/src/main/java/interactor/MarkDelivered.kt b/qksms/src/main/java/interactor/MarkDelivered.kt index be5069dc..8e5fcfe9 100644 --- a/qksms/src/main/java/interactor/MarkDelivered.kt +++ b/qksms/src/main/java/interactor/MarkDelivered.kt @@ -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() { +class MarkDelivered @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { - override fun buildObservable(params: Long): Flowable { + override fun buildObservable(params: Long): Flowable { return Flowable.just(Unit) - .observeOn(AndroidSchedulers.mainThread()) - .flatMap { messageRepo.markDelivered(params) } + .doOnNext { messageRepo.markDelivered(params) } } } \ No newline at end of file diff --git a/qksms/src/main/java/interactor/MarkDeliveryFailed.kt b/qksms/src/main/java/interactor/MarkDeliveryFailed.kt index 48e44afc..11716268 100644 --- a/qksms/src/main/java/interactor/MarkDeliveryFailed.kt +++ b/qksms/src/main/java/interactor/MarkDeliveryFailed.kt @@ -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() { + : Interactor() { data class Params(val id: Long, val resultCode: Int) - override fun buildObservable(params: Params): Flowable { + override fun buildObservable(params: Params): Flowable { return Flowable.just(Unit) - .observeOn(AndroidSchedulers.mainThread()) - .flatMap { messageRepo.markDeliveryFailed(params.id, params.resultCode) } + .doOnNext { messageRepo.markDeliveryFailed(params.id, params.resultCode) } } } \ No newline at end of file diff --git a/qksms/src/main/java/interactor/MarkFailed.kt b/qksms/src/main/java/interactor/MarkFailed.kt index 70c935d2..471e8c2a 100644 --- a/qksms/src/main/java/interactor/MarkFailed.kt +++ b/qksms/src/main/java/interactor/MarkFailed.kt @@ -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() { +) : Interactor() { data class Params(val id: Long, val resultCode: Int) - override fun buildObservable(params: Params): Flowable { + override fun buildObservable(params: Params): Flowable { 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) } } diff --git a/qksms/src/main/java/interactor/MarkSent.kt b/qksms/src/main/java/interactor/MarkSent.kt index f57d6792..30bf9c15 100644 --- a/qksms/src/main/java/interactor/MarkSent.kt +++ b/qksms/src/main/java/interactor/MarkSent.kt @@ -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() { +class MarkSent @Inject constructor(private val messageRepo: MessageRepository) : Interactor() { - override fun buildObservable(params: Long): Flowable { - return Flowable.just(params) + override fun buildObservable(params: Long): Flowable { + return Flowable.just(Unit) .doOnNext { messageRepo.markSent(params) } } diff --git a/qksms/src/main/java/interactor/RetrySending.kt b/qksms/src/main/java/interactor/RetrySending.kt index 08b028a2..889530b3 100644 --- a/qksms/src/main/java/interactor/RetrySending.kt +++ b/qksms/src/main/java/interactor/RetrySending.kt @@ -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() { @@ -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) } }