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

Revert "Check if account thread is alive" 

This reverts commit f0b88c8d2c.
This commit is contained in:
M66B 2020-03-03 19:22:45 +01:00
parent 60fbe7ead5
commit c8f6b77290
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3501,10 +3501,6 @@ class Core {
join(thread); join(thread);
} }
boolean isAlive() {
return thread.isAlive();
}
boolean isRunning() { boolean isRunning() {
return running; return running;
} }

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

@ -236,16 +236,15 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
// Some networks disallow email server connections: // Some networks disallow email server connections:
// - reload on network type change when disconnected // - reload on network type change when disconnected
boolean isRunning = (state != null && state.isAlive());
if (reload || if (reload ||
isRunning != current.canRun() || prev.canRun() != current.canRun() ||
!prev.accountState.equals(current.accountState) || !prev.accountState.equals(current.accountState) ||
(!"connected".equals(current.accountState.state) && (!"connected".equals(current.accountState.state) &&
!Objects.equals(prev.networkState.getType(), current.networkState.getType()))) { !Objects.equals(prev.networkState.getType(), current.networkState.getType()))) {
if (isRunning || current.canRun()) if (prev.canRun() || current.canRun())
EntityLog.log(ServiceSynchronize.this, "### changed " + current + EntityLog.log(ServiceSynchronize.this, "### changed " + current +
" reload=" + reload + " reload=" + reload +
" stop=" + isRunning + " stop=" + prev.canRun() +
" start=" + current.canRun() + " start=" + current.canRun() +
" sync=" + current.accountState.isEnabled(current.enabled) + "/" + sync + " sync=" + current.accountState.isEnabled(current.enabled) + "/" + sync +
" changed=" + !prev.accountState.equals(current.accountState) + " changed=" + !prev.accountState.equals(current.accountState) +
@ -256,7 +255,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
" tbd=" + current.accountState.tbd + " tbd=" + current.accountState.tbd +
" state=" + current.accountState.state + " state=" + current.accountState.state +
" type=" + prev.networkState.getType() + "/" + current.networkState.getType()); " type=" + prev.networkState.getType() + "/" + current.networkState.getType());
if (isRunning) if (prev.canRun())
stop(prev); stop(prev);
if (current.canRun()) if (current.canRun())
start(current, current.accountState.isEnabled(current.enabled) || sync); start(current, current.accountState.isEnabled(current.enabled) || sync);