forked from upstream-mirrors/quik
Safely use conversation in MessagesAdapter
This commit is contained in:
@@ -24,7 +24,6 @@ import android.graphics.PorterDuff
|
|||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.support.v7.widget.LinearLayoutManager
|
import android.support.v7.widget.LinearLayoutManager
|
||||||
import android.support.v7.widget.RecyclerView
|
|
||||||
import android.view.KeyEvent
|
import android.view.KeyEvent
|
||||||
import android.view.Menu
|
import android.view.Menu
|
||||||
import android.view.MenuItem
|
import android.view.MenuItem
|
||||||
@@ -34,11 +33,13 @@ import com.jakewharton.rxbinding2.widget.textChanges
|
|||||||
import com.moez.QKSMS.R
|
import com.moez.QKSMS.R
|
||||||
import com.uber.autodispose.android.lifecycle.scope
|
import com.uber.autodispose.android.lifecycle.scope
|
||||||
import com.uber.autodispose.kotlin.autoDisposable
|
import com.uber.autodispose.kotlin.autoDisposable
|
||||||
import injection.appComponent
|
import common.base.QkThemedActivity
|
||||||
|
import common.util.extensions.autoScrollToStart
|
||||||
import common.util.extensions.setBackgroundTint
|
import common.util.extensions.setBackgroundTint
|
||||||
import common.util.extensions.setTint
|
import common.util.extensions.setTint
|
||||||
import common.util.extensions.setVisible
|
import common.util.extensions.setVisible
|
||||||
import common.util.extensions.showKeyboard
|
import common.util.extensions.showKeyboard
|
||||||
|
import injection.appComponent
|
||||||
import io.reactivex.Observable
|
import io.reactivex.Observable
|
||||||
import io.reactivex.rxkotlin.Observables
|
import io.reactivex.rxkotlin.Observables
|
||||||
import io.reactivex.subjects.PublishSubject
|
import io.reactivex.subjects.PublishSubject
|
||||||
@@ -46,8 +47,6 @@ import io.reactivex.subjects.Subject
|
|||||||
import kotlinx.android.synthetic.main.compose_activity.*
|
import kotlinx.android.synthetic.main.compose_activity.*
|
||||||
import model.Contact
|
import model.Contact
|
||||||
import model.Message
|
import model.Message
|
||||||
import common.base.QkThemedActivity
|
|
||||||
import common.util.extensions.autoScrollToStart
|
|
||||||
import javax.inject.Inject
|
import javax.inject.Inject
|
||||||
|
|
||||||
class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
||||||
@@ -201,9 +200,7 @@ class ComposeActivity : QkThemedActivity<ComposeViewModel>(), ComposeView {
|
|||||||
contactsAdapter.data = state.contacts
|
contactsAdapter.data = state.contacts
|
||||||
}
|
}
|
||||||
|
|
||||||
if (messageAdapter.data !== state.messages) {
|
messageAdapter.data = state.messages
|
||||||
messageAdapter.data = state.messages
|
|
||||||
}
|
|
||||||
|
|
||||||
attachments.setVisible(state.attachments.isNotEmpty())
|
attachments.setVisible(state.attachments.isNotEmpty())
|
||||||
if (attachmentAdapter.data !== state.attachments) {
|
if (attachmentAdapter.data !== state.attachments) {
|
||||||
|
|||||||
@@ -77,6 +77,12 @@ class MessagesAdapter @Inject constructor(
|
|||||||
updateData(value?.second)
|
updateData(value?.second)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Safely return the conversation, if available
|
||||||
|
*/
|
||||||
|
private val conversation: Conversation?
|
||||||
|
get() = data?.first?.takeIf { it.isValid }
|
||||||
|
|
||||||
private val contactMap = HashMap<String, Recipient?>()
|
private val contactMap = HashMap<String, Recipient?>()
|
||||||
private val selected = HashMap<Long, Boolean>()
|
private val selected = HashMap<Long, Boolean>()
|
||||||
private val disposables = CompositeDisposable()
|
private val disposables = CompositeDisposable()
|
||||||
@@ -100,7 +106,7 @@ class MessagesAdapter @Inject constructor(
|
|||||||
.subscribe { color -> view.messageBackground.setBackgroundTint(color) }
|
.subscribe { color -> view.messageBackground.setBackgroundTint(color) }
|
||||||
} else {
|
} else {
|
||||||
view = layoutInflater.inflate(R.layout.message_list_item_in, parent, false)
|
view = layoutInflater.inflate(R.layout.message_list_item_in, parent, false)
|
||||||
view.avatar.threadId = data?.first?.id ?: 0
|
view.avatar.threadId = conversation?.id ?: 0
|
||||||
view.subject.textColorObservable = textPrimaryOnTheme
|
view.subject.textColorObservable = textPrimaryOnTheme
|
||||||
view.body.textColorObservable = textPrimaryOnTheme
|
view.body.textColorObservable = textPrimaryOnTheme
|
||||||
disposables += theme
|
disposables += theme
|
||||||
@@ -147,11 +153,11 @@ class MessagesAdapter @Inject constructor(
|
|||||||
|
|
||||||
val address = message.address
|
val address = message.address
|
||||||
if (contactMap[address]?.isValid != true) {
|
if (contactMap[address]?.isValid != true) {
|
||||||
contactMap[address] = data?.first?.recipients
|
contactMap[address] = conversation?.recipients
|
||||||
?.firstOrNull { PhoneNumberUtils.compare(it.address, address) } // See if any of the phone numbers match
|
?.firstOrNull { PhoneNumberUtils.compare(it.address, address) } // See if any of the phone numbers match
|
||||||
}
|
}
|
||||||
|
|
||||||
view.avatar.threadId = data?.first?.id ?: 0
|
view.avatar.threadId = conversation?.id ?: 0
|
||||||
view.avatar.setContact(contactMap[address])
|
view.avatar.setContact(contactMap[address])
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -166,7 +172,7 @@ class MessagesAdapter @Inject constructor(
|
|||||||
message.isSending() -> context.getString(R.string.message_status_sending)
|
message.isSending() -> context.getString(R.string.message_status_sending)
|
||||||
message.isDelivered() -> context.getString(R.string.message_status_delivered, timestamp)
|
message.isDelivered() -> context.getString(R.string.message_status_delivered, timestamp)
|
||||||
message.isFailedMessage() -> context.getString(R.string.message_status_failed)
|
message.isFailedMessage() -> context.getString(R.string.message_status_failed)
|
||||||
!message.isMe() && data?.first?.recipients?.size ?: 0 > 1 -> "${contactMap[message.address]?.getDisplayName()} • $timestamp"
|
!message.isMe() && conversation?.recipients?.size ?: 0 > 1 -> "${contactMap[message.address]?.getDisplayName()} • $timestamp"
|
||||||
else -> timestamp
|
else -> timestamp
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -175,7 +181,7 @@ class MessagesAdapter @Inject constructor(
|
|||||||
message.isSending() -> true
|
message.isSending() -> true
|
||||||
message.isFailedMessage() -> true
|
message.isFailedMessage() -> true
|
||||||
selected[message.id] == false -> false
|
selected[message.id] == false -> false
|
||||||
data?.first?.recipients?.size ?: 0 > 1 && !message.isMe() && next?.compareSender(message) != true -> true
|
conversation?.recipients?.size ?: 0 > 1 && !message.isMe() && next?.compareSender(message) != true -> true
|
||||||
message.isDelivered() && next?.isDelivered() != true && age <= TIMESTAMP_THRESHOLD -> true
|
message.isDelivered() && next?.isDelivered() != true && age <= TIMESTAMP_THRESHOLD -> true
|
||||||
else -> false
|
else -> false
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user