Merge develop to v7 (17.03.2026)

.github/workflows/pr-checks.yml

@@ -8,15 +8,15 @@ concurrency:
 
 jobs:
   base-android-ci:
-    uses: GetStream/stream-build-conventions-android/.github/workflows/android-ci.yml@v0.7.1
+    uses: GetStream/stream-build-conventions-android/.github/workflows/android-ci.yml@v0.9.0
     secrets: inherit
 
   detekt:
     name: Detekt
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4.2.2
-      - uses: GetStream/stream-build-conventions-android/.github/actions/setup-gradle@v0.7.1
+      - uses: GetStream/stream-build-conventions-android/.github/actions/setup-gradle@v0.9.0
       - name: Detekt
         run: ./gradlew detekt
 

.github/workflows/pr-cleanup.yaml

@@ -12,5 +12,5 @@ permissions:
 
 jobs:
   pr-clean-stale:
-    uses: GetStream/stream-build-conventions-android/.github/workflows/pr-clean-stale.yaml@v0.6.1
+    uses: GetStream/stream-build-conventions-android/.github/workflows/pr-clean-stale.yaml@v0.9.0
     secrets: inherit

.github/workflows/pr-quality.yml

@@ -15,5 +15,5 @@ concurrency:
 
 jobs:
   pr-checklist:
-    uses: GetStream/stream-build-conventions-android/.github/workflows/pr-quality.yml@v0.7.1
+    uses: GetStream/stream-build-conventions-android/.github/workflows/pr-quality.yml@v0.9.0
     secrets: inherit

.github/workflows/publish-new-version.yml

@@ -30,7 +30,7 @@ jobs:
     permissions:
       contents: write
     needs: pre_release_check
-    uses: GetStream/stream-build-conventions-android/.github/workflows/release.yml@v0.8.0
+    uses: GetStream/stream-build-conventions-android/.github/workflows/release.yml@v0.9.0
     with:
       bump: ${{ inputs.bump }}
     secrets:

.github/workflows/sdk-size-checks.yml

@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   compare-sdk-sizes:
-    uses: GetStream/stream-build-conventions-android/.github/workflows/sdk-size-checks.yml@v0.6.1
+    uses: GetStream/stream-build-conventions-android/.github/workflows/sdk-size-checks.yml@v0.9.0
     with:
       modules: "stream-chat-android-client stream-chat-android-ui-components stream-chat-android-compose"
       metrics-project: "stream-chat-android-metrics"

.github/workflows/sdk-size-updates.yml

@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   update-sdk-sizes:
-    uses: GetStream/stream-build-conventions-android/.github/workflows/sdk-size-updates.yml@v0.6.1
+    uses: GetStream/stream-build-conventions-android/.github/workflows/sdk-size-updates.yml@v0.9.0
     with:
       modules: "stream-chat-android-client stream-chat-android-ui-components stream-chat-android-compose"
       metrics-project: "stream-chat-android-metrics"

README.md

