Merge pull request #1422 from RocketChat/fix/lists-on-chat-room

[FIX] Member, Pinned, Favorite and File list not showing bug.

app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt

@@ -10,11 +10,11 @@ import chat.rocket.android.authentication.twofactor.di.TwoFAFragmentProvider
 import chat.rocket.android.authentication.ui.AuthenticationActivity
 import chat.rocket.android.chatroom.di.ChatRoomFragmentProvider
 import chat.rocket.android.chatroom.di.ChatRoomModule
-import chat.rocket.android.chatroom.di.FavoriteMessagesFragmentProvider
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatrooms.di.ChatRoomsFragmentProvider
 import chat.rocket.android.createchannel.di.CreateChannelProvider
 import chat.rocket.android.dagger.scope.PerActivity
+import chat.rocket.android.favoritemessages.di.FavoriteMessagesFragmentProvider
 import chat.rocket.android.files.di.FilesFragmentProvider
 import chat.rocket.android.main.di.MainModule
 import chat.rocket.android.main.ui.MainActivity

app/src/main/java/chat/rocket/android/favoritemessages/di/FavoriteMessagesFragmentModule.kt

-package chat.rocket.android.chatroom.di
+package chat.rocket.android.favoritemessages.di
 
 import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.db.DatabaseManager
+import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.favoritemessages.presentation.FavoriteMessagesView
 import chat.rocket.android.favoritemessages.ui.FavoriteMessagesFragment
+import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import dagger.Module
 import dagger.Provides
 import kotlinx.coroutines.experimental.Job
