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

Simplified store/folder close

This commit is contained in:
M66B 2021-07-31 09:25:58 +02:00
parent 3114de8db5
commit e455a4c374
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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