#42 - Multi selection for messages

This commit is contained in:
Moez Bhatti
2018-05-06 17:12:56 -04:00
parent 7c7e40d90a
commit 7c2e6a2d2c
15 changed files with 203 additions and 98 deletions
@@ -27,7 +27,7 @@ class CancelDelayedMessage @Inject constructor(private val messageRepo: MessageR
override fun buildObservable(params: Long): Flowable<*> {
return Flowable.just(params)
.doOnNext { id -> messageRepo.cancelDelayedSms(id) }
.doOnNext { id -> messageRepo.deleteMessage(id) }
.doOnNext { id -> messageRepo.deleteMessages(id) }
}
}
@@ -22,19 +22,17 @@ import io.reactivex.Flowable
import repository.MessageRepository
import javax.inject.Inject
class DeleteMessage @Inject constructor(
class DeleteMessages @Inject constructor(
private val messageRepo: MessageRepository,
private val updateBadge: UpdateBadge
) : Interactor<Long>() {
) : Interactor<DeleteMessages.Params>() {
override fun buildObservable(params: Long): Flowable<*> {
return Flowable.just(params)
.doOnNext { messageId ->
val threadId = messageRepo.getMessage(messageId)?.threadId
messageRepo.deleteMessage(messageId)
threadId?.let { messageRepo.updateConversations(it) }
}
.doOnNext { messageRepo.updateConversations(params) } // Update the conversation
data class Params(val messageIds: List<Long>, val threadId: Long? = null)
override fun buildObservable(params: Params): Flowable<*> {
return Flowable.just(params.messageIds.toLongArray())
.doOnNext { messageIds -> messageRepo.deleteMessages(*messageIds) } // Delete the messages
.doOnNext { params.threadId?.let { messageRepo.updateConversations(it) } } // Update the conversation
.flatMap { updateBadge.buildObservable(Unit) } // Update the badge
}
@@ -45,7 +45,7 @@ class ReceiveMms @Inject constructor(
// turns out that it should be blocked, then delete it
// TODO Don't store blocked messages in the first place
!externalBlockingManager.shouldBlock(message.address).blockingGet().also { blocked ->
if (blocked) messageRepo.deleteMessage(message.id)
if (blocked) messageRepo.deleteMessages(message.id)
}
}
.doOnNext { message -> messageRepo.updateConversations(message.threadId) } // Update the conversation
@@ -120,7 +120,7 @@ interface MessageRepository {
fun markDeliveryFailed(id: Long, resultCode: Int)
fun deleteMessage(messageId: Long)
fun deleteMessages(vararg messageIds: Long)
fun deleteConversations(vararg threadIds: Long)