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
27b10078
Unverified
Commit
27b10078
authored
Dec 18, 2018
by
Leonardo Aramaki
Committed by
GitHub
Dec 18, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1930 from dabbler011/nullfix
[FIX] roomid or username required bug
parents
a2535dd8
dd3a2f48
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
31 deletions
+5
-31
UserDetailsPresenter.kt
.../android/userdetails/presentation/UserDetailsPresenter.kt
+5
-31
No files found.
app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
View file @
27b10078
package
chat.rocket.android.userdetails.presentation
package
chat.rocket.android.userdetails.presentation
import
chat.rocket.android.chatrooms.domain.FetchChatRoomsInteractor
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.core.lifecycle.CancelStrategy
import
chat.rocket.android.db.DatabaseManager
import
chat.rocket.android.db.DatabaseManager
import
chat.rocket.android.db.model.ChatRoomEntity
import
chat.rocket.android.db.model.ChatRoomEntity
...
@@ -28,6 +29,7 @@ class UserDetailsPresenter @Inject constructor(
...
@@ -28,6 +29,7 @@ class UserDetailsPresenter @Inject constructor(
private
var
currentServer
=
serverInteractor
.
get
()
!!
private
var
currentServer
=
serverInteractor
.
get
()
!!
private
val
manager
=
factory
.
create
(
currentServer
)
private
val
manager
=
factory
.
create
(
currentServer
)
private
val
client
=
manager
.
client
private
val
client
=
manager
.
client
private
val
interactor
=
FetchChatRoomsInteractor
(
client
,
dbManager
)
fun
loadUserDetails
(
userId
:
String
)
{
fun
loadUserDetails
(
userId
:
String
)
{
launchUI
(
strategy
)
{
launchUI
(
strategy
)
{
...
@@ -40,37 +42,7 @@ class UserDetailsPresenter @Inject constructor(
...
@@ -40,37 +42,7 @@ class UserDetailsPresenter @Inject constructor(
val
openedChatRooms
=
chatRoomByName
(
name
=
u
.
name
)
val
openedChatRooms
=
chatRoomByName
(
name
=
u
.
name
)
val
avatarUrl
=
u
.
username
?.
let
{
currentServer
.
avatarUrl
(
avatar
=
it
)
}
val
avatarUrl
=
u
.
username
?.
let
{
currentServer
.
avatarUrl
(
avatar
=
it
)
}
val
chatRoom
:
ChatRoom
?
=
if
(
openedChatRooms
.
isEmpty
())
{
val
chatRoom
:
ChatRoom
?
=
openedChatRooms
.
firstOrNull
()
ChatRoom
(
id
=
""
,
type
=
roomTypeOf
(
RoomType
.
DIRECT_MESSAGE
),
name
=
u
.
username
?:
u
.
name
.
orEmpty
(),
fullName
=
u
.
name
,
favorite
=
false
,
open
=
false
,
alert
=
false
,
status
=
userStatusOf
(
u
.
status
),
client
=
client
,
broadcast
=
false
,
archived
=
false
,
default
=
false
,
description
=
null
,
groupMentions
=
null
,
userMentions
=
null
,
lastMessage
=
null
,
lastSeen
=
null
,
topic
=
null
,
announcement
=
null
,
roles
=
null
,
unread
=
0
,
readonly
=
false
,
muted
=
null
,
subscriptionId
=
""
,
timestamp
=
null
,
updatedAt
=
null
,
user
=
null
)
}
else
openedChatRooms
.
firstOrNull
()
view
.
showUserDetails
(
view
.
showUserDetails
(
avatarUrl
=
avatarUrl
,
avatarUrl
=
avatarUrl
,
...
@@ -93,6 +65,8 @@ class UserDetailsPresenter @Inject constructor(
...
@@ -93,6 +65,8 @@ class UserDetailsPresenter @Inject constructor(
client
.
createDirectMessage
(
username
=
id
)
client
.
createDirectMessage
(
username
=
id
)
}
}
interactor
.
refreshChatRooms
()
val
userEntity
=
withContext
(
CommonPool
)
{
val
userEntity
=
withContext
(
CommonPool
)
{
dbManager
.
userDao
().
getUser
(
id
=
id
)
dbManager
.
userDao
().
getUser
(
id
=
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