From a3ccdbb66771171ff71ebaecf9bcc26a86257571 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Fri, 12 Jan 2018 14:53:58 -0500 Subject: [PATCH] Add ability to send group messages --- qksms/src/main/java/interactor/SendMessage.kt | 69 ++++++++++++------- .../feature/compose/ComposeViewModel.kt | 4 +- .../receiver/RemoteMessagingReceiver.kt | 2 +- 3 files changed, 49 insertions(+), 26 deletions(-) diff --git a/qksms/src/main/java/interactor/SendMessage.kt b/qksms/src/main/java/interactor/SendMessage.kt index 7aebf7a2..1391e8eb 100644 --- a/qksms/src/main/java/interactor/SendMessage.kt +++ b/qksms/src/main/java/interactor/SendMessage.kt @@ -22,8 +22,10 @@ import android.app.PendingIntent import android.content.Context import android.content.Intent 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 data.model.Message import data.repository.MessageRepository import io.reactivex.Flowable import presentation.receiver.MessageDeliveredReceiver @@ -33,32 +35,53 @@ import javax.inject.Inject class SendMessage @Inject constructor( private val context: Context, private val prefs: Preferences, - private val messageRepo: MessageRepository) - : Interactor() { + private val messageRepo: MessageRepository +) : Interactor() { - data class Params(val threadId: Long, val address: String, val body: String) + data class Params(val threadId: Long, val addresses: List, val body: String) - override fun buildObservable(params: Params): Flowable { - val smsManager = SmsManager.getDefault() - - return Flowable.just(params) - .map { messageRepo.insertSentSms(params.threadId, params.address, params.body) } - .doOnNext { message -> - val parts = smsManager.divideMessage(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) + override fun buildObservable(params: Params): Flowable { + return Flowable.just(Unit) + .filter { params.addresses.isNotEmpty() } + .doOnNext { + if (params.addresses.size == 1) { + sendSms(params.threadId, params.addresses.first(), params.body) + } else { + sendMms(params.threadId, params.addresses, params.body) } - - 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, 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) + } + } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt index 40ffffd1..e29f42ad 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt @@ -248,8 +248,8 @@ class ComposeViewModel(intent: Intent) : QkViewModel( .map { body -> body.toString() } .withLatestFrom(conversation, { body, conversation -> val threadId = conversation.id - val address = conversation.recipients.first()?.address.orEmpty() - sendMessage.execute(SendMessage.Params(threadId, address, body)) + val addresses = conversation.recipients.map { it.address } + sendMessage.execute(SendMessage.Params(threadId, addresses, body)) view.setDraft("") }) .withLatestFrom(state, { _, state -> diff --git a/qksms/src/main/java/presentation/receiver/RemoteMessagingReceiver.kt b/qksms/src/main/java/presentation/receiver/RemoteMessagingReceiver.kt index 89903c13..e6b9b9ca 100644 --- a/qksms/src/main/java/presentation/receiver/RemoteMessagingReceiver.kt +++ b/qksms/src/main/java/presentation/receiver/RemoteMessagingReceiver.kt @@ -42,7 +42,7 @@ class RemoteMessagingReceiver : BroadcastReceiver() { val threadId = bundle.getLong("threadId") val body = remoteInput.getCharSequence("body").toString() markRead.execute(threadId) - sendMessage.execute(SendMessage.Params(threadId, address, body)) + sendMessage.execute(SendMessage.Params(threadId, listOf(address), body)) } } }