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

[FIX] fix typing status for 2.5.1

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

@@ -1006,7 +1006,7 @@ class ChatRoomPresenter @Inject constructor(
         }
     }
 
-    private suspend fun subscribeTypingStatus() {
+    private fun subscribeTypingStatus() {
         launch(CommonPool + strategy.jobs) {
             client.subscribeTypingStatus(chatRoomId.toString()) { _, id ->
                 typingStatusSubscriptionId = id
@@ -1019,22 +1019,25 @@ class ChatRoomPresenter @Inject constructor(
     }
 
     private fun processTypingStatus(typingStatus: Pair<String, Boolean>) {
-        if (!typingStatusList.any { username -> username == typingStatus.first }) {
-            if (typingStatus.second) {
-                typingStatusList.add(typingStatus.first)
-            }
-        } else {
-            typingStatusList.find { username -> username == typingStatus.first }?.let {
-                typingStatusList.remove(it)
+        if (typingStatus.first != currentLoggedUsername) {
+            if (!typingStatusList.any { username -> username == typingStatus.first }) {
                 if (typingStatus.second) {
                     typingStatusList.add(typingStatus.first)
                 }
+            } else {
+                typingStatusList.find { username -> username == typingStatus.first }?.let {
+                    typingStatusList.remove(it)
+                    if (typingStatus.second) {
+                        typingStatusList.add(typingStatus.first)
+                    }
+                }
+            }
+
+            if (typingStatusList.isNotEmpty()) {
+                view.showTypingStatus(typingStatusList.toList())
+            } else {
+                view.hideTypingStatusView()
             }
-        }
-        if (typingStatusList.isNotEmpty()) {
-            view.showTypingStatus(typingStatusList.toList()) // copy typingStatusList
-        } else {
-            view.hideTypingStatusView()
         }
     }
 

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

@@ -38,7 +38,6 @@
     <string name="action_invisible">Invisible</string>
     <string name="action_drawing">dibujo</string>
     <string name="action_save_to_gallery">Guardar en la galería</string>
-    <string name="action_share">Compartir</string>
 
     <!-- Settings List -->
     <string-array name="settings_actions">
@@ -275,4 +274,5 @@
     <string name="msg_file_description">Descripción del archivo</string>
     <string name="msg_send">Enviar</string>
     <string name="msg_sent_attachment">Envió un archivo</string>
+
 </resources>

core/build.gradle

@@ -18,6 +18,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    packagingOptions {
+        exclude 'META-INF/core.kotlin_module'
+        exclude 'META-INF/main.kotlin_module'
+    }
 }
 
 dependencies {