Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-01 06:38:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Start with account/folder check

Browse Source
This commit is contained in:
M66B
2018-11-28 18:41:02 +01:00
parent 611a326ffa
commit 2507276a1e
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -839,7 +839,6 @@ public class ServiceSynchronize extends LifecycleService {
Log.i(Helper.TAG, account.name + " idle=" + capIdle);
db.account().setAccountState(account.id, "connected");
db.account().setAccountConnected(account.id, new Date().getTime());
db.account().setAccountError(account.id, capIdle ? null : getString(R.string.title_no_idle));
NotificationManager nm = getSystemService(NotificationManager.class);
@@ -1069,9 +1068,6 @@ public class ServiceSynchronize extends LifecycleService {
}
}
// Successfully connected: reset back off time
backoff = CONNECT_BACKOFF_START;
// Process folder actions
BroadcastReceiver processFolder = new BroadcastReceiver() {
@Override
@@ -1192,6 +1188,22 @@ public class ServiceSynchronize extends LifecycleService {
AlarmManager am = getSystemService(AlarmManager.class);
try {
while (state.running) {
if (!istore.isConnected())
throw new StoreClosedException(istore);
for (EntityFolder folder : folders.keySet())
if (capIdle) {
if (!folders.get(folder).isOpen())
throw new FolderClosedException(folders.get(folder));
} else
synchronizeMessages(account, folder, folders.get(folder), state);
// Successfully connected: reset back off time
backoff = CONNECT_BACKOFF_START;
// Record successful connection
db.account().setAccountConnected(account.id, new Date().getTime());
// Schedule keep alive alarm
EntityLog.log(this, account.name + " wait=" + account.poll_interval);
am.setAndAllowWhileIdle(
@@ -1207,21 +1219,6 @@ public class ServiceSynchronize extends LifecycleService {
} finally {
wl0.acquire();
}
if (state.running) {
if (!istore.isConnected())
throw new StoreClosedException(istore);
for (EntityFolder folder : folders.keySet())
if (capIdle) {
if (!folders.get(folder).isOpen())
throw new FolderClosedException(folders.get(folder));
} else
synchronizeMessages(account, folder, folders.get(folder), state);
db.account().setAccountConnected(account.id, new Date().getTime());
}
}
} finally {
// Cleanup