Move all Logic from SmsReceiver to ReceiveSms interactor

This commit is contained in:
Moez Bhatti
2018-01-11 13:32:58 -05:00
parent 840aaf7bbb
commit 42c949b7dc
2 changed files with 19 additions and 20 deletions
@@ -18,26 +18,34 @@
*/ */
package interactor package interactor
import android.telephony.SmsMessage
import common.util.NotificationManager import common.util.NotificationManager
import common.util.extensions.mapNotNull import common.util.extensions.mapNotNull
import data.model.Conversation
import data.repository.MessageRepository import data.repository.MessageRepository
import io.reactivex.Flowable import io.reactivex.Flowable
import javax.inject.Inject import javax.inject.Inject
class ReceiveMessage @Inject constructor( class ReceiveSms @Inject constructor(
private val messageRepo: MessageRepository, private val messageRepo: MessageRepository,
private val notificationManager: NotificationManager) private val notificationManager: NotificationManager)
: Interactor<ReceiveMessage.Params, Unit>() { : Interactor<Array<SmsMessage>, Conversation>() {
data class Params(val address: String, val body: String, val sentTime: Long) override fun buildObservable(params: Array<SmsMessage>): Flowable<Conversation> {
override fun buildObservable(params: Params): Flowable<Unit> {
return Flowable.just(params) 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 .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 -> if (conversation.archived) messageRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary
.doOnNext { conversation -> notificationManager.update(conversation.id) } // Update the notification .doOnNext { conversation -> notificationManager.update(conversation.id) } // Update the notification
.map { }
} }
} }
@@ -23,28 +23,19 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.provider.Telephony.Sms import android.provider.Telephony.Sms
import common.di.appComponent import common.di.appComponent
import interactor.ReceiveMessage import interactor.ReceiveSms
import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
class SmsReceiver : BroadcastReceiver() { class SmsReceiver : BroadcastReceiver() {
@Inject lateinit var receiveMessage: ReceiveMessage @Inject lateinit var receiveMessage: ReceiveSms
override fun onReceive(context: Context, intent: Intent) { override fun onReceive(context: Context, intent: Intent) {
Timber.v("Received SMS: $intent")
appComponent.inject(this) appComponent.inject(this)
val messages = Sms.Intents.getMessagesFromIntent(intent) Sms.Intents.getMessagesFromIntent(intent)?.let { messages ->
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 }
val pendingResult = goAsync() val pendingResult = goAsync()
receiveMessage.execute(ReceiveMessage.Params(address, body, time), { pendingResult.finish() }) receiveMessage.execute(messages, { pendingResult.finish() })
} }
} }