From 30ecd4fcd11b25115e71beed98ac23502a559c70 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 11 Mar 2021 10:27:38 +0100 Subject: [PATCH] Oops --- app/src/main/java/eu/faircode/email/EmailService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java index e1a704fe07..f454d004fd 100644 --- a/app/src/main/java/eu/faircode/email/EmailService.java +++ b/app/src/main/java/eu/faircode/email/EmailService.java @@ -560,10 +560,12 @@ public class EmailService implements AutoCloseable { private void _connect( InetAddress address, int port, boolean require_id, - String user, Authenticator authenticator, + String _user, Authenticator authenticator, SSLSocketFactoryService factory) throws MessagingException { isession = Session.getInstance(properties, authenticator); + String user = (TextUtils.isEmpty(_user) ? null : _user); + isession.setDebug(debug || log); if (debug || log) isession.setDebugOut(new PrintStream(new OutputStream() { @@ -593,9 +595,6 @@ public class EmailService implements AutoCloseable { //System.setProperty("mail.socket.debug", Boolean.toString(debug)); isession.addProvider(new GmailSSLProvider()); - if (TextUtils.isEmpty(user)) - user = null; - if ("pop3".equals(protocol) || "pop3s".equals(protocol)) { iservice = isession.getStore(protocol); iservice.connect(address.getHostAddress(), port, user, null);