Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/send-typing-status

1eda85ee · Filipe de Lima Brito · a2ded271 · e99671dc · 1eda85ee
Commit 1eda85ee authored May 04, 2018 by Filipe de Lima Brito
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

SaveActiveUsersInteractor.kt ...rocket/android/server/domain/SaveActiveUsersInteractor.kt +2 -1

No files found.
--- a/app/src/main/java/chat/rocket/android/server/domain/SaveActiveUsersInteractor.kt
+++ b/app/src/main/java/chat/rocket/android/server/domain/SaveActiveUsersInteractor.kt
@@ -29,7 +29,8 @@ class SaveActiveUsersInteractor @Inject constructor(
                username = user.username ?: it.username,
                status = user.status ?: it.status,
                emails = user.emails ?: it.emails,
-                utcOffset = user.utcOffset ?: it.utcOffset
+                utcOffset = user.utcOffset ?: it.utcOffset,
+                roles = user.roles ?: it.roles
            )

            val activeUserList: MutableList<User> =