[PBE-5896] Fix/async voice compose render (#5395)

* Remove local uploadId property after the attachment is updated * Reorder attachmentFactories to ensure async-voice attachment is not used by wrong factory * Update CHANGELOG.md --------- Co-authored-by: kanat <kijalbaev@gmail.com>
GetStream · Sep 6, 2024 · 7d67509 · 7d67509
1 parent 8d9ff3c
commit 7d67509
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@
 ### 🐞 Fixed
 
 ### ⬆️ Improved
+- `Attachment.uploadId` is only used locally and removed whenever the attachments are uploaded. [#5395](https://github.com/GetStream/stream-chat-android/pull/5395)
 
 ### ✅ Added
 
@@ -68,6 +69,7 @@
 
 ## stream-chat-android-compose
 ### 🐞 Fixed
+- Fix condition to show async-voice attachments on MessageList. [#5395](https://github.com/GetStream/stream-chat-android/pull/5395)
 
 ### ⬆️ Improved
 

diff --git a/...id-client/src/main/java/io/getstream/chat/android/client/attachment/AttachmentUploader.kt b/...id-client/src/main/java/io/getstream/chat/android/client/attachment/AttachmentUploader.kt
@@ -18,6 +18,7 @@ package io.getstream.chat.android.client.attachment
 
 import android.webkit.MimeTypeMap
 import io.getstream.chat.android.client.ChatClient
+import io.getstream.chat.android.client.extensions.EXTRA_UPLOAD_ID
 import io.getstream.chat.android.client.extensions.uploadId
 import io.getstream.chat.android.client.uploader.StreamCdnImageMimeTypes
 import io.getstream.chat.android.client.utils.ProgressCallback
@@ -266,7 +267,7 @@ public class AttachmentUploader(private val client: ChatClient = ChatClient.inst
                 else -> imageUrl
             },
             assetUrl = uploadedFile.file,
-            extraData = extraData + uploadedFile.extraData,
+            extraData = (extraData + uploadedFile.extraData) - EXTRA_UPLOAD_ID,
         )
     }
 

diff --git a/...ient/src/test/java/io/getstream/chat/android/client/attachment/AttachmentUploaderTests.kt b/...ient/src/test/java/io/getstream/chat/android/client/attachment/AttachmentUploaderTests.kt
@@ -125,6 +125,7 @@ internal class AttachmentUploaderTests {
                 name = attachment.upload!!.name,
                 title = attachment.upload!!.name,
                 uploadState = Attachment.UploadState.Success,
+                extraData = attachment.extraData - EXTRA_UPLOAD_ID,
             )
             val result = sut.uploadAttachment(channelType, channelId, attachment)
             result.shouldBeInstanceOf(Result.Success::class)
@@ -150,6 +151,7 @@ internal class AttachmentUploaderTests {
                 name = attachment.upload!!.name,
                 title = attachment.upload!!.name,
                 uploadState = Attachment.UploadState.Success,
+                extraData = attachment.extraData - EXTRA_UPLOAD_ID,
             )
             val result = sut.uploadAttachment(
                 channelType,