Skip to content

fix: update TriggerCmdSyncData args. #595

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
FGadvancer merged 2 commits into from
Jul 15, 2024
Merged

fix: update TriggerCmdSyncData args. #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d28e4e
fix: update TriggerCmdSyncData args.
mo3et Jul 15, 2024
ed9cdd7
Merge branch 'main' of github.com:openimsdk/openim-sdk-core into fix/…
mo3et Jul 15, 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
5 changes: 3 additions & 2 deletions open_im_sdk/userRelated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,10 +458,11 @@ func (u *LoginMgr) setAppBackgroundStatus(ctx context.Context, isBackground bool
return err
} else {
u.longConnMgr.SetBackground(isBackground)
if isBackground == false {
if !isBackground {
_ = common.TriggerCmdWakeUp(u.heartbeatCmdCh)
_ = common.TriggerCmdSyncData(u.conversationCh)
_ = common.TriggerCmdSyncData(ctx, u.conversationCh)
}

return nil
}
}
4 changes: 2 additions & 2 deletions pkg/common/trigger_channel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ func TriggerCmdWakeUp(ch chan Cmd2Value) error {
return sendCmd(ch, c2v, 100)
}

func TriggerCmdSyncData(ch chan Cmd2Value) error {
func TriggerCmdSyncData(ctx context.Context, ch chan Cmd2Value) error {
if ch == nil {
return errs.Wrap(ErrChanNil)
}
c2v := Cmd2Value{Cmd: constant.CmdSyncData, Value: nil}
c2v := Cmd2Value{Cmd: constant.CmdSyncData, Value: nil, Ctx: ctx}
return sendCmd(ch, c2v, 100)
}

Expand Down