Add ability to mark messages Read or Sent

This commit is contained in:
Moez Bhatti
2017-09-26 12:35:50 -04:00
parent 14e2dbddeb
commit d88bdf679d
3 changed files with 89 additions and 17 deletions
@@ -5,7 +5,8 @@ import android.content.ContentValues
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.net.Uri import android.net.Uri
import android.provider.Telephony import android.provider.BaseColumns
import android.provider.Telephony.Sms
import android.telephony.SmsManager import android.telephony.SmsManager
import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.model.Conversation
import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.model.Message
@@ -13,6 +14,7 @@ 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.MessageDeliveredReceiver
import com.moez.QKSMS.receiver.MessageSentReceiver import com.moez.QKSMS.receiver.MessageSentReceiver
import com.moez.QKSMS.util.extensions.asFlowable
import com.moez.QKSMS.util.extensions.insertOrUpdate import com.moez.QKSMS.util.extensions.insertOrUpdate
import io.reactivex.Flowable import io.reactivex.Flowable
import io.reactivex.schedulers.Schedulers import io.reactivex.schedulers.Schedulers
@@ -60,45 +62,111 @@ class MessageRepository(val context: Context) {
fun insertReceivedMessage(address: String, body: String, time: Long) { fun insertReceivedMessage(address: String, body: String, time: Long) {
val values = ContentValues() val values = ContentValues()
values.put("address", address) values.put(Sms.ADDRESS, address)
values.put("body", body) values.put(Sms.BODY, body)
values.put("date_sent", time) values.put(Sms.DATE_SENT, time)
val contentResolver = context.contentResolver val contentResolver = context.contentResolver
Flowable.just(values) Flowable.just(values)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.map { contentResolver.insert(Uri.parse("content://sms/inbox"), values) } .map { contentResolver.insert(Sms.Inbox.CONTENT_URI, values) }
.subscribe { uri -> copyMessageToRealm(uri) } .subscribe { uri -> copyMessageToRealm(uri) }
} }
fun markAllSeen() {
// Messages in SMS ContentProvider
val projection = arrayOf(BaseColumns._ID)
val selection = "${Sms.SEEN} = 0"
val contentResolver = context.contentResolver
contentResolver.query(Sms.Inbox.CONTENT_URI, projection, selection, null, null)
.asFlowable()
.subscribeOn(Schedulers.io())
.map { cursor -> cursor.getLong(0) }
.map { id -> Uri.withAppendedPath(Sms.CONTENT_URI, id.toString()) }
.subscribe { uri ->
val values = ContentValues()
values.put(Sms.SEEN, true)
contentResolver.update(uri, values, null, null)
}
// TODO also need to mark MMS in ContentProvider as Seen
// Messages in Realm
Schedulers.io().scheduleDirect {
val realm = Realm.getDefaultInstance()
val messages = realm.where(Message::class.java).equalTo("seen", false).findAll()
realm.executeTransaction { messages.forEach { message -> message.seen = true } }
realm.close()
}
}
fun markRead(threadId: Long) {
// Messages in SMS ContentProvider
val projection = arrayOf(BaseColumns._ID)
val selection = "${Sms.THREAD_ID} = $threadId AND (${Sms.SEEN} = 0 OR ${Sms.READ} = 0)"
val contentResolver = context.contentResolver
contentResolver.query(Sms.Inbox.CONTENT_URI, projection, selection, null, null)
.asFlowable()
.subscribeOn(Schedulers.io())
.map { cursor -> cursor.getLong(0) }
.map { id -> Uri.withAppendedPath(Sms.CONTENT_URI, id.toString()) }
.subscribe { uri ->
val values = ContentValues()
values.put(Sms.SEEN, true)
values.put(Sms.READ, true)
contentResolver.update(uri, values, null, null)
}
// TODO also need to mark MMS in ContentProvider as Read
// Messages in Realm
Schedulers.io().scheduleDirect {
val realm = Realm.getDefaultInstance()
val messages = realm.where(Message::class.java)
.equalTo("threadId", threadId)
.beginGroup()
.equalTo("read", false)
.or()
.equalTo("seen", false)
.endGroup()
.findAll()
realm.executeTransaction {
messages.forEach { message ->
message.seen = true
message.read = true
}
}
realm.close()
}
}
fun markSent(uri: Uri) { fun markSent(uri: Uri) {
val values = ContentValues() val values = ContentValues()
values.put("type", Telephony.TextBasedSmsColumns.MESSAGE_TYPE_SENT) values.put(Sms.TYPE, Sms.MESSAGE_TYPE_SENT)
values.put("read", true)
updateMessage(values, uri) updateMessage(values, uri)
} }
fun markFailed(uri: Uri, resultCode: Int) { fun markFailed(uri: Uri, resultCode: Int) {
val values = ContentValues() val values = ContentValues()
values.put("type", Telephony.TextBasedSmsColumns.MESSAGE_TYPE_FAILED) values.put(Sms.TYPE, Sms.MESSAGE_TYPE_FAILED)
values.put("read", true) values.put(Sms.ERROR_CODE, resultCode)
values.put("error_code", resultCode)
updateMessage(values, uri) updateMessage(values, uri)
} }
fun sendMessage(threadId: Long, address: String, body: String) { fun sendMessage(threadId: Long, address: String, body: String) {
val values = ContentValues() val values = ContentValues()
values.put("address", address) values.put(Sms.ADDRESS, address)
values.put("body", body) values.put(Sms.BODY, body)
values.put("date", System.currentTimeMillis()) values.put(Sms.DATE, System.currentTimeMillis())
values.put("read", true) values.put(Sms.READ, true)
values.put("type", Telephony.TextBasedSmsColumns.MESSAGE_TYPE_OUTBOX) values.put(Sms.TYPE, Sms.MESSAGE_TYPE_OUTBOX)
values.put("thread_id", threadId) values.put(Sms.THREAD_ID, threadId)
val contentResolver = context.contentResolver val contentResolver = context.contentResolver
Flowable.just(values) Flowable.just(values)
.subscribeOn(Schedulers.io()) .subscribeOn(Schedulers.io())
.map { contentResolver.insert(Uri.parse("content://sms/"), values) } .map { contentResolver.insert(Sms.CONTENT_URI, values) }
.subscribe { uri -> .subscribe { uri ->
copyMessageToRealm(uri) copyMessageToRealm(uri)
@@ -31,6 +31,8 @@ class ConversationListViewModel : ViewModel() {
conversations = messageRepo.getConversationMessagesAsync() conversations = messageRepo.getConversationMessagesAsync()
partialStates.onNext(PartialState.ConversationsLoaded(conversations)) partialStates.onNext(PartialState.ConversationsLoaded(conversations))
messageRepo.markAllSeen()
} }
fun onRefresh() { fun onRefresh() {
@@ -43,6 +43,8 @@ class MessageListViewModel : ViewModel() {
false -> partialStates.onNext(PartialState.ConversationError(true)) false -> partialStates.onNext(PartialState.ConversationError(true))
} }
} }
messageRepo.markRead(threadId)
} }
fun sendMessage(body: String) { fun sendMessage(body: String) {