From 42c949b7dcce1c3687ce93d18ce9fd6b31193cdc Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 11 Jan 2018 13:32:58 -0500 Subject: [PATCH] Move all Logic from SmsReceiver to ReceiveSms interactor --- .../{ReceiveMessage.kt => ReceiveSms.kt} | 22 +++++++++++++------ .../java/presentation/receiver/SmsReceiver.kt | 17 ++++---------- 2 files changed, 19 insertions(+), 20 deletions(-) rename qksms/src/main/java/interactor/{ReceiveMessage.kt => ReceiveSms.kt} (66%) diff --git a/qksms/src/main/java/interactor/ReceiveMessage.kt b/qksms/src/main/java/interactor/ReceiveSms.kt similarity index 66% rename from qksms/src/main/java/interactor/ReceiveMessage.kt rename to qksms/src/main/java/interactor/ReceiveSms.kt index cd36e1b3..7973c678 100644 --- a/qksms/src/main/java/interactor/ReceiveMessage.kt +++ b/qksms/src/main/java/interactor/ReceiveSms.kt @@ -18,26 +18,34 @@ */ package interactor +import android.telephony.SmsMessage import common.util.NotificationManager import common.util.extensions.mapNotNull +import data.model.Conversation import data.repository.MessageRepository import io.reactivex.Flowable import javax.inject.Inject -class ReceiveMessage @Inject constructor( +class ReceiveSms @Inject constructor( private val messageRepo: MessageRepository, private val notificationManager: NotificationManager) - : Interactor() { + : Interactor, Conversation>() { - data class Params(val address: String, val body: String, val sentTime: Long) - - override fun buildObservable(params: Params): Flowable { + override fun buildObservable(params: Array): Flowable { return Flowable.just(params) - .map { messageRepo.insertReceivedSms(params.address, params.body, params.sentTime) } // Add the message to the db + .filter { it.isNotEmpty() } + .map { messages -> + val address = messages[0].displayOriginatingAddress + val time = messages[0].timestampMillis + val body: String = messages + .map { message -> message.displayMessageBody } + .reduce { body, new -> body + new } + + messageRepo.insertReceivedSms(address, body, time) // Add the message to the db + } .mapNotNull { message -> messageRepo.getOrCreateConversation(message.threadId) } // Map message to conversation .doOnNext { conversation -> if (conversation.archived) messageRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary .doOnNext { conversation -> notificationManager.update(conversation.id) } // Update the notification - .map { } } } \ No newline at end of file diff --git a/qksms/src/main/java/presentation/receiver/SmsReceiver.kt b/qksms/src/main/java/presentation/receiver/SmsReceiver.kt index 0aee1661..ff9df7a5 100644 --- a/qksms/src/main/java/presentation/receiver/SmsReceiver.kt +++ b/qksms/src/main/java/presentation/receiver/SmsReceiver.kt @@ -23,28 +23,19 @@ import android.content.Context import android.content.Intent import android.provider.Telephony.Sms import common.di.appComponent -import interactor.ReceiveMessage -import timber.log.Timber +import interactor.ReceiveSms import javax.inject.Inject class SmsReceiver : BroadcastReceiver() { - @Inject lateinit var receiveMessage: ReceiveMessage + @Inject lateinit var receiveMessage: ReceiveSms override fun onReceive(context: Context, intent: Intent) { - Timber.v("Received SMS: $intent") appComponent.inject(this) - val messages = Sms.Intents.getMessagesFromIntent(intent) - messages?.takeIf { it.isNotEmpty() }?.let { messages -> - val address = messages[0].displayOriginatingAddress - val time = messages[0].timestampMillis - val body: String = messages - .map { message -> message.displayMessageBody } - .reduce { body, new -> body + new } - + Sms.Intents.getMessagesFromIntent(intent)?.let { messages -> val pendingResult = goAsync() - receiveMessage.execute(ReceiveMessage.Params(address, body, time), { pendingResult.finish() }) + receiveMessage.execute(messages, { pendingResult.finish() }) } }