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

Fixed restart

This commit is contained in:
M66B 2018-09-11 16:29:43 +00:00
parent 8619da79b5
commit 831db4569e
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1636,37 +1636,31 @@ public class ServiceSynchronize extends LifecycleService {
} }
private void stop() { private void stop() {
if (main != null) { EntityLog.log(ServiceSynchronize.this, "Main stop " + main);
EntityLog.log(ServiceSynchronize.this, "Main stop " + main); synchronized (state) {
synchronized (state) { state.running = false;
state.running = false; state.notifyAll();
state.notifyAll();
}
// stop wait or backoff
main.interrupt();
join(main);
main = null;
state = null;
EntityLog.log(ServiceSynchronize.this, "Main stopped " + main);
} }
// stop wait or backoff
main.interrupt();
join(main);
main = null;
state = null;
EntityLog.log(ServiceSynchronize.this, "Main stopped " + main);
} }
private void restart() { private void restart() {
lifecycle.submit(new Runnable() { if (running)
@Override lifecycle.submit(new Runnable() {
public void run() { @Override
stop(); public void run() {
} stop();
}); start();
lifecycle.submit(new Runnable() { }
@Override });
public void run() {
start();
}
});
} }
private BroadcastReceiver outboxReceiver = new BroadcastReceiver() { private BroadcastReceiver outboxReceiver = new BroadcastReceiver() {