Merge branch 'develop-2.x' into feature/autocomplete

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

@@ -458,6 +458,17 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
         }
     }
 
+    fun joinChat(chatRoomId: String) {
+        launchUI(strategy) {
+            try {
+                client.joinChat(chatRoomId)
+                view.onJoined()
+            } catch (ex: RocketChatException) {
+                Timber.e(ex)
+            }
+        }
+    }
+
     /**
      * Send an emoji reaction to a message.
      */

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

@@ -2,8 +2,8 @@ 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.ChatRoomViewModel
+import chat.rocket.android.chatroom.viewmodel.PeopleViewModel
 import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
 import chat.rocket.core.internal.realtime.State
@@ -104,5 +104,10 @@ interface ChatRoomView : LoadingView, MessageView {
     fun showConnectionState(state: State)
     fun populateMembers(members: List<PeopleViewModel>)
     fun populateRooms(chatRooms: List<ChatRoomViewModel>)
+    /**
+     * This user has joined the chat callback.
+     */
+    fun onJoined()
+
     fun showReactionsPopup(messageId: String)
 }
\ No newline at end of file

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

@@ -23,13 +23,19 @@ import javax.inject.Inject
 import timber.log.Timber
 
 
-fun Context.chatRoomIntent(chatRoomId: String, chatRoomName: String, chatRoomType: String, isChatRoomReadOnly: Boolean, chatRoomLastSeen: Long): Intent {
+fun Context.chatRoomIntent(chatRoomId: String,
+                           chatRoomName: String,
+                           chatRoomType: String,
+                           isChatRoomReadOnly: Boolean,
+                           chatRoomLastSeen: Long,
+                           isChatRoomSubscribed: Boolean = true): Intent {
     return Intent(this, ChatRoomActivity::class.java).apply {
         putExtra(INTENT_CHAT_ROOM_ID, chatRoomId)
         putExtra(INTENT_CHAT_ROOM_NAME, chatRoomName)
         putExtra(INTENT_CHAT_ROOM_TYPE, chatRoomType)
         putExtra(INTENT_IS_CHAT_ROOM_READ_ONLY, isChatRoomReadOnly)
         putExtra(INTENT_CHAT_ROOM_LAST_SEEN, chatRoomLastSeen)
+        putExtra(INTENT_CHAT_IS_SUBSCRIBED, isChatRoomSubscribed)
     }
 }
 
@@ -38,6 +44,7 @@ private const val INTENT_CHAT_ROOM_NAME = "chat_room_name"
 private const val INTENT_CHAT_ROOM_TYPE = "chat_room_type"
 private const val INTENT_IS_CHAT_ROOM_READ_ONLY = "is_chat_room_read_only"
 private const val INTENT_CHAT_ROOM_LAST_SEEN = "chat_room_last_seen"
+private const val INTENT_CHAT_IS_SUBSCRIBED = "is_chat_room_subscribed"
 
 class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
     @Inject lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
@@ -50,6 +57,7 @@ class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
     private lateinit var chatRoomName: String
     private lateinit var chatRoomType: String
     private var isChatRoomReadOnly: Boolean = false
+    private var isChatRoomSubscribed: Boolean = true
     private var chatRoomLastSeen: Long = -1L
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -76,8 +84,11 @@ class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
 
         chatRoomLastSeen = intent.getLongExtra(INTENT_CHAT_ROOM_LAST_SEEN, -1)
 
+        isChatRoomSubscribed = intent.getBooleanExtra(INTENT_CHAT_IS_SUBSCRIBED, true)
+
         addFragment("ChatRoomFragment", R.id.fragment_container) {
-            newInstance(chatRoomId, chatRoomName, chatRoomType, isChatRoomReadOnly, chatRoomLastSeen)
+            newInstance(chatRoomId, chatRoomName, chatRoomType, isChatRoomReadOnly, chatRoomLastSeen,
+                    isChatRoomSubscribed)
         }
     }
 

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

@@ -40,7 +40,12 @@ import kotlinx.android.synthetic.main.message_list.*
 import timber.log.Timber
 import javax.inject.Inject
 
