forked from upstream-mirrors/quik
add delay send mms. add group send to individual recipients - sms and mms. add immediate show messages in convo, not wait for sent. new qktransaction that replaces android/smsmms transaction with mods for quik. lots of code cleanups and removing superfluous code. some bug fixes.
This commit is contained in:
@@ -0,0 +1,64 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* This file is part of QKSMS.
|
||||
*
|
||||
* QKSMS is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* QKSMS is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package dev.octoshrimpy.quik.interactor
|
||||
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import io.reactivex.Flowable
|
||||
import timber.log.Timber
|
||||
import javax.inject.Inject
|
||||
|
||||
class ActionDelayedMessage @Inject constructor(
|
||||
private val conversationRepo: ConversationRepository,
|
||||
private val messageRepo: MessageRepository
|
||||
) : Interactor<ActionDelayedMessage.Params>() {
|
||||
|
||||
enum class Action {
|
||||
Send,
|
||||
Cancel
|
||||
}
|
||||
|
||||
data class Params(val messageId: Long, val action: Action)
|
||||
|
||||
override fun buildObservable(params: Params): Flowable<*> =
|
||||
Flowable.just(params).doOnNext {
|
||||
val updateConversations = mutableListOf<Long>()
|
||||
|
||||
// cancel the timer before doing anything else
|
||||
messageRepo.cancelDelayedSmsAlarm(params.messageId)
|
||||
|
||||
messageRepo.getUnmanagedMessage(params.messageId)?.let { message ->
|
||||
when (params.action) {
|
||||
Action.Cancel -> {
|
||||
messageRepo.deleteMessages(listOf(message.id))
|
||||
updateConversations.add(message.threadId)
|
||||
}
|
||||
|
||||
Action.Send -> {
|
||||
updateConversations.addAll(
|
||||
messageRepo.sendMessage(message).map { it.threadId }
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
conversationRepo.updateConversations(updateConversations)
|
||||
} ?:let { Timber.e("couldn't find message id ${params.messageId}") }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -21,13 +21,13 @@ package dev.octoshrimpy.quik.interactor
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.Context
|
||||
import android.net.Uri
|
||||
import androidx.core.net.toUri
|
||||
import dev.octoshrimpy.quik.extensions.getName
|
||||
import dev.octoshrimpy.quik.extensions.mapNotNull
|
||||
import dev.octoshrimpy.quik.extensions.getResourceBytes
|
||||
import dev.octoshrimpy.quik.repository.ScheduledMessageRepository
|
||||
import dev.octoshrimpy.quik.util.Constants
|
||||
import dev.octoshrimpy.quik.util.FileUtils
|
||||
import io.reactivex.Flowable
|
||||
import io.realm.RealmList
|
||||
import java.io.File
|
||||
import java.util.UUID
|
||||
import javax.inject.Inject
|
||||
|
||||
@@ -36,61 +36,53 @@ class AddScheduledMessage @Inject constructor(
|
||||
private val updateScheduledMessageAlarms: UpdateScheduledMessageAlarms,
|
||||
private val context: Context,
|
||||
) : Interactor<AddScheduledMessage.Params>() {
|
||||
|
||||
data class Params(
|
||||
val date: Long,
|
||||
val subId: Int,
|
||||
val recipients: List<String>,
|
||||
val sendAsGroup: Boolean,
|
||||
val body: String,
|
||||
val attachments: List<String>
|
||||
val attachments: List<Uri>
|
||||
)
|
||||
|
||||
@SuppressLint("Range")
|
||||
override fun buildObservable(params: Params): Flowable<*> {
|
||||
// have to 3-step save scheduled message
|
||||
return Flowable.just(params)
|
||||
.map { // step 1 - save, as-is, to db to get primary key id
|
||||
.map { // step 1 - save, without attachments, to db to get primary key id which is
|
||||
// needed for building the save file location dir name in step 2
|
||||
scheduledMessageRepo.saveScheduledMessage(
|
||||
it.date, it.subId, it.recipients, it.sendAsGroup, it.body, it.attachments
|
||||
it.date, it.subId, it.recipients, it.sendAsGroup, it.body, listOf()
|
||||
)
|
||||
}
|
||||
.map { scheduledMessageDb ->
|
||||
.map { scheduledMessage ->
|
||||
// step 2 - copy attachments to app local storage
|
||||
scheduledMessageDb.attachments = RealmList(
|
||||
*scheduledMessageDb.attachments.mapNotNull {
|
||||
val inUri = Uri.parse(it)
|
||||
scheduledMessage.attachments = RealmList(
|
||||
*params.attachments.map { attachmentUri ->
|
||||
try {
|
||||
// get filename of input uri or use random uuid on fail to get
|
||||
val filename = inUri.getName(context) ?: UUID.randomUUID()
|
||||
val filename = attachmentUri.getName(context) ?: UUID.randomUUID()
|
||||
|
||||
// copy attachment data to app local dir - first, create dir
|
||||
val localFile = File(
|
||||
context.filesDir,
|
||||
"scheduled-${scheduledMessageDb.id}/${UUID.randomUUID()}/${filename}"
|
||||
val (localUri, e) = FileUtils.createAndWrite(
|
||||
context,
|
||||
FileUtils.Location.Files, // files dir so not deleted if app cache wiped by user
|
||||
"${Constants.SCHEDULED_MESSAGE_FILE_PREFIX}-${scheduledMessage.id}/" +
|
||||
"${UUID.randomUUID()}/${filename}",
|
||||
"",
|
||||
attachmentUri.getResourceBytes(context)
|
||||
)
|
||||
|
||||
// create directory tree in app local storage
|
||||
localFile.parentFile?.mkdirs()
|
||||
|
||||
val localUri = localFile.toUri()
|
||||
|
||||
// copy attachment resource data to local file
|
||||
context.contentResolver.openOutputStream(localUri, "w")
|
||||
?.use { outputStream ->
|
||||
context.contentResolver.openInputStream(inUri)
|
||||
?.use { it.copyTo(outputStream, 4096) }
|
||||
}
|
||||
if (e is Exception)
|
||||
throw e
|
||||
|
||||
localUri.toString()
|
||||
} catch (e: Exception) {
|
||||
it // on any error, use original uri string
|
||||
attachmentUri.toString() // on any error, use original uri string
|
||||
}
|
||||
}.toTypedArray()
|
||||
)
|
||||
|
||||
// step 3 - update scheduled message with new attachment uris
|
||||
scheduledMessageRepo.updateScheduledMessage(scheduledMessageDb)
|
||||
scheduledMessageRepo.updateScheduledMessage(scheduledMessage)
|
||||
}
|
||||
.flatMap { updateScheduledMessageAlarms.buildObservable(Unit) }
|
||||
}
|
||||
|
||||
@@ -35,9 +35,13 @@ class DeleteMessages @Inject constructor(
|
||||
|
||||
override fun buildObservable(params: Params): Flowable<*> {
|
||||
return Flowable.just(params.messageIds)
|
||||
.doOnNext { messageIds -> messageRepo.deleteMessages(messageIds) } // Delete the messages
|
||||
.doOnNext { conversationRepo.updateConversations(params.threadId) } // Update the conversation
|
||||
.doOnNext { notificationManager.update(params.threadId) }
|
||||
.doOnNext { messageIds ->
|
||||
messageRepo.deleteMessages(messageIds)
|
||||
|
||||
conversationRepo.updateConversations(listOf(params.threadId))
|
||||
|
||||
notificationManager.update(params.threadId)
|
||||
}
|
||||
.flatMap { updateBadge.buildObservable(Unit) } // Update the badge
|
||||
}
|
||||
|
||||
|
||||
@@ -34,11 +34,10 @@ class DeleteOldMessages @Inject constructor(
|
||||
override fun buildObservable(params: Unit): Flowable<*> = Flowable.fromCallable {
|
||||
val maxAge = prefs.autoDelete.get().takeIf { it > 0 } ?: return@fromCallable
|
||||
val counts = messageRepo.getOldMessageCounts(maxAge)
|
||||
val threadIds = counts.keys.toLongArray()
|
||||
|
||||
Timber.d("Deleting ${counts.values.sum()} old messages from ${threadIds.size} conversations")
|
||||
Timber.d("Deleting ${counts.values.sum()} old messages from ${counts.keys.size} conversations")
|
||||
messageRepo.deleteOldMessages(maxAge)
|
||||
conversationRepo.updateConversations(*threadIds)
|
||||
conversationRepo.updateConversations(counts.keys)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.interactor
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.Context
|
||||
import dev.octoshrimpy.quik.repository.ScheduledMessageRepository
|
||||
import io.reactivex.Flowable
|
||||
@@ -30,21 +29,20 @@ class DeleteScheduledMessages @Inject constructor(
|
||||
private val context: Context,
|
||||
) : Interactor<List<Long>>() {
|
||||
|
||||
@SuppressLint("Range")
|
||||
override fun buildObservable(scheduledMessageIds: List<Long>): Flowable<*> {
|
||||
return Flowable.just(scheduledMessageIds)
|
||||
.map {
|
||||
override fun buildObservable(params: List<Long>): Flowable<*> {
|
||||
return Flowable.just(Unit)
|
||||
.doOnNext {
|
||||
try {
|
||||
// for each message id to delete
|
||||
it.forEach {
|
||||
params.forEach { scheduledMessageId ->
|
||||
// recursively delete scheduled message top level dir
|
||||
val topDir = File(context.filesDir, "scheduled-${it}")
|
||||
val topDir = File(context.filesDir, "scheduled-${scheduledMessageId}")
|
||||
topDir.exists() && topDir.deleteRecursively()
|
||||
}
|
||||
} catch (e: Exception) { /* nothing */ }
|
||||
|
||||
// delete the db entries
|
||||
scheduledMessageRepo.deleteScheduledMessages(it)
|
||||
scheduledMessageRepo.deleteScheduledMessages(params)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,13 +27,13 @@ class MarkFailed @Inject constructor(
|
||||
private val messageRepo: MessageRepository,
|
||||
private val notificationManager: NotificationManager
|
||||
) : Interactor<MarkFailed.Params>() {
|
||||
data class Params(val messageId: Long, val resultCode: Int)
|
||||
|
||||
data class Params(val id: Long, val resultCode: Int)
|
||||
|
||||
override fun buildObservable(params: Params): Flowable<Unit> {
|
||||
return Flowable.just(Unit)
|
||||
.doOnNext { messageRepo.markFailed(params.id, params.resultCode) }
|
||||
.doOnNext { notificationManager.notifyFailed(params.id) }
|
||||
}
|
||||
override fun buildObservable(params: Params): Flowable<Unit> =
|
||||
Flowable.just(Unit)
|
||||
.doOnNext {
|
||||
if (messageRepo.markFailed(params.messageId, params.resultCode))
|
||||
notificationManager.notifyFailed(params.messageId)
|
||||
}
|
||||
|
||||
}
|
||||
@@ -26,7 +26,7 @@ class MarkSeen @Inject constructor(private val messageRepo: MessageRepository) :
|
||||
|
||||
override fun buildObservable(params: Long): Flowable<Unit> {
|
||||
return Flowable.just(Unit)
|
||||
.doOnNext { messageRepo.markSeen(params) }
|
||||
.doOnNext { messageRepo.markSeen(listOf(params)) }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -22,11 +22,9 @@ import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import io.reactivex.Flowable
|
||||
import javax.inject.Inject
|
||||
|
||||
class MarkSent @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
|
||||
|
||||
override fun buildObservable(params: Long): Flowable<Unit> {
|
||||
return Flowable.just(Unit)
|
||||
.doOnNext { messageRepo.markSent(params) }
|
||||
}
|
||||
class MarkSent @Inject constructor(private val messageRepo: MessageRepository)
|
||||
: Interactor<Long>() {
|
||||
override fun buildObservable(params: Long): Flowable<Unit> =
|
||||
Flowable.just(Unit).doOnNext { messageRepo.markSent(params) }
|
||||
|
||||
}
|
||||
@@ -22,11 +22,11 @@ import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import io.reactivex.Flowable
|
||||
import javax.inject.Inject
|
||||
|
||||
class MarkUnarchived @Inject constructor(private val conversationRepo: ConversationRepository) : Interactor<List<Long>>() {
|
||||
|
||||
class MarkUnarchived @Inject constructor(private val conversationRepo: ConversationRepository)
|
||||
: Interactor<List<Long>>() {
|
||||
override fun buildObservable(params: List<Long>): Flowable<*> {
|
||||
return Flowable.just(params.toLongArray())
|
||||
.doOnNext { threadIds -> conversationRepo.markUnarchived(*threadIds) }
|
||||
return Flowable.just(params)
|
||||
.doOnNext { threadIds -> conversationRepo.markUnarchived(threadIds) }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -44,53 +44,57 @@ class ReceiveMms @Inject constructor(
|
||||
|
||||
override fun buildObservable(params: Uri): Flowable<*> {
|
||||
return Flowable.just(params)
|
||||
.mapNotNull(syncManager::syncMessage) // Sync the message
|
||||
.doOnNext { message ->
|
||||
// TODO: Ideally this is done when we're saving the MMS to ContentResolver
|
||||
// This change can be made once we move the MMS storing code to the Data module
|
||||
if (activeConversationManager.getActiveConversation() == message.threadId) {
|
||||
.mapNotNull(syncManager::syncMessage) // Sync the message
|
||||
.doOnNext { message ->
|
||||
// TODO: Ideally this is done when we're saving the MMS to ContentResolver
|
||||
// This change can be made once we move the MMS storing code to the Data module
|
||||
if (activeConversationManager.getActiveConversation() == message.threadId) {
|
||||
messageRepo.markRead(listOf(message.threadId))
|
||||
}
|
||||
}
|
||||
.mapNotNull { message ->
|
||||
// Because we use the smsmms library for receiving and storing MMS, we'll need
|
||||
// to check if it should be blocked after we've pulled it into realm. If it
|
||||
// turns out that it should be dropped, then delete it
|
||||
// TODO Don't store blocked messages in the first place
|
||||
val action = blockingClient.shouldBlock(message.address).blockingGet()
|
||||
val shouldDrop = prefs.drop.get()
|
||||
Timber.v("block=$action, drop=$shouldDrop")
|
||||
|
||||
if (action is BlockingClient.Action.Block && shouldDrop) {
|
||||
messageRepo.deleteMessages(listOf(message.id))
|
||||
return@mapNotNull null
|
||||
}
|
||||
|
||||
when (action) {
|
||||
is BlockingClient.Action.Block -> {
|
||||
messageRepo.markRead(listOf(message.threadId))
|
||||
conversationRepo.markBlocked(
|
||||
listOf(message.threadId), prefs.blockingManager.get(), action.reason
|
||||
)
|
||||
}
|
||||
is BlockingClient.Action.Unblock ->
|
||||
conversationRepo.markUnblocked(message.threadId)
|
||||
else -> Unit
|
||||
}
|
||||
.mapNotNull { message ->
|
||||
// Because we use the smsmms library for receiving and storing MMS, we'll need
|
||||
// to check if it should be blocked after we've pulled it into realm. If it
|
||||
// turns out that it should be dropped, then delete it
|
||||
// TODO Don't store blocked messages in the first place
|
||||
val action = blockingClient.shouldBlock(message.address).blockingGet()
|
||||
val shouldDrop = prefs.drop.get()
|
||||
Timber.v("block=$action, drop=$shouldDrop")
|
||||
|
||||
if (action is BlockingClient.Action.Block && shouldDrop) {
|
||||
messageRepo.deleteMessages(listOf(message.id))
|
||||
return@mapNotNull null
|
||||
}
|
||||
|
||||
when (action) {
|
||||
is BlockingClient.Action.Block -> {
|
||||
messageRepo.markRead(listOf(message.threadId))
|
||||
conversationRepo.markBlocked(listOf(message.threadId), prefs.blockingManager.get(), action.reason)
|
||||
}
|
||||
is BlockingClient.Action.Unblock -> conversationRepo.markUnblocked(message.threadId)
|
||||
else -> Unit
|
||||
}
|
||||
|
||||
message
|
||||
}
|
||||
.doOnNext { message ->
|
||||
conversationRepo.updateConversations(message.threadId) // Update the conversation
|
||||
}
|
||||
.mapNotNull { message ->
|
||||
conversationRepo.getOrCreateConversation(message.threadId) // Map message to conversation
|
||||
}
|
||||
.filter { conversation -> !conversation.blocked } // Don't notify for blocked conversations
|
||||
.doOnNext { conversation ->
|
||||
// Unarchive conversation if necessary
|
||||
if (conversation.archived) conversationRepo.markUnarchived(conversation.id)
|
||||
}
|
||||
.map { conversation -> conversation.id } // Map to the id because [delay] will put us on the wrong thread
|
||||
.doOnNext(notificationManager::update) // Update the notification
|
||||
.flatMap { updateBadge.buildObservable(Unit) } // Update the badge
|
||||
message
|
||||
}
|
||||
.doOnNext { message ->
|
||||
conversationRepo.updateConversations(listOf(message.threadId)) // Update the conversation
|
||||
}
|
||||
.mapNotNull { message ->
|
||||
conversationRepo.getOrCreateConversation(message.threadId) // Map message to conversation
|
||||
}
|
||||
.filter { conversation -> !conversation.blocked } // Don't notify for blocked conversations
|
||||
.doOnNext { conversation ->
|
||||
// Unarchive conversation if necessary
|
||||
if (conversation.archived)
|
||||
conversationRepo.markUnarchived(listOf(conversation.id))
|
||||
}
|
||||
.map { conversation -> conversation.id } // Map to the id because [delay] will put us on the wrong thread
|
||||
.doOnNext(notificationManager::update) // Update the notification
|
||||
.flatMap { updateBadge.buildObservable(Unit) } // Update the badge
|
||||
}
|
||||
|
||||
}
|
||||
@@ -70,7 +70,7 @@ class ReceiveSms @Inject constructor(
|
||||
}
|
||||
|
||||
// update and fetch conversation
|
||||
conversationRepo.updateConversations(it.threadId)
|
||||
conversationRepo.updateConversations(listOf(it.threadId))
|
||||
conversationRepo.getOrCreateConversation(it.threadId)
|
||||
}
|
||||
.mapNotNull {
|
||||
@@ -83,7 +83,7 @@ class ReceiveSms @Inject constructor(
|
||||
// unarchive conversation if necessary
|
||||
if (it.archived) {
|
||||
Timber.v("conversation unarchived")
|
||||
conversationRepo.markUnarchived(it.id)
|
||||
conversationRepo.markUnarchived(listOf(it.id))
|
||||
}
|
||||
|
||||
// update/create notification
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Moez Bhatti <moez.bhatti@gmail.com>
|
||||
*
|
||||
* This file is part of QKSMS.
|
||||
*
|
||||
* QKSMS is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* QKSMS is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package dev.octoshrimpy.quik.interactor
|
||||
|
||||
import dev.octoshrimpy.quik.extensions.mapNotNull
|
||||
import dev.octoshrimpy.quik.model.Message
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import io.reactivex.Flowable
|
||||
import javax.inject.Inject
|
||||
|
||||
class RetrySending @Inject constructor(private val messageRepo: MessageRepository) : Interactor<Long>() {
|
||||
|
||||
override fun buildObservable(params: Long): Flowable<Message> {
|
||||
return Flowable.just(params)
|
||||
.doOnNext(messageRepo::markSending)
|
||||
.mapNotNull(messageRepo::getMessage)
|
||||
.doOnNext { message ->
|
||||
when (message.isSms()) {
|
||||
true -> messageRepo.sendSms(message)
|
||||
false -> messageRepo.resendMms(message)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
+5
-13
@@ -18,23 +18,15 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.interactor
|
||||
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import io.reactivex.Flowable
|
||||
import javax.inject.Inject
|
||||
|
||||
class CancelDelayedMessage @Inject constructor(
|
||||
private val conversationRepo: ConversationRepository,
|
||||
class SendExistingMessage @Inject constructor(
|
||||
private val messageRepo: MessageRepository
|
||||
) : Interactor<CancelDelayedMessage.Params>() {
|
||||
|
||||
data class Params(val messageId: Long, val threadId: Long)
|
||||
|
||||
override fun buildObservable(params: Params): Flowable<*> {
|
||||
return Flowable.just(Unit)
|
||||
.doOnNext { messageRepo.cancelDelayedSms(params.messageId) }
|
||||
.doOnNext { messageRepo.deleteMessages(listOf(params.messageId)) }
|
||||
.doOnNext { conversationRepo.updateConversations(params.threadId) } // Update the conversation
|
||||
}
|
||||
) : Interactor<Long>() {
|
||||
override fun buildObservable(params: Long): Flowable<Long> =
|
||||
Flowable.just(params)
|
||||
.doOnNext { messageId -> messageRepo.sendMessage(messageId) }
|
||||
|
||||
}
|
||||
+31
-25
@@ -18,53 +18,59 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.interactor
|
||||
|
||||
import android.content.Context
|
||||
import dev.octoshrimpy.quik.manager.ShortcutManager
|
||||
import dev.octoshrimpy.quik.extensions.mapNotNull
|
||||
import dev.octoshrimpy.quik.model.Attachment
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
import io.reactivex.Flowable
|
||||
import timber.log.Timber
|
||||
import javax.inject.Inject
|
||||
|
||||
class SendMessage @Inject constructor(
|
||||
private val context: Context,
|
||||
class SendNewMessage @Inject constructor(
|
||||
private val conversationRepo: ConversationRepository,
|
||||
private val messageRepo: MessageRepository,
|
||||
private val updateBadge: UpdateBadge,
|
||||
private val shortcutManager: ShortcutManager
|
||||
) : Interactor<SendMessage.Params>() {
|
||||
) : Interactor<SendNewMessage.Params>() {
|
||||
|
||||
data class Params(
|
||||
val subId: Int,
|
||||
val threadId: Long,
|
||||
val addresses: List<String>,
|
||||
val addresses: Collection<String>,
|
||||
val body: String,
|
||||
val attachments: List<Attachment> = listOf(),
|
||||
val sendAsGroup: Boolean,
|
||||
val attachments: Collection<Attachment> = listOf(),
|
||||
val delay: Int = 0
|
||||
)
|
||||
|
||||
override fun buildObservable(params: Params): Flowable<*> = Flowable.just(Unit)
|
||||
.filter { params.addresses.isNotEmpty() }
|
||||
.doOnNext {
|
||||
// If a threadId isn't provided, try to obtain one
|
||||
val threadId = when (params.threadId) {
|
||||
0L -> conversationRepo.getOrCreateConversation(params.addresses)?.id ?: 0
|
||||
else -> params.threadId
|
||||
.mapNotNull {
|
||||
// if addresses are provided, prefer them over the thread id because from a user
|
||||
// perspective it is more important that the intended recipients are messaged rather
|
||||
// than that messages go to a thread id
|
||||
when {
|
||||
params.addresses.isNotEmpty() ->
|
||||
conversationRepo.getOrCreateConversation(params.addresses)
|
||||
|
||||
(params.threadId > 0) ->
|
||||
conversationRepo.getOrCreateConversation(params.threadId)
|
||||
|
||||
else -> null
|
||||
}
|
||||
?:let { Timber.e("unable to get or create a conversation record"); null }
|
||||
}
|
||||
.map { conversation ->
|
||||
// send the message
|
||||
messageRepo.sendNewMessages(params.subId, conversation.recipients.map { it.address },
|
||||
params.body, params.attachments, params.sendAsGroup, params.delay)
|
||||
}
|
||||
.map { messages -> messages.map { it.threadId } }
|
||||
.doOnNext { threadIds ->
|
||||
conversationRepo.updateConversations(threadIds)
|
||||
conversationRepo.markUnarchived(threadIds)
|
||||
|
||||
// if unable to find or create a conversation (and/or underlying threadId), fail
|
||||
if (threadId == 0L)
|
||||
return@doOnNext
|
||||
|
||||
params.apply {
|
||||
messageRepo.sendMessage(subId, threadId, addresses, body, attachments, delay)
|
||||
}
|
||||
|
||||
conversationRepo.updateConversations(threadId)
|
||||
|
||||
conversationRepo.markUnarchived(threadId)
|
||||
|
||||
shortcutManager.reportShortcutUsed(threadId)
|
||||
threadIds.forEach { threadId -> shortcutManager.reportShortcutUsed(threadId) }
|
||||
|
||||
// delete attachment local files, if any, because they're saved to mms db by now
|
||||
params.attachments.forEach { it.removeCacheFile() }
|
||||
@@ -33,7 +33,7 @@ class SendScheduledMessage @Inject constructor(
|
||||
private val context: Context,
|
||||
private val scheduledMessageRepo: ScheduledMessageRepository,
|
||||
private val deleteScheduledMessagesInteractor: DeleteScheduledMessages,
|
||||
private val sendMessage: SendMessage
|
||||
private val sendNewMessage: SendNewMessage
|
||||
) : Interactor<Long>() {
|
||||
|
||||
override fun buildObservable(params: Long): Flowable<*> {
|
||||
@@ -49,9 +49,12 @@ class SendScheduledMessage @Inject constructor(
|
||||
.map { message ->
|
||||
val threadId = TelephonyCompat.getOrCreateThreadId(context, message.recipients)
|
||||
val attachments = message.attachments.mapNotNull(Uri::parse).map { Attachment(context, it) }
|
||||
SendMessage.Params(message.subId, threadId, message.recipients, message.body, attachments)
|
||||
SendNewMessage.Params(
|
||||
message.subId, threadId, message.recipients, message.body,
|
||||
message.sendAsGroup, attachments
|
||||
)
|
||||
}
|
||||
.flatMap(sendMessage::buildObservable)
|
||||
.flatMap(sendNewMessage::buildObservable)
|
||||
.doOnNext { deleteScheduledMessagesInteractor.execute(listOf(params)) }
|
||||
}
|
||||
|
||||
|
||||
@@ -18,9 +18,7 @@
|
||||
*/
|
||||
package dev.octoshrimpy.quik.interactor
|
||||
|
||||
import android.content.res.Resources
|
||||
import com.moez.QKSMS.manager.SpeakManager
|
||||
import dev.octoshrimpy.quik.domain.R
|
||||
import dev.octoshrimpy.quik.extensions.mapNotNull
|
||||
import dev.octoshrimpy.quik.repository.ConversationRepository
|
||||
import dev.octoshrimpy.quik.repository.MessageRepository
|
||||
@@ -31,6 +29,7 @@ import javax.inject.Inject
|
||||
class SpeakThreads @Inject constructor(
|
||||
private val conversationRepo: ConversationRepository,
|
||||
private val messageRepo: MessageRepository,
|
||||
private val speakManager: SpeakManager
|
||||
) : Interactor<List<Long>>() {
|
||||
|
||||
companion object {
|
||||
@@ -42,8 +41,6 @@ class SpeakThreads @Inject constructor(
|
||||
}
|
||||
|
||||
override fun buildObservable(threadIds: List<Long>): Flowable<*> {
|
||||
val speakManager = SpeakManager()
|
||||
|
||||
if (threadIds.isEmpty())
|
||||
return Single.just(0)
|
||||
.doOnSubscribe { speakManager.startSpeakSession(noMessagesStr) }
|
||||
@@ -54,9 +51,10 @@ class SpeakThreads @Inject constructor(
|
||||
return Flowable.fromIterable(threadIds)
|
||||
.doOnSubscribe { speakManager.startSpeakSession("threads:" + threadIds.sorted().joinToString()) }
|
||||
.mapNotNull { threadId -> conversationRepo.getConversationAndLastSenderContactName(threadId) }
|
||||
.map { conversationAndSender ->
|
||||
if (speakManager.speakConversationLastSms(conversationAndSender))
|
||||
messageRepo.markSeen(conversationAndSender.first!!.id)
|
||||
.map { (conversation, sender) ->
|
||||
if (speakManager.speakConversationLastSms(Pair(conversation, sender)) &&
|
||||
conversation != null)
|
||||
messageRepo.markSeen(listOf(conversation.id))
|
||||
}
|
||||
.doOnTerminate { speakManager.endSpeakSession() }
|
||||
}
|
||||
|
||||
@@ -29,13 +29,17 @@ class SyncMessage @Inject constructor(
|
||||
private val conversationRepo: ConversationRepository,
|
||||
private val syncManager: SyncRepository,
|
||||
private val updateBadge: UpdateBadge
|
||||
) : Interactor<Uri>() {
|
||||
) : Interactor<SyncMessage.Params>() {
|
||||
|
||||
override fun buildObservable(params: Uri): Flowable<*> {
|
||||
data class Params(val uri: Uri, val messageId: Long = 0)
|
||||
|
||||
override fun buildObservable(params: Params): Flowable<*> {
|
||||
return Flowable.just(params)
|
||||
.mapNotNull { uri -> syncManager.syncMessage(uri) }
|
||||
.doOnNext { message -> conversationRepo.updateConversations(message.threadId) }
|
||||
.flatMap { updateBadge.buildObservable(Unit) } // Update the badge
|
||||
.mapNotNull { syncManager.syncMessage(it.uri, it.messageId) }
|
||||
.doOnNext {
|
||||
message -> conversationRepo.updateConversations(listOf(message.threadId))
|
||||
}
|
||||
.flatMap { updateBadge.buildObservable(Unit) } // Update the badge
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user