Skip to content
Snippets Groups Projects
Commit 7efeac2a authored by Adrien Béraud's avatar Adrien Béraud
Browse files

conversation details: prevent modification by non-ui thread

Change-Id: Iece38d834e97e99bc00ec61f4e450ffc517365e0
parent 00bf3d34
No related branches found
No related tags found
No related merge requests found
......@@ -49,6 +49,7 @@ import cx.ring.utils.ConversationPath
import cx.ring.views.AvatarDrawable
import cx.ring.views.AvatarFactory
import dagger.hilt.android.AndroidEntryPoint
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.core.Single
import io.reactivex.rxjava3.disposables.CompositeDisposable
import net.jami.model.*
......@@ -253,12 +254,13 @@ class ContactDetailsActivity : AppCompatActivity() {
colorActionPosition = 0
symbolActionPosition = 1
mDisposableBag.add(mConversationFacade.observeConversation(conversation).subscribe { vm ->
mDisposableBag.add(mConversationFacade.observeConversation(conversation)
.observeOn(AndroidSchedulers.mainThread())
.subscribe { vm ->
binding.contactImage.setImageDrawable(AvatarDrawable.Builder()
.withViewModel(vm)
.withCircleCrop(true)
.build(this))
supportActionBar?.title = vm.title
binding.contactListLayout.visibility =
if (conversation.isSwarm) View.VISIBLE else View.GONE
......
......@@ -112,10 +112,11 @@
android:text="@string/conversation_members" />
<androidx.recyclerview.widget.RecyclerView
android:clipToPadding="false"
android:paddingHorizontal="16dp"
android:id="@+id/contact_list"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="8dp"
android:orientation="horizontal"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:itemCount="4"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment