mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-27 00:13:13 +00:00
Code Issues Releases Wiki Activity

Improved connect fallback

Browse source
This commit is contained in:
M66B 2020-01-15 08:58:31 +01:00
parent 961212e45b
commit 08098c2285
1 changed files with 111 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
app/src/main/java/eu/faircode/email/MailService.java
View file

@ -12,7 +12,6 @@ import androidx.preference.PreferenceManager;
import com.sun.mail.imap.IMAPFolder; import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPStore; import com.sun.mail.imap.IMAPStore;
import com.sun.mail.smtp.SMTPTransport; import com.sun.mail.smtp.SMTPTransport;
import com.sun.mail.util.MailConnectException;
import net.openid.appauth.AuthState; import net.openid.appauth.AuthState;
import net.openid.appauth.AuthorizationException; import net.openid.appauth.AuthorizationException;
@ -219,7 +218,10 @@ public class MailService implements AutoCloseable {
} }
} }
public String connect(String host, int port, int auth, String provider, String user, String password, String fingerprint) throws MessagingException { public String connect(
String host, int port,
int auth, String provider, String user, String password,
String fingerprint) throws MessagingException {
SSLSocketFactoryService factory = null; SSLSocketFactoryService factory = null;
try { try {
factory = new SSLSocketFactoryService(host, insecure, fingerprint); factory = new SSLSocketFactoryService(host, insecure, fingerprint);
@ -237,16 +239,12 @@ public class MailService implements AutoCloseable {
if (auth == AUTH_TYPE_GMAIL || auth == AUTH_TYPE_OAUTH) if (auth == AUTH_TYPE_GMAIL || auth == AUTH_TYPE_OAUTH)
properties.put("mail." + protocol + ".auth.mechanisms", "XOAUTH2"); properties.put("mail." + protocol + ".auth.mechanisms", "XOAUTH2");
//if (BuildConfig.DEBUG)
// throw new MailConnectException(
// new SocketConnectException("Debug", new Exception("Test"), host, port, 0));
if (auth == AUTH_TYPE_OAUTH) { if (auth == AUTH_TYPE_OAUTH) {
AuthState authState = OAuthRefresh(context, provider, password); AuthState authState = OAuthRefresh(context, provider, password);
_connect(context, host, port, user, authState.getAccessToken(), factory); connect(host, port, user, authState.getAccessToken(), factory);
return authState.jsonSerializeString(); return authState.jsonSerializeString();
} else { } else {
_connect(context, host, port, user, password, factory); connect(host, port, user, password, factory);
return null; return null;
} }
} catch (AuthenticationFailedException ex) { } catch (AuthenticationFailedException ex) {
@ -264,7 +262,7 @@ public class MailService implements AutoCloseable {
if (token == null) if (token == null)
throw new IllegalArgumentException("No token on refresh"); throw new IllegalArgumentException("No token on refresh");
_connect(context, host, port, user, token, factory); connect(host, port, user, token, factory);
return token; return token;
} }
@ -275,11 +273,34 @@ public class MailService implements AutoCloseable {
} }
else if (auth == AUTH_TYPE_OAUTH) { else if (auth == AUTH_TYPE_OAUTH) {
AuthState authState = OAuthRefresh(context, provider, password); AuthState authState = OAuthRefresh(context, provider, password);
_connect(context, host, port, user, authState.getAccessToken(), factory); connect(host, port, user, authState.getAccessToken(), factory);
return authState.jsonSerializeString(); return authState.jsonSerializeString();
} else } else
throw ex; throw ex;
} catch (MailConnectException ex) { }
}
private void connect(
String host, int port, String user, String password,
SSLSocketFactoryService factory) throws MessagingException {
try {
//if (BuildConfig.DEBUG)
// throw new MailConnectException(
// new SocketConnectException("Debug", new IOException("Test"), host, port, 0));
_connect(host, port, user, password, factory);
} catch (MessagingException ex) {
boolean ioError = false;
Throwable ce = ex;
while (ce != null) {
if (factory != null && ce instanceof CertificateException)
throw new UntrustedException(factory.getFingerPrint(), ex);
if (ce instanceof IOException)
ioError = true;
ce = ce.getCause();
}
if (ioError) {
try { try {
// Some devices resolve IPv6 addresses while not having IPv6 connectivity // Some devices resolve IPv6 addresses while not having IPv6 connectivity
InetAddress[] iaddrs = InetAddress.getAllByName(host); InetAddress[] iaddrs = InetAddress.getAllByName(host);
@ -288,24 +309,23 @@ public class MailService implements AutoCloseable {
for (InetAddress iaddr : iaddrs) for (InetAddress iaddr : iaddrs)
try { try {
Log.i("Falling back to " + iaddr.getHostAddress()); Log.i("Falling back to " + iaddr.getHostAddress());
_connect(context, iaddr.getHostAddress(), port, user, password, factory); _connect(iaddr.getHostAddress(), port, user, password, factory);
return null; return;
} catch (MessagingException ex1) { } catch (MessagingException ex1) {
Log.w(ex1); Log.w(ex1);
} }
} catch (Throwable ex1) { } catch (Throwable ex1) {
Log.w(ex1); Log.w(ex1);
} }
}
throw ex; throw ex;
} }
} }
private void _connect( private void _connect(
Context context,
String host, int port, String user, String password, String host, int port, String user, String password,
SSLSocketFactoryService factory) throws MessagingException { SSLSocketFactoryService factory) throws MessagingException {
try {
isession = Session.getInstance(properties, null); isession = Session.getInstance(properties, null);
isession.setDebug(debug); isession.setDebug(debug);
//System.setProperty("mail.socket.debug", Boolean.toString(debug)); //System.setProperty("mail.socket.debug", Boolean.toString(debug));
@ -377,17 +397,6 @@ public class MailService implements AutoCloseable {
} }
} else } else
throw new NoSuchProviderException(protocol); throw new NoSuchProviderException(protocol);
} catch (MessagingException ex) {
if (factory != null) {
Throwable ce = ex;
while (ce != null) {
if (ce instanceof CertificateException)
throw new UntrustedException(factory.getFingerPrint(), ex);
ce = ce.getCause();
}
}
throw ex;
}
} }
private static class ErrorHolder { private static class ErrorHolder {