diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt index 1713b0e9..026c16ed 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt @@ -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) diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index 9caee9aa..cb83ee27 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -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) { diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt index 347b8c43..80e49330 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/MessageSentReceiver.kt @@ -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) } } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt index e7e73029..1c4b1096 100644 --- a/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt +++ b/qksms/src/main/java/com/moez/QKSMS/receiver/SmsReceiver.kt @@ -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) } } diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt index e7fbf3c1..1b6b586e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt @@ -49,6 +49,12 @@ class MessageAdapter(data: OrderedRealmCollection?) : 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) diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt index 501c581a..9aaf45b6 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageViewHolder.kt @@ -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) diff --git a/qksms/src/main/res/layout/message_list_item_out.xml b/qksms/src/main/res/layout/message_list_item_out.xml index 6f1e19e5..c0e6bee8 100644 --- a/qksms/src/main/res/layout/message_list_item_out.xml +++ b/qksms/src/main/res/layout/message_list_item_out.xml @@ -52,4 +52,13 @@ + + \ No newline at end of file