Display status of outgoing messages

This commit is contained in:
Moez Bhatti
2017-09-25 22:08:33 -04:00
parent 2d1165d605
commit 6b8d190361
7 changed files with 74 additions and 32 deletions
@@ -1,5 +1,6 @@
package com.moez.QKSMS.dagger
import com.moez.QKSMS.receiver.MessageSentReceiver
import com.moez.QKSMS.receiver.SmsReceiver
import com.moez.QKSMS.ui.conversations.ConversationAdapter
import com.moez.QKSMS.ui.conversations.ConversationListViewModel
@@ -13,6 +14,7 @@ import javax.inject.Singleton
interface AppComponent {
fun inject(receiver: SmsReceiver)
fun inject(receiver: MessageSentReceiver)
fun inject(viewModel: ConversationListViewModel)
fun inject(viewModel: MessageListViewModel)
@@ -14,6 +14,8 @@ import com.moez.QKSMS.data.sync.SyncManager
import com.moez.QKSMS.receiver.MessageDeliveredReceiver
import com.moez.QKSMS.receiver.MessageSentReceiver
import com.moez.QKSMS.util.extensions.insertOrUpdate
import io.reactivex.Flowable
import io.reactivex.schedulers.Schedulers
import io.realm.Realm
import io.realm.RealmResults
import io.realm.Sort
@@ -56,16 +58,32 @@ class MessageRepository(val context: Context) {
.findAllSorted("date")
}
fun insertMessage(address: String, body: String, time: Long) {
val cv = ContentValues()
cv.put("address", address)
cv.put("body", body)
cv.put("date_sent", time)
fun insertReceivedMessage(address: String, body: String, time: Long) {
val values = ContentValues()
values.put("address", address)
values.put("body", body)
values.put("date_sent", time)
val contentResolver = context.contentResolver
val uri = contentResolver.insert(Uri.parse("content://sms/inbox"), cv)
copyMessageToRealm(uri)
Flowable.just(values)
.subscribeOn(Schedulers.io())
.map { contentResolver.insert(Uri.parse("content://sms/inbox"), values) }
.subscribe { uri -> copyMessageToRealm(uri) }
}
fun markSent(uri: Uri) {
val values = ContentValues()
values.put("type", Telephony.TextBasedSmsColumns.MESSAGE_TYPE_SENT)
values.put("read", true)
updateMessage(values, uri)
}
fun markFailed(uri: Uri, resultCode: Int) {
val values = ContentValues()
values.put("type", Telephony.TextBasedSmsColumns.MESSAGE_TYPE_FAILED)
values.put("read", true)
values.put("error_code", resultCode)
updateMessage(values, uri)
}
fun sendMessage(threadId: Long, address: String, body: String) {
@@ -78,17 +96,29 @@ class MessageRepository(val context: Context) {
values.put("thread_id", threadId)
val contentResolver = context.contentResolver
val uri = contentResolver.insert(Uri.parse("content://sms/"), values)
copyMessageToRealm(uri)
Flowable.just(values)
.subscribeOn(Schedulers.io())
.map { contentResolver.insert(Uri.parse("content://sms/"), values) }
.subscribe { uri ->
copyMessageToRealm(uri)
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 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 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)
val smsManager = SmsManager.getDefault()
smsManager.sendTextMessage(address, null, body, sentPI, deliveredPI)
}
}
private fun updateMessage(values: ContentValues, uri: Uri) {
val contentResolver = context.contentResolver
Flowable.just(values)
.subscribeOn(Schedulers.io())
.map { contentResolver.update(uri, values, null, null) }
.subscribe { copyMessageToRealm(uri) }
}
private fun copyMessageToRealm(uri: Uri) {
@@ -2,36 +2,30 @@ 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
import com.moez.QKSMS.dagger.AppComponentManager
import com.moez.QKSMS.data.repository.MessageRepository
import javax.inject.Inject
class MessageSentReceiver : BroadcastReceiver() {
@Inject lateinit var messageRepo: MessageRepository
override fun onReceive(context: Context, intent: Intent) {
AppComponentManager.appComponent.inject(this)
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)
}
Activity.RESULT_OK -> messageRepo.markSent(uri)
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)
}
SmsManager.RESULT_ERROR_RADIO_OFF -> messageRepo.markFailed(uri, resultCode)
}
}
}
@@ -25,7 +25,7 @@ class SmsReceiver : BroadcastReceiver() {
.map { message -> message.displayMessageBody }
.reduce { body, new -> body + new }
messageRepo.insertMessage(address, body, time)
messageRepo.insertReceivedMessage(address, body, time)
}
}
@@ -49,6 +49,12 @@ class MessageAdapter(data: OrderedRealmCollection<Message>?) : RealmRecyclerView
bindGrouping(viewHolder, position)
viewHolder.status?.text = when {
message.isSending() -> "..."
message.isFailedMessage() -> "fail"
else -> "sent"
}
viewHolder.avatar?.apply { contact = Contact() }
viewHolder.body.text = message.body
viewHolder.timestamp.text = dateFormatter.getMessageTimestamp(message.date)
@@ -10,6 +10,7 @@ class MessageViewHolder(view: View) : RecyclerView.ViewHolder(view) {
val timestamp: TextView = view.findViewById(R.id.timestamp)
val message: View = view.findViewById(R.id.message)
val status: TextView? = view.findViewById(R.id.status)
val avatar: AvatarView? = view.findViewById(R.id.avatar)
val body: TextView = view.findViewById(R.id.body)
@@ -52,4 +52,13 @@
</LinearLayout>
<TextView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:textColor="@color/textTertiary"
android:layout_marginRight="24dp"
tools:text="Sending" />
</LinearLayout>