seang96/gmessages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Cancel gaia pairing on phone too if HTTP requests is canceled

Browse source
This commit is contained in:
Tulir Asokan 2024-03-28 16:52:02 +02:00
parent 074ad64773
commit 4add3fb896
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libgm/pair_google.go
View file

@ -322,6 +322,13 @@ func (c *Client) DoGaiaPairing(ctx context.Context, emojiCallback func(string))
emojiCallback(pairingEmoji)
finishResp, err := c.sendGaiaPairingMessage(ctx, ps, gmproto.ActionType_CREATE_GAIA_PAIRING_CLIENT_FINISHED, clientFinish)
if err != nil {
if errors.Is(err, context.Canceled) {
zerolog.Ctx(ctx).Debug().Msg("Sending gaia pairing cancel after context was canceled")
cancelErr := c.cancelGaiaPairing(ps)
if cancelErr != nil {
zerolog.Ctx(ctx).Warn().Err(err).Msg("Failed to send gaia pairing cancel request after context was canceled")
}
}
return fmt.Errorf("failed to send client finish: %w", err)
}
if finishResp.GetFinishErrorType() != 0 {