Add receivers for message Sent and Delivery confirmation

This commit is contained in:
Moez Bhatti
2017-09-23 01:11:09 -04:00
parent 7725e7734a
commit e1b33538ba
4 changed files with 91 additions and 5 deletions
+2
View File
@@ -59,6 +59,8 @@
<data android:mimeType="application/vnd.wap.mms-message" /> <data android:mimeType="application/vnd.wap.mms-message" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name=".receiver.MessageSentReceiver" />
<receiver android:name=".receiver.MessageDeliveredReceiver" />
<service android:name=".service.HeadlessSmsSendService" <service android:name=".service.HeadlessSmsSendService"
android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE" android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE"
@@ -1,8 +1,10 @@
package com.moez.QKSMS.data.repository package com.moez.QKSMS.data.repository
import android.app.PendingIntent
import android.content.ContentResolver import android.content.ContentResolver
import android.content.ContentValues import android.content.ContentValues
import android.content.Context import android.content.Context
import android.content.Intent
import android.net.Uri import android.net.Uri
import android.provider.Telephony import android.provider.Telephony
import android.telephony.SmsManager import android.telephony.SmsManager
@@ -10,6 +12,8 @@ import com.moez.QKSMS.data.model.Conversation
import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.sync.MessageColumns import com.moez.QKSMS.data.sync.MessageColumns
import com.moez.QKSMS.data.sync.SyncManager import com.moez.QKSMS.data.sync.SyncManager
import com.moez.QKSMS.receiver.MessageDeliveredReceiver
import com.moez.QKSMS.receiver.MessageSentReceiver
import io.realm.Realm import io.realm.Realm
import io.realm.RealmResults import io.realm.RealmResults
@@ -50,20 +54,26 @@ class MessageRepository(val context: Context) {
} }
fun sendMessage(threadId: Long, address: String, body: String) { fun sendMessage(threadId: Long, address: String, body: String) {
val smsManager = SmsManager.getDefault()
smsManager.sendTextMessage(address, null, body, null, null)
val values = ContentValues() val values = ContentValues()
values.put("address", address) values.put("address", address)
values.put("body", body) values.put("body", body)
values.put("date", System.currentTimeMillis()) values.put("date", System.currentTimeMillis())
values.put("read", 1) values.put("read", true)
values.put("type", 4) values.put("type", Telephony.TextBasedSmsColumns.MESSAGE_TYPE_OUTBOX)
values.put("thread_id", threadId) values.put("thread_id", threadId)
val contentResolver = context.contentResolver val contentResolver = context.contentResolver
val uri = contentResolver.insert(Uri.parse("content://sms/"), values) val uri = contentResolver.insert(Uri.parse("content://sms/"), values)
copyLatestMessageToRealm(uri, contentResolver) copyLatestMessageToRealm(uri, contentResolver)
val sentIntent = Intent(context, MessageSentReceiver::class.java).putExtra("uri", uri.toString())
val sentPI = PendingIntent.getBroadcast(context, uri.lastPathSegment.toInt(), sentIntent, PendingIntent.FLAG_UPDATE_CURRENT)
val deliveredIntent = Intent(context, MessageDeliveredReceiver::class.java).putExtra("uri", uri.toString())
val deliveredPI = PendingIntent.getBroadcast(context, uri.lastPathSegment.toInt(), deliveredIntent, PendingIntent.FLAG_UPDATE_CURRENT)
val smsManager = SmsManager.getDefault()
smsManager.sendTextMessage(address, null, body, sentPI, deliveredPI)
} }
// TODO this is really sloppy, it should be fixed // TODO this is really sloppy, it should be fixed
@@ -0,0 +1,37 @@
package com.moez.QKSMS.receiver
import android.app.Activity
import android.content.BroadcastReceiver
import android.content.ContentValues
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.provider.Telephony
import java.util.*
class MessageDeliveredReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
val uri = Uri.parse(intent.getStringExtra("uri"))
when (resultCode) {
Activity.RESULT_OK -> { // TODO notify about delivery
val values = ContentValues()
values.put("status", Telephony.TextBasedSmsColumns.STATUS_COMPLETE)
values.put("date_sent", Calendar.getInstance().timeInMillis)
values.put("read", true)
context.contentResolver.update(uri, values, null, null)
}
Activity.RESULT_CANCELED -> { // TODO notify about delivery failure
val values = ContentValues()
values.put("status", Telephony.TextBasedSmsColumns.STATUS_FAILED)
values.put("date_sent", Calendar.getInstance().timeInMillis)
values.put("read", true)
values.put("error_code", resultCode)
context.contentResolver.update(uri, values, null, null)
}
}
}
}
@@ -0,0 +1,37 @@
package com.moez.QKSMS.receiver
import android.app.Activity
import android.content.BroadcastReceiver
import android.content.ContentValues
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.provider.Telephony
import android.telephony.SmsManager
class MessageSentReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
val uri = Uri.parse(intent.getStringExtra("uri"))
when (resultCode) {
Activity.RESULT_OK -> {
val values = ContentValues()
values.put("type", Telephony.TextBasedSmsColumns.MESSAGE_TYPE_SENT)
values.put("read", true)
context.contentResolver.update(uri, values, null, null)
}
SmsManager.RESULT_ERROR_GENERIC_FAILURE,
SmsManager.RESULT_ERROR_NO_SERVICE,
SmsManager.RESULT_ERROR_NULL_PDU,
SmsManager.RESULT_ERROR_RADIO_OFF -> {
val values = ContentValues()
values.put("type", Telephony.TextBasedSmsColumns.MESSAGE_TYPE_FAILED)
values.put("read", true)
values.put("error_code", resultCode)
context.contentResolver.update(uri, values, null, null)
}
}
}
}