diff --git a/commands.go b/commands.go index 96e835f..d2716e7 100644 --- a/commands.go +++ b/commands.go @@ -160,7 +160,7 @@ func fnLoginGoogle(ce *WrappedCommandEvent) { const ( 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" pairingErrMsgCancelled = "Pairing cancelled on phone" pairingErrMsgTimeout = "Pairing timed out, please try again" diff --git a/provisioning.go b/provisioning.go index b983258..108bf3d 100644 --- a/provisioning.go +++ b/provisioning.go @@ -372,8 +372,12 @@ func (prov *ProvisioningAPI) GoogleLoginStart(w http.ResponseWriter, r *http.Req ErrCode: "no-devices-found", }) case errors.Is(err, libgm.ErrPairingInitTimeout): + errMsg := pairingErrPhoneNotResponding + if strings.Contains(r.UserAgent(), "; Android") { + errMsg += " using the desktop app" + } jsonResponse(w, http.StatusBadRequest, Error{ - Error: pairingErrPhoneNotResponding, + Error: errMsg, ErrCode: "timeout", }) default: