When copying message to realm, use correct message from URI

This commit is contained in:
Moez Bhatti
2017-09-25 00:30:57 -04:00
parent e1b33538ba
commit 4c1ecc03c6
5 changed files with 111 additions and 106 deletions
@@ -1,8 +1,6 @@
package com.moez.QKSMS.data.model
import android.provider.Telephony
import android.provider.Telephony.Mms
import android.provider.Telephony.Sms
import android.provider.Telephony.*
import io.realm.RealmObject
import io.realm.annotations.PrimaryKey
@@ -44,7 +42,7 @@ open class Message : RealmObject() {
}
fun isFailedMessage(): Boolean {
val isFailedMms = isMms() && errorType >= Telephony.MmsSms.ERR_TYPE_GENERIC_PERMANENT
val isFailedMms = isMms() && errorType >= MmsSms.ERR_TYPE_GENERIC_PERMANENT
val isFailedSms = isSms() && boxId == Sms.MESSAGE_TYPE_FAILED
return isFailedMms || isFailedSms
}
@@ -1,7 +1,6 @@
package com.moez.QKSMS.data.repository
import android.app.PendingIntent
import android.content.ContentResolver
import android.content.ContentValues
import android.content.Context
import android.content.Intent
@@ -14,6 +13,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.insertOrUpdate
import io.realm.Realm
import io.realm.RealmResults
@@ -50,7 +50,7 @@ class MessageRepository(val context: Context) {
val contentResolver = context.contentResolver
val uri = contentResolver.insert(Uri.parse("content://sms/inbox"), cv)
copyLatestMessageToRealm(uri, contentResolver)
copyMessageToRealm(uri)
}
fun sendMessage(threadId: Long, address: String, body: String) {
@@ -64,7 +64,7 @@ class MessageRepository(val context: Context) {
val contentResolver = context.contentResolver
val uri = contentResolver.insert(Uri.parse("content://sms/"), values)
copyLatestMessageToRealm(uri, contentResolver)
copyMessageToRealm(uri)
val sentIntent = Intent(context, MessageSentReceiver::class.java).putExtra("uri", uri.toString())
val sentPI = PendingIntent.getBroadcast(context, uri.lastPathSegment.toInt(), sentIntent, PendingIntent.FLAG_UPDATE_CURRENT)
@@ -76,25 +76,12 @@ class MessageRepository(val context: Context) {
smsManager.sendTextMessage(address, null, body, sentPI, deliveredPI)
}
// TODO this is really sloppy, it should be fixed
private fun copyLatestMessageToRealm(uri: Uri, contentResolver: ContentResolver) {
val projection = arrayOf(Telephony.Sms.Conversations.THREAD_ID)
val cursor = contentResolver.query(uri, projection, null, null, null)
private fun copyMessageToRealm(uri: Uri) {
val cursor = context.contentResolver.query(uri, null, null, null, "date DESC")
if (cursor.moveToFirst()) {
val threadId = cursor.getLong(0)
val threadUri = Uri.withAppendedPath(MessageColumns.URI, threadId.toString())
val messageCursor = contentResolver.query(threadUri, MessageColumns.PROJECTION, null, null, "date DESC")
if (messageCursor.moveToFirst()) {
val columns = MessageColumns(messageCursor)
val message = SyncManager.messageFromCursor(threadId, messageCursor, columns)
val realm = Realm.getDefaultInstance()
realm.executeTransaction { it.insertOrUpdate(message) }
realm.close()
}
messageCursor.close()
val columns = MessageColumns(cursor)
val message = SyncManager.messageFromCursor(cursor, columns)
message.insertOrUpdate()
}
cursor.close()
}
@@ -2,8 +2,7 @@ package com.moez.QKSMS.data.sync
import android.database.Cursor
import android.net.Uri
import android.provider.BaseColumns
import android.provider.Telephony
import android.provider.Telephony.*
import timber.log.Timber
@Suppress("unused")
@@ -14,75 +13,76 @@ class MessageColumns(val cursor: Cursor) {
companion object {
val URI: Uri = Uri.parse("content://mms-sms/conversations/")
val PROJECTION = arrayOf(
Telephony.MmsSms.TYPE_DISCRIMINATOR_COLUMN,
BaseColumns._ID,
Telephony.Sms.Conversations.THREAD_ID,
MmsSms.TYPE_DISCRIMINATOR_COLUMN,
MmsSms._ID,
Telephony.Sms.ADDRESS,
Telephony.Sms.BODY,
Telephony.Sms.DATE,
Telephony.Sms.DATE_SENT,
Telephony.Sms.SEEN,
Telephony.Sms.READ,
Telephony.Sms.TYPE,
Telephony.Sms.STATUS,
Telephony.Sms.LOCKED,
Telephony.Sms.ERROR_CODE,
Sms.THREAD_ID,
Sms.ADDRESS,
Sms.BODY,
Sms.DATE,
Sms.DATE_SENT,
Sms.SEEN,
Sms.READ,
Sms.TYPE,
Sms.STATUS,
Sms.LOCKED,
Sms.ERROR_CODE,
Telephony.Mms.SUBJECT,
Telephony.Mms.SUBJECT_CHARSET,
Telephony.Mms.DATE,
Telephony.Mms.DATE_SENT,
Telephony.Mms.SEEN,
Telephony.Mms.READ,
Telephony.Mms.MESSAGE_TYPE,
Telephony.Mms.MESSAGE_BOX,
Telephony.Mms.DELIVERY_REPORT,
Telephony.Mms.READ_REPORT,
Telephony.MmsSms.PendingMessages.ERROR_TYPE,
Telephony.Mms.LOCKED,
Telephony.Mms.STATUS,
Telephony.Mms.TEXT_ONLY)
Mms.THREAD_ID,
Mms.SUBJECT,
Mms.SUBJECT_CHARSET,
Mms.DATE,
Mms.DATE_SENT,
Mms.SEEN,
Mms.READ,
Mms.MESSAGE_TYPE,
Mms.MESSAGE_BOX,
Mms.DELIVERY_REPORT,
Mms.READ_REPORT,
MmsSms.PendingMessages.ERROR_TYPE,
Mms.LOCKED,
Mms.STATUS,
Mms.TEXT_ONLY)
}
val msgType = getColumnIndex(0)
val msgId = getColumnIndex(1)
val threadId = getColumnIndex(2)
val msgType by lazy { getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN) }
val msgId by lazy { getColumnIndex(MmsSms._ID) }
val smsAddress = getColumnIndex(3)
val smsBody = getColumnIndex(4)
val smsDate = getColumnIndex(5)
val smsDateSent = getColumnIndex(6)
val smsSeen = getColumnIndex(7)
val smsRead = getColumnIndex(8)
val smsType = getColumnIndex(9)
val smsStatus = getColumnIndex(10)
val smsLocked = getColumnIndex(11)
val smsErrorCode = getColumnIndex(12)
val smsThreadId by lazy { getColumnIndex(Sms.THREAD_ID) }
val smsAddress by lazy { getColumnIndex(Sms.ADDRESS) }
val smsBody by lazy { getColumnIndex(Sms.BODY) }
val smsDate by lazy { getColumnIndex(Sms.DATE) }
val smsDateSent by lazy { getColumnIndex(Sms.DATE_SENT) }
val smsSeen by lazy { getColumnIndex(Sms.SEEN) }
val smsRead by lazy { getColumnIndex(Sms.READ) }
val smsType by lazy { getColumnIndex(Sms.TYPE) }
val smsStatus by lazy { getColumnIndex(Sms.STATUS) }
val smsLocked by lazy { getColumnIndex(Sms.LOCKED) }
val smsErrorCode by lazy { getColumnIndex(Sms.ERROR_CODE) }
val mmsSubject = getColumnIndex(13)
val mmsSubjectCharset = getColumnIndex(14)
val mmsDate = getColumnIndex(15)
val mmsDateSent = getColumnIndex(16)
val mmsSeen = getColumnIndex(17)
val mmsRead = getColumnIndex(18)
val mmsMessageType = getColumnIndex(19)
val mmsMessageBox = getColumnIndex(20)
val mmsDeliveryReport = getColumnIndex(21)
val mmsReadReport = getColumnIndex(22)
val mmsErrorType = getColumnIndex(23)
val mmsLocked = getColumnIndex(24)
val mmsStatus = getColumnIndex(25)
val mmsTextOnly = getColumnIndex(26)
val mmsThreadId by lazy { getColumnIndex(Mms.THREAD_ID) }
val mmsSubject by lazy { getColumnIndex(Mms.SUBJECT) }
val mmsSubjectCharset by lazy { getColumnIndex(Mms.SUBJECT_CHARSET) }
val mmsDate by lazy { getColumnIndex(Mms.DATE) }
val mmsDateSent by lazy { getColumnIndex(Mms.DATE_SENT) }
val mmsSeen by lazy { getColumnIndex(Mms.SEEN) }
val mmsRead by lazy { getColumnIndex(Mms.READ) }
val mmsMessageType by lazy { getColumnIndex(Mms.MESSAGE_TYPE) }
val mmsMessageBox by lazy { getColumnIndex(Mms.MESSAGE_BOX) }
val mmsDeliveryReport by lazy { getColumnIndex(Mms.DELIVERY_REPORT) }
val mmsReadReport by lazy { getColumnIndex(Mms.READ_REPORT) }
val mmsErrorType by lazy { getColumnIndex(MmsSms.PendingMessages.ERROR_TYPE) }
val mmsLocked by lazy { getColumnIndex(Mms.LOCKED) }
val mmsStatus by lazy { getColumnIndex(Mms.STATUS) }
val mmsTextOnly by lazy { getColumnIndex(Mms.TEXT_ONLY) }
private fun getColumnIndex(index: Int): Int {
try {
return cursor.getColumnIndexOrThrow(PROJECTION[index])
} catch (e: IllegalArgumentException) {
private fun getColumnIndex(columnsName: String): Int {
return try {
cursor.getColumnIndexOrThrow(columnsName)
} catch (e: Exception) {
Timber.w(e)
-1
}
return index
}
}
@@ -3,6 +3,7 @@ package com.moez.QKSMS.data.sync
import android.content.Context
import android.database.Cursor
import android.net.Uri
import android.provider.Telephony
import com.moez.QKSMS.data.model.Conversation
import com.moez.QKSMS.data.model.Message
import com.moez.QKSMS.data.repository.ContactRepository
@@ -11,6 +12,8 @@ import io.reactivex.Flowable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import io.realm.Realm
import timber.log.Timber
import java.util.*
class SyncManager(val context: Context, private val contactsRepo: ContactRepository) {
@@ -57,8 +60,9 @@ class SyncManager(val context: Context, private val contactsRepo: ContactReposit
val uri = Uri.withAppendedPath(MessageColumns.URI, id.toString())
val messagesCursor = contentResolver.query(uri, MessageColumns.PROJECTION, null, null, "date desc")
val columnsMap = MessageColumns(messagesCursor)
Timber.d("Columns: ${Arrays.toString(messagesCursor.columnNames)}")
messagesCursor.asFlowable()
.map { cursor -> messageFromCursor(id, cursor, columnsMap) }
.map { cursor -> messageFromCursor(cursor, columnsMap) }
.filter { message -> message.type == "sms" || message.type == "mms" }
.distinct { message -> message.id }
.doOnNext { message -> messages.add(message) }
@@ -68,29 +72,35 @@ class SyncManager(val context: Context, private val contactsRepo: ContactReposit
// TODO take this out of the companion object
companion object {
fun messageFromCursor(threadId: Long, cursor: Cursor, columnsMap: MessageColumns): Message {
fun messageFromCursor(cursor: Cursor, columnsMap: MessageColumns): Message {
return Message().apply {
this.threadId = threadId
type = when (cursor.getColumnIndex(Telephony.MmsSms.TYPE_DISCRIMINATOR_COLUMN)) {
-1 -> "sms"
else -> cursor.getString(columnsMap.msgType)
}
id = cursor.getLong(columnsMap.msgId)
type = cursor.getString(columnsMap.msgType)
val isMms = type == "mms"
body = cursor.getString(columnsMap.smsBody) ?: ""
errorType = cursor.getInt(columnsMap.mmsErrorType)
if (isMms) {
boxId = cursor.getInt(columnsMap.mmsMessageBox)
date = cursor.getLong(columnsMap.smsDate)
dateSent = cursor.getLong(columnsMap.smsDateSent)
seen = cursor.getInt(columnsMap.smsSeen) != 0
read = cursor.getInt(columnsMap.smsRead) != 0
} else {
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
when (type) {
"sms" -> {
threadId = cursor.getLong(columnsMap.smsThreadId)
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
}
"mms" -> {
threadId = cursor.getLong(columnsMap.mmsThreadId)
boxId = cursor.getInt(columnsMap.mmsMessageBox)
date = cursor.getLong(columnsMap.smsDate)
dateSent = cursor.getLong(columnsMap.smsDateSent)
seen = cursor.getInt(columnsMap.smsSeen) != 0
read = cursor.getInt(columnsMap.smsRead) != 0
errorType = cursor.getInt(columnsMap.mmsErrorType)
}
}
}
}
@@ -0,0 +1,10 @@
package com.moez.QKSMS.util.extensions
import io.realm.Realm
import io.realm.RealmObject
fun RealmObject.insertOrUpdate() {
val realm = Realm.getDefaultInstance()
realm.executeTransaction { realm.insertOrUpdate(this) }
realm.close()
}