From e3619dbe7b460d2506493afcd0b774245b2278a9 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Mon, 18 Mar 2024 15:12:30 +0200 Subject: [PATCH] Include UUID in phone ID when using google pairing --- libgm/pair_google.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libgm/pair_google.go b/libgm/pair_google.go index 47b9645..0e6c150 100644 --- a/libgm/pair_google.go +++ b/libgm/pair_google.go @@ -330,7 +330,7 @@ func (c *Client) DoGaiaPairing(ctx context.Context, emojiCallback func(string)) c.AuthData.RequestCrypto.AESKey = doHKDF(ps.NextKey, encryptionKeyInfo, []byte("client")) c.AuthData.RequestCrypto.HMACKey = doHKDF(ps.NextKey, encryptionKeyInfo, []byte("server")) c.AuthData.PairingID = ps.UUID - c.triggerEvent(&events.PairSuccessful{PhoneID: c.AuthData.Mobile.GetSourceID()}) + c.triggerEvent(&events.PairSuccessful{PhoneID: fmt.Sprintf("%s/%s", c.AuthData.Mobile.GetSourceID(), destRegUUID)}) go func() { // Sleep for a bit to let the phone save the pair data. If we reconnect too quickly,