Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
06de18fb
Commit
06de18fb
authored
May 16, 2018
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/starred-message-list
parents
7ebd1d98
9e70822c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
ChatRoomsPresenter.kt
...cket/android/chatrooms/presentation/ChatRoomsPresenter.kt
+5
-5
No files found.
app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt
View file @
06de18fb
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment