Merge branch 'v3.0.0' into redesignOnboarding

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/drawable/ic_onboarding.xml

@@ -770,4 +770,4 @@
         android:pathData="M89.876,190C88.289,190.003 87.003,191.286 87,192.87C87.004,193.159 87.053,193.445 87.144,193.719C87.639,193.823 88.14,193.916 88.648,194C88.193,193.513 88.073,192.802 88.341,192.193C88.609,191.584 89.215,191.192 89.882,191.196L107.855,191.196C108.586,190.843 109.305,190.466 110,190.066C109.803,190.023 109.602,190.001 109.401,190L89.876,190Z"
         android:strokeWidth="1"
         android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
+</vector>

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

@@ -37,7 +37,6 @@
     <string name="action_busy">Ocupado</string>
     <string name="action_invisible">Invisible</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">
@@ -260,8 +259,6 @@
     <string name="notif_action_reply_hint">RESPUESTA</string>
     <string name="notif_error_sending">La respuesta ha fallado. Inténtalo de nuevo.</string>
     <string name="notif_success_sending">Mensaje enviado a %1$s!</string>
-
-    <string name="share_label">Editar mensaje compartido</string>
     <string name="read_by">Leído por</string>
     <string name="message_information_title">Información del mensaje</string>
     <string name="msg_log_out">Saliendo de tu cuenta…</string>