Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/active-users

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

@@ -134,6 +134,7 @@ class ChatRoomsPresenter @Inject constructor(
                     null
                 },
                 name = it.name ?: "",
+                status = null,
                 fullName = it.name,
                 readonly = false,
                 updatedAt = null,
@@ -167,6 +168,7 @@ class ChatRoomsPresenter @Inject constructor(
                     null
                 },
                 name = it.name ?: "",
+                status = null,
                 fullName = it.fullName,
                 readonly = it.readonly,
                 updatedAt = it.updatedAt,
@@ -399,6 +401,7 @@ class ChatRoomsPresenter @Inject constructor(
                     room.name ?: name
                 )?.status,
                 name = room.name ?: name,
+                status = null,
                 fullName = room.fullName ?: fullName,
                 readonly = room.readonly,
                 updatedAt = room.updatedAt ?: updatedAt,
@@ -438,6 +441,7 @@ class ChatRoomsPresenter @Inject constructor(
                     subscription.name
                 )?.status,
                 name = subscription.name,
+                status = null,
                 fullName = subscription.fullName ?: fullName,
                 readonly = subscription.readonly ?: readonly,
                 updatedAt = subscription.updatedAt ?: updatedAt,

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

@@ -3,7 +3,12 @@ package chat.rocket.android.server.infraestructure
 import chat.rocket.common.model.BaseRoom
 import chat.rocket.common.model.User
 import chat.rocket.core.RocketChatClient
-import chat.rocket.core.internal.realtime.*
+import chat.rocket.core.internal.realtime.subscribeSubscriptions
+import chat.rocket.core.internal.realtime.subscribeRooms
+import chat.rocket.core.internal.realtime.subscribeUserData
+import chat.rocket.core.internal.realtime.subscribeActiveUsers
+import chat.rocket.core.internal.realtime.subscribeRoomMessages
+import chat.rocket.core.internal.realtime.unsubscribe
 import chat.rocket.core.internal.realtime.socket.connect
 import chat.rocket.core.internal.realtime.socket.disconnect
 import chat.rocket.core.internal.realtime.socket.model.State