From 9bb19efced6dd3e906f08e03d601142106b3f647 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 24 Dec 2017 20:33:56 -0500 Subject: [PATCH] Fix threading issues with selecting conversation --- .../moez/QKSMS/data/repository/MessageRepository.kt | 8 +++++--- .../moez/QKSMS/presentation/compose/ChipsAdapter.kt | 12 ++++++++++-- .../QKSMS/presentation/compose/ComposeActivity.kt | 3 +++ qksms/src/main/res/drawable/chip_background.xml | 8 +------- qksms/src/main/res/layout/compose_activity.xml | 1 - 5 files changed, 19 insertions(+), 13 deletions(-) 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 988d3a45..41c8b67f 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 @@ -77,6 +77,7 @@ class MessageRepository @Inject constructor( fun getOrCreateConversation(addresses: List): Maybe { return Maybe.just(addresses) + .subscribeOn(Schedulers.io()) .map { recipients -> recipients.map { address -> when (MessageUtils.isEmailAddress(address)) { @@ -96,9 +97,10 @@ class MessageRepository @Inject constructor( .map { cursor -> cursor.getLong(0) } .filter { threadId -> threadId != 0L } .map { threadId -> - getConversation(threadId) - ?: getConversationFromCp(threadId)?.apply { insertOrUpdate() } - ?: Conversation() + var conversation = getConversation(threadId) + if (conversation != null) conversation = Realm.getDefaultInstance().copyFromRealm(conversation) + + conversation ?: getConversationFromCp(threadId)?.apply { insertOrUpdate() } ?: Conversation() } .onErrorReturn { Conversation() } } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt index fc079041..2887736f 100755 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt @@ -12,7 +12,9 @@ import com.google.android.flexbox.FlexboxLayoutManager import com.jakewharton.rxbinding2.view.keys import com.jakewharton.rxbinding2.widget.textChanges import com.moez.QKSMS.R +import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.extensions.dpToPx +import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.showKeyboard import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.presentation.common.base.QkAdapter @@ -21,7 +23,7 @@ import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.contact_chip.view.* import javax.inject.Inject -class ChipsAdapter @Inject constructor(private val context: Context) : QkAdapter() { +class ChipsAdapter @Inject constructor(private val context: Context, private val colors: Colors) : QkAdapter() { companion object { private val TYPE_EDIT_TEXT = 0 @@ -64,7 +66,13 @@ class ChipsAdapter @Inject constructor(private val context: Context) : QkAdapter override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = when (viewType) { TYPE_EDIT_TEXT -> QkViewHolder(editText) - else -> QkViewHolder(LayoutInflater.from(context).inflate(R.layout.contact_chip, parent, false)) + + else -> { + val view = LayoutInflater.from(context).inflate(R.layout.contact_chip, parent, false) + colors.composeBackground.subscribe { color -> view.content.setBackgroundTint(color) } + + QkViewHolder(view) + } } override fun onBindViewHolder(holder: QkViewHolder, position: Int) { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt index f6939d9d..1a698c88 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -122,6 +122,9 @@ class ComposeActivity : QkActivity(), ComposeView { disposables += colors.bubble .subscribe { color -> messageBackground.setBackgroundTint(color) } + disposables += colors.background + .subscribe { color -> contacts.setBackgroundTint(color) } + disposables += colors.composeBackground .doOnNext { color -> composeBar.setBackgroundTint(color) } .doOnNext { color -> window.decorView.setBackgroundColor(color) } diff --git a/qksms/src/main/res/drawable/chip_background.xml b/qksms/src/main/res/drawable/chip_background.xml index 005f9226..80fad671 100755 --- a/qksms/src/main/res/drawable/chip_background.xml +++ b/qksms/src/main/res/drawable/chip_background.xml @@ -1,16 +1,10 @@ - - - - - - - + diff --git a/qksms/src/main/res/layout/compose_activity.xml b/qksms/src/main/res/layout/compose_activity.xml index 469e3043..e747d494 100644 --- a/qksms/src/main/res/layout/compose_activity.xml +++ b/qksms/src/main/res/layout/compose_activity.xml @@ -32,7 +32,6 @@ android:id="@+id/contacts" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" android:clipChildren="false" android:clipToPadding="false" android:paddingBottom="8dp"