Skip to content

Fix unable to update delivery receipts privacy setting #6178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VelikovPetar merged 1 commit into from
Feb 23, 2026
Merged

Fix unable to update delivery receipts privacy setting #6178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ...-android-client/src/main/java/io/getstream/chat/android/client/api2/mapping/DtoMapping.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(),
)

/**
Expand All @@ -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.
*
Expand Down
21 changes: 7 additions & 14 deletions ...hat-android-client/src/main/java/io/getstream/chat/android/client/socket/SocketFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}

Expand Down
21 changes: 21 additions & 0 deletions ...roid-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DtoMappingTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -238,12 +240,31 @@ internal class DtoMappingTest {
val privacySettings = PrivacySettings(
typingIndicators = TypingIndicators(enabled = true),
readReceipts = ReadReceipts(enabled = false),
deliveryReceipts = DeliveryReceipts(enabled = false),
)
val mapping = Fixture().get()
val dto = with(mapping) { privacySettings.toDto() }
val expected = PrivacySettingsDto(
typing_indicators = TypingIndicatorsDto(enabled = true),
read_receipts = ReadReceiptsDto(enabled = false),
delivery_receipts = DeliveryReceiptsDto(enabled = false),
)
dto shouldBeEqualTo expected
}

@Test
fun `PrivacySettings with null deliveryReceipts is correctly mapped to Dto`() {
val privacySettings = PrivacySettings(
typingIndicators = TypingIndicators(enabled = true),
readReceipts = ReadReceipts(enabled = false),
deliveryReceipts = null,
)
val mapping = Fixture().get()
val dto = with(mapping) { privacySettings.toDto() }
val expected = PrivacySettingsDto(
typing_indicators = TypingIndicatorsDto(enabled = true),
read_receipts = ReadReceiptsDto(enabled = false),
delivery_receipts = null,
)
dto shouldBeEqualTo expected
}
Expand Down
80 changes: 65 additions & 15 deletions ...android-client/src/test/java/io/getstream/chat/android/client/socket/SocketFactoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@

package io.getstream.chat.android.client.socket

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.parser.ChatParser
import io.getstream.chat.android.client.parser2.ParserFactory
import io.getstream.chat.android.client.token.FakeTokenManager
Expand Down Expand Up @@ -94,7 +98,7 @@ internal class SocketFactoryTest {
}

@JvmStatic
@Suppress("MaxLineLength")
@Suppress("MaxLineLength", "LongMethod")
Comment thread
VelikovPetar marked this conversation as resolved.
fun arguments() = listOf(
randomUser(image = randomString(), name = randomString(), language = randomString()).let {
Arguments.of(
Expand Down Expand Up @@ -138,26 +142,72 @@ internal class SocketFactoryTest {
"${endpoint}connect?json=${buildMinimumUserJson("anon")}&api_key=$apiKey&X-Stream-Client=${headersUtil.buildSdkTrackingHeaders()}&stream-auth-type=anonymous",
)
},
randomUser(
image = randomString(),
name = randomString(),
language = randomString(),
privacySettings = PrivacySettings(
typingIndicators = TypingIndicators(enabled = false),
deliveryReceipts = DeliveryReceipts(enabled = false),
readReceipts = ReadReceipts(enabled = true),
),
).let {
Arguments.of(
false,
SocketFactory.ConnectionConf.UserConnectionConf(endpoint, apiKey, it),
"${endpoint}connect?json=${buildFullUserJson(it, it.id)}&api_key=$apiKey&X-Stream-Client=${headersUtil.buildSdkTrackingHeaders()}&authorization=$token&stream-auth-type=jwt",
)
},
randomUser(
image = randomString(),
name = randomString(),
language = randomString(),
privacySettings = PrivacySettings(
typingIndicators = null,
deliveryReceipts = DeliveryReceipts(enabled = false),
readReceipts = null,
),
).let {
Arguments.of(
false,
SocketFactory.ConnectionConf.UserConnectionConf(endpoint, apiKey, it),
"${endpoint}connect?json=${buildFullUserJson(it, it.id)}&api_key=$apiKey&X-Stream-Client=${headersUtil.buildSdkTrackingHeaders()}&authorization=$token&stream-auth-type=jwt",
)
},
)

private fun buildMinimumUserJson(userId: String): String = encode(
defaultMap(userId, mapOf("id" to userId)),
)

private fun buildFullUserJson(user: User, userId: String): String = encode(
defaultMap(
userId,
mapOf(
"id" to userId,
"role" to user.role,
"banned" to user.isBanned,
"invisible" to user.isInvisible,
"language" to user.language,
"image" to user.image,
"name" to user.name,
) + user.extraData,
),
)
private fun buildFullUserJson(user: User, userId: String): String {
val ps = user.privacySettings
return encode(
defaultMap(
userId,
linkedMapOf(
"id" to userId,
"role" to user.role,
"banned" to user.isBanned,
"invisible" to user.isInvisible,
) + if (ps != null) {
mapOf(
"privacy_settings" to listOfNotNull(
ps.typingIndicators?.let { "typing_indicators" to mapOf("enabled" to it.enabled) },
ps.deliveryReceipts?.let { "delivery_receipts" to mapOf("enabled" to it.enabled) },
ps.readReceipts?.let { "read_receipts" to mapOf("enabled" to it.enabled) },
).toMap(),
)
} else {
emptyMap()
} + mapOf(
"language" to user.language,
"image" to user.image,
"name" to user.name,
) + user.extraData,
),
)
}

private fun defaultMap(userId: String, userDetails: Map<String, Any>): Map<String, Any> =
mapOf(
Expand Down
Loading