forked from upstream-mirrors/quik
Fix scheduled messaging sometimes failing to send
This commit is contained in:
@@ -51,7 +51,7 @@ class SendScheduledMessage @Inject constructor(
|
|||||||
SendMessage.Params(message.subId, threadId, message.recipients, message.body, attachments)
|
SendMessage.Params(message.subId, threadId, message.recipients, message.body, attachments)
|
||||||
}
|
}
|
||||||
.flatMap(sendMessage::buildObservable)
|
.flatMap(sendMessage::buildObservable)
|
||||||
.doFinally { scheduledMessageRepo.deleteScheduledMessage(params) }
|
.doOnNext { scheduledMessageRepo.deleteScheduledMessage(params) }
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -25,15 +25,18 @@ import javax.inject.Inject
|
|||||||
|
|
||||||
class UpdateScheduledMessageAlarms @Inject constructor(
|
class UpdateScheduledMessageAlarms @Inject constructor(
|
||||||
private val alarmManager: AlarmManager,
|
private val alarmManager: AlarmManager,
|
||||||
private val scheduledMessageRepo: ScheduledMessageRepository
|
private val scheduledMessageRepo: ScheduledMessageRepository,
|
||||||
|
private val sendScheduledMessage: SendScheduledMessage
|
||||||
) : Interactor<Unit>() {
|
) : Interactor<Unit>() {
|
||||||
|
|
||||||
override fun buildObservable(params: Unit): Flowable<*> {
|
override fun buildObservable(params: Unit): Flowable<*> {
|
||||||
return Flowable.just(params)
|
return Flowable.just(params)
|
||||||
.map { scheduledMessageRepo.getScheduledMessages() }
|
.map { scheduledMessageRepo.getScheduledMessages() } // Get all the scheduled messages
|
||||||
.flatMap { messages -> Flowable.fromIterable(messages) }
|
.map { it.map { message -> Pair(message.id, message.date) } } // Map the data we need out of Realm
|
||||||
.map { message -> Pair(message.id, message.date) }
|
.flatMap { messages -> Flowable.fromIterable(messages) } // Turn the list into a stream
|
||||||
.doOnNext { (id, date) -> alarmManager.setAlarm(date, alarmManager.getScheduledMessageIntent(id)) }
|
.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
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user