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
@@ -20,6 +20,7 @@ package common.di
import common.QKApplication import common.QKApplication
import common.util.ContactImageLoader import common.util.ContactImageLoader
import dagger.Component
import presentation.common.widget.* import presentation.common.widget.*
import presentation.feature.compose.ComposeActivity import presentation.feature.compose.ComposeActivity
import presentation.feature.compose.ComposeViewModel import presentation.feature.compose.ComposeViewModel
@@ -31,7 +32,6 @@ import presentation.feature.settings.SettingsViewModel
import presentation.feature.setup.SetupActivity import presentation.feature.setup.SetupActivity
import presentation.feature.setup.SetupViewModel import presentation.feature.setup.SetupViewModel
import presentation.receiver.* import presentation.receiver.*
import dagger.Component
import javax.inject.Singleton import javax.inject.Singleton
@Singleton @Singleton
@@ -51,6 +51,7 @@ interface AppComponent {
fun inject(receiver: MessageSentReceiver) fun inject(receiver: MessageSentReceiver)
fun inject(receiver: MarkSeenReceiver) fun inject(receiver: MarkSeenReceiver)
fun inject(receiver: MarkReadReceiver) fun inject(receiver: MarkReadReceiver)
fun inject(receiver: MmsReceivedReceiver)
fun inject(receiver: RemoteMessagingReceiver) fun inject(receiver: RemoteMessagingReceiver)
fun inject(view: AvatarView) fun inject(view: AvatarView)
+18 -1
View File
@@ -19,19 +19,25 @@
package common.util package common.util
import android.content.Context import android.content.Context
import android.net.Uri
import common.util.extensions.asFlowable
import common.util.extensions.insertOrUpdate
import common.util.extensions.map import common.util.extensions.map
import common.util.extensions.mapWhile import common.util.extensions.mapWhile
import data.mapper.CursorToConversation import data.mapper.CursorToConversation
import data.mapper.CursorToMessage import data.mapper.CursorToMessage
import data.mapper.CursorToRecipient import data.mapper.CursorToRecipient
import data.model.* import data.model.*
import data.repository.MessageRepository
import io.reactivex.Flowable
import io.realm.Realm import io.realm.Realm
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@Singleton @Singleton
class SyncManager @Inject constructor( class SyncManager @Inject constructor(
context: Context, private val context: Context,
private val messageRepo: MessageRepository,
private val cursorToConversation: CursorToConversation, private val cursorToConversation: CursorToConversation,
private val cursorToMessage: CursorToMessage, private val cursorToMessage: CursorToMessage,
private val cursorToRecipient: CursorToRecipient) { private val cursorToRecipient: CursorToRecipient) {
@@ -99,4 +105,15 @@ class SyncManager @Inject constructor(
status = Status.Idle() status = Status.Idle()
} }
fun syncMessage(uri: Uri): Flowable<Message> {
val cursor = context.contentResolver.query(uri, null, null, null, null)
val columnsMap = CursorToMessage.MessageColumns(cursor)
// Map the cursor to a message
return cursor.asFlowable()
.map { cursorToMessage.map(Pair(it, columnsMap)) }
.doOnNext { message -> messageRepo.getOrCreateConversation(message.threadId) }
.doOnNext { message -> message.insertOrUpdate() }
}
} }
@@ -38,9 +38,11 @@ class CursorToMessage @Inject constructor(
val columnsMap = from.second val columnsMap = from.second
return Message().apply { return Message().apply {
type = when (cursor.getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN)) { type = when {
-1 -> "sms" cursor.getColumnIndex(MmsSms.TYPE_DISCRIMINATOR_COLUMN) != -1 -> cursor.getString(columnsMap.msgType)
else -> cursor.getString(columnsMap.msgType) cursor.getColumnIndex(Sms.ADDRESS) != -1 -> "sms"
cursor.getColumnIndex(Mms.SUBJECT) != -1 -> "mms"
else -> "unknown"
} }
id = keys.newId() id = keys.newId()
@@ -72,7 +74,7 @@ class CursorToMessage @Inject constructor(
"mms" -> { "mms" -> {
threadId = cursor.getLong(columnsMap.mmsThreadId) threadId = cursor.getLong(columnsMap.mmsThreadId)
address = getMmsAddress(id) address = getMmsAddress(contentId)
boxId = cursor.getInt(columnsMap.mmsMessageBox) boxId = cursor.getInt(columnsMap.mmsMessageBox)
date = cursor.getLong(columnsMap.mmsDate) * 1000L date = cursor.getLong(columnsMap.mmsDate) * 1000L
dateSent = cursor.getLong(columnsMap.mmsDateSent) dateSent = cursor.getLong(columnsMap.mmsDateSent)
@@ -86,7 +88,7 @@ class CursorToMessage @Inject constructor(
else -> Message.AttachmentType.TEXT else -> Message.AttachmentType.TEXT
} }
mmsDeliveryStatusString = cursor.getString(columnsMap.mmsDeliveryReport) ?: "" mmsDeliveryStatusString = cursor.getString(columnsMap.mmsDeliveryReport) ?: ""
errorType = cursor.getInt(columnsMap.mmsErrorType) errorType = if (columnsMap.mmsErrorType != -1) cursor.getInt(columnsMap.mmsErrorType) else 0
messageSize = 0 messageSize = 0
readReportString = cursor.getString(columnsMap.mmsReadReport) ?: "" readReportString = cursor.getString(columnsMap.mmsReadReport) ?: ""
messageType = cursor.getInt(columnsMap.mmsMessageType) messageType = cursor.getInt(columnsMap.mmsMessageType)
@@ -98,6 +98,10 @@ class MessageRepository @Inject constructor(
.findFirst() .findFirst()
} }
fun getOrCreateConversation(threadId: Long) {
getConversation(threadId) ?: getConversationFromCp(threadId)
}
fun getOrCreateConversation(address: String): Maybe<Conversation> { fun getOrCreateConversation(address: String): Maybe<Conversation> {
return getOrCreateConversation(listOf(address)) return getOrCreateConversation(listOf(address))
} }
@@ -0,0 +1,16 @@
package interactor
import android.net.Uri
import common.util.SyncManager
import data.model.Message
import io.reactivex.Flowable
import javax.inject.Inject
class SyncMessage @Inject constructor(private val syncManager: SyncManager) : Interactor<Uri, Message>() {
override fun buildObservable(params: Uri): Flowable<Message> {
return Flowable.just(params)
.flatMap { uri -> syncManager.syncMessage(uri) }
}
}
@@ -2,13 +2,25 @@ package presentation.receiver
import android.net.Uri import android.net.Uri
import com.klinker.android.send_message.MmsReceivedReceiver import com.klinker.android.send_message.MmsReceivedReceiver
import timber.log.Timber import common.di.appComponent
import interactor.SyncMessage
import javax.inject.Inject
class MmsReceivedReceiver : MmsReceivedReceiver() { class MmsReceivedReceiver : MmsReceivedReceiver() {
@Inject lateinit var syncMessage: SyncMessage
init {
appComponent.inject(this)
}
override fun onMessageReceived(messageUri: Uri?) { override fun onMessageReceived(messageUri: Uri?) {
super.onMessageReceived(messageUri) super.onMessageReceived(messageUri)
Timber.v("onMessageReceived: $messageUri")
messageUri?.let { uri ->
val pendingResult = goAsync()
syncMessage.execute(uri) { pendingResult.finish() }
}
} }
} }