+import javax.inject.Named
 
 @Module
 class FavoriteMessagesFragmentModule {
 
     @Provides
     @PerFragment
-    fun provideJob() = Job()
+    fun provideFavoriteMessagesView(frag: FavoriteMessagesFragment): FavoriteMessagesView {
+        return frag
+    }
 
     @Provides
     @PerFragment
-    fun provideLifecycleOwner(frag: FavoriteMessagesFragment): LifecycleOwner {
-        return frag
+    @Named("currentServer")
+    fun provideCurrentServer(currentServerInteractor: GetCurrentServerInteractor): String {
+        return currentServerInteractor.get()!!
     }
 
     @Provides
     @PerFragment
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
+    fun provideDatabaseManager(
+        factory: DatabaseManagerFactory,
+        @Named("currentServer") currentServer: String
+    ): DatabaseManager {
+        return factory.create(currentServer)
     }
 
     @Provides
     @PerFragment
-    fun provideFavoriteMessagesView(frag: FavoriteMessagesFragment): FavoriteMessagesView {
+    fun provideJob() = Job()
+
+    @Provides
+    @PerFragment
+    fun provideLifecycleOwner(frag: FavoriteMessagesFragment): LifecycleOwner {
         return frag
     }
+
+    @Provides
+    @PerFragment
+    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
+        return CancelStrategy(owner, jobs)
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/favoritemessages/di/FavoriteMessagesFragmentProvider.kt

-package chat.rocket.android.chatroom.di
+package chat.rocket.android.favoritemessages.di
 
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.favoritemessages.ui.FavoriteMessagesFragment

app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt

@@ -2,26 +2,27 @@ package chat.rocket.android.favoritemessages.presentation
 
 import chat.rocket.android.chatroom.uimodel.UiModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
-import chat.rocket.android.server.domain.ChatRoomsInteractor
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extensions.launchUI
 import chat.rocket.common.RocketChatException
+import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
+import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.getFavoriteMessages
 import timber.log.Timber
 import javax.inject.Inject
+import javax.inject.Named
 
 class FavoriteMessagesPresenter @Inject constructor(
     private val view: FavoriteMessagesView,
     private val strategy: CancelStrategy,
-    private val roomsInteractor: ChatRoomsInteractor,
+    private val dbManager: DatabaseManager,
+    @Named("currentServer") private val currentServer: String,
     private val mapper: UiModelMapper,
-    val serverInteractor: GetCurrentServerInteractor,
     val factory: RocketChatClientFactory
 ) {
-    private val serverUrl = serverInteractor.get()!!
-    private val client = factory.create(serverUrl)
+    private val client: RocketChatClient = factory.create(currentServer)
     private var offset: Int = 0
 
     /**
@@ -33,8 +34,9 @@ class FavoriteMessagesPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-                roomsInteractor.getById(serverUrl, roomId)?.let {
-                    val favoriteMessages = client.getFavoriteMessages(roomId, it.type, offset)
+                dbManager.getRoom(roomId)?.let {
+                    val favoriteMessages =
+                        client.getFavoriteMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
                     val messageList = mapper.map(favoriteMessages.result, asNotReversed = true)
                     view.showFavoriteMessages(messageList)
                     offset += 1 * 30

app/src/main/java/chat/rocket/android/files/di/FilesFragmentModule.kt

@@ -3,34 +3,54 @@ package chat.rocket.android.files.di
 import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.db.DatabaseManager
+import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.files.presentation.FilesView
 import chat.rocket.android.files.ui.FilesFragment
+import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import dagger.Module
 import dagger.Provides
 import kotlinx.coroutines.experimental.Job
+import javax.inject.Named
 
 @Module
 class FilesFragmentModule {
 
     @Provides
     @PerFragment
-    fun provideJob() = Job()
+    fun provideFilesView(frag: FilesFragment): FilesView {
+        return frag
+    }
 
     @Provides
     @PerFragment
-    fun provideLifecycleOwner(frag: FilesFragment): LifecycleOwner {
-        return frag
+    @Named("currentServer")
+    fun provideCurrentServer(currentServerInteractor: GetCurrentServerInteractor): String {
+        return currentServerInteractor.get()!!
     }
 
     @Provides
     @PerFragment
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
+    fun provideDatabaseManager(
+        factory: DatabaseManagerFactory,
+        @Named("currentServer") currentServer: String
+    ): DatabaseManager {
+        return factory.create(currentServer)
     }
 
     @Provides
     @PerFragment
-    fun provideFilesView(frag: FilesFragment): FilesView {
+    fun provideJob() = Job()
+
+    @Provides
+    @PerFragment
+    fun provideLifecycleOwner(frag: FilesFragment): LifecycleOwner {
         return frag
     }
+
+    @Provides
+    @PerFragment
+    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
+        return CancelStrategy(owner, jobs)
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/files/presentation/FilesPresenter.kt

@@ -2,28 +2,29 @@ package chat.rocket.android.files.presentation
 
 import androidx.core.net.toUri
 import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.files.uimodel.FileUiModel
 import chat.rocket.android.files.uimodel.FileUiModelMapper
-import chat.rocket.android.server.domain.ChatRoomsInteractor
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extensions.launchUI
 import chat.rocket.common.RocketChatException
+import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
+import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.getFiles
 import timber.log.Timber
 import javax.inject.Inject
+import javax.inject.Named
 
 class FilesPresenter @Inject constructor(
-        private val view: FilesView,
-        private val strategy: CancelStrategy,
-        private val roomsInteractor: ChatRoomsInteractor,
-        private val mapper: FileUiModelMapper,
-        val serverInteractor: GetCurrentServerInteractor,
-        val factory: RocketChatClientFactory
+    private val view: FilesView,
+    private val strategy: CancelStrategy,
+    private val dbManager: DatabaseManager,
+    @Named("currentServer") private val currentServer: String,
+    private val mapper: FileUiModelMapper,
+    val factory: RocketChatClientFactory
 ) {
-    private val serverUrl = serverInteractor.get()!!
-    private val client = factory.create(serverUrl)
+    private val client: RocketChatClient = factory.create(currentServer)
     private var offset: Int = 0
 
     /**
@@ -35,8 +36,8 @@ class FilesPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-                roomsInteractor.getById(serverUrl, roomId)?.let {
-                    val files = client.getFiles(roomId, it.type, offset)
+                dbManager.getRoom(roomId)?.let {
+                    val files = client.getFiles(roomId, roomTypeOf(it.chatRoom.type), offset)
                     val filesUiModel = mapper.mapToUiModelList(files.result)
                     view.showFiles(filesUiModel, files.total)
                     offset += 1 * 30

app/src/main/java/chat/rocket/android/members/di/MembersFragmentModule.kt

@@ -4,19 +4,25 @@ import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.db.DatabaseManager
+import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.members.presentation.MembersNavigator
 import chat.rocket.android.members.presentation.MembersView
 import chat.rocket.android.members.ui.MembersFragment
+import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import dagger.Module
 import dagger.Provides
 import kotlinx.coroutines.experimental.Job
+import javax.inject.Named
 
 @Module
 class MembersFragmentModule {
 
     @Provides
     @PerFragment
-    fun provideJob() = Job()
+    fun membersView(frag: MembersFragment): MembersView {
+        return frag
+    }
 
     @Provides
     @PerFragment
@@ -24,10 +30,24 @@ class MembersFragmentModule {
 
     @Provides
     @PerFragment
-    fun membersView(frag: MembersFragment): MembersView {
-        return frag
+    @Named("currentServer")
+    fun provideCurrentServer(currentServerInteractor: GetCurrentServerInteractor): String {
+        return currentServerInteractor.get()!!
+    }
+
+    @Provides
+    @PerFragment
+    fun provideDatabaseManager(
+        factory: DatabaseManagerFactory,
+        @Named("currentServer") currentServer: String
+    ): DatabaseManager {
+        return factory.create(currentServer)
     }
 
+    @Provides
+    @PerFragment
+    fun provideJob() = Job()
+
     @Provides
     @PerFragment
     fun provideLifecycleOwner(frag: MembersFragment): LifecycleOwner {

app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt

 package chat.rocket.android.members.presentation
 
 import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.members.uimodel.MemberUiModel
 import chat.rocket.android.members.uimodel.MemberUiModelMapper
-import chat.rocket.android.server.domain.ChatRoomsInteractor
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extensions.launchUI
 import chat.rocket.common.RocketChatException
+import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.getMembers
 import timber.log.Timber
 import javax.inject.Inject
+import javax.inject.Named
 
 class MembersPresenter @Inject constructor(
     private val view: MembersView,
     private val navigator: MembersNavigator,
+    private val dbManager: DatabaseManager,
+    @Named("currentServer") private val currentServer: String,
     private val strategy: CancelStrategy,
-    private val roomsInteractor: ChatRoomsInteractor,
     private val mapper: MemberUiModelMapper,
-    val serverInteractor: GetCurrentServerInteractor,
     val factory: RocketChatClientFactory
 ) {
-    private val serverUrl = serverInteractor.get()!!
-    private val client: RocketChatClient = factory.create(serverUrl)
+    private val client: RocketChatClient = factory.create(currentServer)
     private var offset: Long = 0
 
+    /**
+     * Loads all the chat room members for the given room id.
+     *
+     * @param roomId The id of the room to get chat room members from.
+     */
     fun loadChatRoomsMembers(roomId: String) {
         launchUI(strategy) {
             try {
                 view.showLoading()
-                roomsInteractor.getById(serverUrl, roomId)?.let {
-                    val members = client.getMembers(it.id, it.type, offset, 60)
+                dbManager.getRoom(roomId)?.let {
+                    val members =
+                        client.getMembers(roomId, roomTypeOf(it.chatRoom.type), offset, 60)
                     val memberUiModels = mapper.mapToUiModelList(members.result)
                     view.showMembers(memberUiModels, members.total)
                     offset += 1 * 60L
                 }.ifNull {
-                    Timber.e("Couldn't find a room with id: $roomId at current server")
+                    Timber.e("Couldn't find a room with id: $roomId at current server.")
                 }
             } catch (exception: RocketChatException) {
                 exception.message?.let {
@@ -52,12 +58,12 @@ class MembersPresenter @Inject constructor(
     }
 
     fun toMemberDetails(memberUiModel: MemberUiModel) {
-        val avatarUri = memberUiModel.avatarUri.toString()
-        val realName = memberUiModel.realName.toString()
-        val username = "@${memberUiModel.username}"
-        val email = memberUiModel.email ?: ""
-        val utcOffset = memberUiModel.utcOffset.toString()
-
-        navigator.toMemberDetails(avatarUri, realName, username, email, utcOffset)
+        navigator.toMemberDetails(
+            memberUiModel.avatarUri.toString(),
+            memberUiModel.realName.toString(),
+            "@${memberUiModel.username}",
+            memberUiModel.email ?: "",
+            memberUiModel.utcOffset.toString()
+        )
     }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/pinnedmessages/di/PinnedMessagesFragmentModule.kt

@@ -3,34 +3,54 @@ package chat.rocket.android.pinnedmessages.di
 import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.db.DatabaseManager
+import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.pinnedmessages.presentation.PinnedMessagesView
 import chat.rocket.android.pinnedmessages.ui.PinnedMessagesFragment
+import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import dagger.Module
 import dagger.Provides
 import kotlinx.coroutines.experimental.Job
+import javax.inject.Named
 
 @Module
 class PinnedMessagesFragmentModule {
 
     @Provides
     @PerFragment
-    fun provideJob() = Job()
+    fun providePinnedMessagesView(frag: PinnedMessagesFragment): PinnedMessagesView {
+        return frag
+    }
 
     @Provides
     @PerFragment
-    fun provideLifecycleOwner(frag: PinnedMessagesFragment): LifecycleOwner {
-        return frag
+    @Named("currentServer")
+    fun provideCurrentServer(currentServerInteractor: GetCurrentServerInteractor): String {
+        return currentServerInteractor.get()!!
     }
 
     @Provides
     @PerFragment
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
+    fun provideDatabaseManager(
+        factory: DatabaseManagerFactory,
+        @Named("currentServer") currentServer: String
+    ): DatabaseManager {
+        return factory.create(currentServer)
     }
 
     @Provides
     @PerFragment
-    fun providePinnedMessagesView(frag: PinnedMessagesFragment): PinnedMessagesView {
+    fun provideJob() = Job()
+
+    @Provides
+    @PerFragment
+    fun provideLifecycleOwner(frag: PinnedMessagesFragment): LifecycleOwner {
         return frag
     }
+
+    @Provides
+    @PerFragment
+    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
+        return CancelStrategy(owner, jobs)
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt

@@ -2,26 +2,27 @@ package chat.rocket.android.pinnedmessages.presentation
 
 import chat.rocket.android.chatroom.uimodel.UiModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
-import chat.rocket.android.server.domain.ChatRoomsInteractor
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.server.infraestructure.RocketChatClientFactory
 import chat.rocket.android.util.extensions.launchUI
 import chat.rocket.common.RocketChatException
+import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
+import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.getPinnedMessages
 import timber.log.Timber
 import javax.inject.Inject
+import javax.inject.Named
 
 class PinnedMessagesPresenter @Inject constructor(
     private val view: PinnedMessagesView,
     private val strategy: CancelStrategy,
-    private val roomsInteractor: ChatRoomsInteractor,
+    private val dbManager: DatabaseManager,
+    @Named("currentServer") private val currentServer: String,
     private val mapper: UiModelMapper,
-    val serverInteractor: GetCurrentServerInteractor,
     val factory: RocketChatClientFactory
 ) {
-    private val serverUrl = serverInteractor.get()!!
-    private val client = factory.create(serverUrl)
+    private val client: RocketChatClient = factory.create(currentServer)
     private var offset: Int = 0
 
     /**
@@ -33,8 +34,9 @@ class PinnedMessagesPresenter @Inject constructor(
         launchUI(strategy) {
             try {
                 view.showLoading()
-                roomsInteractor.getById(serverUrl, roomId)?.let {
-                    val pinnedMessages = client.getPinnedMessages(roomId, it.type, offset)
+                dbManager.getRoom(roomId)?.let {
+                    val pinnedMessages =
+                        client.getPinnedMessages(roomId, roomTypeOf(it.chatRoom.type), offset)
                     val messageList = mapper.map(pinnedMessages.result, asNotReversed = true)
                     view.showPinnedMessages(messageList)
                     offset += 1 * 30