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
15096c28
Commit
15096c28
authored
Apr 20, 2018
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix app build.
parent
db38a4ab
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
ChatRoomsPresenter.kt
...cket/android/chatrooms/presentation/ChatRoomsPresenter.kt
+4
-0
ConnectionManager.kt
...ocket/android/server/infraestructure/ConnectionManager.kt
+2
-6
No files found.
app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt
View file @
15096c28
...
@@ -118,6 +118,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
...
@@ -118,6 +118,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
type
=
RoomType
.
DIRECT_MESSAGE
,
type
=
RoomType
.
DIRECT_MESSAGE
,
user
=
SimpleUser
(
username
=
it
.
username
,
name
=
it
.
name
,
id
=
null
),
user
=
SimpleUser
(
username
=
it
.
username
,
name
=
it
.
name
,
id
=
null
),
name
=
it
.
name
?:
""
,
name
=
it
.
name
?:
""
,
status
=
null
,
fullName
=
it
.
name
,
fullName
=
it
.
name
,
readonly
=
false
,
readonly
=
false
,
updatedAt
=
null
,
updatedAt
=
null
,
...
@@ -144,6 +145,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
...
@@ -144,6 +145,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
type
=
it
.
type
,
type
=
it
.
type
,
user
=
it
.
user
,
user
=
it
.
user
,
name
=
it
.
name
?:
""
,
name
=
it
.
name
?:
""
,
status
=
null
,
fullName
=
it
.
fullName
,
fullName
=
it
.
fullName
,
readonly
=
it
.
readonly
,
readonly
=
it
.
readonly
,
updatedAt
=
it
.
updatedAt
,
updatedAt
=
it
.
updatedAt
,
...
@@ -349,6 +351,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
...
@@ -349,6 +351,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
type
=
room
.
type
,
type
=
room
.
type
,
user
=
room
.
user
?:
user
,
user
=
room
.
user
?:
user
,
name
=
room
.
name
?:
name
,
name
=
room
.
name
?:
name
,
status
=
null
,
fullName
=
room
.
fullName
?:
fullName
,
fullName
=
room
.
fullName
?:
fullName
,
readonly
=
room
.
readonly
,
readonly
=
room
.
readonly
,
updatedAt
=
room
.
updatedAt
?:
updatedAt
,
updatedAt
=
room
.
updatedAt
?:
updatedAt
,
...
@@ -382,6 +385,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
...
@@ -382,6 +385,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
type
=
subscription
.
type
,
type
=
subscription
.
type
,
user
=
subscription
.
user
?:
user
,
user
=
subscription
.
user
?:
user
,
name
=
subscription
.
name
,
name
=
subscription
.
name
,
status
=
null
,
fullName
=
subscription
.
fullName
?:
fullName
,
fullName
=
subscription
.
fullName
?:
fullName
,
readonly
=
subscription
.
readonly
?:
readonly
,
readonly
=
subscription
.
readonly
?:
readonly
,
updatedAt
=
subscription
.
updatedAt
?:
updatedAt
,
updatedAt
=
subscription
.
updatedAt
?:
updatedAt
,
...
...
app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManager.kt
View file @
15096c28
...
@@ -2,15 +2,11 @@ package chat.rocket.android.server.infraestructure
...
@@ -2,15 +2,11 @@ package chat.rocket.android.server.infraestructure
import
chat.rocket.common.model.BaseRoom
import
chat.rocket.common.model.BaseRoom
import
chat.rocket.core.RocketChatClient
import
chat.rocket.core.RocketChatClient
import
chat.rocket.core.internal.realtime.
unsubscribe
import
chat.rocket.core.internal.realtime.
*
import
chat.rocket.core.internal.realtime.socket.connect
import
chat.rocket.core.internal.realtime.socket.connect
import
chat.rocket.core.internal.realtime.socket.disconnect
import
chat.rocket.core.internal.realtime.socket.disconnect
import
chat.rocket.core.internal.realtime.socket.model.State
import
chat.rocket.core.internal.realtime.socket.model.State
import
chat.rocket.core.internal.realtime.socket.model.StreamMessage
import
chat.rocket.core.internal.realtime.socket.model.StreamMessage
import
chat.rocket.core.internal.realtime.subscribeRoomMessages
import
chat.rocket.core.internal.realtime.subscribeRooms
import
chat.rocket.core.internal.realtime.subscribeSubscriptions
import
chat.rocket.core.internal.realtime.subscribeUserDataChanges
import
chat.rocket.core.internal.rest.chatRooms
import
chat.rocket.core.internal.rest.chatRooms
import
chat.rocket.core.model.Message
import
chat.rocket.core.model.Message
import
chat.rocket.core.model.Myself
import
chat.rocket.core.model.Myself
...
@@ -60,7 +56,7 @@ class ConnectionManager(internal val client: RocketChatClient) {
...
@@ -60,7 +56,7 @@ class ConnectionManager(internal val client: RocketChatClient) {
Timber
.
d
(
"Subscribed to rooms: $id"
)
Timber
.
d
(
"Subscribed to rooms: $id"
)
roomsId
=
id
roomsId
=
id
}
}
client
.
subscribeUserData
Changes
{
_
,
id
->
client
.
subscribeUserData
{
_
,
id
->
Timber
.
d
(
"Subscribed to the user: $id"
)
Timber
.
d
(
"Subscribed to the user: $id"
)
userId
=
id
userId
=
id
}
}
...
...
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