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

Adjust pairing init timeout message

Browse source
This commit is contained in:
Tulir Asokan 2024-04-10 16:42:24 +03:00
parent bbfb5e7b5b
commit c82a38b662
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands.go
View file

@ -160,7 +160,7 @@ func fnLoginGoogle(ce *WrappedCommandEvent) {
const ( const (
pairingErrMsgNoDevices = "No devices found. Make sure you've enabled account pairing in the Google Messages app on your phone." pairingErrMsgNoDevices = "No devices found. Make sure you've enabled account pairing in the Google Messages app on your phone."
pairingErrPhoneNotResponding = "Phone not responding. Make sure your phone is connected to the internet and that account pairing is enabled in the Google Messages app. You may need to keep the app open and/or disable battery optimizations." pairingErrPhoneNotResponding = "Phone not responding. Make sure your phone is connected to the internet and that account pairing is enabled in the Google Messages app. You may need to keep the app open and/or disable battery optimizations. Alternatively, try QR pairing"
pairingErrMsgIncorrectEmoji = "Incorrect emoji chosen on phone, please try again" pairingErrMsgIncorrectEmoji = "Incorrect emoji chosen on phone, please try again"
pairingErrMsgCancelled = "Pairing cancelled on phone" pairingErrMsgCancelled = "Pairing cancelled on phone"
pairingErrMsgTimeout = "Pairing timed out, please try again" pairingErrMsgTimeout = "Pairing timed out, please try again"

6
provisioning.go
View file

@ -372,8 +372,12 @@ func (prov *ProvisioningAPI) GoogleLoginStart(w http.ResponseWriter, r *http.Req
ErrCode: "no-devices-found", ErrCode: "no-devices-found",
}) })
case errors.Is(err, libgm.ErrPairingInitTimeout): case errors.Is(err, libgm.ErrPairingInitTimeout):
errMsg := pairingErrPhoneNotResponding
if strings.Contains(r.UserAgent(), "; Android") {
errMsg += " using the desktop app"
}
jsonResponse(w, http.StatusBadRequest, Error{ jsonResponse(w, http.StatusBadRequest, Error{
Error: pairingErrPhoneNotResponding, Error: errMsg,
ErrCode: "timeout", ErrCode: "timeout",
}) })
default: default: