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

Revert "Fast close" 

This reverts commit 3c417d3a02.
This commit is contained in:
M66B 2020-09-24 08:12:25 +02:00
parent 3c417d3a02
commit 5d3900553d
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1615,7 +1615,21 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
state.resetBatches();
((ThreadPoolExecutor) executor).getQueue().clear();
// Close store/folders
// Close folders
for (EntityFolder folder : mapFolders.keySet())
if (folder.synchronize && !folder.poll && mapFolders.get(folder) != null) {
db.folder().setFolderState(folder.id, "closing");
try {
if (iservice.getStore().isConnected())
mapFolders.get(folder).close();
} catch (Throwable ex) {
Log.w(ex);
} finally {
db.folder().setFolderState(folder.id, null);
}
}
// Close store
try {
EntityLog.log(this, account.name + " store closing");
iservice.close();
@ -1624,8 +1638,6 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
Log.w(account.name, ex);
} finally {
EntityLog.log(this, account.name + " closed");
for (EntityFolder folder : mapFolders.keySet())
db.folder().setFolderState(folder.id, null);
db.account().setAccountState(account.id, null);
}