Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-02 19:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check for VPN

Browse Source
This commit is contained in:
M66B
2020-02-12 12:56:19 +01:00
parent 2460e6c08d
commit 033efe23d3
3 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/EmailService.java
View File

@@ -14,6 +14,8 @@ import androidx.preference.PreferenceManager;
import com.sun.mail.imap.IMAPFolder;
import com.sun.mail.imap.IMAPStore;
import com.sun.mail.smtp.SMTPTransport;
import com.sun.mail.util.MailConnectException;
import com.sun.mail.util.SocketConnectException;
import net.openid.appauth.AuthState;
import net.openid.appauth.AuthorizationException;
@@ -329,6 +331,18 @@ public class EmailService implements AutoCloseable {
return authState.jsonSerializeString();
} else
throw ex;
} catch (MailConnectException ex) {
if (ConnectionHelper.vpnActive(context)) {
MailConnectException mex = new MailConnectException(new SocketConnectException(
"The might be caused by the VPN in use",
new Exception(),
ex.getHost(),
ex.getPort(),
ex.getConnectionTimeout()));
mex.setNextException(ex.getNextException());
throw mex;
} else
throw ex;
}
}