Skip to content

fix: ensure cells state is synced when disabled or pending - WPB-20736 #3691

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
merged 8 commits into from
Oct 7, 2025
Merged

fix: ensure cells state is synced when disabled or pending - WPB-20736 #3691

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
35af767
ensure cells state is synced when disabled or pending
jullianm Oct 3, 2025
b4fc016
add missing cells decoding property in v10
jullianm Oct 6, 2025
a4cbf91
Merge branch 'develop' into fix/cells-disabled-issue
jullianm Oct 6, 2025
f6c4ca0
lint and format
jullianm Oct 6, 2025
bf8fbef
Merge branch 'fix/cells-disabled-issue' of github.com:wireapp/wire-io…
jullianm Oct 6, 2025
c657298
lint and format
jullianm Oct 6, 2025
b0a39fd
add error description to log
jullianm Oct 7, 2025
b1a91ed
Merge branch 'develop' into fix/cells-disabled-issue
jullianm Oct 7, 2025
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
5 changes: 4 additions & 1 deletion WireNetwork/Sources/WireNetwork/APIs/Rest/ConversationsAPI/ConversationsAPIV10.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ struct ConversationV10: Decodable, ToAPIModelConvertible {
case type
case groupType = "group_conv_type"
case addPermission = "add_permission"
case cellsState = "cells_state"
}

var access: Set<ConversationAccessModeV0>?
Expand All @@ -165,6 +166,7 @@ struct ConversationV10: Decodable, ToAPIModelConvertible {
var type: ConversationTypeV0?
var groupType: ConversationGroupTypeV8?
var addPermission: ChannelPermissionV8?
var cellsState: CellsStateV8

func toAPIModel() -> Conversation {
let access = access?.map { $0.toAPIModel() }
Expand All @@ -190,7 +192,8 @@ struct ConversationV10: Decodable, ToAPIModelConvertible {
lastEvent: lastEvent,
lastEventTime: lastEventTime?.date,
groupType: groupType?.toAPIModel(),
addPermission: addPermission?.toAPIModel()
addPermission: addPermission?.toAPIModel(),
cellsState: cellsState.toAPIModel()
)
}
}
Expand Down
1 change: 1 addition & 0 deletions ...ConversationsAPI/Resources/testCreateGroupConversation_givenV10AndSuccessResponse200.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"group_id": "string",
"last_event": "string",
"last_event_time": "2024-06-04T15:03:07.598Z",
"cells_state": "disabled",
"members": {
"others": [
{
Expand Down
1 change: 1 addition & 0 deletions ...ConversationsAPI/Resources/testCreateGroupConversation_givenV10AndSuccessResponse201.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"group_id": "string",
"last_event": "string",
"last_event_time": "2024-06-04T15:03:07.598Z",
"cells_state": "disabled",
"members": {
"others": [
{
Expand Down
1 change: 1 addition & 0 deletions ...PI/Resources/testCreateGroupConversation_givenV10_EmptySelfMember_SuccessResponse201.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"group_id": "string",
"last_event": "string",
"last_event_time": "2024-06-04T15:03:07.598Z",
"cells_state": "disabled",
"members": {
"others": [
{
Expand Down
1 change: 1 addition & 0 deletions .../ConversationsAPI/Resources/testCreateGroupConversation_givenV8AndSuccessResponse200.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"id": "99db9768-04e3-4b5d-9268-831b6a25c4ab",
"last_event": "string",
"last_event_time": "2024-06-04T15:03:07.598Z",
"cells_state": "disabled",
"members": {
"others": [
{
Expand Down
1 change: 1 addition & 0 deletions .../ConversationsAPI/Resources/testCreateGroupConversation_givenV8AndSuccessResponse201.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"id": "99db9768-04e3-4b5d-9268-831b6a25c4ab",
"last_event": "string",
"last_event_time": "2024-06-04T15:03:07.598Z",
"cells_state": "disabled",
"members": {
"others": [
{
Expand Down
2 changes: 1 addition & 1 deletion ...ire-iOS/Sources/UserInterface/Conversation/ConversationViewController+ViewLifeCycle.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ extension ConversationViewController {

isAppearing = false

syncCellsStateIfPending()
syncCellsState()
}
}
8 changes: 4 additions & 4 deletions wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,10 +879,10 @@ extension ConversationViewController: ConversationInputBarViewControllerDelegate
filesView.presentOverAll(animated: true)
}

/// If cells state is pending we need to sync it to ensure the value is up to date
/// as it might have been updated to a `ready` state.
func syncCellsStateIfPending() {
guard wireCellsState == .pending else {
/// If cells state is different than ready we need to sync it when view appears to ensure the value is up to date
/// as it might have been updated to either a `pending` or `ready` state.
func syncCellsState() {
guard wireCellsState != .ready else {
return
}

Expand Down
Loading