From c912f99bce196ce38e59d1f96ccdbe38dd5a8b0c Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 6 Feb 2020 13:06:10 +0100 Subject: [PATCH] Refactoring --- .../main/java/eu/faircode/email/ActivityEML.java | 3 ++- .../faircode/email/BoundaryCallbackMessages.java | 3 ++- .../java/eu/faircode/email/FragmentAccount.java | 16 ++++++++++++---- .../java/eu/faircode/email/FragmentGmail.java | 16 ++++++++++++---- .../java/eu/faircode/email/FragmentIdentity.java | 3 ++- .../java/eu/faircode/email/FragmentOAuth.java | 16 ++++++++++++---- .../main/java/eu/faircode/email/FragmentPop.java | 8 ++++++-- .../eu/faircode/email/FragmentQuickSetup.java | 16 ++++++++++++---- 8 files changed, 60 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityEML.java b/app/src/main/java/eu/faircode/email/ActivityEML.java index 4eb706c605..04f2ff3ec3 100644 --- a/app/src/main/java/eu/faircode/email/ActivityEML.java +++ b/app/src/main/java/eu/faircode/email/ActivityEML.java @@ -415,7 +415,8 @@ public class ActivityEML extends ActivityBase { Session isession = Session.getInstance(props, null); MimeMessage imessage = new MimeMessage(isession, is); - try (EmailService iservice = new EmailService(context, account.getProtocol(), account.realm, account.insecure, true)) { + try (EmailService iservice = new EmailService( + context, account.getProtocol(), account.realm, account.insecure, true)) { iservice.setPartialFetch(account.partial_fetch); iservice.setIgnoreBodyStructureSize(account.ignore_size); iservice.connect(account); diff --git a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java index 8e024f51cb..8b1f948df7 100644 --- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java +++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java @@ -303,7 +303,8 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback folders; String aprotocol = provider.imap.starttls ? "imap" : "imaps"; - try (EmailService iservice = new EmailService(context, aprotocol, null, false, EmailService.PURPOSE_CHECK, true)) { - iservice.connect(provider.imap.host, provider.imap.port, EmailService.AUTH_TYPE_GMAIL, null, user, password, null); + try (EmailService iservice = new EmailService( + context, aprotocol, null, false, EmailService.PURPOSE_CHECK, true)) { + iservice.connect( + provider.imap.host, provider.imap.port, + EmailService.AUTH_TYPE_GMAIL, null, + user, password, null); folders = iservice.getFolders(); @@ -320,8 +324,12 @@ public class FragmentGmail extends FragmentBase { } String iprotocol = provider.smtp.starttls ? "smtp" : "smtps"; - try (EmailService iservice = new EmailService(context, iprotocol, null, false, EmailService.PURPOSE_CHECK, true)) { - iservice.connect(provider.smtp.host, provider.smtp.port, EmailService.AUTH_TYPE_GMAIL, null, user, password, null); + try (EmailService iservice = new EmailService( + context, iprotocol, null, false, EmailService.PURPOSE_CHECK, true)) { + iservice.connect( + provider.smtp.host, provider.smtp.port, + EmailService.AUTH_TYPE_GMAIL, null, + user, password, null); } DB db = DB.getInstance(context); diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index 26b6504bb7..ac06263cf8 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -776,7 +776,8 @@ public class FragmentIdentity extends FragmentBase { if (check) { // Create transport String protocol = (starttls ? "smtp" : "smtps"); - try (EmailService iservice = new EmailService(context, protocol, realm, insecure, EmailService.PURPOSE_CHECK, true)) { + try (EmailService iservice = new EmailService( + context, protocol, realm, insecure, EmailService.PURPOSE_CHECK, true)) { iservice.setUseIp(use_ip); iservice.connect(host, Integer.parseInt(port), auth, provider, user, password, fingerprint); } diff --git a/app/src/main/java/eu/faircode/email/FragmentOAuth.java b/app/src/main/java/eu/faircode/email/FragmentOAuth.java index 43b8a8dd21..0ec1168306 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java +++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java @@ -469,8 +469,12 @@ public class FragmentOAuth extends FragmentBase { Log.i("OAuth checking IMAP provider=" + provider.id); String aprotocol = provider.imap.starttls ? "imap" : "imaps"; - try (EmailService iservice = new EmailService(context, aprotocol, null, false, EmailService.PURPOSE_CHECK, true)) { - iservice.connect(provider.imap.host, provider.imap.port, EmailService.AUTH_TYPE_OAUTH, provider.id, primaryEmail, state, null); + try (EmailService iservice = new EmailService( + context, aprotocol, null, false, EmailService.PURPOSE_CHECK, true)) { + iservice.connect( + provider.imap.host, provider.imap.port, + EmailService.AUTH_TYPE_OAUTH, provider.id, + primaryEmail, state, null); folders = iservice.getFolders(); @@ -480,8 +484,12 @@ public class FragmentOAuth extends FragmentBase { Log.i("OAuth checking SMTP provider=" + provider.id); String iprotocol = provider.smtp.starttls ? "smtp" : "smtps"; - try (EmailService iservice = new EmailService(context, iprotocol, null, false, EmailService.PURPOSE_CHECK, true)) { - iservice.connect(provider.smtp.host, provider.smtp.port, EmailService.AUTH_TYPE_OAUTH, provider.id, primaryEmail, state, null); + try (EmailService iservice = new EmailService( + context, iprotocol, null, false, EmailService.PURPOSE_CHECK, true)) { + iservice.connect( + provider.smtp.host, provider.smtp.port, + EmailService.AUTH_TYPE_OAUTH, provider.id, + primaryEmail, state, null); } Log.i("OAuth passed provider=" + provider.id); diff --git a/app/src/main/java/eu/faircode/email/FragmentPop.java b/app/src/main/java/eu/faircode/email/FragmentPop.java index e3b9e3d914..7c400c2e6e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentPop.java +++ b/app/src/main/java/eu/faircode/email/FragmentPop.java @@ -309,8 +309,12 @@ public class FragmentPop extends FragmentBase { // Check POP3 server if (check) { String protocol = "pop3" + (starttls ? "" : "s"); - try (EmailService iservice = new EmailService(context, protocol, null, insecure, EmailService.PURPOSE_CHECK, true)) { - iservice.connect(host, Integer.parseInt(port), EmailService.AUTH_TYPE_PASSWORD, null, user, password, null); + try (EmailService iservice = new EmailService( + context, protocol, null, insecure, EmailService.PURPOSE_CHECK, true)) { + iservice.connect( + host, Integer.parseInt(port), + EmailService.AUTH_TYPE_PASSWORD, null, + user, password, null); } } diff --git a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java index 26e8d65c66..59f34d348d 100644 --- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java @@ -278,9 +278,13 @@ public class FragmentQuickSetup extends FragmentBase { List folders; String aprotocol = provider.imap.starttls ? "imap" : "imaps"; - try (EmailService iservice = new EmailService(context, aprotocol, null, false, EmailService.PURPOSE_CHECK, true)) { + try (EmailService iservice = new EmailService( + context, aprotocol, null, false, EmailService.PURPOSE_CHECK, true)) { try { - iservice.connect(provider.imap.host, provider.imap.port, EmailService.AUTH_TYPE_PASSWORD, null, user, password, null); + iservice.connect( + provider.imap.host, provider.imap.port, + EmailService.AUTH_TYPE_PASSWORD, null, + user, password, null); } catch (AuthenticationFailedException ex) { if (!user.equals(username)) { Log.w(ex); @@ -298,9 +302,13 @@ public class FragmentQuickSetup extends FragmentBase { } String iprotocol = provider.smtp.starttls ? "smtp" : "smtps"; - try (EmailService iservice = new EmailService(context, iprotocol, null, false, EmailService.PURPOSE_CHECK, true)) { + try (EmailService iservice = new EmailService( + context, iprotocol, null, false, EmailService.PURPOSE_CHECK, true)) { iservice.setUseIp(provider.useip); - iservice.connect(provider.smtp.host, provider.smtp.port, EmailService.AUTH_TYPE_PASSWORD, null, user, password, null); + iservice.connect( + provider.smtp.host, provider.smtp.port, + EmailService.AUTH_TYPE_PASSWORD, null, + user, password, null); } if (check)