Avoid race condition with TextFuture when setting message text

Change-Id: I7de99faf565b73a67aceeaf646fec6e6d56123c8
2021-10-29 18:36:41 +02:00 · 2021-10-29 18:36:41 +02:00 · 57d3f3bc68
parent bbb2a631cf
commit 57d3f3bc68
1 changed files with 2 additions and 0 deletions
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
@ -122,6 +122,8 @@ abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
        if (canUseTextFuture) {
            holder.messageView.setTextFuture(textFuture)
        } else {
+            // Remove possible previously set futures that might overwrite our text
+            holder.messageView.setTextFuture(null)
            holder.messageView.text = message
        }
    }