pair: update PairClientType to a string

Author: tulir

pair-code.go

@@ -29,19 +29,20 @@ import (
 
 // PairClientType is the type of client to use with PairCode.
 // The type is automatically filled based on store.DeviceProps.PlatformType (which is what QR login uses).
-type PairClientType int
+type PairClientType string
 
 const (
-	PairClientUnknown PairClientType = iota
-	PairClientChrome
-	PairClientEdge
-	PairClientFirefox
-	PairClientIE
-	PairClientOpera
-	PairClientSafari
-	PairClientElectron
-	PairClientUWP
-	PairClientOtherWebClient
+	PairClientUnknown        PairClientType = "0"
+	PairClientChrome         PairClientType = "1"
+	PairClientEdge           PairClientType = "2"
+	PairClientFirefox        PairClientType = "3"
+	PairClientIE             PairClientType = "4"
+	PairClientOpera          PairClientType = "5"
+	PairClientSafari         PairClientType = "6"
+	PairClientElectron       PairClientType = "7"
+	PairClientUWP            PairClientType = "8"
+	PairClientOtherWebClient PairClientType = "9"
+	PairClientAndroid        PairClientType = "e"
 )
 
 var notNumbers = regexp.MustCompile("[^0-9]")
@@ -114,7 +115,7 @@ func (cli *Client) PairPhone(ctx context.Context, phone string, showPushNotifica
 			Content: []waBinary.Node{
 				{Tag: "link_code_pairing_wrapped_companion_ephemeral_pub", Content: ephemeralKey},
 				{Tag: "companion_server_auth_key_pub", Content: cli.Store.NoiseKey.Pub[:]},
-				{Tag: "companion_platform_id", Content: strconv.Itoa(int(clientType))},
+				{Tag: "companion_platform_id", Content: clientType},
 				{Tag: "companion_platform_display", Content: clientDisplayName},
 				{Tag: "link_code_pairing_nonce", Content: []byte{0}},
 			},

pair.go

@@ -80,38 +80,39 @@ func (cli *Client) handlePairDevice(ctx context.Context, node *waBinary.Node) {
 }
 
 func (cli *Client) getQRClientType() PairClientType {
-	if cli.QRClientType == PairClientUnknown {
-		switch store.DeviceProps.GetPlatformType() {
-		case waCompanionReg.DeviceProps_CHROME:
-			return PairClientChrome
-		case waCompanionReg.DeviceProps_FIREFOX:
-			return PairClientFirefox
-		case waCompanionReg.DeviceProps_EDGE:
-			return PairClientEdge
-		case waCompanionReg.DeviceProps_IE:
-			return PairClientIE
-		case waCompanionReg.DeviceProps_OPERA:
-			return PairClientOpera
-		case waCompanionReg.DeviceProps_SAFARI:
-			return PairClientSafari
-		case waCompanionReg.DeviceProps_UWP:
-			return PairClientUWP
-		default:
-			if store.BaseClientPayload.WebInfo != nil &&
-				store.BaseClientPayload.WebInfo.WebSubPlatform != nil &&
-				store.BaseClientPayload.WebInfo.GetWebSubPlatform() == waWa6.ClientPayload_WebInfo_WEB_BROWSER {
-				return PairClientOtherWebClient
-			}
+	if cli.QRClientType != "" {
+		return cli.QRClientType
+	}
+	switch store.DeviceProps.GetPlatformType() {
+	case waCompanionReg.DeviceProps_CHROME:
+		return PairClientChrome
+	case waCompanionReg.DeviceProps_FIREFOX:
+		return PairClientFirefox
+	case waCompanionReg.DeviceProps_EDGE:
+		return PairClientEdge
+	case waCompanionReg.DeviceProps_IE:
+		return PairClientIE
+	case waCompanionReg.DeviceProps_OPERA:
+		return PairClientOpera
+	case waCompanionReg.DeviceProps_SAFARI:
+		return PairClientSafari
+	case waCompanionReg.DeviceProps_UWP:
+		return PairClientUWP
+	case waCompanionReg.DeviceProps_ANDROID_PHONE:
+		return PairClientAndroid
+	default:
+		if store.BaseClientPayload.UserAgent.GetPlatform() == waWa6.ClientPayload_UserAgent_WEB {
+			return PairClientOtherWebClient
 		}
+		return PairClientUnknown
 	}
-	return cli.QRClientType
 }
 
 func (cli *Client) makeQRData(ref []byte, clientType PairClientType) string {
 	noise := base64.StdEncoding.EncodeToString(cli.Store.NoiseKey.Pub[:])
 	identity := base64.StdEncoding.EncodeToString(cli.Store.IdentityKey.Pub[:])
 	adv := base64.StdEncoding.EncodeToString(cli.Store.AdvSecretKey)
-	return fmt.Sprintf("https://wa.me/settings/linked_devices#%s,%s,%s,%s,%d", ref, noise, identity, adv, clientType)
+	return fmt.Sprintf("https://wa.me/settings/linked_devices#%s,%s,%s,%s,%s", ref, noise, identity, adv, clientType)
 }
 
 func (cli *Client) handlePairSuccess(ctx context.Context, node *waBinary.Node) {