mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Uses network timeout for store close timeout

This commit is contained in:
M66B 2018-09-08 18:15:23 +00:00
parent f25c1296df
commit 89f1321a0a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@ -61,7 +61,7 @@ public class MessageHelper {
private MimeMessage imessage;
private String raw = null;
private final static int NETWORK_TIMEOUT = 60 * 1000; // milliseconds
final static int NETWORK_TIMEOUT = 60 * 1000; // milliseconds
static Properties getSessionProperties(Context context, int auth_type) {
Properties props = new Properties();

3
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@ -126,7 +126,6 @@ public class ServiceSynchronize extends LifecycleService {
private static final int CONNECT_BACKOFF_START = 8; // seconds
private static final int CONNECT_BACKOFF_MAX = 1024; // seconds (1024 sec ~ 17 min)
private static final long STORE_NOOP_INTERVAL = 9 * 60 * 1000L; // ms
private static final long STORE_CLOSE_TIMEOUT = 20 * 1000L; // ms
private static final int ATTACHMENT_AUTO_DOWNLOAD_SIZE = 32 * 1024; // bytes
static final String ACTION_SYNCHRONIZE_FOLDER = BuildConfig.APPLICATION_ID + ".SYNCHRONIZE_FOLDER";
@ -807,7 +806,7 @@ public class ServiceSynchronize extends LifecycleService {
});
t.start();
try {
t.join(STORE_CLOSE_TIMEOUT);
t.join(MessageHelper.NETWORK_TIMEOUT);
if (t.isAlive())
Log.w(Helper.TAG, account.name + " Close timeout");
} catch (InterruptedException ex) {