From 2168c16c5ef2ebab99bd6978d168a03b2ed98b83 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 29 Nov 2017 04:10:31 -0500 Subject: [PATCH] Load appropriate conversation based on chip selection --- .../moez/QKSMS/common/util/MessageUtils.kt | 32 +++++++++++++++++++ .../util/extensions/CursorExtensions.kt | 20 +++++++++++- .../data/repository/MessageRepository.kt | 32 +++++++++++++++++++ .../presentation/compose/ComposeViewModel.kt | 9 ++++-- 4 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/common/util/MessageUtils.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/MessageUtils.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/MessageUtils.kt new file mode 100644 index 00000000..66137ec1 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/MessageUtils.kt @@ -0,0 +1,32 @@ +package com.moez.QKSMS.common.util + +import android.text.TextUtils +import android.util.Patterns +import java.util.regex.Pattern + +/** + * Utils for using Telephony functions on lower API levels + * + * Adapted from https://android.googlesource.com/platform/packages/apps/Messaging/+/master/src/com/android/messaging/sms/MmsSmsUtils.java + */ +object MessageUtils { + + val NAME_ADDR_EMAIL_PATTERN = Pattern.compile("\\s*(\"[^\"]*\"|[^<>\"]+)\\s*<([^<>]+)>\\s*") + + fun extractAddrSpec(address: String): String { + val match = NAME_ADDR_EMAIL_PATTERN.matcher(address) + return if (match.matches()) { + match.group(2) + } else address + } + + fun isEmailAddress(address: String): Boolean { + if (TextUtils.isEmpty(address)) { + return false + } + val s = extractAddrSpec(address) + val match = Patterns.EMAIL_ADDRESS.matcher(s) + return match.matches() + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/CursorExtensions.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/CursorExtensions.kt index 90539cc7..44cb83d8 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/CursorExtensions.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/extensions/CursorExtensions.kt @@ -2,6 +2,8 @@ package com.moez.QKSMS.common.util.extensions import android.database.Cursor import io.reactivex.Flowable +import io.reactivex.Maybe +import io.reactivex.subjects.MaybeSubject fun Cursor.forEach(closeOnComplete: Boolean = true, method: (Cursor) -> Unit = {}) { moveToPosition(-1) @@ -29,4 +31,20 @@ fun Cursor.asFlowable(): Flowable { this } .doOnComplete { close() } -} \ No newline at end of file +} + +fun Cursor.asMaybe(): Maybe { + val subject = MaybeSubject.create() + + if (moveToFirst()) { + subject.onSuccess(this) + } else { + subject.onError(IndexOutOfBoundsException("The cursor has no items")) + } + + subject.doOnComplete { close() } + return subject +} + + + diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt index 17dbfb23..394513ff 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/MessageRepository.kt @@ -6,13 +6,16 @@ import android.net.Uri import android.provider.BaseColumns import android.provider.Telephony.Sms import android.provider.Telephony.TextBasedSmsColumns +import com.moez.QKSMS.common.util.MessageUtils import com.moez.QKSMS.common.util.extensions.asFlowable +import com.moez.QKSMS.common.util.extensions.asMaybe import com.moez.QKSMS.common.util.extensions.insertOrUpdate import com.moez.QKSMS.data.mapper.CursorToMessage import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.model.ConversationMessagePair import com.moez.QKSMS.data.model.Message import io.reactivex.Flowable +import io.reactivex.Maybe import io.reactivex.functions.BiFunction import io.reactivex.schedulers.Schedulers import io.realm.Realm @@ -66,6 +69,35 @@ class MessageRepository @Inject constructor( .findFirst() } + /** + * Gets an unmanaged conversation by the address + */ + fun getOrCreateConversation(address: String) = getOrCreateConversation(listOf(address)) + + fun getOrCreateConversation(addresses: List): Maybe { + return Maybe.just(addresses) + .map { recipients -> + recipients.map { address -> + when (MessageUtils.isEmailAddress(address)) { + true -> MessageUtils.extractAddrSpec(address) + false -> address + } + } + } + .map { recipients -> + Uri.parse("content://mms-sms/threadID").buildUpon().apply { + recipients.forEach { recipient -> appendQueryParameter("recipient", recipient) } + } + } + .flatMap { uriBuilder -> + context.contentResolver.query(uriBuilder.build(), arrayOf(BaseColumns._ID), null, null, null).asMaybe() + } + .map { cursor -> cursor.getLong(0) } + .filter { threadId -> threadId != 0L } + .map { threadId -> getConversation(threadId) ?: Conversation() } // TODO create actual conversation + .onErrorReturn { Conversation() } + } + fun getMessages(threadId: Long): RealmResults { return Realm.getDefaultInstance() .where(Message::class.java) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt index 92b59461..70d055ff 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt @@ -38,27 +38,30 @@ class ComposeViewModel(threadId: Long) : QkViewModel( private val contacts: List - private val selectedContacts: Observable> private val conversation: Observable init { AppComponentManager.appComponent.inject(this) - selectedContacts = contactsReducer + // Merges two potential conversation sources (threadId from constructor and contact selection) into a single + // stream of conversations + val selectedConversation = contactsReducer .scan(listOf(), { previousState, reducer -> reducer(previousState) }) .doOnNext { contacts -> newState { it.copy(selectedContacts = contacts) } } + .map { contacts -> contacts.map { it.address } } + .flatMapMaybe { addresses -> messageRepo.getOrCreateConversation(addresses) } conversation = messageRepo.getConversationAsync(threadId) .asObservable() .filter { conversation -> conversation.isLoaded } .filter { conversation -> conversation.isValid } + .mergeWith(selectedConversation) .distinctUntilChanged { conversation -> conversation.id } .doOnNext { conversation -> newState { it.copy(title = conversation.getTitle()) } } disposables += sendMessage disposables += markRead disposables += conversation.subscribe() - disposables += selectedContacts.subscribe() // When the conversation changes, update the messages for the adapter // When the message list changes, make sure to mark them read