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

Refactoring

This commit is contained in:
M66B 2019-08-12 15:29:23 +02:00
parent aef181b869
commit beb2d6a1f1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/eu/faircode/email/Core.java
View File

@ -2392,6 +2392,7 @@ class Core {
private Semaphore semaphore = new Semaphore(0); private Semaphore semaphore = new Semaphore(0);
private boolean running = true; private boolean running = true;
private boolean recoverable = true; private boolean recoverable = true;
List<State> childs = Collections.synchronizedList(new ArrayList<>());
State(ConnectionHelper.NetworkState networkState) { State(ConnectionHelper.NetworkState networkState) {
this.networkState = networkState; this.networkState = networkState;

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

@ -506,7 +506,6 @@ public class ServiceSynchronize extends ServiceBase {
private PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE); private PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
private PowerManager.WakeLock wl = pm.newWakeLock( private PowerManager.WakeLock wl = pm.newWakeLock(
PowerManager.PARTIAL_WAKE_LOCK, BuildConfig.APPLICATION_ID + ":main"); PowerManager.PARTIAL_WAKE_LOCK, BuildConfig.APPLICATION_ID + ":main");
private List<Core.State> threadState = new ArrayList<>();
@Override @Override
public void run() { public void run() {
@ -549,7 +548,7 @@ public class ServiceSynchronize extends ServiceBase {
} }
}, "sync.account." + account.id); }, "sync.account." + account.id);
astate.start(); astate.start();
threadState.add(astate); state.childs.add(astate);
} }
EntityLog.log(ServiceSynchronize.this, "Main started"); EntityLog.log(ServiceSynchronize.this, "Main started");
@ -564,11 +563,11 @@ public class ServiceSynchronize extends ServiceBase {
} }
// Stop monitoring accounts // Stop monitoring accounts
for (Core.State astate : threadState) for (Core.State astate : state.childs)
astate.stop(); astate.stop();
for (Core.State astate : threadState) for (Core.State astate : state.childs)
astate.join(); astate.join();
threadState.clear(); state.childs.clear();
EntityLog.log(ServiceSynchronize.this, "Main exited"); EntityLog.log(ServiceSynchronize.this, "Main exited");
} catch (Throwable ex) { } catch (Throwable ex) {