From d88bdf679dd783d331a80ff587867c5d3c1b9d5c Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 26 Sep 2017 12:35:50 -0400 Subject: [PATCH] Add ability to mark messages Read or Sent --- .../data/repository/MessageRepository.kt | 102 +++++++++++++++--- .../ConversationListViewModel.kt | 2 + .../QKSMS/ui/messages/MessageListViewModel.kt | 2 + 3 files changed, 89 insertions(+), 17 deletions(-) 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 cb83ee27..bfa98971 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 @@ -5,7 +5,8 @@ import android.content.ContentValues import android.content.Context import android.content.Intent import android.net.Uri -import android.provider.Telephony +import android.provider.BaseColumns +import android.provider.Telephony.Sms import android.telephony.SmsManager import com.moez.QKSMS.data.model.Conversation 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.receiver.MessageDeliveredReceiver import com.moez.QKSMS.receiver.MessageSentReceiver +import com.moez.QKSMS.util.extensions.asFlowable import com.moez.QKSMS.util.extensions.insertOrUpdate import io.reactivex.Flowable import io.reactivex.schedulers.Schedulers @@ -60,45 +62,111 @@ class MessageRepository(val context: Context) { fun insertReceivedMessage(address: String, body: String, time: Long) { val values = ContentValues() - values.put("address", address) - values.put("body", body) - values.put("date_sent", time) + values.put(Sms.ADDRESS, address) + values.put(Sms.BODY, body) + values.put(Sms.DATE_SENT, time) val contentResolver = context.contentResolver Flowable.just(values) .subscribeOn(Schedulers.io()) - .map { contentResolver.insert(Uri.parse("content://sms/inbox"), values) } + .map { contentResolver.insert(Sms.Inbox.CONTENT_URI, values) } .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) { val values = ContentValues() - values.put("type", Telephony.TextBasedSmsColumns.MESSAGE_TYPE_SENT) - values.put("read", true) + values.put(Sms.TYPE, Sms.MESSAGE_TYPE_SENT) 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) + values.put(Sms.TYPE, Sms.MESSAGE_TYPE_FAILED) + values.put(Sms.ERROR_CODE, resultCode) updateMessage(values, uri) } fun sendMessage(threadId: Long, address: String, body: String) { val values = ContentValues() - values.put("address", address) - values.put("body", body) - values.put("date", System.currentTimeMillis()) - values.put("read", true) - values.put("type", Telephony.TextBasedSmsColumns.MESSAGE_TYPE_OUTBOX) - values.put("thread_id", threadId) + values.put(Sms.ADDRESS, address) + values.put(Sms.BODY, body) + values.put(Sms.DATE, System.currentTimeMillis()) + values.put(Sms.READ, true) + values.put(Sms.TYPE, Sms.MESSAGE_TYPE_OUTBOX) + values.put(Sms.THREAD_ID, threadId) val contentResolver = context.contentResolver Flowable.just(values) .subscribeOn(Schedulers.io()) - .map { contentResolver.insert(Uri.parse("content://sms/"), values) } + .map { contentResolver.insert(Sms.CONTENT_URI, values) } .subscribe { uri -> copyMessageToRealm(uri) diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt index a326adc4..942aa50e 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListViewModel.kt @@ -31,6 +31,8 @@ class ConversationListViewModel : ViewModel() { conversations = messageRepo.getConversationMessagesAsync() partialStates.onNext(PartialState.ConversationsLoaded(conversations)) + + messageRepo.markAllSeen() } fun onRefresh() { diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt index 7ef7cd37..11f0e5d4 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListViewModel.kt @@ -43,6 +43,8 @@ class MessageListViewModel : ViewModel() { false -> partialStates.onNext(PartialState.ConversationError(true)) } } + + messageRepo.markRead(threadId) } fun sendMessage(body: String) {