mirror of https://github.com/M66B/FairEmail.git
Fixed stop with multiple accounts
This commit is contained in:
parent
403fce8b52
commit
8ac94776ed
|
@ -1549,9 +1549,19 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
|
|
||||||
EntityLog.log(ServiceSynchronize.this, "Main started");
|
EntityLog.log(ServiceSynchronize.this, "Main started");
|
||||||
|
|
||||||
|
synchronized (state) {
|
||||||
|
try {
|
||||||
|
state.wait();
|
||||||
|
} catch (InterruptedException ex) {
|
||||||
|
Log.w(Helper.TAG, "main wait " + ex.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Stop monitoring accounts
|
// Stop monitoring accounts
|
||||||
for (Thread t : threads)
|
for (Thread t : threads) {
|
||||||
|
t.interrupt();
|
||||||
join(t);
|
join(t);
|
||||||
|
}
|
||||||
threads.clear();
|
threads.clear();
|
||||||
|
|
||||||
// Stop monitoring outbox
|
// Stop monitoring outbox
|
||||||
|
@ -1642,7 +1652,6 @@ public class ServiceSynchronize extends LifecycleService {
|
||||||
Log.i(Helper.TAG, "Joined " + thread.getName());
|
Log.i(Helper.TAG, "Joined " + thread.getName());
|
||||||
} catch (InterruptedException ex) {
|
} catch (InterruptedException ex) {
|
||||||
Log.e(Helper.TAG, thread.getName() + " join " + ex.toString());
|
Log.e(Helper.TAG, thread.getName() + " join " + ex.toString());
|
||||||
thread.interrupt();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue