Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-05 16:43:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Wait longer only when max connections

Browse Source
This commit is contained in:
M66B
2020-02-05 19:11:34 +01:00
parent b73b26b44d
commit e0b6060252
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -819,7 +819,10 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
EntityLog.log(ServiceSynchronize.this, account.name + " alert: " + message);
if (!isMaxConnections(message) || state.getBackoff() > CONNECT_BACKOFF_MAX) {
boolean max = isMaxConnections(message);
if (max)
state.setMaxConnections();
if (!max || state.getBackoff() > CONNECT_BACKOFF_MAX) {
NotificationManager nm = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
nm.notify("alert:" + account.id, 1,
getNotificationAlert(account.name, message).build());
@@ -849,7 +852,10 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
boolean ioError = false;
Throwable c = ex;
while (c != null) {
if (c instanceof IOException || isMaxConnections(c.getMessage())) {
boolean max = isMaxConnections(c.getMessage());
if (max)
state.setMaxConnections();
if (c instanceof IOException || max) {
ioError = true;
break;
}
@@ -1456,8 +1462,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
// Short back-off period, keep device awake
EntityLog.log(this, account.name + " backoff=" + backoff);
try {
state.acquire(backoff *
("imap.gmail.com".equalsIgnoreCase(account.host) ? 2000L : 1000L));
state.acquire(backoff * 1000L * (state.getMaxConnections() ? 2 : 1));
} catch (InterruptedException ex) {
Log.w(account.name + " backoff " + ex.toString());
}