Skip to content
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

Jump to bottom

[PBE-3845] fix side-effect & add missing changelog #5295

Merged
merged 3 commits into from
Jun 18, 2024
Merged

[PBE-3845] fix side-effect & add missing changelog #5295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a4457d
[PBE-3845] fix side-effect with ownCapabilities
kanat Jun 18, 2024
97f3fc0
[PBE-3845] add missing CHANGELOG
kanat Jun 18, 2024
6a02c45
Merge branch 'develop' into bugfix/channel-role-extra
kanat Jun 18, 2024
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

## stream-chat-android-state
### 🐞 Fixed
- Fixed member.role being missing when updating other members' roles in a channel. [#5290](https://github.com/GetStream/stream-chat-android/pull/5290)

### ⬆️ Improved

Expand Down Expand Up @@ -70,6 +71,7 @@
- Extended search result list styling. [#5286](https://github.com/GetStream/stream-chat-android/pull/5286)

### ✅ Added
- Added additional message option for user blocking. [#5289](https://github.com/GetStream/stream-chat-android/pull/5289)

### ⚠️ Changed

Expand Down
8 changes: 6 additions & 2 deletions ...n/java/io/getstream/chat/android/state/plugin/logic/channel/internal/ChannelStateLogic.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,12 @@ internal class ChannelStateLogic(
replaceWith = ReplaceWith("updateChannelData((ChannelData?) -> ChannelData?)"),
)
fun updateChannelData(channel: Channel) {
val currentOwnCapabilities = mutableState.channelData.value.ownCapabilities
val newChannelData = channel.toChannelData().copy(ownCapabilities = currentOwnCapabilities)
val newChannelData = channel.toChannelData().let {
when (it.ownCapabilities.isEmpty()) {
true -> it.copy(ownCapabilities = mutableState.channelData.value.ownCapabilities)
else -> it
}
}
mutableState.setChannelData(newChannelData)
}

Expand Down
Loading