diff --git a/qksms/src/main/java/common/di/AppComponent.kt b/qksms/src/main/java/common/di/AppComponent.kt index 0987c374..e1778eb0 100644 --- a/qksms/src/main/java/common/di/AppComponent.kt +++ b/qksms/src/main/java/common/di/AppComponent.kt @@ -20,6 +20,7 @@ package common.di import common.QKApplication import common.util.ContactImageLoader +import dagger.Component import presentation.common.widget.* import presentation.feature.compose.ComposeActivity import presentation.feature.compose.ComposeViewModel @@ -31,7 +32,6 @@ import presentation.feature.settings.SettingsViewModel import presentation.feature.setup.SetupActivity import presentation.feature.setup.SetupViewModel import presentation.receiver.* -import dagger.Component import javax.inject.Singleton @Singleton @@ -51,6 +51,7 @@ interface AppComponent { fun inject(receiver: MessageSentReceiver) fun inject(receiver: MarkSeenReceiver) fun inject(receiver: MarkReadReceiver) + fun inject(receiver: MmsReceivedReceiver) fun inject(receiver: RemoteMessagingReceiver) fun inject(view: AvatarView) diff --git a/qksms/src/main/java/common/util/SyncManager.kt b/qksms/src/main/java/common/util/SyncManager.kt index 51532a29..87e2e468 100644 --- a/qksms/src/main/java/common/util/SyncManager.kt +++ b/qksms/src/main/java/common/util/SyncManager.kt @@ -19,19 +19,25 @@ package common.util 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.mapWhile import data.mapper.CursorToConversation import data.mapper.CursorToMessage import data.mapper.CursorToRecipient import data.model.* +import data.repository.MessageRepository +import io.reactivex.Flowable import io.realm.Realm import javax.inject.Inject import javax.inject.Singleton @Singleton class SyncManager @Inject constructor( - context: Context, + private val context: Context, + private val messageRepo: MessageRepository, private val cursorToConversation: CursorToConversation, private val cursorToMessage: CursorToMessage, private val cursorToRecipient: CursorToRecipient) { @@ -99,4 +105,15 @@ class SyncManager @Inject constructor( status = Status.Idle() } + fun syncMessage(uri: Uri): Flowable { + 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() } + } + } \ No newline at end of file diff --git a/qksms/src/main/java/data/mapper/CursorToMessage.kt b/qksms/src/main/java/data/mapper/CursorToMessage.kt index 6642bb8c..05a4255e 100644 --- a/qksms/src/main/java/data/mapper/CursorToMessage.kt +++ b/qksms/src/main/java/data/mapper/CursorToMessage.kt @@ -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) diff --git a/qksms/src/main/java/data/repository/MessageRepository.kt b/qksms/src/main/java/data/repository/MessageRepository.kt index 476c49cb..d61aebc0 100644 --- a/qksms/src/main/java/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/data/repository/MessageRepository.kt @@ -98,6 +98,10 @@ class MessageRepository @Inject constructor( .findFirst() } + fun getOrCreateConversation(threadId: Long) { + getConversation(threadId) ?: getConversationFromCp(threadId) + } + fun getOrCreateConversation(address: String): Maybe { return getOrCreateConversation(listOf(address)) } diff --git a/qksms/src/main/java/interactor/SyncMessage.kt b/qksms/src/main/java/interactor/SyncMessage.kt new file mode 100644 index 00000000..f77a0eeb --- /dev/null +++ b/qksms/src/main/java/interactor/SyncMessage.kt @@ -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() { + + override fun buildObservable(params: Uri): Flowable { + return Flowable.just(params) + .flatMap { uri -> syncManager.syncMessage(uri) } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/presentation/receiver/MmsReceivedReceiver.kt b/qksms/src/main/java/presentation/receiver/MmsReceivedReceiver.kt index 597ee16b..0c20c3d2 100644 --- a/qksms/src/main/java/presentation/receiver/MmsReceivedReceiver.kt +++ b/qksms/src/main/java/presentation/receiver/MmsReceivedReceiver.kt @@ -2,13 +2,25 @@ package presentation.receiver import android.net.Uri 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() { + @Inject lateinit var syncMessage: SyncMessage + + init { + appComponent.inject(this) + } + override fun onMessageReceived(messageUri: Uri?) { super.onMessageReceived(messageUri) - Timber.v("onMessageReceived: $messageUri") + + messageUri?.let { uri -> + val pendingResult = goAsync() + syncMessage.execute(uri) { pendingResult.finish() } + } } } \ No newline at end of file