Skip to content

Commit 0e4f258

Browse files
committed
Add deliveryEventsEnabled to channel configuration and mapping
1 parent ec9d868 commit 0e4f258

File tree

7 files changed

+8
-2
lines changed

7 files changed

+8
-2
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,6 +603,7 @@ internal class DomainMapping(
603603
name = name ?: "",
604604
typingEventsEnabled = typing_events,
605605
readEventsEnabled = read_events,
606+
deliveryEventsEnabled = delivery_events,
606607
connectEventsEnabled = connect_events,
607608
searchEnabled = search,
608609
isReactionsEnabled = reactions,

stream-chat-android-client/src/main/java/io/getstream/chat/android/client/api2/model/dto/ConfigDto.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ internal data class ConfigDto(
2626
val name: String?,
2727
val typing_events: Boolean,
2828
val read_events: Boolean,
29-
val delivery_events: Boolean?,
29+
val delivery_events: Boolean = true,
3030
val connect_events: Boolean,
3131
val search: Boolean,
3232
val reactions: Boolean,

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/api2/mapping/DomainMappingTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -591,6 +591,7 @@ internal class DomainMappingTest {
591591
name = configDto.name ?: "",
592592
typingEventsEnabled = configDto.typing_events,
593593
readEventsEnabled = configDto.read_events,
594+
deliveryEventsEnabled = configDto.delivery_events,
594595
connectEventsEnabled = configDto.connect_events,
595596
searchEnabled = configDto.search,
596597
isReactionsEnabled = configDto.reactions,

stream-chat-android-client/src/test/java/io/getstream/chat/android/client/receipts/MessageReceiptManagerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ internal class MessageReceiptManagerTest {
203203
fun `should skip storing message delivery receipt from muted users`() = runTest {
204204
val message = DeliverableMessage
205205
val currentUser = CurrentUser.copy(
206-
mutes = listOf(randomMute(user = CurrentUser, target = message.user))
206+
mutes = listOf(randomMute(user = CurrentUser, target = message.user)),
207207
)
208208
val fixture = Fixture()
209209
.givenCurrentUser(currentUser)

stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/channelconfig/internal/ChannelConfigEntity.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ internal data class ChannelConfigInnerEntity(
3333
val name: String,
3434
val isTypingEvents: Boolean,
3535
val isReadEvents: Boolean,
36+
val deliveryEventsEnabled: Boolean,
3637
val isConnectEvents: Boolean,
3738
val isSearch: Boolean,
3839
val isReactionsEnabled: Boolean,

stream-chat-android-offline/src/main/java/io/getstream/chat/android/offline/repository/domain/channelconfig/internal/ChannelConfigMapper.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ internal fun ChannelConfig.toEntity(): ChannelConfigEntity = ChannelConfigEntity
2929
name = name,
3030
isTypingEvents = typingEventsEnabled,
3131
isReadEvents = readEventsEnabled,
32+
deliveryEventsEnabled = deliveryEventsEnabled,
3233
isConnectEvents = connectEventsEnabled,
3334
isSearch = searchEnabled,
3435
isReactionsEnabled = isReactionsEnabled,
@@ -59,6 +60,7 @@ internal fun ChannelConfigEntity.toModel(): ChannelConfig = ChannelConfig(
5960
name = name,
6061
typingEventsEnabled = isTypingEvents,
6162
readEventsEnabled = isReadEvents,
63+
deliveryEventsEnabled = deliveryEventsEnabled,
6264
connectEventsEnabled = isConnectEvents,
6365
searchEnabled = isSearch,
6466
isReactionsEnabled = isReactionsEnabled,

stream-chat-android-offline/src/test/java/io/getstream/chat/android/offline/repository/ChannelConfigRepositoryTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ internal class ChannelConfigRepositoryTest {
136136
isMutes = randomBoolean(),
137137
isReactionsEnabled = randomBoolean(),
138138
isReadEvents = randomBoolean(),
139+
deliveryEventsEnabled = randomBoolean(),
139140
isSearch = randomBoolean(),
140141
isThreadEnabled = randomBoolean(),
141142
isTypingEvents = randomBoolean(),

0 commit comments

Comments
 (0)