Commit 06de18fb authored by Filipe de Lima Brito's avatar Filipe de Lima Brito

Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/starred-message-list

parents 7ebd1d98 9e70822c
...@@ -246,7 +246,7 @@ class ChatRoomsPresenter @Inject constructor( ...@@ -246,7 +246,7 @@ class ChatRoomsPresenter @Inject constructor(
groupMentions = 0L, groupMentions = 0L,
lastMessage = it.lastMessage, lastMessage = it.lastMessage,
client = client, client = client,
broadcast = false broadcast = it.broadcast
) )
} }
} }
...@@ -338,7 +338,7 @@ class ChatRoomsPresenter @Inject constructor( ...@@ -338,7 +338,7 @@ class ChatRoomsPresenter @Inject constructor(
groupMentions = it.groupMentions, groupMentions = it.groupMentions,
lastMessage = it.lastMessage, lastMessage = it.lastMessage,
client = client, client = client,
broadcast = false broadcast = it.broadcast
) )
chatRoomsList.add(newRoom) chatRoomsList.add(newRoom)
} }
...@@ -482,7 +482,7 @@ class ChatRoomsPresenter @Inject constructor( ...@@ -482,7 +482,7 @@ class ChatRoomsPresenter @Inject constructor(
groupMentions = groupMentions, groupMentions = groupMentions,
lastMessage = room.lastMessage, lastMessage = room.lastMessage,
client = client, client = client,
broadcast = false broadcast = broadcast
) )
removeRoom(room.id, chatRooms) removeRoom(room.id, chatRooms)
chatRooms.add(newRoom) chatRooms.add(newRoom)
...@@ -522,7 +522,7 @@ class ChatRoomsPresenter @Inject constructor( ...@@ -522,7 +522,7 @@ class ChatRoomsPresenter @Inject constructor(
groupMentions = subscription.groupMentions, groupMentions = subscription.groupMentions,
lastMessage = lastMessage, lastMessage = lastMessage,
client = client, client = client,
broadcast = false broadcast = broadcast
) )
removeRoom(subscription.roomId, chatRooms) removeRoom(subscription.roomId, chatRooms)
chatRooms.add(newRoom) chatRooms.add(newRoom)
...@@ -597,7 +597,7 @@ class ChatRoomsPresenter @Inject constructor( ...@@ -597,7 +597,7 @@ class ChatRoomsPresenter @Inject constructor(
groupMentions = it.groupMentions, groupMentions = it.groupMentions,
lastMessage = it.lastMessage, lastMessage = it.lastMessage,
client = client, client = client,
broadcast = false broadcast = it.broadcast
) )
getChatRoomsInteractor.remove(currentServer, it) getChatRoomsInteractor.remove(currentServer, it)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment