Merge pull request #1238 from RocketChat/new/send-typing-status

[NEW] Send typing status feature.

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion 21
         targetSdkVersion versions.targetSdk
-        versionCode 2019
-        versionName "2.1.0"
+        versionCode 2020
+        versionName "2.2.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }

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

@@ -14,6 +14,7 @@ import chat.rocket.android.core.behaviours.showMessage
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.infrastructure.LocalRepository
+import chat.rocket.android.infrastructure.username
 import chat.rocket.android.server.domain.*
 import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
 import chat.rocket.android.server.infraestructure.state
@@ -26,6 +27,7 @@ import chat.rocket.common.model.SimpleUser
 import chat.rocket.common.model.UserStatus
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
+import chat.rocket.core.internal.realtime.setTypingStatus
 import chat.rocket.core.internal.realtime.socket.model.State
 import chat.rocket.core.internal.rest.*
 import chat.rocket.core.model.Command
@@ -45,8 +47,6 @@ class ChatRoomPresenter @Inject constructor(
     private val view: ChatRoomView,
     private val navigator: ChatRoomNavigator,
     private val strategy: CancelStrategy,
-    getSettingsInteractor: GetSettingsInteractor,
-    serverInteractor: GetCurrentServerInteractor,
     private val getChatRoomsInteractor: GetChatRoomsInteractor,
     private val permissions: PermissionsInteractor,
     private val uriInteractor: UriInteractor,
@@ -55,15 +55,17 @@ class ChatRoomPresenter @Inject constructor(
     private val roomsRepository: RoomRepository,
     private val localRepository: LocalRepository,
     private val userHelper: UserHelper,
-    factory: ConnectionManagerFactory,
     private val mapper: ViewModelMapper,
-    private val jobSchedulerInteractor: JobSchedulerInteractor
+    private val jobSchedulerInteractor: JobSchedulerInteractor,
+    getSettingsInteractor: GetSettingsInteractor,
+    serverInteractor: GetCurrentServerInteractor,
+    factory: ConnectionManagerFactory
 ) {
-
     private val currentServer = serverInteractor.get()!!
     private val manager = factory.create(currentServer)
     private val client = manager.client
     private var settings: PublicSettings = getSettingsInteractor.get(serverInteractor.get()!!)
+    private val currentLoggedUsername = localRepository.username()
     private val messagesChannel = Channel<Message>()
 
     private var chatRoomId: String? = null
@@ -212,6 +214,22 @@ class ChatRoomPresenter @Inject constructor(
         }
     }
 
+    fun sendTyping() {
+        launch(CommonPool + strategy.jobs) {
+            if (chatRoomId != null && currentLoggedUsername != null) {
+                client.setTypingStatus(chatRoomId.toString(), currentLoggedUsername, true)
+            }
+        }
+    }
+
+    fun sendNotTyping() {
+        launch(CommonPool + strategy.jobs) {
+            if (chatRoomId != null && currentLoggedUsername != null) {
+                client.setTypingStatus(chatRoomId.toString(), currentLoggedUsername, false)
+            }
+        }
+    }
+
     private fun markRoomAsRead(roomId: String) {
         launchUI(strategy) {
             try {

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

@@ -30,11 +30,14 @@ import chat.rocket.android.util.extensions.*
 import chat.rocket.android.widget.emoji.*
 import chat.rocket.core.internal.realtime.socket.model.State
 import dagger.android.support.AndroidSupportInjection
+import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.disposables.Disposable
 import kotlinx.android.synthetic.main.fragment_chat_room.*
 import kotlinx.android.synthetic.main.message_attachment_options.*
 import kotlinx.android.synthetic.main.message_composer.*
 import kotlinx.android.synthetic.main.message_list.*
+import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicInteger
 import javax.inject.Inject
 
@@ -154,7 +157,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
 
         presenter.unsubscribeMessages(chatRoomId)
         handler.removeCallbacksAndMessages(null)
-        unsubscribeTextMessage()
+        unsubscribeComposeTextMessage()
 
         // Hides the keyboard (if it's opened) before going to any view.
         activity?.apply {
@@ -577,7 +580,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             button_show_attachment_options.alpha = 1f
             button_show_attachment_options.setVisible(true)
 
-            subscribeTextMessage()
+            subscribeComposeTextMessage()
             emojiKeyboardPopup = EmojiKeyboardPopup(activity!!, activity!!.findViewById(R.id.fragment_container))
             emojiKeyboardPopup.listener = this
             text_message.listener = object : ComposerEditText.ComposerEditTextListener {
@@ -682,18 +685,30 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         })
     }
 
-    private fun subscribeTextMessage() {
-        val disposable = text_message.asObservable(0)
-            .subscribe({ t -> setupComposeMessageButtons(t) })
+    private fun subscribeComposeTextMessage() {
+        val editTextObservable = text_message.asObservable()
 
-        compositeDisposable.add(disposable)
+        compositeDisposable.addAll(
+            subscribeComposeButtons(editTextObservable),
+            subscribeComposeTypingStatus(editTextObservable)
+        )
     }
 
-    private fun unsubscribeTextMessage() {
+    private fun unsubscribeComposeTextMessage() {
         compositeDisposable.clear()
     }
 
-    private fun setupComposeMessageButtons(charSequence: CharSequence) {
+    private fun subscribeComposeButtons(observable: Observable<CharSequence>): Disposable {
+        return observable.subscribe { t -> setupComposeButtons(t) }
+    }
+
+    private fun subscribeComposeTypingStatus(observable: Observable<CharSequence>): Disposable {
+        return observable.debounce(300, TimeUnit.MILLISECONDS)
+            .skip(1)
+            .subscribe { t -> sendTypingStatus(t) }
+    }
+
+    private fun setupComposeButtons(charSequence: CharSequence) {
         if (charSequence.isNotEmpty() && playComposeMessageButtonsAnimation) {
             button_show_attachment_options.fadeOut(1F, 0F, 120)
             button_send.fadeIn(0F, 1F, 120)
@@ -707,6 +722,14 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
+    private fun sendTypingStatus(charSequence: CharSequence) {
+        if (charSequence.isNotBlank()) {
+            presenter.sendTyping()
+        } else {
+            presenter.sendNotTyping()
+        }
+    }
+
     private fun showAttachmentOptions() {
         view_dim.setVisible(true)
 

app/src/main/java/chat/rocket/android/main/viewmodel/NavHeaderViewModel.kt

@@ -2,7 +2,6 @@ package chat.rocket.android.main.viewmodel
 
 import chat.rocket.common.model.UserStatus
 
-
 data class NavHeaderViewModel(
     val userDisplayName: String?,
     val userStatus: UserStatus?,

app/src/main/java/chat/rocket/android/util/extensions/Rx.kt

@@ -6,9 +6,8 @@ import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import java.util.concurrent.TimeUnit
 
-fun EditText.asObservable(debounceTimeout: Long = 100): Observable<CharSequence> {
+fun EditText.asObservable(): Observable<CharSequence> {
     return RxTextView.textChanges(this)
-        .debounce(debounceTimeout, TimeUnit.MILLISECONDS)
         .observeOn(AndroidSchedulers.mainThread())
         .subscribeOn(AndroidSchedulers.mainThread())
 }
\ No newline at end of file