Fix scheduled messaging sometimes failing to send

This commit is contained in:
Moez Bhatti
2018-09-19 18:14:27 -04:00
parent 76a5c9e3ec
commit adf007f92c
2 changed files with 9 additions and 6 deletions
@@ -51,7 +51,7 @@ class SendScheduledMessage @Inject constructor(
SendMessage.Params(message.subId, threadId, message.recipients, message.body, attachments)
}
.flatMap(sendMessage::buildObservable)
.doFinally { scheduledMessageRepo.deleteScheduledMessage(params) }
.doOnNext { scheduledMessageRepo.deleteScheduledMessage(params) }
}
}
@@ -25,15 +25,18 @@ import javax.inject.Inject
class UpdateScheduledMessageAlarms @Inject constructor(
private val alarmManager: AlarmManager,
private val scheduledMessageRepo: ScheduledMessageRepository
private val scheduledMessageRepo: ScheduledMessageRepository,
private val sendScheduledMessage: SendScheduledMessage
) : Interactor<Unit>() {
override fun buildObservable(params: Unit): Flowable<*> {
return Flowable.just(params)
.map { scheduledMessageRepo.getScheduledMessages() }
.flatMap { messages -> Flowable.fromIterable(messages) }
.map { message -> Pair(message.id, message.date) }
.doOnNext { (id, date) -> alarmManager.setAlarm(date, alarmManager.getScheduledMessageIntent(id)) }
.map { scheduledMessageRepo.getScheduledMessages() } // Get all the scheduled messages
.map { it.map { message -> Pair(message.id, message.date) } } // Map the data we need out of Realm
.flatMap { messages -> Flowable.fromIterable(messages) } // Turn the list into a stream
.doOnNext { (id, date) -> alarmManager.setAlarm(date, alarmManager.getScheduledMessageIntent(id)) } // Create alarm
.filter { (_, date) -> date < System.currentTimeMillis() } // Filter messages that should have already been sent
.flatMap { (id, _) -> sendScheduledMessage.buildObservable(id) } // Send them
}
}