Merge branch 'develop-2.x' into new/version-check

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

@@ -2,10 +2,10 @@ package chat.rocket.android.chatrooms.presentation
 
 import chat.rocket.android.chatroom.viewmodel.ViewModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
-import chat.rocket.android.main.presentation.MainNavigator
 import chat.rocket.android.helper.ChatRoomsSortOrder
 import chat.rocket.android.helper.Constants
 import chat.rocket.android.helper.SharedPreferenceHelper
+import chat.rocket.android.main.presentation.MainNavigator
 import chat.rocket.android.server.domain.*
 import chat.rocket.android.server.infraestructure.ConnectionManager
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
@@ -23,14 +23,12 @@ import chat.rocket.core.internal.realtime.StreamMessage
 import chat.rocket.core.internal.realtime.Type
 import chat.rocket.core.internal.rest.spotlight
 import chat.rocket.core.model.ChatRoom
-import chat.rocket.core.model.Message
 import chat.rocket.core.model.Room
 import kotlinx.coroutines.experimental.*
 import kotlinx.coroutines.experimental.android.UI
 import kotlinx.coroutines.experimental.channels.Channel
 import timber.log.Timber
 import javax.inject.Inject
-import kotlin.reflect.KProperty
 import kotlin.reflect.KProperty1
 
 class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
@@ -341,27 +339,27 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
         val chatRooms = getChatRoomsInteractor.get(currentServer).toMutableList()
         val chatRoom = chatRooms.find { chatRoom -> chatRoom.id == room.id }
         chatRoom?.apply {
-            val newRoom = ChatRoom(room.id,
-                    room.type,
-                    room.user ?: user,
-                    room.name ?: name,
-                    room.fullName ?: fullName,
-                    room.readonly,
-                    room.updatedAt ?: updatedAt,
-                    timestamp,
-                    lastSeen,
-                    room.topic,
-                    room.description,
-                    room.announcement,
-                    default,
-                    favorite,
-                    open,
-                    alert,
-                    unread,
-                    userMenstions,
-                    groupMentions,
-                    room.lastMessage,
-                    client)
+            val newRoom = ChatRoom(id = room.id,
+                    type = room.type,
+                    user = room.user ?: user,
+                    name = room.name ?: name,
+                    fullName = room.fullName ?: fullName,
+                    readonly = room.readonly,
+                    updatedAt = room.updatedAt ?: updatedAt,
+                    timestamp = timestamp,
+                    lastSeen = lastSeen,
+                    topic = room.topic,
+                    description = room.description,
+                    announcement = room.announcement,
+                    default = default,
+                    favorite = favorite,
+                    open = open,
+                    alert = alert,
+                    unread = unread,
+                    userMenstions = userMenstions,
+                    groupMentions = groupMentions,
+                    lastMessage = room.lastMessage,
+                    client = client)
             removeRoom(room.id, chatRooms)
             chatRooms.add(newRoom)
             saveChatRoomsInteractor.save(currentServer, sortRooms(chatRooms))
@@ -374,27 +372,27 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
         val chatRooms = getChatRoomsInteractor.get(currentServer).toMutableList()
         val chatRoom = chatRooms.find { chatRoom -> chatRoom.id == subscription.roomId }
         chatRoom?.apply {
-            val newRoom = ChatRoom(subscription.roomId,
-                    subscription.type,
-                    subscription.user ?: user,
-                    subscription.name,
-                    subscription.fullName ?: fullName,
-                    subscription.readonly ?: readonly,
-                    subscription.updatedAt ?: updatedAt,
-                    subscription.timestamp ?: timestamp,
-                    subscription.lastSeen ?: lastSeen,
-                    topic,
-                    description,
-                    announcement,
-                    subscription.isDefault,
-                    favorite,
-                    subscription.open,
-                    subscription.alert,
-                    subscription.unread,
-                    subscription.userMentions,
-                    subscription.groupMentions,
-                    lastMessage,
-                    client)
+            val newRoom = ChatRoom(id = subscription.roomId,
+                    type = subscription.type,
+                    user = subscription.user ?: user,
+                    name = subscription.name,
+                    fullName = subscription.fullName ?: fullName,
+                    readonly = subscription.readonly ?: readonly,
+                    updatedAt = subscription.updatedAt ?: updatedAt,
+                    timestamp = subscription.timestamp ?: timestamp,
+                    lastSeen = subscription.lastSeen ?: lastSeen,
+                    topic = topic,
+                    description = description,
+                    announcement = announcement,
+                    default = subscription.isDefault,
+                    favorite = subscription.isFavorite,
+                    open = subscription.open,
+                    alert = subscription.alert,
+                    unread = subscription.unread,
+                    userMenstions = subscription.userMentions,
+                    groupMentions = subscription.groupMentions,
+                    lastMessage = lastMessage,
+                    client = client)
             removeRoom(subscription.roomId, chatRooms)
             chatRooms.add(newRoom)
             saveChatRoomsInteractor.save(currentServer, sortRooms(chatRooms))