More fixes.

app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt

@@ -270,6 +270,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
     // TODO - Temporary stuff, remove when adding DB support
     private suspend fun subscribeRoomUpdates() {
         manager.addStatusChannel(stateChannel)
+        view.showConnectionState(client.state)
         manager.addRoomsAndSubscriptionsChannel(subscriptionsChannel)
         launch(CommonPool + strategy.jobs) {
             for (message in subscriptionsChannel) {

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsAdapter.kt

@@ -24,7 +24,6 @@ import chat.rocket.android.util.extensions.textContent
 import chat.rocket.common.model.RoomType
 import chat.rocket.core.model.ChatRoom
 import com.facebook.drawee.view.SimpleDraweeView
-import kotlinx.android.synthetic.main.avatar.view.*
 import kotlinx.android.synthetic.main.item_chat.view.*
 import kotlinx.android.synthetic.main.unread_messages_badge.view.*
 

app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt

@@ -36,6 +36,7 @@ import kotlinx.coroutines.experimental.NonCancellable.isActive
 import kotlinx.coroutines.experimental.android.UI
 import kotlinx.coroutines.experimental.async
 import kotlinx.coroutines.experimental.launch
+import timber.log.Timber
 import javax.inject.Inject
 
 
@@ -204,6 +205,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
     override fun showGenericErrorMessage() = showMessage(getString(R.string.msg_generic_error))
 
     override fun showConnectionState(state: State) {
+        Timber.d("Got new state: $state")
         ui {
             connection_status_text.fadeIn()
             handler.removeCallbacks(dismissStatus)

app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManager.kt

@@ -15,7 +15,7 @@ import java.util.concurrent.CopyOnWriteArrayList
 
 class ConnectionManager(internal val client: RocketChatClient) {
     private val statusChannelList = CopyOnWriteArrayList<Channel<State>>()
-    private val statusChannel = Channel<State>()
+    private val statusChannel = Channel<State>(Channel.CONFLATED)
     private var connectJob: Job? = null
 
     private val roomAndSubscriptionChannels = ArrayList<Channel<StreamMessage<BaseRoom>>>()
@@ -67,7 +67,8 @@ class ConnectionManager(internal val client: RocketChatClient) {
                 }
 
                 for (channel in statusChannelList) {
-                    channel.send(status)
+                    Timber.d("Sending status: $status to $channel")
+                    channel.offer(status)
                 }
             }
         }

app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt

@@ -11,7 +11,10 @@ import chat.rocket.android.util.extensions.asObservable
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.textContent
 import android.support.v7.view.ActionMode
+import chat.rocket.android.util.extensions.ui
 import dagger.android.support.AndroidSupportInjection
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.disposables.Disposable
 import io.reactivex.rxkotlin.Observables
 import kotlinx.android.synthetic.main.fragment_password.*
 import javax.inject.Inject
@@ -19,6 +22,7 @@ import javax.inject.Inject
 class PasswordFragment: Fragment(), PasswordView, android.support.v7.view.ActionMode.Callback {
     @Inject lateinit var presenter: PasswordPresenter
     private var actionMode: ActionMode? = null
+    private val disposables = CompositeDisposable()
 
     companion object {
         fun newInstance() = PasswordFragment()
@@ -34,14 +38,21 @@ class PasswordFragment: Fragment(), PasswordView, android.support.v7.view.Action
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        listenToChanges()
+        disposables.add(listenToChanges())
+    }
+
+    override fun onDestroyView() {
+        disposables.clear()
+        super.onDestroyView()
     }
 
     override fun hideLoading() {
+        ui {
             layout_new_password.visibility = View.VISIBLE
             layout_confirm_password.visibility = View.VISIBLE
             view_loading.visibility = View.GONE
         }
+    }
 
     override fun onActionItemClicked(mode: ActionMode, menuItem: MenuItem): Boolean {
         return when (menuItem.itemId) {
@@ -69,10 +80,12 @@ class PasswordFragment: Fragment(), PasswordView, android.support.v7.view.Action
     }
 
     override fun showLoading() {
+        ui {
             layout_new_password.visibility = View.GONE
             layout_confirm_password.visibility = View.GONE
             view_loading.visibility = View.VISIBLE
         }
+    }
 
     override fun showPasswordFailsUpdateMessage(error: String?) {
         showToast("Password fails to update: " + error)
@@ -84,8 +97,9 @@ class PasswordFragment: Fragment(), PasswordView, android.support.v7.view.Action
 
     private fun finishActionMode() = actionMode?.finish()
 
-    private fun listenToChanges() {
-        Observables.combineLatest(text_new_password.asObservable(), text_confirm_password.asObservable()).subscribe {
+    private fun listenToChanges(): Disposable {
+        return Observables.combineLatest(text_new_password.asObservable(),
+                text_confirm_password.asObservable()).subscribe {
             val textPassword = text_new_password.textContent
             val textConfirmPassword = text_confirm_password.textContent
 
@@ -97,7 +111,9 @@ class PasswordFragment: Fragment(), PasswordView, android.support.v7.view.Action
     }
 
     private fun showToast(msg: String?) {
-        Toast.makeText(context, msg, Toast.LENGTH_LONG).show()
+        ui {
+            Toast.makeText(it, msg, Toast.LENGTH_LONG).show()
+        }
     }
 
     private fun startActionMode() {

app/src/main/res/layout/item_chat.xml

@@ -10,14 +10,14 @@
     android:paddingTop="@dimen/chat_item_top_and_bottom_padding"
     android:paddingBottom="@dimen/chat_item_top_and_bottom_padding">
 
-    <include
-        android:id="@+id/layout_avatar"
-        layout="@layout/avatar"
+    <com.facebook.drawee.view.SimpleDraweeView
+        android:id="@+id/image_avatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
+        app:roundedCornerRadius="3dp"
         android:layout_marginTop="6dp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <TextView
         android:id="@+id/text_chat_name"
@@ -25,7 +25,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        app:layout_constraintStart_toEndOf="@id/layout_avatar"
+        app:layout_constraintStart_toEndOf="@id/image_avatar"
         android:textDirection="locale"
         tools:text="General"/>
 
@@ -51,7 +51,7 @@
         app:layout_constraintTop_toBottomOf="@id/text_chat_name"
         app:layout_constraintEnd_toStartOf="@id/layout_unread_messages_badge"
         android:textDirection="locale"
-        tools:text="You: Type something"/>
+        tools:text="You: Type something that is very big and need at least to lines, or maybe even more"/>
 
     <include
         android:id="@+id/layout_unread_messages_badge"