Sync MMS upon receiving

This commit is contained in:
Moez Bhatti
2018-01-10 15:47:47 -05:00
parent 42d27a1cca
commit ce6dee2ef4
6 changed files with 61 additions and 9 deletions
@@ -38,9 +38,11 @@ class CursorToMessage @Inject constructor(
val columnsMap = from.second
return Message().apply {
type = when (cursor.getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN)) {
-1 -> "sms"
else -> cursor.getString(columnsMap.msgType)
type = when {
cursor.getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN) != -1 -> cursor.getString(columnsMap.msgType)
cursor.getColumnIndex(Sms.ADDRESS) != -1 -> "sms"
cursor.getColumnIndex(Mms.SUBJECT) != -1 -> "mms"
else -> "unknown"
}
id = keys.newId()
@@ -72,7 +74,7 @@ class CursorToMessage @Inject constructor(
"mms" -> {
threadId = cursor.getLong(columnsMap.mmsThreadId)
address = getMmsAddress(id)
address = getMmsAddress(contentId)
boxId = cursor.getInt(columnsMap.mmsMessageBox)
date = cursor.getLong(columnsMap.mmsDate) * 1000L
dateSent = cursor.getLong(columnsMap.mmsDateSent)
@@ -86,7 +88,7 @@ class CursorToMessage @Inject constructor(
else -> Message.AttachmentType.TEXT
}
mmsDeliveryStatusString = cursor.getString(columnsMap.mmsDeliveryReport) ?: ""
errorType = cursor.getInt(columnsMap.mmsErrorType)
errorType = if (columnsMap.mmsErrorType != -1) cursor.getInt(columnsMap.mmsErrorType) else 0
messageSize = 0
readReportString = cursor.getString(columnsMap.mmsReadReport) ?: ""
messageType = cursor.getInt(columnsMap.mmsMessageType)
@@ -98,6 +98,10 @@ class MessageRepository @Inject constructor(
.findFirst()
}
fun getOrCreateConversation(threadId: Long) {
getConversation(threadId) ?: getConversationFromCp(threadId)
}
fun getOrCreateConversation(address: String): Maybe<Conversation> {
return getOrCreateConversation(listOf(address))
}