mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-24 23:12:55 +00:00
Code Issues Releases Wiki Activity

Increase network timeout to 60 seconds

Browse source
This commit is contained in:
M66B 2018-09-08 18:03:10 +00:00
parent f570911f8c
commit ba1a8e9551
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/eu/faircode/email/MessageHelper.java
View file

@ -61,6 +61,8 @@ public class MessageHelper {
private MimeMessage imessage; private MimeMessage imessage;
private String raw = null; private String raw = null;
private final static int NETWORK_TIMEOUT = 60 * 1000; // milliseconds
static Properties getSessionProperties(Context context, int auth_type) { static Properties getSessionProperties(Context context, int auth_type) {
Properties props = new Properties(); Properties props = new Properties();
@ -72,9 +74,9 @@ public class MessageHelper {
props.put("mail.imaps.starttls.enable", "false"); props.put("mail.imaps.starttls.enable", "false");
// TODO: make timeouts configurable? // TODO: make timeouts configurable?
props.put("mail.imaps.connectiontimeout", "60000"); props.put("mail.imaps.connectiontimeout", Integer.toString(NETWORK_TIMEOUT));
props.put("mail.imaps.timeout", "60000"); props.put("mail.imaps.timeout", Integer.toString(NETWORK_TIMEOUT));
props.put("mail.imaps.writetimeout", "60000"); // one thread overhead props.put("mail.imaps.writetimeout", Integer.toString(NETWORK_TIMEOUT)); // one thread overhead
props.put("mail.imaps.connectionpooltimeout", Integer.toString(3 * 60 * 1000)); // default: 45 sec props.put("mail.imaps.connectionpooltimeout", Integer.toString(3 * 60 * 1000)); // default: 45 sec
@ -94,9 +96,9 @@ public class MessageHelper {
props.put("mail.smtps.starttls.required", "false"); props.put("mail.smtps.starttls.required", "false");
props.put("mail.smtps.auth", "true"); props.put("mail.smtps.auth", "true");
props.put("mail.smtps.connectiontimeout", "20000"); props.put("mail.smtps.connectiontimeout", Integer.toString(NETWORK_TIMEOUT));
props.put("mail.smtps.writetimeout", "20000"); // one thread overhead props.put("mail.smtps.writetimeout", Integer.toString(NETWORK_TIMEOUT)); // one thread overhead
props.put("mail.smtps.timeout", "20000"); props.put("mail.smtps.timeout", Integer.toString(NETWORK_TIMEOUT));
props.put("mail.smtp.ssl.checkserveridentity", "true"); props.put("mail.smtp.ssl.checkserveridentity", "true");
props.put("mail.smtp.ssl.trust", "*"); props.put("mail.smtp.ssl.trust", "*");
@ -104,9 +106,9 @@ public class MessageHelper {
props.put("mail.smtp.starttls.required", "true"); props.put("mail.smtp.starttls.required", "true");
props.put("mail.smtp.auth", "true"); props.put("mail.smtp.auth", "true");
props.put("mail.smtp.connectiontimeout", "20000"); props.put("mail.smtp.connectiontimeout", Integer.toString(NETWORK_TIMEOUT));
props.put("mail.smtp.writetimeout", "20000"); // one thread overhead props.put("mail.smtp.writetimeout", Integer.toString(NETWORK_TIMEOUT)); // one thread overhead
props.put("mail.smtp.timeout", "20000"); props.put("mail.smtp.timeout", Integer.toString(NETWORK_TIMEOUT));
props.put("mail.imaps.peek", "true"); props.put("mail.imaps.peek", "true");
//props.put("mail.imaps.minidletime", "5000"); //props.put("mail.imaps.minidletime", "5000");