diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt b/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt index b81320bf..1170b757 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt @@ -20,7 +20,6 @@ package presentation.feature.compose import android.app.AlertDialog import android.content.res.ColorStateList -import android.graphics.Bitmap import android.graphics.PorterDuff import android.net.Uri import android.os.Bundle @@ -217,7 +216,7 @@ class ComposeActivity : QkActivity(), ComposeView { } if (messageAdapter.data !== state.messages) { - messageAdapter.updateData(state.messages) + messageAdapter.data = state.messages } attachments.setVisible(state.attachments.isNotEmpty()) diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeState.kt b/qksms/src/main/java/presentation/feature/compose/ComposeState.kt index 4d135b8b..7ab52234 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeState.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeState.kt @@ -20,6 +20,7 @@ package presentation.feature.compose import android.net.Uri import data.model.Contact +import data.model.Conversation import data.model.Message import io.realm.RealmResults @@ -31,7 +32,7 @@ data class ComposeState( val selectedContacts: List = ArrayList(), val title: String = "", val archived: Boolean = false, - val messages: RealmResults? = null, + val messages: Pair>? = null, val attachments: List = ArrayList(), val canSend: Boolean = false ) \ No newline at end of file diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt index 655fb9bd..0cd85773 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt @@ -147,8 +147,11 @@ class ComposeViewModel(intent: Intent) : QkViewModel( messages = conversation .distinctUntilChanged() .observeOn(AndroidSchedulers.mainThread()) - .map { conversation -> messageRepo.getMessages(conversation.id) } - .doOnNext { messages -> newState { it.copy(messages = messages) } } + .map { conversation -> + val messages = messageRepo.getMessages(conversation.id) + newState { it.copy(messages = Pair(conversation, messages)) } + messages + } .switchMap { messages -> messages.asObservable() } disposables += sendMessage diff --git a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt index d4007dc3..6eb85fa0 100644 --- a/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/presentation/feature/compose/MessagesAdapter.kt @@ -20,6 +20,7 @@ package presentation.feature.compose import android.content.Context import android.support.v7.widget.RecyclerView +import android.telephony.PhoneNumberUtils import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -32,6 +33,7 @@ import common.util.extensions.setBackgroundTint import common.util.extensions.setPadding import common.util.extensions.setVisible import data.model.Contact +import data.model.Conversation import data.model.Message import data.model.PhoneNumber import io.reactivex.disposables.CompositeDisposable @@ -40,6 +42,7 @@ import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import io.realm.RealmList import io.realm.RealmRecyclerViewAdapter +import io.realm.RealmResults import kotlinx.android.synthetic.main.message_list_item_in.view.* import presentation.common.base.QkViewHolder import java.util.concurrent.TimeUnit @@ -58,7 +61,16 @@ class MessagesAdapter @Inject constructor( val longClicks: Subject = PublishSubject.create() + var data: Pair>? = null + set(value) { + field = value + people.clear() + contactMap.clear() + updateData(value?.second) + } + private val people = ArrayList() + private val contactMap = HashMap() private val selected = ArrayList() private val disposables = CompositeDisposable() @@ -93,8 +105,16 @@ class MessagesAdapter @Inject constructor( } if (absViewType != VIEW_TYPE_ME) { - val number = PhoneNumber(address = people[absViewType - 2]) - view.avatar.contact = Contact(numbers = RealmList(number)) + val address = people[absViewType - 2] + if (!contactMap.containsKey(address)) { + val contact = data?.first?.recipients?.mapNotNull { it.contact } // Map the conversation to its contacts + ?.firstOrNull { it.numbers.any { PhoneNumberUtils.compare(it.address, address) } } // See if any of the phone numbers match + ?: Contact(numbers = RealmList(PhoneNumber(address = address))) // Fallback to a fake contact + + contactMap.put(address, contact) + } + + view.avatar.contact = contactMap[address] } return QkViewHolder(view) @@ -143,6 +163,7 @@ class MessagesAdapter @Inject constructor( message.isSending() -> context.getString(R.string.message_status_sending) message.isDelivered() -> context.getString(R.string.message_status_delivered, timestamp) message.isFailedMessage() -> context.getString(R.string.message_status_failed) + !message.isMe() && data?.first?.recipients?.size ?: 0 > 1 -> "$timestamp • ${contactMap[message.address]?.name}" else -> timestamp }