Add remaining fields from mms-sms contentprovider

This commit is contained in:
Moez Bhatti
2017-11-17 16:57:00 -05:00
parent 8e95999275
commit a8476d3be2
2 changed files with 75 additions and 8 deletions
@@ -5,6 +5,7 @@ import android.database.Cursor
import android.provider.Telephony.*
import com.moez.QKSMS.common.util.extensions.asFlowable
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.model.Message.DeliveryStatus
import io.reactivex.Flowable
import timber.log.Timber
import javax.inject.Inject
@@ -21,17 +22,29 @@ class CursorToMessageFlowable @Inject constructor(val context: Context) : Mapper
}
id = cursor.getLong(columnsMap.msgId)
body = cursor.getString(columnsMap.smsBody) ?: ""
when (type) {
"sms" -> {
threadId = cursor.getLong(columnsMap.smsThreadId)
address = cursor.getString(columnsMap.smsAddress)
address = cursor.getString(columnsMap.smsAddress) ?: ""
boxId = cursor.getInt(columnsMap.smsType)
date = cursor.getLong(columnsMap.mmsDate)
dateSent = cursor.getLong(columnsMap.mmsDateSent)
seen = cursor.getInt(columnsMap.mmsSeen) != 0
read = cursor.getInt(columnsMap.mmsRead) != 0
seen = cursor.getInt(columnsMap.mmsSeen) != 0
locked = cursor.getInt(columnsMap.smsLocked) != 0
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
}
// SMS Specific
body = cursor.getString(columnsMap.smsBody) ?: ""
errorCode = cursor.getInt(columnsMap.smsErrorCode)
}
"mms" -> {
@@ -40,25 +53,46 @@ class CursorToMessageFlowable @Inject constructor(val context: Context) : Mapper
boxId = cursor.getInt(columnsMap.mmsMessageBox)
date = cursor.getLong(columnsMap.mmsDate) * 1000L
dateSent = cursor.getLong(columnsMap.mmsDateSent)
seen = cursor.getInt(columnsMap.mmsSeen) != 0
read = cursor.getInt(columnsMap.mmsRead) != 0
seen = cursor.getInt(columnsMap.mmsSeen) != 0
locked = cursor.getInt(columnsMap.mmsLocked) != 0
// MMS Specific
attachmentType = when (cursor.getInt(columnsMap.mmsTextOnly)) {
0 -> Message.AttachmentType.NOT_LOADED
else -> Message.AttachmentType.TEXT
}
mmsDeliveryStatusString = cursor.getString(columnsMap.mmsDeliveryReport) ?: ""
errorType = cursor.getInt(columnsMap.mmsErrorType)
messageSize = 0
readReportString = cursor.getString(columnsMap.mmsReadReport) ?: ""
messageType = cursor.getInt(columnsMap.mmsMessageType)
mmsStatus = cursor.getInt(columnsMap.mmsStatus)
subject = cursor.getString(columnsMap.mmsSubject) ?: ""
textContentType = ""
}
}
}
}
}
private fun getMmsAddress(messageId: Long): String {
val uri = Mms.CONTENT_URI.buildUpon().appendPath(messageId.toString()).appendPath("addr").build()
val uri = Mms.CONTENT_URI.buildUpon()
.appendPath(messageId.toString())
.appendPath("addr").build()
//TODO: Use Charset to ensure address is decoded correctly
val projection = arrayOf(Mms.Addr.ADDRESS, Mms.Addr.CHARSET)
val selection = "${Mms.Addr.TYPE} = 137"
context.contentResolver.query(uri, projection, selection, null, null)?.use { cursor ->
val cursor = context.contentResolver.query(uri, projection, selection, null, null)
cursor?.use {
if (cursor.moveToFirst()) {
return cursor.getString(0)
}
}
return ""
}
@@ -1,11 +1,17 @@
package com.moez.QKSMS.data.model
import android.content.ContentUris
import android.net.Uri
import android.provider.Telephony.*
import io.realm.RealmObject
import io.realm.annotations.Ignore
import io.realm.annotations.PrimaryKey
open class Message : RealmObject() {
enum class DeliveryStatus { NONE, INFO, FAILED, PENDING, RECEIVED }
enum class AttachmentType { TEXT, IMAGE, VIDEO, AUDIO, SLIDESHOW, NOT_LOADED }
@PrimaryKey var id: Long = 0
var threadId: Long = 0
var address: String = ""
@@ -16,7 +22,35 @@ open class Message : RealmObject() {
var dateSent: Long = 0
var seen: Boolean = false
var read: Boolean = false
var locked: Boolean = false
@Ignore var deliveryStatus: DeliveryStatus = DeliveryStatus.NONE
get() = DeliveryStatus.valueOf(deliveryStatusString)
var deliveryStatusString: String = "NONE"
get() = deliveryStatus.toString()
// SMS only
var errorCode: Int = 0
// MMS only
@Ignore var attachmentType: AttachmentType = AttachmentType.NOT_LOADED
get() = AttachmentType.valueOf(attachmentTypeString)
var attachmentTypeString: String = "NOT_LOADED"
get() = attachmentType.toString()
var mmsDeliveryStatusString: String = ""
var readReportString: String = ""
var errorType: Int = 0
var messageSize: Int = 0
var messageType: Int = 0
var mmsStatus: Int = 0
var subject: String = ""
var textContentType: String = ""
fun getUri(): Uri {
val baseUri = if (isMms()) Mms.CONTENT_URI else Sms.CONTENT_URI
return ContentUris.withAppendedId(baseUri, id)
}
fun isMms(): Boolean = type == "mms"
@@ -47,5 +81,4 @@ open class Message : RealmObject() {
val isFailedSms = isSms() && boxId == Sms.MESSAGE_TYPE_FAILED
return isFailedMms || isFailedSms
}
}
}