Refresh realm before trying to resend

Fixes #1523
This commit is contained in:
Moez Bhatti
2019-11-20 23:14:24 -05:00
parent 2c4823fc95
commit cfd5bb723c
3 changed files with 7 additions and 12 deletions
@@ -34,13 +34,10 @@ class SendSmsReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
AndroidInjection.inject(this, context) AndroidInjection.inject(this, context)
intent.getLongExtra("id", -1L) val messageId = intent.getLongExtra("id", -1L).takeIf { it >= 0 } ?: return
.takeIf { it >= 0 }
?.let(messageRepo::getMessage) val result = goAsync()
?.let { message -> retrySending.execute(messageId) { result.finish() }
val result = goAsync()
retrySending.execute(message.id) { result.finish() }
}
} }
} }
@@ -50,7 +50,6 @@ import com.moez.QKSMS.receiver.SendSmsReceiver
import com.moez.QKSMS.receiver.SmsDeliveredReceiver import com.moez.QKSMS.receiver.SmsDeliveredReceiver
import com.moez.QKSMS.receiver.SmsSentReceiver import com.moez.QKSMS.receiver.SmsSentReceiver
import com.moez.QKSMS.util.ImageUtils import com.moez.QKSMS.util.ImageUtils
import com.moez.QKSMS.util.PhoneNumberUtils
import com.moez.QKSMS.util.Preferences import com.moez.QKSMS.util.Preferences
import com.moez.QKSMS.util.tryOrNull import com.moez.QKSMS.util.tryOrNull
import io.realm.Case import io.realm.Case
@@ -71,7 +70,6 @@ class MessageRepositoryImpl @Inject constructor(
private val context: Context, private val context: Context,
private val imageRepository: ImageRepository, private val imageRepository: ImageRepository,
private val messageIds: KeyManager, private val messageIds: KeyManager,
private val phoneNumberUtils: PhoneNumberUtils,
private val prefs: Preferences, private val prefs: Preferences,
private val syncRepository: SyncRepository private val syncRepository: SyncRepository
) : MessageRepository { ) : MessageRepository {
@@ -97,6 +95,7 @@ class MessageRepositoryImpl @Inject constructor(
override fun getMessage(id: Long): Message? { override fun getMessage(id: Long): Message? {
return Realm.getDefaultInstance() return Realm.getDefaultInstance()
.also { realm -> realm.refresh() }
.where(Message::class.java) .where(Message::class.java)
.equalTo("id", id) .equalTo("id", id)
.findFirst() .findFirst()
@@ -27,10 +27,9 @@ import javax.inject.Inject
class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() { class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
override fun buildObservable(params: Long): Flowable<Message> { override fun buildObservable(params: Long): Flowable<Message> {
return Flowable.just(params) return Flowable.just(params)
.doOnNext(messageRepo::markSending)
.mapNotNull(messageRepo::getMessage) .mapNotNull(messageRepo::getMessage)
.doOnNext { message -> messageRepo.markSending(message.id) }
.doOnNext { message -> .doOnNext { message ->
when (message.isSms()) { when (message.isSms()) {
true -> messageRepo.sendSms(message) true -> messageRepo.sendSms(message)