Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-29 09:01:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed occasional hangs on stop, small improvements

Browse Source
This commit is contained in:
M66B
2018-09-12 08:16:38 +00:00
parent dfb19c24a2
commit 99a174f8c1
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1549,6 +1549,7 @@ public class ServiceSynchronize extends LifecycleService {
private void start() {
EntityLog.log(ServiceSynchronize.this, "Main start");
state = new ServiceState();
main = new Thread(new Runnable() {
@@ -1556,9 +1557,9 @@ public class ServiceSynchronize extends LifecycleService {
@Override
public void run() {
DB db = DB.getInstance(ServiceSynchronize.this);
try {
DB db = DB.getInstance(ServiceSynchronize.this);
outbox = db.folder().getOutbox();
if (outbox == null) {
EntityLog.log(ServiceSynchronize.this, "No outbox, halt");
@@ -1604,11 +1605,12 @@ public class ServiceSynchronize extends LifecycleService {
threads.add(t);
}
EntityLog.log(ServiceSynchronize.this, "Main started " + main);
EntityLog.log(ServiceSynchronize.this, "Main started");
synchronized (state) {
try {
state.wait();
if (state.running)
state.wait();
} catch (InterruptedException ex) {
Log.w(Helper.TAG, "main wait " + ex.toString());
}
@@ -1638,7 +1640,8 @@ public class ServiceSynchronize extends LifecycleService {
}
private void stop() {
EntityLog.log(ServiceSynchronize.this, "Main stop " + main);
EntityLog.log(ServiceSynchronize.this, "Main stop");
synchronized (state) {
state.running = false;
state.notifyAll();
@@ -1648,10 +1651,10 @@ public class ServiceSynchronize extends LifecycleService {
main.interrupt();
join(main);
EntityLog.log(ServiceSynchronize.this, "Main stopped");
main = null;
state = null;
EntityLog.log(ServiceSynchronize.this, "Main stopped " + main);
}
private void restart() {