@@ -20,7 +20,7 @@
 
 ![stream-chat-android-client](https://img.shields.io/badge/stream--chat--android--client-5.25%20MB-lightgreen)
 ![stream-chat-android-ui-components](https://img.shields.io/badge/stream--chat--android--ui--components-10.62%20MB-lightgreen)
-![stream-chat-android-compose](https://img.shields.io/badge/stream--chat--android--compose-12.84%20MB-lightgreen)
+![stream-chat-android-compose](https://img.shields.io/badge/stream--chat--android--compose-12.85%20MB-lightgreen)
 
 </div>
 

build.gradle.kts

@@ -28,6 +28,8 @@ plugins {
 }
 
 streamProject {
+    repositoryName = "stream-chat-android"
+
     spotless {
         ignoredModules = setOf("stream-chat-android-docs")
     }

gradle.properties

@@ -10,4 +10,4 @@ android.enableR8.fullMode=true
 android.suppressUnsupportedCompileSdk=34
 
 # Project version
-version=6.32.2
+version=6.35.0

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/ChatClient.kt

@@ -1766,8 +1766,11 @@ internal constructor(
         next: String? = null,
         sort: QuerySorter<Message>? = null,
     ): Call<SearchMessagesResult> {
-        if (offset != null && (sort != null || next != null)) {
-            return ErrorCall(userScope, Error.GenericError("Cannot specify offset with sort or next parameters"))
+        if (offset != null && next != null) {
+            return ErrorCall(
+                userScope,
+                Error.GenericError("Cannot use both offset and next values. Specify only one of these options."),
+            )
         }
         return api.searchMessages(
             channelFilter = channelFilter,

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DtoMapping.kt

@@ -16,10 +16,12 @@
 
 package io.getstream.chat.android.client.api2.mapping
 
+import io.getstream.chat.android.DeliveryReceipts
 import io.getstream.chat.android.PrivacySettings
 import io.getstream.chat.android.ReadReceipts
 import io.getstream.chat.android.TypingIndicators
 import io.getstream.chat.android.client.api2.model.dto.AttachmentDto
+import io.getstream.chat.android.client.api2.model.dto.DeliveryReceiptsDto
 import io.getstream.chat.android.client.api2.model.dto.DeviceDto
 import io.getstream.chat.android.client.api2.model.dto.PrivacySettingsDto
 import io.getstream.chat.android.client.api2.model.dto.ReadReceiptsDto
@@ -207,6 +209,7 @@ internal class DtoMapping(
     internal fun PrivacySettings.toDto(): PrivacySettingsDto = PrivacySettingsDto(
         typing_indicators = typingIndicators?.toDto(),
         read_receipts = readReceipts?.toDto(),
+        delivery_receipts = deliveryReceipts?.toDto(),
     )
 
     /**
@@ -223,6 +226,13 @@ internal class DtoMapping(
         enabled = enabled,
     )
 
+    /**
+     * Maps the domain [DeliveryReceipts] model to a network [DeliveryReceiptsDto] model.
+     */
+    internal fun DeliveryReceipts.toDto(): DeliveryReceiptsDto = DeliveryReceiptsDto(
+        enabled = enabled,
+    )
+
     /**
      * Maps the domain [User] model to a network [UpstreamUserDto] model.
      *

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/internal/offline/plugin/listener/internal/DeleteMessageListenerDatabase.kt

@@ -16,16 +16,14 @@
 
 package io.getstream.chat.android.client.internal.offline.plugin.listener.internal
 
-import io.getstream.chat.android.client.errors.cause.MessageModerationDeletedException
 import io.getstream.chat.android.client.extensions.internal.users
 import io.getstream.chat.android.client.persistance.repository.MessageRepository
 import io.getstream.chat.android.client.persistance.repository.UserRepository
 import io.getstream.chat.android.client.plugin.listeners.DeleteMessageListener
 import io.getstream.chat.android.client.setup.state.ClientState
-import io.getstream.chat.android.client.utils.message.isModerationError
+import io.getstream.chat.android.client.utils.message.shouldDeleteRemote
 import io.getstream.chat.android.models.Message
 import io.getstream.chat.android.models.SyncStatus
-import io.getstream.result.Error
 import io.getstream.result.Result
 import java.util.Date
 
@@ -45,24 +43,19 @@ internal class DeleteMessageListenerDatabase(
      * @param messageId The message id to be deleted.
      */
     override suspend fun onMessageDeletePrecondition(messageId: String): Result<Unit> {
-        return messageRepository.selectMessage(messageId)?.let { message ->
-            val currentUserId = clientState.user.value?.id
-            val isModerationFailed = message.isModerationError(currentUserId)
-
-            if (isModerationFailed) {
-                messageRepository.deleteChannelMessage(message)
-                Result.Failure(
-                    Error.ThrowableError(
-                        message = "Message with failed moderation has been deleted locally: $messageId",
-                        cause = MessageModerationDeletedException(
-                            "Message with failed moderation has been deleted locally: $messageId",
-                        ),
-                    ),
-                )
-            } else {
-                Result.Success(Unit)
-            }
-        } ?: Result.Success(Unit)
+        val localMessage = messageRepository.selectMessage(messageId)
+        val currentUserId = clientState.user.value?.id
+        // We don't have the message locally, we must attempt to delete the message remotely
+        if (localMessage == null) {
+            return Result.Success(Unit)
+        }
+        // Check if the message is local-only (if attempting remote delete should be skipped
+        val shouldDeleteRemote = localMessage.shouldDeleteRemote(currentUserId)
+        if (shouldDeleteRemote is Result.Failure) {
+            // Delete the message ONLY locally
+            messageRepository.deleteChannelMessage(localMessage)
+        }
+        return shouldDeleteRemote
     }
 
     /**

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/internal/state/plugin/listener/internal/DeleteMessageListenerState.kt

@@ -17,15 +17,13 @@
 package io.getstream.chat.android.client.internal.state.plugin.listener.internal
 
 import io.getstream.chat.android.client.api.state.GlobalState
-import io.getstream.chat.android.client.errors.cause.MessageModerationDeletedException
 import io.getstream.chat.android.client.internal.state.plugin.logic.channel.internal.ChannelLogic
 import io.getstream.chat.android.client.internal.state.plugin.logic.internal.LogicRegistry
 import io.getstream.chat.android.client.plugin.listeners.DeleteMessageListener
 import io.getstream.chat.android.client.setup.state.ClientState
-import io.getstream.chat.android.client.utils.message.isModerationError
+import io.getstream.chat.android.client.utils.message.shouldDeleteRemote
 import io.getstream.chat.android.models.Message
 import io.getstream.chat.android.models.SyncStatus
-import io.getstream.result.Error
 import io.getstream.result.Result
 import java.util.Date
 
@@ -45,25 +43,19 @@ internal class DeleteMessageListenerState(
      * @param messageId The message id to be deleted.
      */
     override suspend fun onMessageDeletePrecondition(messageId: String): Result<Unit> {
-        val channelLogic: ChannelLogic? = logic.channelFromMessageId(messageId)
-
-        return channelLogic?.getMessage(messageId)?.let { message ->
-            val isModerationFailed = message.isModerationError(clientState.user.value?.id)
-
-            if (isModerationFailed) {
-                deleteMessage(message)
-                Result.Failure(
-                    Error.ThrowableError(
-                        message = "Message with failed moderation has been deleted locally: $messageId",
-                        cause = MessageModerationDeletedException(
-                            "Message with failed moderation has been deleted locally: $messageId",
-                        ),
-                    ),
-                )
-            } else {
-                Result.Success(Unit)
-            }
-        } ?: Result.Success(Unit)
+        val localMessage = logic.channelFromMessageId(messageId)?.getMessage(messageId)
+        val currentUserId = clientState.user.value?.id
+        // We don't have the message locally, we must attempt to delete the message remotely
+        if (localMessage == null) {
+            return Result.Success(Unit)
+        }
+        // Check if the message is local-only (if attempting remote delete should be skipped)
+        val shouldDeleteRemote = localMessage.shouldDeleteRemote(currentUserId)
+        if (shouldDeleteRemote is Result.Failure) {
+            // Delete the message ONLY locally
+            deleteMessage(localMessage)
+        }
+        return shouldDeleteRemote
     }
 
     /**
@@ -75,19 +67,13 @@ internal class DeleteMessageListenerState(
         val channelLogic: ChannelLogic? = logic.channelFromMessageId(messageId)
 
         channelLogic?.getMessage(messageId)?.let { message ->
-            val isModerationFailed = message.isModerationError(clientState.user.value?.id)
+            val networkAvailable = clientState.isNetworkAvailable
+            val messageToBeDeleted = message.copy(
+                deletedAt = Date(),
+                syncStatus = if (!networkAvailable) SyncStatus.SYNC_NEEDED else SyncStatus.IN_PROGRESS,
+            )
 
-            if (isModerationFailed) {
-                deleteMessage(message)
-            } else {
-                val networkAvailable = clientState.isNetworkAvailable
-                val messageToBeDeleted = message.copy(
-                    deletedAt = Date(),
-                    syncStatus = if (!networkAvailable) SyncStatus.SYNC_NEEDED else SyncStatus.IN_PROGRESS,
-                )
-
-                updateMessage(messageToBeDeleted)
-            }
+            updateMessage(messageToBeDeleted)
         }
     }
 

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/internal/state/plugin/logic/querychannels/internal/QueryChannelsLogic.kt

@@ -32,8 +32,6 @@ import io.getstream.log.taggedLogger
 import io.getstream.result.Result
 import kotlinx.coroutines.flow.StateFlow
 
-private const val MESSAGE_LIMIT = 1
-private const val MEMBER_LIMIT = 30
 private const val INITIAL_CHANNEL_OFFSET = 0
 private const val CHANNEL_LIMIT = 30
 
@@ -155,13 +153,16 @@ internal class QueryChannelsLogic(
      */
     internal suspend fun queryFirstPage(): Result<List<Channel>> {
         logger.d { "[queryFirstPage] no args" }
+        val currentRequest = queryChannelsStateLogic.getState().currentRequest.value
+        val messageLimit = currentRequest?.messageLimit
+        val memberLimit = currentRequest?.memberLimit
         val request = QueryChannelsRequest(
             filter = filter,
             offset = INITIAL_CHANNEL_OFFSET,
             limit = CHANNEL_LIMIT,
             querySort = sort,
-            messageLimit = MESSAGE_LIMIT,
-            memberLimit = MEMBER_LIMIT,
+            messageLimit = messageLimit,
+            memberLimit = memberLimit,
         )
 
         queryChannelsStateLogic.setCurrentRequest(request)

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/socket/SocketFactory.kt

@@ -107,21 +107,14 @@ internal class SocketFactory(
 
     private fun PrivacySettings.reducePrivacySettings(): Map<String, Any> = mutableMapOf<String, Any>()
         .apply {
-            typingIndicators?.also {
-                put(
-                    "typing_indicators",
-                    mapOf<String, Any>(
-                        "enabled" to it.enabled,
-                    ),
-                )
+            typingIndicators?.let {
+                put("typing_indicators", mapOf<String, Any>("enabled" to it.enabled))
             }
-            readReceipts?.also {
-                put(
-                    "read_receipts",
-                    mapOf<String, Any>(
-                        "enabled" to it.enabled,
-                    ),
-                )
+            deliveryReceipts?.let {
+                put("delivery_receipts", mapOf<String, Any>("enabled" to it.enabled))
+            }
+            readReceipts?.let {
+                put("read_receipts", mapOf<String, Any>("enabled" to it.enabled))
             }
         }
 

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/utils/internal/MessageUtils.kt

@@ -20,17 +20,14 @@ import io.getstream.chat.android.client.extensions.internal.hasPendingAttachment
 import io.getstream.chat.android.core.internal.InternalStreamChatApi
 import io.getstream.chat.android.models.Message
 import io.getstream.chat.android.models.MessageType
-import java.util.regex.Pattern
-
-private val COMMAND_PATTERN = Pattern.compile("^/[a-z]*$")
 
 /**
  * Updates the type of the [Message] based on its content.
  *
- * If the message contains a command or has attachments to upload, the type will be [MessageType.EPHEMERAL].
+ * If the message has attachments to upload, the type will be [MessageType.EPHEMERAL] (local-only - after the
+ * attachments are uploaded, the type is changed to [MessageType.REGULAR]).
  * If the message is a system message, the type will be [MessageType.SYSTEM].
- * Otherwise, the type will be [MessageType.REGULAR], as we cannot send messages which are not regular, ephemeral, or
- * system.
+ * Otherwise, the type will be [MessageType.REGULAR], as we cannot send messages which are not regular or system.
  *
  * @param message The message to update.
  */
@@ -39,7 +36,7 @@ public fun getMessageType(message: Message): String {
     val hasAttachments = message.attachments.isNotEmpty()
     val hasAttachmentsToUpload = message.hasPendingAttachments()
 
-    return if (COMMAND_PATTERN.matcher(message.text).find() || (hasAttachments && hasAttachmentsToUpload)) {
+    return if (hasAttachments && hasAttachmentsToUpload) {
         MessageType.EPHEMERAL
     } else if (message.type == MessageType.SYSTEM) {
         MessageType.SYSTEM