mirror of https://github.com/M66B/FairEmail.git
Android account manager might be blocked
This commit is contained in:
parent
2aa333ee17
commit
9034c9360a
|
@ -446,8 +446,12 @@ public class EmailService implements AutoCloseable {
|
||||||
connect(host, port, auth, user, factory);
|
connect(host, port, auth, user, factory);
|
||||||
} catch (Exception ex1) {
|
} catch (Exception ex1) {
|
||||||
Log.e(ex1);
|
Log.e(ex1);
|
||||||
|
String msg = ex.getMessage();
|
||||||
|
if (auth == AUTH_TYPE_GMAIL &&
|
||||||
|
msg != null && msg.endsWith("Invalid credentials (Failure)"))
|
||||||
|
msg += "; " + context.getString(R.string.title_service_token);
|
||||||
throw new AuthenticationFailedException(
|
throw new AuthenticationFailedException(
|
||||||
context.getString(R.string.title_service_auth, ex.getMessage()),
|
context.getString(R.string.title_service_auth, msg),
|
||||||
ex.getNextException());
|
ex.getNextException());
|
||||||
}
|
}
|
||||||
} else if (purpose == PURPOSE_CHECK) {
|
} else if (purpose == PURPOSE_CHECK) {
|
||||||
|
|
|
@ -928,6 +928,7 @@
|
||||||
<string name="title_hint_alias">Long press an identity to display options, like copy to create alias identities</string>
|
<string name="title_hint_alias">Long press an identity to display options, like copy to create alias identities</string>
|
||||||
<string name="title_service_auth">The email server said: \'%1$s\'</string>
|
<string name="title_service_auth">The email server said: \'%1$s\'</string>
|
||||||
<string name="title_service_vpn">This might be caused by the VPN that is being used</string>
|
<string name="title_service_vpn">This might be caused by the VPN that is being used</string>
|
||||||
|
<string name="title_service_token">The Android account manager could be blocked by a VPN, firewall, ad blocker, etc., preventing it from obtaining an access token</string>
|
||||||
<string name="title_service_port">Please double check the port number</string>
|
<string name="title_service_port">Please double check the port number</string>
|
||||||
<string name="title_service_protocol">Please double check the protocol (SSL/TLS or STARTTLS)</string>
|
<string name="title_service_protocol">Please double check the protocol (SSL/TLS or STARTTLS)</string>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue