Load rooms from subscriptions

app/src/main/java/chat/rocket/android/chatroom/adapter/RoomSuggestionsAdapter.kt

@@ -6,7 +6,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.adapter.RoomSuggestionsAdapter.RoomSuggestionsViewHolder
-import chat.rocket.android.chatroom.viewmodel.RoomViewModel
+import chat.rocket.android.chatroom.viewmodel.ChatRoomViewModel
 import chat.rocket.android.widget.autocompletion.model.SuggestionModel
 import chat.rocket.android.widget.autocompletion.ui.BaseSuggestionViewHolder
 import chat.rocket.android.widget.autocompletion.ui.SuggestionsAdapter
@@ -22,7 +22,7 @@ class RoomSuggestionsAdapter : SuggestionsAdapter<RoomSuggestionsViewHolder>("#"
     class RoomSuggestionsViewHolder(view: View) : BaseSuggestionViewHolder(view) {
 
         override fun bind(item: SuggestionModel, itemClickListener: SuggestionsAdapter.ItemClickListener?) {
-            item as RoomViewModel
+            item as ChatRoomViewModel
             with(itemView) {
                 val fullname = itemView.findViewById<TextView>(R.id.text_fullname)
                 val name = itemView.findViewById<TextView>(R.id.text_name)

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt

@@ -7,7 +7,7 @@ import chat.rocket.android.chatroom.adapter.PEOPLE
 import chat.rocket.android.chatroom.adapter.ROOMS
 import chat.rocket.android.chatroom.domain.UriInteractor
 import chat.rocket.android.chatroom.viewmodel.PeopleViewModel
-import chat.rocket.android.chatroom.viewmodel.RoomViewModel
+import chat.rocket.android.chatroom.viewmodel.ChatRoomViewModel
 import chat.rocket.android.chatroom.viewmodel.ViewModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.helper.UrlHelper
@@ -38,6 +38,7 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
                                             private val strategy: CancelStrategy,
                                             getSettingsInteractor: GetSettingsInteractor,
                                             private val serverInteractor: GetCurrentServerInteractor,
+                                            private val getChatRoomsInteractor: GetChatRoomsInteractor,
                                             private val permissions: GetPermissionsInteractor,
                                             private val uriInteractor: UriInteractor,
                                             private val messagesRepository: MessagesRepository,
@@ -420,7 +421,7 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
                             val fullName = it.fullName ?: ""
                             val name = it.name ?: ""
                             val searchList = mutableListOf(fullName, name)
-                            RoomViewModel(name, fullName, name, searchList)
+                            ChatRoomViewModel(name, fullName, name, searchList)
                         })
                     }
                 }
@@ -430,6 +431,26 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
         }
     }
 
