forked from upstream-mirrors/quik
Use int instead of enum to store SMS delivery status
This commit is contained in:
@@ -24,7 +24,6 @@ import android.net.Uri
|
|||||||
import android.provider.Telephony.*
|
import android.provider.Telephony.*
|
||||||
import common.util.Keys
|
import common.util.Keys
|
||||||
import data.model.Message
|
import data.model.Message
|
||||||
import data.model.Message.DeliveryStatus
|
|
||||||
import timber.log.Timber
|
import timber.log.Timber
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
@@ -60,14 +59,7 @@ class CursorToMessage @Inject constructor(
|
|||||||
seen = cursor.getInt(columnsMap.smsSeen) != 0
|
seen = cursor.getInt(columnsMap.smsSeen) != 0
|
||||||
body = cursor.getString(columnsMap.smsBody) ?: ""
|
body = cursor.getString(columnsMap.smsBody) ?: ""
|
||||||
errorCode = cursor.getInt(columnsMap.smsErrorCode)
|
errorCode = cursor.getInt(columnsMap.smsErrorCode)
|
||||||
|
deliveryStatus = cursor.getInt(columnsMap.smsStatus)
|
||||||
val status = cursor.getLong(columnsMap.smsStatus)
|
|
||||||
deliveryStatus = when {
|
|
||||||
status == Sms.STATUS_NONE.toLong() -> DeliveryStatus.NONE
|
|
||||||
status >= Sms.STATUS_FAILED -> DeliveryStatus.FAILED
|
|
||||||
status >= Sms.STATUS_PENDING -> DeliveryStatus.PENDING
|
|
||||||
else -> DeliveryStatus.RECEIVED
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
"mms" -> {
|
"mms" -> {
|
||||||
|
|||||||
@@ -41,22 +41,16 @@ open class Message : RealmObject() {
|
|||||||
var address: String = ""
|
var address: String = ""
|
||||||
var boxId: Int = 0
|
var boxId: Int = 0
|
||||||
var type: String = ""
|
var type: String = ""
|
||||||
var body: String = ""
|
|
||||||
var date: Long = 0
|
var date: Long = 0
|
||||||
var dateSent: Long = 0
|
var dateSent: Long = 0
|
||||||
var seen: Boolean = false
|
var seen: Boolean = false
|
||||||
var read: Boolean = false
|
var read: Boolean = false
|
||||||
var locked: Boolean = false
|
var locked: Boolean = false
|
||||||
|
|
||||||
var deliveryStatusString: String = DeliveryStatus.NONE.toString()
|
|
||||||
var deliveryStatus: DeliveryStatus
|
|
||||||
get() = DeliveryStatus.valueOf(deliveryStatusString)
|
|
||||||
set(value) {
|
|
||||||
deliveryStatusString = value.toString()
|
|
||||||
}
|
|
||||||
|
|
||||||
// SMS only
|
// SMS only
|
||||||
|
var body: String = ""
|
||||||
var errorCode: Int = 0
|
var errorCode: Int = 0
|
||||||
|
var deliveryStatus: Int = Sms.STATUS_NONE
|
||||||
|
|
||||||
// MMS only
|
// MMS only
|
||||||
var attachmentTypeString: String = AttachmentType.NOT_LOADED.toString()
|
var attachmentTypeString: String = AttachmentType.NOT_LOADED.toString()
|
||||||
@@ -114,7 +108,7 @@ open class Message : RealmObject() {
|
|||||||
|
|
||||||
fun isDelivered(): Boolean {
|
fun isDelivered(): Boolean {
|
||||||
val isDeliveredMms = false // TODO
|
val isDeliveredMms = false // TODO
|
||||||
val isDeliveredSms = deliveryStatus == DeliveryStatus.RECEIVED
|
val isDeliveredSms = deliveryStatus == Sms.STATUS_COMPLETE
|
||||||
return isDeliveredMms || isDeliveredSms
|
return isDeliveredMms || isDeliveredSms
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ import android.net.Uri
|
|||||||
import android.provider.BaseColumns
|
import android.provider.BaseColumns
|
||||||
import android.provider.Telephony
|
import android.provider.Telephony
|
||||||
import android.provider.Telephony.Sms
|
import android.provider.Telephony.Sms
|
||||||
import android.provider.Telephony.TextBasedSmsColumns
|
|
||||||
import common.util.Keys
|
import common.util.Keys
|
||||||
import common.util.MessageUtils
|
import common.util.MessageUtils
|
||||||
import common.util.extensions.*
|
import common.util.extensions.*
|
||||||
@@ -389,7 +388,7 @@ class MessageRepository @Inject constructor(
|
|||||||
.doOnNext { message ->
|
.doOnNext { message ->
|
||||||
// Update the message in realm
|
// Update the message in realm
|
||||||
realm.executeTransaction {
|
realm.executeTransaction {
|
||||||
message.deliveryStatus = Message.DeliveryStatus.RECEIVED
|
message.deliveryStatus = Sms.STATUS_COMPLETE
|
||||||
message.dateSent = System.currentTimeMillis()
|
message.dateSent = System.currentTimeMillis()
|
||||||
message.read = true
|
message.read = true
|
||||||
}
|
}
|
||||||
@@ -399,7 +398,7 @@ class MessageRepository @Inject constructor(
|
|||||||
.doOnNext { uri ->
|
.doOnNext { uri ->
|
||||||
// Update the message in the native ContentProvider
|
// Update the message in the native ContentProvider
|
||||||
val values = ContentValues()
|
val values = ContentValues()
|
||||||
values.put(Sms.STATUS, TextBasedSmsColumns.STATUS_COMPLETE)
|
values.put(Sms.STATUS, Sms.STATUS_COMPLETE)
|
||||||
values.put(Sms.DATE_SENT, System.currentTimeMillis())
|
values.put(Sms.DATE_SENT, System.currentTimeMillis())
|
||||||
values.put(Sms.READ, true)
|
values.put(Sms.READ, true)
|
||||||
context.contentResolver.update(uri, values, null, null)
|
context.contentResolver.update(uri, values, null, null)
|
||||||
@@ -418,7 +417,7 @@ class MessageRepository @Inject constructor(
|
|||||||
.doOnNext { message ->
|
.doOnNext { message ->
|
||||||
// Update the message in realm
|
// Update the message in realm
|
||||||
realm.executeTransaction {
|
realm.executeTransaction {
|
||||||
message.deliveryStatus = Message.DeliveryStatus.FAILED
|
message.deliveryStatus = Sms.STATUS_FAILED
|
||||||
message.dateSent = System.currentTimeMillis()
|
message.dateSent = System.currentTimeMillis()
|
||||||
message.read = true
|
message.read = true
|
||||||
message.errorCode = resultCode
|
message.errorCode = resultCode
|
||||||
@@ -429,7 +428,7 @@ class MessageRepository @Inject constructor(
|
|||||||
.doOnNext { uri ->
|
.doOnNext { uri ->
|
||||||
// Update the message in the native ContentProvider
|
// Update the message in the native ContentProvider
|
||||||
val values = ContentValues()
|
val values = ContentValues()
|
||||||
values.put(Sms.STATUS, TextBasedSmsColumns.STATUS_FAILED)
|
values.put(Sms.STATUS, Sms.STATUS_FAILED)
|
||||||
values.put(Sms.DATE_SENT, System.currentTimeMillis())
|
values.put(Sms.DATE_SENT, System.currentTimeMillis())
|
||||||
values.put(Sms.READ, true)
|
values.put(Sms.READ, true)
|
||||||
values.put(Sms.ERROR_CODE, resultCode)
|
values.put(Sms.ERROR_CODE, resultCode)
|
||||||
|
|||||||
Reference in New Issue
Block a user