6.24.0 release testing (#5939)

* Add local filtering for attachments in ChannelAttachmentsViewController and unify SDKs

* Use imagePreviewUrl to consider thumbUrl or imageUrl

Author: andremion

CHANGELOG.md

@@ -58,6 +58,7 @@
 
 ## stream-chat-android-ui-components
 ### 🐞 Fixed
+- Fix the inconsistency in the channel attachments items between XML and Compose SDKs. [#5939](https://github.com/GetStream/stream-chat-android/pull/5939)
 
 ### ⬆️ Improved
 
@@ -71,6 +72,7 @@
 
 ## stream-chat-android-compose
 ### 🐞 Fixed
+- Fix the inconsistency in the channel attachments items between XML and Compose SDKs. [#5939](https://github.com/GetStream/stream-chat-android/pull/5939) 
 
 ### ⬆️ Improved
 - Remove the fixed height modifier in `FileUploadItem`. [#5932](https://github.com/GetStream/stream-chat-android/pull/5932)

stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/channel/attachments/ChannelMediaAttachmentsActivity.kt

@@ -34,6 +34,7 @@ import io.getstream.chat.android.compose.viewmodel.channel.ChannelAttachmentsVie
 import io.getstream.chat.android.compose.viewmodel.channel.ChannelAttachmentsViewModelFactory
 import io.getstream.chat.android.models.AttachmentType
 import io.getstream.chat.android.ui.common.feature.channel.attachments.ChannelAttachmentsViewEvent
+import io.getstream.chat.android.ui.common.utils.extensions.imagePreviewUrl
 import kotlinx.coroutines.flow.collectLatest
 
 class ChannelMediaAttachmentsActivity : ComponentActivity() {
@@ -49,6 +50,7 @@ class ChannelMediaAttachmentsActivity : ComponentActivity() {
         ChannelAttachmentsViewModelFactory(
             cid = requireNotNull(intent.getStringExtra(KEY_CID)),
             attachmentTypes = listOf(AttachmentType.IMAGE, AttachmentType.VIDEO),
+            localFilter = { !it.imagePreviewUrl.isNullOrEmpty() && it.titleLink.isNullOrEmpty() },
         )
     }
 

stream-chat-android-compose-sample/src/main/java/io/getstream/chat/android/compose/sample/ui/chats/ChatsActivity.kt

@@ -97,6 +97,7 @@ import io.getstream.chat.android.ui.common.feature.channel.info.ChannelInfoViewE
 import io.getstream.chat.android.ui.common.state.channel.info.ChannelInfoViewState
 import io.getstream.chat.android.ui.common.state.messages.list.ChannelHeaderViewState
 import io.getstream.chat.android.ui.common.state.messages.list.DeletedMessageVisibility
+import io.getstream.chat.android.ui.common.utils.extensions.imagePreviewUrl
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.collectLatest
@@ -576,6 +577,7 @@ class ChatsActivity : ComponentActivity() {
         val viewModelFactory = ChannelAttachmentsViewModelFactory(
             cid = cid,
             attachmentTypes = listOf(AttachmentType.IMAGE, AttachmentType.VIDEO),
+            localFilter = { !it.imagePreviewUrl.isNullOrEmpty() && it.titleLink.isNullOrEmpty() },
         )
         val viewModel = viewModel<ChannelAttachmentsViewModel>(
             factory = viewModelFactory,

stream-chat-android-compose/api/stream-chat-android-compose.api

@@ -4751,16 +4751,17 @@ public final class io/getstream/chat/android/compose/util/KeyValuePair {
 
 public final class io/getstream/chat/android/compose/viewmodel/channel/ChannelAttachmentsViewModel : androidx/lifecycle/ViewModel {
 	public static final field $stable I
-	public fun <init> (Ljava/lang/String;Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/util/List;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/util/List;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/util/List;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public final fun getEvents ()Lkotlinx/coroutines/flow/SharedFlow;
 	public final fun getState ()Lkotlinx/coroutines/flow/StateFlow;
 	public final fun onViewAction (Lio/getstream/chat/android/ui/common/feature/channel/attachments/ChannelAttachmentsViewAction;)V
 }
 
 public final class io/getstream/chat/android/compose/viewmodel/channel/ChannelAttachmentsViewModelFactory : androidx/lifecycle/ViewModelProvider$Factory {
 	public static final field $stable I
-	public fun <init> (Ljava/lang/String;Ljava/util/List;)V
+	public fun <init> (Ljava/lang/String;Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/util/List;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun create (Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
 }
 

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/viewmodel/channel/ChannelAttachmentsViewModel.kt

@@ -18,6 +18,7 @@ package io.getstream.chat.android.compose.viewmodel.channel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import io.getstream.chat.android.models.Attachment
 import io.getstream.chat.android.ui.common.feature.channel.attachments.ChannelAttachmentsViewAction
 import io.getstream.chat.android.ui.common.feature.channel.attachments.ChannelAttachmentsViewController
 import io.getstream.chat.android.ui.common.feature.channel.attachments.ChannelAttachmentsViewEvent
@@ -30,15 +31,18 @@ import kotlinx.coroutines.flow.StateFlow
  *
  * @param cid The full channel identifier (e.g., "messaging:123").
  * @param attachmentTypes The list of attachment types (e.g., "image", "file").
+ * @param localFilter A function to filter attachments locally after fetching.
  * @param controllerProvider The provider for [ChannelAttachmentsViewController].
  */
 public class ChannelAttachmentsViewModel(
     private val cid: String,
     private val attachmentTypes: List<String>,
+    private val localFilter: (attachment: Attachment) -> Boolean = { true },
     private val controllerProvider: ViewModel.() -> ChannelAttachmentsViewController = {
         ChannelAttachmentsViewController(
             cid = cid,
             attachmentTypes = attachmentTypes,
+            localFilter = localFilter,
             scope = viewModelScope,
         )
     },

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/viewmodel/channel/ChannelAttachmentsViewModelFactory.kt

@@ -18,23 +18,26 @@ package io.getstream.chat.android.compose.viewmodel.channel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import io.getstream.chat.android.models.Attachment
 
 /**
  * Factory for creating instances of [ChannelAttachmentsViewModel].
  *
  * @param cid The full channel identifier (e.g., "messaging:123").
  * @param attachmentTypes The list of attachment types (e.g., "image", "file").
+ * @param localFilter A function to filter attachments locally after fetching.
  */
 public class ChannelAttachmentsViewModelFactory(
     private val cid: String,
     private val attachmentTypes: List<String>,
+    private val localFilter: (attachment: Attachment) -> Boolean = { true },
 ) : ViewModelProvider.Factory {
 
     override fun <T : ViewModel> create(modelClass: Class<T>): T {
         require(modelClass == ChannelAttachmentsViewModel::class.java) {
             "ChannelAttachmentsViewModelFactory can only create instances of ChannelAttachmentsViewModel"
         }
         @Suppress("UNCHECKED_CAST")
-        return ChannelAttachmentsViewModel(cid, attachmentTypes) as T
+        return ChannelAttachmentsViewModel(cid, attachmentTypes, localFilter) as T
     }
 }

stream-chat-android-ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/feature/channel/attachments/ChannelAttachmentsViewController.kt

@@ -19,6 +19,7 @@ package io.getstream.chat.android.ui.common.feature.channel.attachments
 import io.getstream.chat.android.client.ChatClient
 import io.getstream.chat.android.client.extensions.cidToTypeAndId
 import io.getstream.chat.android.core.internal.InternalStreamChatApi
+import io.getstream.chat.android.models.Attachment
 import io.getstream.chat.android.models.Filters
 import io.getstream.chat.android.models.SearchMessagesResult
 import io.getstream.chat.android.ui.common.state.channel.attachments.ChannelAttachmentsViewState
@@ -47,13 +48,15 @@ import kotlinx.coroutines.flow.update
  *
  * @param cid The full channel identifier (e.g., "messaging:123").
  * @param attachmentTypes The list of attachment types to filter by.
+ * @param localFilter A function to filter attachments locally after fetching.
  * @param chatClient The [ChatClient] instance used for interacting with the chat API.
  * @param scope The [CoroutineScope] used for launching coroutines.
  */
 @InternalStreamChatApi
 public class ChannelAttachmentsViewController(
     private val cid: String,
     private val attachmentTypes: List<String>,
+    private val localFilter: (attachment: Attachment) -> Boolean = { true },
     private val chatClient: ChatClient = ChatClient.instance(),
     scope: CoroutineScope,
 ) {
@@ -120,7 +123,7 @@ public class ChannelAttachmentsViewController(
         nextPage = result.next
         val items = result.messages.flatMap { message ->
             message.attachments
-                .filter { it.type in attachmentTypes }
+                .filter(localFilter)
                 .map {
                     ChannelAttachmentsViewState.Content.Item(
                         message = message,

stream-chat-android-ui-common/src/main/kotlin/io/getstream/chat/android/ui/common/utils/StreamFileUtil.kt

@@ -262,9 +262,7 @@ public object StreamFileUtil {
                                 Success(getUri(file))
                             }
 
-                            is Failure -> response.also {
-                                println()
-                            }
+                            is Failure -> response
                         }
                     }
                 }

stream-chat-android-ui-common/src/test/kotlin/io/getstream/chat/android/ui/common/feature/channel/attachments/ChannelAttachmentsViewControllerTest.kt

@@ -19,6 +19,7 @@ package io.getstream.chat.android.ui.common.feature.channel.attachments
 import app.cash.turbine.test
 import io.getstream.chat.android.client.ChatClient
 import io.getstream.chat.android.client.extensions.cidToTypeAndId
+import io.getstream.chat.android.models.Attachment
 import io.getstream.chat.android.models.Filters
 import io.getstream.chat.android.models.SearchMessagesResult
 import io.getstream.chat.android.randomAttachment
@@ -52,8 +53,9 @@ internal class ChannelAttachmentsViewControllerTest {
 
     @Test
     fun `when initial load succeeds, should update state with content`() = runTest {
-        val attachment1 = randomAttachment(type = ATTACHMENT_TYPE)
-        val attachment2 = randomAttachment(type = ATTACHMENT_TYPE)
+        val attachmentType = randomString()
+        val attachment1 = randomAttachment(type = attachmentType)
+        val attachment2 = randomAttachment(type = attachmentType)
         val message1 = randomMessage(
             cid = CID,
             attachments = listOf(attachment1, randomAttachment()),
@@ -68,7 +70,7 @@ internal class ChannelAttachmentsViewControllerTest {
         )
         val sut = Fixture()
             .givenSearchMessagesResult(result = searchMessagesResult)
-            .get(backgroundScope)
+            .get(backgroundScope, localFilter = { it.type == attachmentType })
 
         sut.state.test {
             skipItems(1) // Skip initial state
@@ -105,14 +107,14 @@ internal class ChannelAttachmentsViewControllerTest {
 
     @Test
     fun `when load more succeeds, should append items to state`() = runTest {
-        val attachment1 = randomAttachment(type = ATTACHMENT_TYPE)
+        val attachment1 = randomAttachment()
         val message1 = randomMessage(cid = CID, attachments = listOf(attachment1))
         val nextPage = randomString()
         val firstSearchMessagesResult = SearchMessagesResult(
             messages = listOf(message1),
             next = nextPage,
         )
-        val attachment2 = randomAttachment(type = ATTACHMENT_TYPE)
+        val attachment2 = randomAttachment()
         val message2 = randomMessage(cid = CID, attachments = listOf(attachment2))
         val secondSearchMessagesResult = SearchMessagesResult(
             messages = listOf(message2),
@@ -151,7 +153,7 @@ internal class ChannelAttachmentsViewControllerTest {
 
     @Test
     fun `when load more fails, should emit error event and retain state`() = runTest {
-        val attachment1 = randomAttachment(type = ATTACHMENT_TYPE)
+        val attachment1 = randomAttachment()
         val message1 = randomMessage(cid = CID, attachments = listOf(attachment1))
         val nextPage = randomString()
         val firstSearchMessagesResult = SearchMessagesResult(
@@ -271,9 +273,10 @@ private class Fixture {
         ) doAnswer { result?.asCall() ?: error?.asCall() }
     }
 
-    fun get(scope: CoroutineScope) = ChannelAttachmentsViewController(
+    fun get(scope: CoroutineScope, localFilter: (Attachment) -> Boolean = { true }) = ChannelAttachmentsViewController(
         cid = CID,
         attachmentTypes = listOf(ATTACHMENT_TYPE),
+        localFilter = localFilter,
         chatClient = chatClient,
         scope = scope,
     )

stream-chat-android-ui-components-sample/src/main/kotlin/io/getstream/chat/ui/sample/feature/chat/info/shared/media/ChatInfoSharedMediaFragment.kt

@@ -33,6 +33,7 @@ import io.getstream.chat.android.models.AttachmentType
 import io.getstream.chat.android.ui.ChatUI
 import io.getstream.chat.android.ui.common.feature.channel.attachments.ChannelAttachmentsViewAction
 import io.getstream.chat.android.ui.common.state.channel.attachments.ChannelAttachmentsViewState
+import io.getstream.chat.android.ui.common.utils.extensions.imagePreviewUrl
 import io.getstream.chat.android.ui.feature.gallery.AttachmentGalleryDestination
 import io.getstream.chat.android.ui.feature.gallery.AttachmentGalleryItem
 import io.getstream.chat.android.ui.viewmodel.channel.ChannelAttachmentsViewModel
@@ -46,8 +47,9 @@ class ChatInfoSharedMediaFragment : Fragment() {
     private val args: ChatInfoSharedMediaFragmentArgs by navArgs()
     private val viewModel: ChannelAttachmentsViewModel by viewModels {
         ChannelAttachmentsViewModelFactory(
-            args.cid!!,
+            cid = args.cid!!,
             attachmentTypes = listOf(AttachmentType.IMAGE, AttachmentType.VIDEO),
+            localFilter = { !it.imagePreviewUrl.isNullOrEmpty() && it.titleLink.isNullOrEmpty() },
         )
     }
 
@@ -122,19 +124,15 @@ class ChatInfoSharedMediaFragment : Fragment() {
                 }
 
                 is ChannelAttachmentsViewState.Content -> {
-                    val results = state.items.mapNotNull {
-                        if (!it.attachment.imageUrl.isNullOrEmpty() && it.attachment.titleLink.isNullOrEmpty()) {
-                            AttachmentGalleryItem(
-                                attachment = it.attachment,
-                                user = it.message.user,
-                                createdAt = it.message.getCreatedAtOrThrow(),
-                                messageId = it.message.id,
-                                cid = it.message.cid,
-                                isMine = it.message.user.id == user?.id,
-                            )
-                        } else {
-                            null
-                        }
+                    val results = state.items.map {
+                        AttachmentGalleryItem(
+                            attachment = it.attachment,
+                            user = it.message.user,
+                            createdAt = it.message.getCreatedAtOrThrow(),
+                            messageId = it.message.id,
+                            cid = it.message.cid,
+                            isMine = it.message.user.id == user?.id,
+                        )
                     }
                     if (results.isEmpty()) {
                         showEmptyState()