+    fun loadChatRooms() {
+        launchUI(strategy) {
+            try {
+                val chatRooms = getChatRoomsInteractor.get(currentServer).map { chatRoom ->
+                    val name = chatRoom.name
+                    val fullName = chatRoom.fullName ?: ""
+                    ChatRoomViewModel(
+                            text = name,
+                            name = name,
+                            fullName = fullName,
+                            searchList = listOf(name, fullName)
+                    )
+                }
+                view.populateRooms(chatRooms)
+            } catch (e: RocketChatException) {
+                Timber.e(e)
+            }
+        }
+    }
+
     private fun updateMessage(streamedMessage: Message) {
         launchUI(strategy) {
             val viewModelStreamedMessage = mapper.map(streamedMessage)

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomView.kt

@@ -3,7 +3,7 @@ package chat.rocket.android.chatroom.presentation
 import android.net.Uri
 import chat.rocket.android.chatroom.viewmodel.BaseViewModel
 import chat.rocket.android.chatroom.viewmodel.PeopleViewModel
-import chat.rocket.android.chatroom.viewmodel.RoomViewModel
+import chat.rocket.android.chatroom.viewmodel.ChatRoomViewModel
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
 import chat.rocket.core.internal.realtime.State
@@ -103,5 +103,5 @@ interface ChatRoomView : LoadingView, MessageView {
 
     fun showConnectionState(state: State)
     fun populateMembers(members: List<PeopleViewModel>)
-    fun populateRooms(rooms: List<RoomViewModel>)
+    fun populateRooms(chatRooms: List<ChatRoomViewModel>)
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt

@@ -15,12 +15,15 @@ import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.view.*
 import chat.rocket.android.R
-import chat.rocket.android.chatroom.adapter.*
+import chat.rocket.android.chatroom.adapter.ChatRoomAdapter
+import chat.rocket.android.chatroom.adapter.PEOPLE
+import chat.rocket.android.chatroom.adapter.PeopleSuggestionsAdapter
+import chat.rocket.android.chatroom.adapter.RoomSuggestionsAdapter
 import chat.rocket.android.chatroom.presentation.ChatRoomPresenter
 import chat.rocket.android.chatroom.presentation.ChatRoomView
 import chat.rocket.android.chatroom.viewmodel.BaseViewModel
+import chat.rocket.android.chatroom.viewmodel.ChatRoomViewModel
 import chat.rocket.android.chatroom.viewmodel.PeopleViewModel
-import chat.rocket.android.chatroom.viewmodel.RoomViewModel
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
 import chat.rocket.android.helper.KeyboardHelper
 import chat.rocket.android.helper.MessageParser
@@ -103,9 +106,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardPopup.Listener {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         presenter.loadMessages(chatRoomId, chatRoomType)
+        presenter.loadChatRooms()
         setupRecyclerView()
         setupFab()
         setupMessageComposer()
+        setupSuggestionsView()
         setupActionSnackbar()
     }
 
@@ -247,8 +252,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardPopup.Listener {
         suggestions_view.addItems("@", members)
     }
 
-    override fun populateRooms(rooms: List<RoomViewModel>) {
-        suggestions_view.addItems("#", rooms)
+    override fun populateRooms(chatRooms: List<ChatRoomViewModel>) {
+        suggestions_view.addItems("#", chatRooms)
     }
 
     override fun copyToClipboard(message: String) {
@@ -409,7 +414,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardPopup.Listener {
                 openEmojiKeyboardPopup()
             }
         }
+    }
 
+    private fun setupSuggestionsView() {
         suggestions_view.anchor(text_message)
                 .bindTokenAdapter(PeopleSuggestionsAdapter())
                 .bindTokenAdapter(RoomSuggestionsAdapter())
@@ -420,7 +427,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardPopup.Listener {
                 }
                 .addSuggestionProviderAction("#") { query ->
                     if (query.isNotEmpty()) {
-                        presenter.spotlight(query, ROOMS)
+                        presenter.loadChatRooms()
                     }
                 }
     }

app/src/main/java/chat/rocket/android/chatroom/viewmodel/RoomViewModel.kt → app/src/main/java/chat/rocket/android/chatroom/viewmodel/ChatRoomViewModel.kt

@@ -2,8 +2,8 @@ package chat.rocket.android.chatroom.viewmodel
 
 import chat.rocket.android.widget.autocompletion.model.SuggestionModel
 
-class RoomViewModel(text: String,
-                    val fullName: String,
-                    val name: String,
-                    searchList: List<String>) : SuggestionModel(text, searchList, false) {
+class ChatRoomViewModel(text: String,
+                        val fullName: String,
+                        val name: String,
+                        searchList: List<String>) : SuggestionModel(text, searchList, false) {
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/server/domain/GetChatRoomsInteractor.kt

@@ -6,6 +6,14 @@ import kotlinx.coroutines.experimental.withContext
 import javax.inject.Inject
 
 class GetChatRoomsInteractor @Inject constructor(private val repository: ChatRoomsRepository) {
+
+    /**
+     * Get all ChatRoom objects.
+     *
+     * @param url The server url.
+     *
+     * @return All the ChatRoom objects.
+     */
     fun get(url: String) = repository.get(url)
 
     /**