forked from upstream-mirrors/quik
Move logic for marking message sent into repo
This commit is contained in:
@@ -4,7 +4,8 @@ import android.content.ContentValues
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.provider.BaseColumns
|
import android.provider.BaseColumns
|
||||||
import android.provider.Telephony
|
import android.provider.Telephony.Sms
|
||||||
|
import android.provider.Telephony.TextBasedSmsColumns
|
||||||
import com.moez.QKSMS.common.util.extensions.asFlowable
|
import com.moez.QKSMS.common.util.extensions.asFlowable
|
||||||
import com.moez.QKSMS.common.util.extensions.insertOrUpdate
|
import com.moez.QKSMS.common.util.extensions.insertOrUpdate
|
||||||
import com.moez.QKSMS.data.mapper.CursorToMessageFlowable
|
import com.moez.QKSMS.data.mapper.CursorToMessageFlowable
|
||||||
@@ -83,17 +84,17 @@ class MessageRepository @Inject constructor(private val context: Context) {
|
|||||||
fun markRead(threadId: Long) {
|
fun markRead(threadId: Long) {
|
||||||
// TODO also need to mark MMS in ContentProvider as Read
|
// TODO also need to mark MMS in ContentProvider as Read
|
||||||
val projection = arrayOf(BaseColumns._ID)
|
val projection = arrayOf(BaseColumns._ID)
|
||||||
val selection = "${Telephony.Sms.THREAD_ID} = $threadId AND (${Telephony.Sms.SEEN} = 0 OR ${Telephony.Sms.READ} = 0)"
|
val selection = "${Sms.THREAD_ID} = $threadId AND (${Sms.SEEN} = 0 OR ${Sms.READ} = 0)"
|
||||||
val contentResolver = context.contentResolver
|
val contentResolver = context.contentResolver
|
||||||
contentResolver.query(Telephony.Sms.Inbox.CONTENT_URI, projection, selection, null, null)
|
contentResolver.query(Sms.Inbox.CONTENT_URI, projection, selection, null, null)
|
||||||
.asFlowable()
|
.asFlowable()
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.map { cursor -> cursor.getLong(0) }
|
.map { cursor -> cursor.getLong(0) }
|
||||||
.map { id -> Uri.withAppendedPath(Telephony.Sms.CONTENT_URI, id.toString()) }
|
.map { id -> Uri.withAppendedPath(Sms.CONTENT_URI, id.toString()) }
|
||||||
.subscribe { uri ->
|
.subscribe { uri ->
|
||||||
val values = ContentValues()
|
val values = ContentValues()
|
||||||
values.put(Telephony.Sms.SEEN, true)
|
values.put(Sms.SEEN, true)
|
||||||
values.put(Telephony.Sms.READ, true)
|
values.put(Sms.READ, true)
|
||||||
contentResolver.update(uri, values, null, null)
|
contentResolver.update(uri, values, null, null)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -117,16 +118,22 @@ class MessageRepository @Inject constructor(private val context: Context) {
|
|||||||
realm.close()
|
realm.close()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun markSent(uri: Uri) {
|
||||||
|
val values = ContentValues()
|
||||||
|
values.put(Sms.TYPE, Sms.MESSAGE_TYPE_SENT)
|
||||||
|
updateMessageFromUri(uri, values)
|
||||||
|
}
|
||||||
|
|
||||||
fun markFailed(uri: Uri, resultCode: Int) {
|
fun markFailed(uri: Uri, resultCode: Int) {
|
||||||
val values = ContentValues()
|
val values = ContentValues()
|
||||||
values.put(Telephony.Sms.TYPE, Telephony.Sms.MESSAGE_TYPE_FAILED)
|
values.put(Sms.TYPE, Sms.MESSAGE_TYPE_FAILED)
|
||||||
values.put(Telephony.Sms.ERROR_CODE, resultCode)
|
values.put(Sms.ERROR_CODE, resultCode)
|
||||||
updateMessageFromUri(uri, values)
|
updateMessageFromUri(uri, values)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun markDelivered(uri: Uri) {
|
fun markDelivered(uri: Uri) {
|
||||||
val values = ContentValues()
|
val values = ContentValues()
|
||||||
values.put("status", Telephony.TextBasedSmsColumns.STATUS_COMPLETE)
|
values.put("status", TextBasedSmsColumns.STATUS_COMPLETE)
|
||||||
values.put("date_sent", Calendar.getInstance().timeInMillis)
|
values.put("date_sent", Calendar.getInstance().timeInMillis)
|
||||||
values.put("read", true)
|
values.put("read", true)
|
||||||
updateMessageFromUri(uri, values)
|
updateMessageFromUri(uri, values)
|
||||||
@@ -134,7 +141,7 @@ class MessageRepository @Inject constructor(private val context: Context) {
|
|||||||
|
|
||||||
fun markDeliveryFailed(uri: Uri, resultCode: Int) {
|
fun markDeliveryFailed(uri: Uri, resultCode: Int) {
|
||||||
val values = ContentValues()
|
val values = ContentValues()
|
||||||
values.put("status", Telephony.TextBasedSmsColumns.STATUS_FAILED)
|
values.put("status", TextBasedSmsColumns.STATUS_FAILED)
|
||||||
values.put("date_sent", Calendar.getInstance().timeInMillis)
|
values.put("date_sent", Calendar.getInstance().timeInMillis)
|
||||||
values.put("read", true)
|
values.put("read", true)
|
||||||
values.put("error_code", resultCode)
|
values.put("error_code", resultCode)
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package com.moez.QKSMS.domain.interactor
|
package com.moez.QKSMS.domain.interactor
|
||||||
|
|
||||||
import android.content.ContentValues
|
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.provider.Telephony
|
|
||||||
import com.moez.QKSMS.data.repository.MessageRepository
|
import com.moez.QKSMS.data.repository.MessageRepository
|
||||||
import io.reactivex.Flowable
|
import io.reactivex.Flowable
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
@@ -10,13 +8,8 @@ import javax.inject.Inject
|
|||||||
class MarkSent @Inject constructor(val messageRepo: MessageRepository) : Interactor<Unit, Uri>() {
|
class MarkSent @Inject constructor(val messageRepo: MessageRepository) : Interactor<Unit, Uri>() {
|
||||||
|
|
||||||
override fun buildObservable(params: Uri): Flowable<Unit> {
|
override fun buildObservable(params: Uri): Flowable<Unit> {
|
||||||
return Flowable.just(params)
|
return Flowable.just(Unit)
|
||||||
.doOnNext {
|
.doOnNext { messageRepo.markSent(params) }
|
||||||
val values = ContentValues()
|
|
||||||
values.put(Telephony.Sms.TYPE, Telephony.Sms.MESSAGE_TYPE_SENT)
|
|
||||||
messageRepo.updateMessageFromUri(params, values)
|
|
||||||
}
|
|
||||||
.map { Unit }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user