diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/SendScheduledMessage.kt b/domain/src/main/java/com/moez/QKSMS/interactor/SendScheduledMessage.kt index ae24c54a..f8fda7fd 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/SendScheduledMessage.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/SendScheduledMessage.kt @@ -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) } } } \ No newline at end of file diff --git a/domain/src/main/java/com/moez/QKSMS/interactor/UpdateScheduledMessageAlarms.kt b/domain/src/main/java/com/moez/QKSMS/interactor/UpdateScheduledMessageAlarms.kt index 674c305d..256146a9 100644 --- a/domain/src/main/java/com/moez/QKSMS/interactor/UpdateScheduledMessageAlarms.kt +++ b/domain/src/main/java/com/moez/QKSMS/interactor/UpdateScheduledMessageAlarms.kt @@ -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() { 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 } } \ No newline at end of file