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

Try different ID for gaia pairing

Browse source
This commit is contained in:
Tulir Asokan 2024-03-18 15:55:23 +02:00
parent 720e16f1ce
commit a0602d6c94
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libgm/pair_google.go
View file

@ -264,6 +264,7 @@ func (c *Client) DoGaiaPairing(ctx context.Context, emojiCallback func(string))
Msg("Gaia devices response") Msg("Gaia devices response")
// TODO multiple devices? // TODO multiple devices?
var destRegID string var destRegID string
var destRegUnknownInt uint64
for _, dev := range sigResp.GetDeviceData().GetUnknownItems2() { for _, dev := range sigResp.GetDeviceData().GetUnknownItems2() {
if dev.GetUnknownInt4() == 1 { if dev.GetUnknownInt4() == 1 {
if destRegID != "" { if destRegID != "" {
@ -273,11 +274,16 @@ func (c *Client) DoGaiaPairing(ctx context.Context, emojiCallback func(string))
Msg("Found multiple primary-looking devices for gaia pairing") Msg("Found multiple primary-looking devices for gaia pairing")
} }
destRegID = dev.GetDestOrSourceUUID() destRegID = dev.GetDestOrSourceUUID()
destRegUnknownInt = dev.GetUnknownBigInt7()
} }
} }
if destRegID == "" { if destRegID == "" {
return ErrNoDevicesFound return ErrNoDevicesFound
} }
zerolog.Ctx(ctx).Debug().
Str("dest_reg_uuid", destRegID).
Uint64("dest_reg_unknown_int", destRegUnknownInt).
Msg("Found UUID to use for gaia pairing")
destRegUUID, err := uuid.Parse(destRegID) destRegUUID, err := uuid.Parse(destRegID)
if err != nil { if err != nil {
return fmt.Errorf("failed to parse destination UUID: %w", err) return fmt.Errorf("failed to parse destination UUID: %w", err)
@ -330,7 +336,7 @@ func (c *Client) DoGaiaPairing(ctx context.Context, emojiCallback func(string))
c.AuthData.RequestCrypto.AESKey = doHKDF(ps.NextKey, encryptionKeyInfo, []byte("client")) c.AuthData.RequestCrypto.AESKey = doHKDF(ps.NextKey, encryptionKeyInfo, []byte("client"))
c.AuthData.RequestCrypto.HMACKey = doHKDF(ps.NextKey, encryptionKeyInfo, []byte("server")) c.AuthData.RequestCrypto.HMACKey = doHKDF(ps.NextKey, encryptionKeyInfo, []byte("server"))
c.AuthData.PairingID = ps.UUID c.AuthData.PairingID = ps.UUID
c.triggerEvent(&events.PairSuccessful{PhoneID: fmt.Sprintf("%s/%s", c.AuthData.Mobile.GetSourceID(), destRegUUID)}) c.triggerEvent(&events.PairSuccessful{PhoneID: fmt.Sprintf("%s/%d", c.AuthData.Mobile.GetSourceID(), destRegUnknownInt)})
go func() { go func() {
// Sleep for a bit to let the phone save the pair data. If we reconnect too quickly, // Sleep for a bit to let the phone save the pair data. If we reconnect too quickly,