Simplify logic for obtaining SmsMessages from Intent

This commit is contained in:
Moez Bhatti
2017-09-25 16:35:48 -04:00
parent 0bb0f47fe9
commit 36389c9864
@@ -3,8 +3,7 @@ package com.moez.QKSMS.receiver
import android.content.BroadcastReceiver import android.content.BroadcastReceiver
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Build import android.provider.Telephony.Sms
import android.telephony.SmsMessage
import com.moez.QKSMS.dagger.AppComponentManager import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.data.repository.MessageRepository
import timber.log.Timber import timber.log.Timber
@@ -18,26 +17,15 @@ class SmsReceiver : BroadcastReceiver() {
Timber.v("Received SMS: $intent") Timber.v("Received SMS: $intent")
AppComponentManager.appComponent.inject(this) AppComponentManager.appComponent.inject(this)
intent.extras?.let { extras -> val messages = Sms.Intents.getMessagesFromIntent(intent)
val pdus = extras.get("pdus") as Array<Any> messages?.takeIf { it.isNotEmpty() }?.let { messages ->
val format = extras.getString("format") val address = messages[0].displayOriginatingAddress
val messages = pdus.map { pdu -> val time = messages[0].timestampMillis
if (Build.VERSION.SDK_INT > 23) { val body: String = messages
SmsMessage.createFromPdu(pdu as ByteArray, format) .map { message -> message.displayMessageBody }
} else { .reduce { body, new -> body + new }
SmsMessage.createFromPdu(pdu as ByteArray)
}
}
messages[0]?.let { sms -> messageRepo.insertMessage(address, body, time)
val address = sms.displayOriginatingAddress
val time = sms.timestampMillis
val body: String = messages
.map { message -> message.displayMessageBody }
.reduce { body, new -> body + new }
messageRepo.insertMessage(address, body, time)
}
} }
} }