Merge pull request #1988 from RocketChat/fix/typing-status

rafaelks · web-flow · commit aede1acbe36d · 2019-01-11T09:39:46.000-02:00
[FIX] Typing status
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2055
+        versionCode 2056
         versionName "3.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -312,6 +312,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             showToolbarChatRoomIcon(chatRoomType)
         }
         getDraftMessage()
+        subscribeComposeTextMessage()
 
         analyticsManager.logScreenView(ScreenViewEvent.ChatRoom)
     }
@@ -848,7 +849,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                 true
             )
 
-            subscribeComposeTextMessage()
             emojiKeyboardPopup = EmojiKeyboardPopup(activity!!, activity!!.findViewById(R.id.fragment_container))
 
             emojiKeyboardPopup.listener = this
@@ -1000,12 +1000,12 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     }
 
     private fun subscribeComposeTextMessage() {
-        val editTextObservable = text_message.asObservable()
-
-        compositeDisposable.addAll(
-            subscribeComposeButtons(editTextObservable),
-            subscribeComposeTypingStatus(editTextObservable)
-        )
+        text_message.asObservable().let {
+            compositeDisposable.addAll(
+                subscribeComposeButtons(it),
+                subscribeComposeTypingStatus(it)
+            )
+        }
     }
 
     private fun unsubscribeComposeTextMessage() {

Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR`
`312`	`312`	`showToolbarChatRoomIcon(chatRoomType)`
`313`	`313`	`}`
`314`	`314`	`getDraftMessage()`
	`315`	`+ subscribeComposeTextMessage()`
`315`	`316`
`316`	`317`	`analyticsManager.logScreenView(ScreenViewEvent.ChatRoom)`
`317`	`318`	`}`
`@@ -848,7 +849,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR`
`848`	`849`	`true`
`849`	`850`	`)`
`850`	`851`
`851`		`- subscribeComposeTextMessage()`
`852`	`852`	`emojiKeyboardPopup = EmojiKeyboardPopup(activity!!, activity!!.findViewById(R.id.fragment_container))`
`853`	`853`
`854`	`854`	`emojiKeyboardPopup.listener = this`
`@@ -1000,12 +1000,12 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR`
`1000`	`1000`	`}`
`1001`	`1001`
`1002`	`1002`	`private fun subscribeComposeTextMessage() {`
`1003`		`- val editTextObservable = text_message.asObservable()`
`1004`		`-`
`1005`		`- compositeDisposable.addAll(`
`1006`		`- subscribeComposeButtons(editTextObservable),`
`1007`		`- subscribeComposeTypingStatus(editTextObservable)`
`1008`		`- )`
	`1003`	`+ text_message.asObservable().let {`
	`1004`	`+ compositeDisposable.addAll(`
	`1005`	`+ subscribeComposeButtons(it),`
	`1006`	`+ subscribeComposeTypingStatus(it)`
	`1007`	`+ )`
	`1008`	`+ }`
`1009`	`1009`	`}`
`1010`	`1010`
`1011`	`1011`	`private fun unsubscribeComposeTextMessage() {`