From f1e4d3df425b7e75265ffbbad42880187ced62c4 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 10 Jan 2018 20:17:43 -0500 Subject: [PATCH] Create conversation when message is received from new sender --- .../java/data/repository/MessageRepository.kt | 25 ++++++++----------- .../main/java/interactor/ReceiveMessage.kt | 2 +- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/qksms/src/main/java/data/repository/MessageRepository.kt b/qksms/src/main/java/data/repository/MessageRepository.kt index d61aebc0..cf2628d7 100644 --- a/qksms/src/main/java/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/data/repository/MessageRepository.kt @@ -39,7 +39,6 @@ import io.reactivex.Flowable import io.reactivex.Maybe import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.rxkotlin.Flowables -import io.reactivex.rxkotlin.toFlowable import io.reactivex.schedulers.Schedulers import io.realm.Realm import io.realm.RealmList @@ -98,8 +97,8 @@ class MessageRepository @Inject constructor( .findFirst() } - fun getOrCreateConversation(threadId: Long) { - getConversation(threadId) ?: getConversationFromCp(threadId) + fun getOrCreateConversation(threadId: Long): Conversation? { + return getConversation(threadId) ?: getConversationFromCp(threadId) } fun getOrCreateConversation(address: String): Maybe { @@ -468,23 +467,21 @@ class MessageRepository @Inject constructor( private fun getConversationFromCp(threadId: Long): Conversation? { var conversation: Conversation? = null - val cursor = context.contentResolver.query( - CursorToConversation.URI, - CursorToConversation.PROJECTION, - "_id = ?", - arrayOf(threadId.toString()), - null) + val cursor = context.contentResolver.query(CursorToConversation.URI, CursorToConversation.PROJECTION, + "_id = ?", arrayOf(threadId.toString()), null) if (cursor.moveToFirst()) { conversation = cursorToConversation.map(cursor) - conversation.insertOrUpdate() - conversation.recipients.toFlowable() + val recipients = conversation.recipients .map { recipient -> recipient.id.toString() } .map { id -> context.contentResolver.query(CursorToRecipient.URI, null, "_id = ?", arrayOf(id), null) } - .flatMap { recipientCursor -> recipientCursor.asFlowable().map { cursor -> cursorToRecipient.map(cursor) } } - .doOnNext { recipient -> recipient.insertOrUpdate() } - .blockingSubscribe() + .map { recipientCursor -> recipientCursor.map { cursorToRecipient.map(recipientCursor) } } + .flatten() + + conversation.recipients.clear() + conversation.recipients.addAll(recipients) + conversation.insertOrUpdate() } cursor.close() diff --git a/qksms/src/main/java/interactor/ReceiveMessage.kt b/qksms/src/main/java/interactor/ReceiveMessage.kt index 07fba70e..cd36e1b3 100644 --- a/qksms/src/main/java/interactor/ReceiveMessage.kt +++ b/qksms/src/main/java/interactor/ReceiveMessage.kt @@ -34,7 +34,7 @@ class ReceiveMessage @Inject constructor( override fun buildObservable(params: Params): Flowable { return Flowable.just(params) .map { messageRepo.insertReceivedSms(params.address, params.body, params.sentTime) } // Add the message to the db - .mapNotNull { message -> messageRepo.getConversation(message.threadId) } // Map message to conversation + .mapNotNull { message -> messageRepo.getOrCreateConversation(message.threadId) } // Map message to conversation .doOnNext { conversation -> if (conversation.archived) messageRepo.markUnarchived(conversation.id) } // Unarchive conversation if necessary .doOnNext { conversation -> notificationManager.update(conversation.id) } // Update the notification .map { }