-fun newInstance(chatRoomId: String, chatRoomName: String, chatRoomType: String, isChatRoomReadOnly: Boolean, chatRoomLastSeen: Long): Fragment {
+fun newInstance(chatRoomId: String,
+                chatRoomName: String,
+                chatRoomType: String,
+                isChatRoomReadOnly: Boolean,
+                chatRoomLastSeen: Long,
+                isSubscribed: Boolean = true): Fragment {
     return ChatRoomFragment().apply {
         arguments = Bundle(1).apply {
             putString(BUNDLE_CHAT_ROOM_ID, chatRoomId)
@@ -48,6 +53,7 @@ fun newInstance(chatRoomId: String, chatRoomName: String, chatRoomType: String,
             putString(BUNDLE_CHAT_ROOM_TYPE, chatRoomType)
             putBoolean(BUNDLE_IS_CHAT_ROOM_READ_ONLY, isChatRoomReadOnly)
             putLong(BUNDLE_CHAT_ROOM_LAST_SEEN, chatRoomLastSeen)
+            putBoolean(BUNDLE_CHAT_ROOM_IS_SUBSCRIBED, isSubscribed)
         }
     }
 }
@@ -58,6 +64,7 @@ private const val BUNDLE_CHAT_ROOM_TYPE = "chat_room_type"
 private const val BUNDLE_IS_CHAT_ROOM_READ_ONLY = "is_chat_room_read_only"
 private const val REQUEST_CODE_FOR_PERFORM_SAF = 42
 private const val BUNDLE_CHAT_ROOM_LAST_SEEN = "chat_room_last_seen"
+private const val BUNDLE_CHAT_ROOM_IS_SUBSCRIBED = "chat_room_is_subscribed"
 
 class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiReactionListener {
     @Inject lateinit var presenter: ChatRoomPresenter
@@ -66,6 +73,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     private lateinit var chatRoomId: String
     private lateinit var chatRoomName: String
     private lateinit var chatRoomType: String
+    private var isSubscribed: Boolean = true
     private var isChatRoomReadOnly: Boolean = false
     private lateinit var emojiKeyboardPopup: EmojiKeyboardPopup
     private var chatRoomLastSeen: Long = -1
@@ -93,6 +101,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             chatRoomName = bundle.getString(BUNDLE_CHAT_ROOM_NAME)
             chatRoomType = bundle.getString(BUNDLE_CHAT_ROOM_TYPE)
             isChatRoomReadOnly = bundle.getBoolean(BUNDLE_IS_CHAT_ROOM_READ_ONLY)
+            isSubscribed = bundle.getBoolean(BUNDLE_CHAT_ROOM_IS_SUBSCRIBED)
             chatRoomLastSeen = bundle.getLong(BUNDLE_CHAT_ROOM_LAST_SEEN)
         } else {
             requireNotNull(bundle) { "no arguments supplied when the fragment was instantiated" }
@@ -375,6 +384,13 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
+    override fun onJoined() {
+        input_container.setVisible(true)
+        button_join_chat.setVisible(false)
+        isSubscribed = true
+        setupMessageComposer()
+    }
+
     private val dismissStatus = {
         connection_status_text.fadeOut()
     }
@@ -405,6 +421,10 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         if (isChatRoomReadOnly) {
             text_room_is_read_only.setVisible(true)
             input_container.setVisible(false)
+        } else if (!isSubscribed) {
+            input_container.setVisible(false)
+            button_join_chat.setVisible(true)
+            button_join_chat.setOnClickListener { presenter.joinChat(chatRoomId) }
         } else {
             button_send.alpha = 0f
             button_send.setVisible(false)

app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt

@@ -9,12 +9,12 @@ import chat.rocket.android.server.infraestructure.chatRooms
 import chat.rocket.android.server.infraestructure.state
 import chat.rocket.android.util.extensions.launchUI
 import chat.rocket.common.RocketChatException
-import chat.rocket.common.model.BaseRoom
-import chat.rocket.common.model.RoomType
+import chat.rocket.common.model.*
 import chat.rocket.core.internal.model.Subscription
 import chat.rocket.core.internal.realtime.State
 import chat.rocket.core.internal.realtime.StreamMessage
 import chat.rocket.core.internal.realtime.Type
+import chat.rocket.core.internal.rest.spotlight
 import chat.rocket.core.model.ChatRoom
 import chat.rocket.core.model.Room
 import kotlinx.coroutines.experimental.*
@@ -34,6 +34,7 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
                                              factory: ConnectionManagerFactory) {
     private val manager: ConnectionManager = factory.create(serverInteractor.get()!!)
     private val currentServer = serverInteractor.get()!!
+    private val client = manager.client
     private var reloadJob: Deferred<List<ChatRoom>>? = null
     private val settings = settingsRepository.get(currentServer)!!
 
@@ -69,7 +70,9 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
         }
 
         navigator.toChatRoom(chatRoom.id, roomName,
-                chatRoom.type.toString(), chatRoom.readonly ?: false, chatRoom.lastSeen ?: -1)
+                chatRoom.type.toString(), chatRoom.readonly ?: false,
+                chatRoom.lastSeen ?: -1,
+                chatRoom.open)
     }
 
     /**
@@ -80,7 +83,36 @@ class ChatRoomsPresenter @Inject constructor(private val view: ChatRoomsView,
         val currentServer = serverInteractor.get()!!
         launchUI(strategy) {
             val roomList = getChatRoomsInteractor.getByName(currentServer, name)
-            view.updateChatRooms(roomList)
+            if (roomList.isEmpty()) {
+                val (users, rooms) = client.spotlight(name)
+                val chatRoomsCombined = mutableListOf<ChatRoom>()
+                chatRoomsCombined.addAll(usersToChatRooms(users))
+                chatRoomsCombined.addAll(roomsToChatRooms(rooms))
+                view.updateChatRooms(chatRoomsCombined)
+            } else {
+                view.updateChatRooms(roomList)
+            }
+        }
+    }
+
+    private suspend fun usersToChatRooms(users: List<User>): List<ChatRoom> {
+        return users.map {
+            ChatRoom(it.id, RoomType.DIRECT_MESSAGE, SimpleUser(
+                    username = it.username, name = it.name, id = null), it.name ?: "",
+                    it.name, false, null, null, null,
+                    null, null, false, false, false,
+                    0L, null, 0L, null, client
+            )
+        }
+    }
+
+    private suspend fun roomsToChatRooms(rooms: List<Room>): List<ChatRoom> {
+        return rooms.map {
+            ChatRoom(it.id, it.type, it.user, it.name ?: "",
+                    it.fullName, it.readonly, it.updatedAt, null, null,
+                    it.topic, it.announcement, false, false, false,
+                    0L, null, 0L, it.lastMessage, client
+            )
         }
     }
 

app/src/main/java/chat/rocket/android/main/presentation/MainNavigator.kt

@@ -29,8 +29,14 @@ class MainNavigator(internal val activity: MainActivity, internal val context: C
         }
     }
 
-    fun toChatRoom(chatRoomId: String, chatRoomName: String, chatRoomType: String, isChatRoomReadOnly: Boolean, chatRoomLastSeen: Long) {
-        activity.startActivity(context.chatRoomIntent(chatRoomId, chatRoomName, chatRoomType, isChatRoomReadOnly, chatRoomLastSeen))
+    fun toChatRoom(chatRoomId: String,
+                   chatRoomName: String,
+                   chatRoomType: String,
+                   isChatRoomReadOnly: Boolean,
+                   chatRoomLastSeen: Long,
+                   isChatRoomSubscribed: Boolean) {
+        activity.startActivity(context.chatRoomIntent(chatRoomId, chatRoomName, chatRoomType,
+                isChatRoomReadOnly, chatRoomLastSeen, isChatRoomSubscribed))
         activity.overridePendingTransition(R.anim.open_enter, R.anim.open_exit)
     }
 }
\ No newline at end of file

app/src/main/res/layout/message_composer.xml

@@ -27,6 +27,18 @@
             android:visibility="gone"
             app:layout_constraintTop_toBottomOf="@+id/divider" />
 
+        <Button
+            android:id="@+id/button_join_chat"
+            android:layout_width="match_parent"
+            android:layout_height="45dp"
+            android:background="@color/white"
+            android:text="@string/action_join_chat"
+            android:textColor="@color/colorAccent"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/divider" />
+
         <LinearLayout
             android:id="@+id/input_container"
             android:layout_width="match_parent"

app/src/main/res/values-pt-rBR/strings.xml

@@ -24,6 +24,8 @@
     <string name="action_logout">Sair</string>
     <string name="action_files">Arquivos</string>
     <string name="action_confirm_password">Confirme a nova senha</string>
+    <string name="action_join_chat">Entrar no Chat</string>
+
 
     <!-- Settings List -->
     <string-array name="settings_actions">

app/src/main/res/values/strings.xml

@@ -25,6 +25,7 @@
     <string name="action_logout">Logout</string>
     <string name="action_files">Files</string>
     <string name="action_confirm_password">Confirm Password Change</string>
+    <string name="action_join_chat">Join Chat</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
         classpath 'com.google.gms:google-services:3.2.0'
-        classpath 'io.fabric.tools:gradle:1.+'
+        classpath 'io.fabric.tools:gradle:1.25.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

dependencies.gradle

@@ -4,7 +4,7 @@ ext {
         compileSdk        : 27,
         targetSdk         : 27,
         buildTools        : '27.0.3',
-        kotlin            : '1.2.21',
+        kotlin            : '1.2.30',
         coroutine         : '0.22',
         dokka             : '0.9.15',