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

Log warning if multiple devices are found for gaia pairing

Browse source
This commit is contained in:
Tulir Asokan 2024-03-18 14:54:06 +02:00
parent 2d02241fc4
commit e81339183e
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libgm/pair_google.go
View file

@ -256,12 +256,23 @@ func (c *Client) DoGaiaPairing(ctx context.Context, emojiCallback func(string))
if err != nil { if err != nil {
return fmt.Errorf("failed to prepare gaia pairing: %w", err) return fmt.Errorf("failed to prepare gaia pairing: %w", err)
} }
// Don't log the whole object as it also contains the tachyon token
zerolog.Ctx(ctx).Debug().
Any("header", sigResp.Header).
Str("maybe_browser_uuid", sigResp.MaybeBrowserUUID).
Any("device_data", sigResp.DeviceData).
Msg("Gaia devices response")
// TODO multiple devices? // TODO multiple devices?
var destRegID string var destRegID string
for _, dev := range sigResp.GetDeviceData().GetUnknownItems2() { for _, dev := range sigResp.GetDeviceData().GetUnknownItems2() {
if dev.GetUnknownInt4() == 1 { if dev.GetUnknownInt4() == 1 {
if destRegID != "" {
zerolog.Ctx(ctx).Warn().
Str("prev_reg_id", destRegID).
Str("next_reg_id", dev.GetDestOrSourceUUID()).
Msg("Found multiple primary-looking devices for gaia pairing")
}
destRegID = dev.GetDestOrSourceUUID() destRegID = dev.GetDestOrSourceUUID()
break
} }
} }
if destRegID == "" { if destRegID == "" {