forked from upstream-mirrors/quik
Add ability to send group messages
This commit is contained in:
@@ -22,8 +22,10 @@ import android.app.PendingIntent
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.telephony.SmsManager
|
import android.telephony.SmsManager
|
||||||
|
import com.klinker.android.send_message.Message
|
||||||
|
import com.klinker.android.send_message.Settings
|
||||||
|
import com.klinker.android.send_message.Transaction
|
||||||
import common.util.Preferences
|
import common.util.Preferences
|
||||||
import data.model.Message
|
|
||||||
import data.repository.MessageRepository
|
import data.repository.MessageRepository
|
||||||
import io.reactivex.Flowable
|
import io.reactivex.Flowable
|
||||||
import presentation.receiver.MessageDeliveredReceiver
|
import presentation.receiver.MessageDeliveredReceiver
|
||||||
@@ -33,32 +35,53 @@ import javax.inject.Inject
|
|||||||
class SendMessage @Inject constructor(
|
class SendMessage @Inject constructor(
|
||||||
private val context: Context,
|
private val context: Context,
|
||||||
private val prefs: Preferences,
|
private val prefs: Preferences,
|
||||||
private val messageRepo: MessageRepository)
|
private val messageRepo: MessageRepository
|
||||||
: Interactor<SendMessage.Params, Message>() {
|
) : Interactor<SendMessage.Params, Unit>() {
|
||||||
|
|
||||||
data class Params(val threadId: Long, val address: String, val body: String)
|
data class Params(val threadId: Long, val addresses: List<String>, val body: String)
|
||||||
|
|
||||||
override fun buildObservable(params: Params): Flowable<Message> {
|
override fun buildObservable(params: Params): Flowable<Unit> {
|
||||||
val smsManager = SmsManager.getDefault()
|
return Flowable.just(Unit)
|
||||||
|
.filter { params.addresses.isNotEmpty() }
|
||||||
return Flowable.just(params)
|
.doOnNext {
|
||||||
.map { messageRepo.insertSentSms(params.threadId, params.address, params.body) }
|
if (params.addresses.size == 1) {
|
||||||
.doOnNext { message ->
|
sendSms(params.threadId, params.addresses.first(), params.body)
|
||||||
val parts = smsManager.divideMessage(params.body)
|
} else {
|
||||||
|
sendMms(params.threadId, params.addresses, params.body)
|
||||||
val sentIntents = parts.map {
|
|
||||||
val intent = Intent(context, MessageSentReceiver::class.java).putExtra("id", message.id)
|
|
||||||
PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val deliveredIntents = parts.map {
|
|
||||||
val intent = Intent(context, MessageDeliveredReceiver::class.java).putExtra("id", message.id)
|
|
||||||
val pendingIntent = PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
|
|
||||||
if (prefs.delivery.get()) pendingIntent else null
|
|
||||||
}
|
|
||||||
|
|
||||||
smsManager.sendMultipartTextMessage(params.address, null, parts, ArrayList(sentIntents), ArrayList(deliveredIntents))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun sendSms(threadId: Long, address: String, body: String) {
|
||||||
|
val smsManager = SmsManager.getDefault()
|
||||||
|
|
||||||
|
val message = messageRepo.insertSentSms(threadId, address, body)
|
||||||
|
val parts = smsManager.divideMessage(body)
|
||||||
|
|
||||||
|
val sentIntents = parts.map {
|
||||||
|
val intent = Intent(context, MessageSentReceiver::class.java).putExtra("id", message.id)
|
||||||
|
PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
|
}
|
||||||
|
|
||||||
|
val deliveredIntents = parts.map {
|
||||||
|
val intent = Intent(context, MessageDeliveredReceiver::class.java).putExtra("id", message.id)
|
||||||
|
val pendingIntent = PendingIntent.getBroadcast(context, message.id.toInt(), intent, PendingIntent.FLAG_UPDATE_CURRENT)
|
||||||
|
if (prefs.delivery.get()) pendingIntent else null
|
||||||
|
}
|
||||||
|
|
||||||
|
smsManager.sendMultipartTextMessage(address, null, parts, ArrayList(sentIntents), ArrayList(deliveredIntents))
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun sendMms(threadId: Long, addresses: List<String>, body: String) {
|
||||||
|
val settings = Settings().apply {
|
||||||
|
useSystemSending = true
|
||||||
|
group = true
|
||||||
|
}
|
||||||
|
|
||||||
|
val message = Message(body, addresses.toTypedArray())
|
||||||
|
|
||||||
|
val transaction = Transaction(context, settings)
|
||||||
|
transaction.sendNewMessage(message, threadId)
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -248,8 +248,8 @@ class ComposeViewModel(intent: Intent) : QkViewModel<ComposeView, ComposeState>(
|
|||||||
.map { body -> body.toString() }
|
.map { body -> body.toString() }
|
||||||
.withLatestFrom(conversation, { body, conversation ->
|
.withLatestFrom(conversation, { body, conversation ->
|
||||||
val threadId = conversation.id
|
val threadId = conversation.id
|
||||||
val address = conversation.recipients.first()?.address.orEmpty()
|
val addresses = conversation.recipients.map { it.address }
|
||||||
sendMessage.execute(SendMessage.Params(threadId, address, body))
|
sendMessage.execute(SendMessage.Params(threadId, addresses, body))
|
||||||
view.setDraft("")
|
view.setDraft("")
|
||||||
})
|
})
|
||||||
.withLatestFrom(state, { _, state ->
|
.withLatestFrom(state, { _, state ->
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ class RemoteMessagingReceiver : BroadcastReceiver() {
|
|||||||
val threadId = bundle.getLong("threadId")
|
val threadId = bundle.getLong("threadId")
|
||||||
val body = remoteInput.getCharSequence("body").toString()
|
val body = remoteInput.getCharSequence("body").toString()
|
||||||
markRead.execute(threadId)
|
markRead.execute(threadId)
|
||||||
sendMessage.execute(SendMessage.Params(threadId, address, body))
|
sendMessage.execute(SendMessage.Params(threadId, listOf(address), body))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user