mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-17 03:28:52 +01:00
#874 - Multi selection for conversations
This commit is contained in:
+5
-5
@@ -22,14 +22,14 @@ import io.reactivex.Flowable
|
||||
import repository.MessageRepository
|
||||
import javax.inject.Inject
|
||||
|
||||
class DeleteConversation @Inject constructor(
|
||||
class DeleteConversations @Inject constructor(
|
||||
private val messageRepo: MessageRepository,
|
||||
private val updateBadge: UpdateBadge
|
||||
): Interactor<Long>() {
|
||||
) : Interactor<List<Long>>() {
|
||||
|
||||
override fun buildObservable(params: Long): Flowable<*> {
|
||||
return Flowable.just(Unit)
|
||||
.doOnNext { messageRepo.deleteConversation(params) }
|
||||
override fun buildObservable(params: List<Long>): Flowable<*> {
|
||||
return Flowable.just(params.toLongArray())
|
||||
.doOnNext { threadIds -> messageRepo.deleteConversations(*threadIds) }
|
||||
.flatMap { updateBadge.buildObservable(Unit) } // Update the badge
|
||||
}
|
||||
|
||||
@@ -32,9 +32,9 @@ class DeleteMessage @Inject constructor(
|
||||
.doOnNext { messageId ->
|
||||
val threadId = messageRepo.getMessage(messageId)?.threadId
|
||||
messageRepo.deleteMessage(messageId)
|
||||
threadId?.let { messageRepo.updateConversation(it) }
|
||||
threadId?.let { messageRepo.updateConversations(it) }
|
||||
}
|
||||
.doOnNext { messageRepo.updateConversation(params) } // Update the conversation
|
||||
.doOnNext { messageRepo.updateConversations(params) } // Update the conversation
|
||||
.flatMap { updateBadge.buildObservable(Unit) } // Update the badge
|
||||
}
|
||||
|
||||
|
||||
@@ -22,11 +22,11 @@ import io.reactivex.Flowable
|
||||
import repository.MessageRepository
|
||||
import javax.inject.Inject
|
||||
|
||||
class MarkArchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
|
||||
class MarkArchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor<List<Long>>() {
|
||||
|
||||
override fun buildObservable(params: Long): Flowable<Unit> {
|
||||
return Flowable.just(Unit)
|
||||
.doOnNext { messageRepo.markArchived(params) }
|
||||
override fun buildObservable(params: List<Long>): Flowable<*> {
|
||||
return Flowable.just(params.toLongArray())
|
||||
.doOnNext { threadIds -> messageRepo.markArchived(*threadIds) }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -22,11 +22,11 @@ import io.reactivex.Flowable
|
||||
import repository.MessageRepository
|
||||
import javax.inject.Inject
|
||||
|
||||
class MarkBlocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
|
||||
class MarkBlocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor<List<Long>>() {
|
||||
|
||||
override fun buildObservable(params: Long): Flowable<Unit> {
|
||||
return Flowable.just(Unit)
|
||||
.doOnNext { messageRepo.markBlocked(params) }
|
||||
override fun buildObservable(params: List<Long>): Flowable<*> {
|
||||
return Flowable.just(params.toLongArray())
|
||||
.doOnNext { threadIds -> messageRepo.markBlocked(*threadIds) }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -32,7 +32,7 @@ class MarkRead @Inject constructor(
|
||||
override fun buildObservable(params: Long): Flowable<*> {
|
||||
return Flowable.just(Unit)
|
||||
.doOnNext { messageRepo.markRead(params) }
|
||||
.doOnNext { messageRepo.updateConversation(params) } // Update the conversation
|
||||
.doOnNext { messageRepo.updateConversations(params) } // Update the conversation
|
||||
.doOnNext { notificationManager.update(params) }
|
||||
.flatMap { updateBadge.buildObservable(Unit) } // Update the badge
|
||||
}
|
||||
|
||||
@@ -22,11 +22,11 @@ import io.reactivex.Flowable
|
||||
import repository.MessageRepository
|
||||
import javax.inject.Inject
|
||||
|
||||
class MarkUnarchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
|
||||
class MarkUnarchived @Inject constructor(private val messageRepo: MessageRepository) : Interactor<List<Long>>() {
|
||||
|
||||
override fun buildObservable(params: Long): Flowable<Unit> {
|
||||
return Flowable.just(Unit)
|
||||
.doOnNext { messageRepo.markUnarchived(params) }
|
||||
override fun buildObservable(params: List<Long>): Flowable<*> {
|
||||
return Flowable.just(params.toLongArray())
|
||||
.doOnNext { threadIds -> messageRepo.markUnarchived(*threadIds) }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -22,11 +22,11 @@ import io.reactivex.Flowable
|
||||
import repository.MessageRepository
|
||||
import javax.inject.Inject
|
||||
|
||||
class MarkUnblocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
|
||||
class MarkUnblocked @Inject constructor(private val messageRepo: MessageRepository) : Interactor<List<Long>>() {
|
||||
|
||||
override fun buildObservable(params: Long): Flowable<Unit> {
|
||||
return Flowable.just(Unit)
|
||||
.doOnNext { messageRepo.markUnblocked(params) }
|
||||
override fun buildObservable(params: List<Long>): Flowable<*> {
|
||||
return Flowable.just(params.toLongArray())
|
||||
.doOnNext { threadIds -> messageRepo.markUnblocked(*threadIds) }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -48,7 +48,7 @@ class ReceiveMms @Inject constructor(
|
||||
if (blocked) messageRepo.deleteMessage(message.id)
|
||||
}
|
||||
}
|
||||
.doOnNext { message -> messageRepo.updateConversation(message.threadId) } // Update the conversation
|
||||
.doOnNext { message -> messageRepo.updateConversations(message.threadId) } // Update the conversation
|
||||
.mapNotNull { message -> messageRepo.getOrCreateConversation(message.threadId) } // Map message to conversation
|
||||
.filter { conversation -> !conversation.blocked } // Don't notify for blocked conversations
|
||||
.doOnNext { conversation -> if (conversation.archived) messageRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary
|
||||
|
||||
@@ -50,7 +50,7 @@ class ReceiveSms @Inject constructor(
|
||||
|
||||
messageRepo.insertReceivedSms(address, body, time) // Add the message to the db
|
||||
}
|
||||
.doOnNext { message -> messageRepo.updateConversation(message.threadId) } // Update the conversation
|
||||
.doOnNext { message -> messageRepo.updateConversations(message.threadId) } // Update the conversation
|
||||
.mapNotNull { message -> messageRepo.getOrCreateConversation(message.threadId) } // Map message to conversation
|
||||
.filter { conversation -> !conversation.blocked } // Don't notify for blocked conversations
|
||||
.doOnNext { conversation -> if (conversation.archived) messageRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary
|
||||
|
||||
@@ -34,7 +34,7 @@ class SyncMessage @Inject constructor(
|
||||
override fun buildObservable(params: Uri): Flowable<Message> {
|
||||
return Flowable.just(params)
|
||||
.mapNotNull { uri -> syncManager.syncMessage(uri) }
|
||||
.doOnNext { message -> messageRepo.updateConversation(message.threadId) }
|
||||
.doOnNext { message -> messageRepo.updateConversations(message.threadId) }
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user