Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-31 14:17:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Simplification

Browse Source
This commit is contained in:
M66B
2021-09-02 21:09:35 +02:00
parent eefab1d75d
commit 0c25724063
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -351,6 +351,8 @@ public class EmailService implements AutoCloseable {
String user, String password,
ServiceAuthenticator.IAuthenticated intf,
String certificate, String fingerprint) throws MessagingException {
properties.put("fairemail.server", host);
SSLSocketFactoryService factory = null;
try {
PrivateKey key = null;
@@ -478,7 +480,7 @@ public class EmailService implements AutoCloseable {
}
EntityLog.log(context, "Connecting to " + main);
_connect(host, main, port, require_id, user, authenticator, factory);
_connect(main, port, require_id, user, authenticator, factory);
} catch (UnknownHostException ex) {
throw new MessagingException(ex.getMessage(), ex);
} catch (MessagingException ex) {
@@ -552,7 +554,7 @@ public class EmailService implements AutoCloseable {
try {
EntityLog.log(context, "Falling back to " + iaddr);
_connect(host, iaddr, port, require_id, user, authenticator, factory);
_connect(iaddr, port, require_id, user, authenticator, factory);
return;
} catch (MessagingException ex1) {
ex = ex1;
@@ -570,10 +572,9 @@ public class EmailService implements AutoCloseable {
}
private void _connect(
String host, InetAddress address, int port, boolean require_id,
InetAddress address, int port, boolean require_id,
String user, Authenticator authenticator,
SSLSocketFactoryService factory) throws MessagingException {
properties.setProperty("fairemail.server", host);
isession = Session.getInstance(properties, authenticator);
isession.setDebug(debug || log);