From 9543eef2925aed4cc9abd7078b41f91252a24c38 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 1 Dec 2020 08:50:25 +0100 Subject: [PATCH] Reduced connection timeout --- app/src/main/java/eu/faircode/email/EmailService.java | 2 +- app/src/main/java/eu/faircode/email/ServiceSynchronize.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java index 9a88167fae..e23e4e7b5b 100644 --- a/app/src/main/java/eu/faircode/email/EmailService.java +++ b/app/src/main/java/eu/faircode/email/EmailService.java @@ -126,7 +126,7 @@ public class EmailService implements AutoCloseable { static final int ENCRYPTION_STARTTLS = 1; static final int ENCRYPTION_NONE = 2; - final static int DEFAULT_CONNECT_TIMEOUT = 20; // seconds + final static int DEFAULT_CONNECT_TIMEOUT = 15; // seconds private final static int SEARCH_TIMEOUT = 90 * 1000; // milliseconds private final static int FETCH_SIZE = 1024 * 1024; // bytes, default 16K diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index 44de8a0744..e14ffe045c 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -111,7 +111,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences private static final int OPTIMIZE_KEEP_ALIVE_INTERVAL = 12; // minutes private static final int OPTIMIZE_POLL_INTERVAL = 15; // minutes private static final int CONNECT_BACKOFF_START = 4; // seconds - private static final int CONNECT_BACKOFF_MAX = 8; // seconds (totally 4+8+2x20=52 seconds) + private static final int CONNECT_BACKOFF_MAX = 8; // seconds (totally 4+8+2x15=42 seconds) private static final int CONNECT_BACKOFF_ALARM_START = 15; // minutes private static final int CONNECT_BACKOFF_ALARM_MAX = 60; // minutes private static final long CONNECT_BACKOFF_GRACE = 2 * 60 * 1000L; // milliseconds