From e1a785afc3e2a143c12863eabeeaaca93b4b3213 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 6 Feb 2020 13:01:11 +0100 Subject: [PATCH] Increased search timeout --- .../java/eu/faircode/email/ActivityEML.java | 2 +- .../email/BoundaryCallbackMessages.java | 2 +- .../java/eu/faircode/email/EmailService.java | 28 ++++++++++++++++--- .../eu/faircode/email/FragmentAccount.java | 4 +-- .../java/eu/faircode/email/FragmentGmail.java | 4 +-- .../eu/faircode/email/FragmentIdentity.java | 2 +- .../java/eu/faircode/email/FragmentOAuth.java | 4 +-- .../java/eu/faircode/email/FragmentPop.java | 2 +- .../eu/faircode/email/FragmentQuickSetup.java | 4 +-- .../java/eu/faircode/email/ServiceSend.java | 2 +- .../eu/faircode/email/ServiceSynchronize.java | 2 +- 11 files changed, 38 insertions(+), 18 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityEML.java b/app/src/main/java/eu/faircode/email/ActivityEML.java index f9e41f3693..4eb706c605 100644 --- a/app/src/main/java/eu/faircode/email/ActivityEML.java +++ b/app/src/main/java/eu/faircode/email/ActivityEML.java @@ -415,7 +415,7 @@ 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, false, 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 4af6d519bd..8e024f51cb 100644 --- a/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java +++ b/app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java @@ -303,7 +303,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback folders; String aprotocol = provider.imap.starttls ? "imap" : "imaps"; - try (EmailService iservice = new EmailService(context, aprotocol, null, false, true, true)) { + 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,7 +320,7 @@ public class FragmentGmail extends FragmentBase { } String iprotocol = provider.smtp.starttls ? "smtp" : "smtps"; - try (EmailService iservice = new EmailService(context, iprotocol, null, false, true, true)) { + 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); } diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java index 814bab3d91..26b6504bb7 100644 --- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java +++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java @@ -776,7 +776,7 @@ public class FragmentIdentity extends FragmentBase { if (check) { // Create transport String protocol = (starttls ? "smtp" : "smtps"); - try (EmailService iservice = new EmailService(context, protocol, realm, insecure, true, 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 9ef930d821..43b8a8dd21 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOAuth.java +++ b/app/src/main/java/eu/faircode/email/FragmentOAuth.java @@ -469,7 +469,7 @@ 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, true, true)) { + 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,7 +480,7 @@ 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, true, true)) { + 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); } diff --git a/app/src/main/java/eu/faircode/email/FragmentPop.java b/app/src/main/java/eu/faircode/email/FragmentPop.java index 6c95009ee3..e3b9e3d914 100644 --- a/app/src/main/java/eu/faircode/email/FragmentPop.java +++ b/app/src/main/java/eu/faircode/email/FragmentPop.java @@ -309,7 +309,7 @@ public class FragmentPop extends FragmentBase { // Check POP3 server if (check) { String protocol = "pop3" + (starttls ? "" : "s"); - try (EmailService iservice = new EmailService(context, protocol, null, insecure, true, true)) { + 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 1b6840617e..26e8d65c66 100644 --- a/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentQuickSetup.java @@ -278,7 +278,7 @@ public class FragmentQuickSetup extends FragmentBase { List folders; String aprotocol = provider.imap.starttls ? "imap" : "imaps"; - try (EmailService iservice = new EmailService(context, aprotocol, null, false, true, 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); } catch (AuthenticationFailedException ex) { @@ -298,7 +298,7 @@ public class FragmentQuickSetup extends FragmentBase { } String iprotocol = provider.smtp.starttls ? "smtp" : "smtps"; - try (EmailService iservice = new EmailService(context, iprotocol, null, false, true, 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); } diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java index 06c4b67625..d25bf018b4 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSend.java +++ b/app/src/main/java/eu/faircode/email/ServiceSend.java @@ -420,7 +420,7 @@ public class ServiceSend extends ServiceBase { // Create transport try (EmailService iservice = new EmailService( - this, ident.getProtocol(), ident.realm, ident.insecure, false, debug)) { + this, ident.getProtocol(), ident.realm, ident.insecure, debug)) { iservice.setUseIp(ident.use_ip); // Connect transport diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index dbc38a49b8..088ae54588 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -801,7 +801,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences boolean debug = (prefs.getBoolean("debug", false) || BuildConfig.DEBUG); final EmailService iservice = new EmailService( - this, account.getProtocol(), account.realm, account.insecure, false, debug); + this, account.getProtocol(), account.realm, account.insecure, debug); iservice.setPartialFetch(account.partial_fetch); iservice.setIgnoreBodyStructureSize(account.ignore_size); if (account.protocol != EntityAccount.TYPE_IMAP)